Incorporate ErrorApi

Author: jack-berg

newrelic-opentelemetry-agent-extension/src/main/java/com/newrelic/opentelemetry/OpenTelemetryAgent.java

@@ -78,6 +78,7 @@ public Map<String, String> getLinkingMetadata() {
         return Collections.emptyMap();
     }
 
+    @Override
     public OpenTelemetryErrorApi getErrorApi() {
         return OpenTelemetryErrorApi.getInstance();
     }

newrelic-opentelemetry-agent-extension/src/main/java/com/newrelic/opentelemetry/OpenTelemetryErrorApi.java

@@ -1,18 +1,22 @@
 package com.newrelic.opentelemetry;
 
+import com.newrelic.api.agent.ErrorApi;
+import com.newrelic.api.agent.ErrorGroupCallback;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.StatusCode;
 
 import java.util.Map;
 
+import static com.newrelic.opentelemetry.OpenTelemetryNewRelic.logUnsupportedMethod;
+
 /**
  * Note class is public because it is accessed from package
  * {@code com.newrelic.api.agent} after {@link com.newrelic.api.agent.NewRelic}
  * is rewritten.
  */
-public final class OpenTelemetryErrorApi {
+public final class OpenTelemetryErrorApi implements ErrorApi {
 
     private static final OpenTelemetryErrorApi INSTANCE = new OpenTelemetryErrorApi();
 
@@ -27,41 +31,54 @@ static OpenTelemetryErrorApi getInstance() {
         return INSTANCE;
     }
 
+    @Override
     public void noticeError(Throwable throwable, Map<String, ?> params) {
         noticeError(throwable, params, false);
     }
 
+    @Override
     public void noticeError(Throwable throwable) {
         noticeError(throwable, false);
     }
 
+    @Override
     public void noticeError(String message, Map<String, ?> params) {
         noticeError(new ReportedError(message), params);
     }
 
+    @Override
     public void noticeError(String message) {
         noticeError(new ReportedError(message));
     }
 
+    @Override
     public void noticeError(Throwable throwable, Map<String, ?> params, boolean expected) {
         Attributes attributes = OpenTelemetryNewRelic.toAttributes(params).putAll(expected ? EXPECTED_ERROR_ATTRIBUTES : UNEXPECTED_ERROR_ATTRIBUTES).build();
         Span.current().recordException(throwable, attributes);
         Span.current().setStatus(StatusCode.ERROR);
     }
 
+    @Override
     public void noticeError(Throwable throwable, boolean expected) {
         Span.current().recordException(throwable, expected ? EXPECTED_ERROR_ATTRIBUTES : UNEXPECTED_ERROR_ATTRIBUTES);
         Span.current().setStatus(StatusCode.ERROR);
     }
 
+    @Override
     public void noticeError(String message, Map<String, ?> params, boolean expected) {
         noticeError(new ReportedError(message), params, expected);
     }
 
+    @Override
     public void noticeError(String message, boolean expected) {
         noticeError(new ReportedError(message), expected);
     }
 
+    @Override
+    public void setErrorGroupCallback(ErrorGroupCallback errorGroupCallback) {
+        logUnsupportedMethod("ErrorApi", "setErrorGroupCallback");
+    }
+
     private static class ReportedError extends Exception {
         private ReportedError(String message) {
             super(message);

newrelic-opentelemetry-agent-extension/src/main/java/com/newrelic/opentelemetry/OpenTelemetryNewRelic.java

@@ -25,10 +25,6 @@ public static Agent getAgent() {
         return AGENT_REF.get();
     }
 
-    static OpenTelemetryAgent getOpenTelemetryAgent() {
-        return AGENT_REF.get();
-    }
-
     // Visible for testing
     public static void resetForTest() {
         AGENT_REF.set(NOOP_AGENT);
@@ -59,35 +55,35 @@ public static void incrementCounter(String name, int count) {
     // ************************** Error API ***********************************//
 
     public static void noticeError(Throwable throwable, Map<String, ?> params) {
-        getOpenTelemetryAgent().getErrorApi().noticeError(throwable, params);
+        getAgent().getErrorApi().noticeError(throwable, params);
     }
 
     public static void noticeError(Throwable throwable) {
-        getOpenTelemetryAgent().getErrorApi().noticeError(throwable);
+        getAgent().getErrorApi().noticeError(throwable);
     }
 
     public static void noticeError(String message, Map<String, ?> params) {
-        getOpenTelemetryAgent().getErrorApi().noticeError(message, params);
+        getAgent().getErrorApi().noticeError(message, params);
     }
 
     public static void noticeError(String message) {
-        getOpenTelemetryAgent().getErrorApi().noticeError(message);
+        getAgent().getErrorApi().noticeError(message);
     }
 
     public static void noticeError(Throwable throwable, Map<String, ?> params, boolean expected) {
-        getOpenTelemetryAgent().getErrorApi().noticeError(throwable, params, expected);
+        getAgent().getErrorApi().noticeError(throwable, params, expected);
     }
 
     public static void noticeError(Throwable throwable, boolean expected) {
-        getOpenTelemetryAgent().getErrorApi().noticeError(throwable, expected);
+        getAgent().getErrorApi().noticeError(throwable, expected);
     }
 
     public static void noticeError(String message, Map<String, ?> params, boolean expected) {
-        getOpenTelemetryAgent().getErrorApi().noticeError(message, params, expected);
+        getAgent().getErrorApi().noticeError(message, params, expected);
     }
 
     public static void noticeError(String message, boolean expected) {
-        getOpenTelemetryAgent().getErrorApi().noticeError(message, expected);
+        getAgent().getErrorApi().noticeError(message, expected);
     }
 
     // **************************** Transaction APIs ********************************//
@@ -179,7 +175,7 @@ public static void setInstanceName(String instanceName) {
     }
 
     public static void setErrorGroupCallback(ErrorGroupCallback errorGroupCallback) {
-        logUnsupportedMethod("NewRelic", "setErrorGroupCallback");
+        getAgent().getErrorApi().setErrorGroupCallback(errorGroupCallback);
     }
 
     static void logUnsupportedMethod(String className, String methodName) {

newrelic-opentelemetry-agent-extension/src/test/java/com/newrelic/api/agent/opentelemetry/NewRelicApiCompatibilityTest.java

@@ -38,6 +38,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 
+@SuppressWarnings("deprecation")
 class NewRelicApiCompatibilityTest {
 
     private static final ExtendedRequest DUMMY_REQUEST = new ExtendedRequestImpl();

newrelic-opentelemetry-agent-extension/src/testAgentExtension/java/com/newrelic/api/agent/opentelemetry/OpenTelemetryAgentExtensionSmokeTest.java

@@ -32,6 +32,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@SuppressWarnings("deprecation")
 class OpenTelemetryAgentExtensionSmokeTest {
 
     private static final ExtendedRequest DUMMY_REQUEST = new ExtendedRequestImpl();