NR-134815 Treat OTel WithSpan annotation as Trace (#1841)

* NR-134815 Treat OTel WithSpan annotation as Trace * Update TraceAnnotationTest.java
newrelic · Apr 5, 2024 · c3a1f53 · c3a1f53
1 parent 87cc68b
commit c3a1f53
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/functional_test/build.gradle b/functional_test/build.gradle
@@ -11,6 +11,9 @@ dependencies {
  implementation(project(":agent-bridge-datastore"))
  implementation(project(":newrelic-weaver"))
 
+ // WithSpan annotation
+ implementation('io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:1.33.1')
+
  testImplementation(project(":functional_test:weave_test_impl"))
 
  // the newrelic-agent test classes

diff --git a/functional_test/src/test/java/test/newrelic/test/agent/TraceAnnotationTest.java b/functional_test/src/test/java/test/newrelic/test/agent/TraceAnnotationTest.java
@@ -7,6 +7,7 @@
 
 package test.newrelic.test.agent;
 
+import com.newrelic.agent.Agent;
 import com.newrelic.agent.AgentHelper;
 import com.newrelic.agent.MetricNames;
 import com.newrelic.agent.Transaction;
@@ -29,6 +30,7 @@
 import com.newrelic.api.agent.NewRelic;
 import com.newrelic.api.agent.Token;
 import com.newrelic.api.agent.Trace;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -267,6 +269,19 @@ public void testDoubleArrayArgs() throws Exception {
  AgentHelper.verifyMetrics(metrics, MessageFormat.format("Custom/{0}/doubleArrayArg", Simple.class.getName()));
  }
 
+ @Test
+ public void testOTelWithSpan() {
+ withSpan();
+
+ Set<String> metrics = AgentHelper.getMetrics();
+ AgentHelper.verifyMetrics(metrics, MessageFormat.format("Custom/{0}/withSpan", Simple.class.getName()));
+ }
+
+ @Trace(dispatcher = true)
+ static void withSpan() {
+ new Simple().withSpan();
+ }
+
  @Trace(dispatcher = true)
  private void callDoubleArray() {
  new Simple().doubleArrayArg(new String[0][0]);
@@ -305,7 +320,12 @@ private void callCharArray() {
  new Simple().charArray(new char[] { 6 });
  }
 
- private class Simple {
+ private static class Simple {
+ @WithSpan
+ void withSpan() {
+ Agent.LOG.info("withSpan");
+ }
+
  @Trace
  private void foo() throws InterruptedException {
  Thread.sleep(200);

diff --git a/newrelic-agent/src/main/java/com/newrelic/agent/config/ClassTransformerConfigImpl.java b/newrelic-agent/src/main/java/com/newrelic/agent/config/ClassTransformerConfigImpl.java
@@ -59,6 +59,7 @@ final class ClassTransformerConfigImpl extends BaseConfig implements ClassTransf
  private static final String SYSTEM_PROPERTY_ROOT = "newrelic.config.class_transformer.";
 
  static final String NEW_RELIC_TRACE_TYPE_DESC = "Lcom/newrelic/api/agent/Trace;";
+ static final String OTEL_WITH_SPAN_TYPE_DESC = "Lio/opentelemetry/instrumentation/annotations/WithSpan;";
  static final String DEPRECATED_NEW_RELIC_TRACE_TYPE_DESC = "Lcom/newrelic/agent/Trace;";
 
  // as of JAVA-4824 the yml config file is not required, but still need to match old behavior
@@ -186,6 +187,7 @@ private AnnotationMatcher initializeTraceAnnotationMatcher(Map<?, ?> props) {
  List<AnnotationMatcher> matchers = new ArrayList<>();
  matchers.add(new ClassNameAnnotationMatcher(Type.getType(DEPRECATED_NEW_RELIC_TRACE_TYPE_DESC).getDescriptor()));
  matchers.add(new ClassNameAnnotationMatcher(Type.getType(NEW_RELIC_TRACE_TYPE_DESC).getDescriptor()));
+ matchers.add(new ClassNameAnnotationMatcher(Type.getType(OTEL_WITH_SPAN_TYPE_DESC).getDescriptor()));
 
  final Collection<String> traceAnnotationClassNames = getUniqueStrings("trace_annotation_class_name");
  if (traceAnnotationClassNames.isEmpty()) {