Move reactor context propagation operator instrumentation to separate…

… instrumentation module (open-telemetry#5188)
RashmiRam · May 23, 2022 · b16639a · b16639a
1 parent a25a459
commit b16639a
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/...java/io/opentelemetry/javaagent/instrumentation/reactor/ReactorInstrumentationModule.java b/...java/io/opentelemetry/javaagent/instrumentation/reactor/ReactorInstrumentationModule.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.reactor;
 
-import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
@@ -21,6 +21,6 @@ public ReactorInstrumentationModule() {
 
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
-    return asList(new HooksInstrumentation(), new ContextPropagationOperatorInstrumentation());
+    return singletonList(new HooksInstrumentation());
   }
 }
diff --git a/...xtPropagationOperatorInstrumentation.java → ...xtPropagationOperatorInstrumentation.java b/...xtPropagationOperatorInstrumentation.java → ...xtPropagationOperatorInstrumentation.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.reactor;
+package io.opentelemetry.javaagent.instrumentation.reactor.operator;
 
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;

diff --git a/...ent/instrumentation/reactor/operator/ContextPropagationOperatorInstrumentationModule.java b/...ent/instrumentation/reactor/operator/ContextPropagationOperatorInstrumentationModule.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.reactor.operator;
+
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
+import static java.util.Collections.singletonList;
+
+import com.google.auto.service.AutoService;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+import java.util.List;
+import net.bytebuddy.matcher.ElementMatcher;
+
+@AutoService(InstrumentationModule.class)
+public class ContextPropagationOperatorInstrumentationModule extends InstrumentationModule {
+
+  public ContextPropagationOperatorInstrumentationModule() {
+    super("reactor", "reactor-3.1", "reactor-context-propagation-operator");
+  }
+
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    return hasClassesNamed("application.io.opentelemetry.context.Context");
+  }
+
+  @Override
+  public List<TypeInstrumentation> typeInstrumentations() {
+    return singletonList(new ContextPropagationOperatorInstrumentation());
+  }
+}