Fix import statements and remove dead code

Author: cb645j

instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaBehaviorSingletons.java

@@ -7,20 +7,18 @@
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.camunda.v7_0.behavior.CamundaBehaviorSpanNameExtractor;
-import io.opentelemetry.camunda.v7_0.common.CamundaCommonRequest;
-import io.opentelemetry.camunda.v7_0.common.CamundaVariableAttributeExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
+import io.opentelemetry.instrumentation.camunda.v7_0.behavior.CamundaBehaviorSpanNameExtractor;
+import io.opentelemetry.instrumentation.camunda.v7_0.common.CamundaCommonRequest;
+import io.opentelemetry.instrumentation.camunda.v7_0.common.CamundaVariableAttributeExtractor;
 
 public class CamundaBehaviorSingletons {
 
   private static final Instrumenter<CamundaCommonRequest, String> instrumenter;
 
   private static final OpenTelemetry opentelemetry;
 
-  private static final boolean propagationEnabled;
-
   static {
     opentelemetry = GlobalOpenTelemetry.get();
 

instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaEndEventActivityBehaviorInstrumentation.java

@@ -10,10 +10,10 @@
 import static io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior.CamundaBehaviorSingletons.getOpentelemetry;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
-import io.opentelemetry.camunda.v7_0.behavior.CamundaActivityExecutionGetter;
-import io.opentelemetry.camunda.v7_0.common.CamundaCommonRequest;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
+import io.opentelemetry.instrumentation.camunda.v7_0.behavior.CamundaActivityExecutionGetter;
+import io.opentelemetry.instrumentation.camunda.v7_0.common.CamundaCommonRequest;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;

instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaExternalTaskActivityBehaviorInstrumentation.java

@@ -10,11 +10,11 @@
 import static io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior.CamundaBehaviorSingletons.getOpentelemetry;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
-import io.opentelemetry.camunda.v7_0.behavior.CamundaActivityExecutionGetter;
-import io.opentelemetry.camunda.v7_0.behavior.CamundaActivityExecutionLocalSetter;
-import io.opentelemetry.camunda.v7_0.common.CamundaCommonRequest;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
+import io.opentelemetry.instrumentation.camunda.v7_0.behavior.CamundaActivityExecutionGetter;
+import io.opentelemetry.instrumentation.camunda.v7_0.behavior.CamundaActivityExecutionLocalSetter;
+import io.opentelemetry.instrumentation.camunda.v7_0.common.CamundaCommonRequest;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;

instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaTaskActivityBehaviorInstrumentation.java

@@ -11,10 +11,10 @@
 import static io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior.CamundaBehaviorSingletons.getOpentelemetry;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
-import io.opentelemetry.camunda.v7_0.behavior.CamundaActivityExecutionGetter;
-import io.opentelemetry.camunda.v7_0.common.CamundaCommonRequest;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
+import io.opentelemetry.instrumentation.camunda.v7_0.behavior.CamundaActivityExecutionGetter;
+import io.opentelemetry.instrumentation.camunda.v7_0.common.CamundaCommonRequest;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;

instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/processes/CamundaProcessInstantiationBuilderModule.java

@@ -10,7 +10,6 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -28,11 +27,6 @@ public List<TypeInstrumentation> typeInstrumentations() {
     return Collections.singletonList(new CamundaProcessInstantiationBuilderInstrumentation());
   }
 
-  @Override
-  public boolean defaultEnabled(ConfigProperties config) {
-    return config.getBoolean("otel.instrumentation.common.default-enabled", true);
-  }
-
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
 

instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/task/CamundaTopicSubscriptionManagerModule.java

@@ -10,7 +10,6 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -23,11 +22,6 @@ public CamundaTopicSubscriptionManagerModule() {
     super("camunda", "camunda-task", "camunda-task-7_18");
   }
 
-  @Override
-  public boolean defaultEnabled(ConfigProperties config) {
-    return config.getBoolean("otel.instrumentation.common.default-enabled", true);
-  }
-
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return Collections.singletonList(new CamundaTopicSubscriptionMangerInstrumentation());