backcompat

Author: trask

instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/cxf/v3_0/CxfInstrumentationModule.java

@@ -8,18 +8,26 @@
 import static java.util.Collections.singletonList;
 
 import com.google.auto.service.AutoService;
+import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
 public class CxfInstrumentationModule extends InstrumentationModule {
   public CxfInstrumentationModule() {
-    super("cxf", "jaxws-2.0-cxf-3.0", "jaxws");
+    super("cxf", additionalNames());
   }
 
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new JaxWsServerFactoryBeanInstrumentation());
   }
+
+  private static String[] additionalNames() {
+    if (AgentCommonConfig.get().isV3Preview()) {
+      return new String[] {"jaxws-2.0-cxf-3.0", "jaxws"};
+    }
+    return new String[] {"jaxws-2.0-cxf-3.0", "jaxws", "jaxws-cxf-3.0"};
+  }
 }

instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/cxf/v3_0/CxfSingletons.java

@@ -7,10 +7,14 @@
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig;
 
 public class CxfSingletons {
-  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jaxws-2.0-cxf-3.0";
+  private static final String INSTRUMENTATION_NAME =
+      AgentCommonConfig.get().isV3Preview()
+          ? "io.opentelemetry.jaxws-2.0-cxf-3.0"
+          : "io.opentelemetry.jaxws-cxf-3.0";
 
   private static final Instrumenter<CxfRequest, Void> instrumenter;
 

instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/MetroInstrumentationModule.java

@@ -9,6 +9,7 @@
 import static java.util.Arrays.asList;
 
 import com.google.auto.service.AutoService;
+import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.List;
@@ -17,7 +18,7 @@
 @AutoService(InstrumentationModule.class)
 public class MetroInstrumentationModule extends InstrumentationModule {
   public MetroInstrumentationModule() {
-    super("metro", "jaxws-2.0-metro-2.2", "jaxws");
+    super("metro", additionalNames());
   }
 
   @Override
@@ -31,4 +32,11 @@ public List<TypeInstrumentation> typeInstrumentations() {
     return asList(
         new ServerTubeAssemblerContextInstrumentation(), new SoapFaultBuilderInstrumentation());
   }
+
+  private static String[] additionalNames() {
+    if (AgentCommonConfig.get().isV3Preview()) {
+      return new String[] {"jaxws-2.0-metro-2.2", "jaxws"};
+    }
+    return new String[] {"jaxws-2.0-metro-2.2", "jaxws", "jaxws-metro-2.2"};
+  }
 }

instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/metro/v2_2/MetroSingletons.java

@@ -7,10 +7,14 @@
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig;
 
 public class MetroSingletons {
-  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jaxws-2.0-metro-2.2";
+  private static final String INSTRUMENTATION_NAME =
+      AgentCommonConfig.get().isV3Preview()
+          ? "io.opentelemetry.jaxws-2.0-metro-2.2"
+          : "io.opentelemetry.jaxws-metro-2.2";
 
   private static final Instrumenter<MetroRequest, Void> instrumenter;