diff --git a/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaCallableElementActivityBehaviorInstrumentation.java b/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaCallableElementActivityBehaviorInstrumentation.java index d43db2f433f5..7d4fc486c87f 100644 --- a/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaCallableElementActivityBehaviorInstrumentation.java +++ b/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaCallableElementActivityBehaviorInstrumentation.java @@ -14,10 +14,10 @@ import io.opentelemetry.api.trace.SpanContext; 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.CamundaVariableMapSetter; +import io.opentelemetry.instrumentation.camunda.v7_0.common.CamundaCommonRequest; import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge; -import io.opentelemetry.javaagent.camunda.v7_0.behavior.CamundaActivityExecutionGetter; -import io.opentelemetry.javaagent.camunda.v7_0.behavior.CamundaVariableMapSetter; -import io.opentelemetry.javaagent.camunda.v7_0.common.CamundaCommonRequest; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; import java.util.Optional; diff --git a/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaTaskActivityBehaviorModule.java b/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaTaskActivityBehaviorModule.java index 5573874c3e24..d4ec844f7921 100644 --- a/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaTaskActivityBehaviorModule.java +++ b/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaTaskActivityBehaviorModule.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 CamundaTaskActivityBehaviorModule() { super("camunda", "camunda-behavior", "camunda-behavior-7_18"); } - @Override - public boolean defaultEnabled(ConfigProperties config) { - return config.getBoolean("otel.instrumentation.common.default-enabled", true); - } - @Override public List typeInstrumentations() { return Collections.singletonList(new CamundaTaskActivityBehaviorInstrumentation()); diff --git a/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/jobs/CamundaAsyncContinuationJobHandlerModule.java b/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/jobs/CamundaAsyncContinuationJobHandlerModule.java index 6fc6c5cf67fe..6f3f83db7794 100644 --- a/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/jobs/CamundaAsyncContinuationJobHandlerModule.java +++ b/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/jobs/CamundaAsyncContinuationJobHandlerModule.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 CamundaAsyncContinuationJobHandlerModule() { super("camunda", "camunda-job", "camunda-job-7_18"); } - @Override - public boolean defaultEnabled(ConfigProperties config) { - return config.getBoolean("otel.instrumentation.common.default-enabled", true); - } - @Override public List typeInstrumentations() { return Collections.singletonList(new CamundaAsyncContinuationJobHandlerInstrumentation()); diff --git a/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/processes/CamundaProcessSingletons.java b/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/processes/CamundaProcessSingletons.java index 2d182d726cb1..02fad4b28696 100644 --- a/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/processes/CamundaProcessSingletons.java +++ b/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/processes/CamundaProcessSingletons.java @@ -19,8 +19,6 @@ public class CamundaProcessSingletons { private static final OpenTelemetry opentelemetry; - private static final boolean propagationEnabled; - static { opentelemetry = GlobalOpenTelemetry.get(); diff --git a/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/task/CamundaTopicSubscriptionMangerInstrumentation.java b/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/task/CamundaTopicSubscriptionMangerInstrumentation.java index d9fac16573f3..a40dced38fad 100644 --- a/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/task/CamundaTopicSubscriptionMangerInstrumentation.java +++ b/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/task/CamundaTopicSubscriptionMangerInstrumentation.java @@ -6,8 +6,8 @@ package io.opentelemetry.javaagent.instrumentation.camunda.v7_0.task; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; -import static io.opentelemetry.javaagent.instrumentationn.camunda.v7_0.task.CamundaTaskSingletons.getInstumenter; -import static io.opentelemetry.javaagent.instrumentationn.camunda.v7_0.task.CamundaTaskSingletons.getOpentelemetry; +import static io.opentelemetry.javaagent.instrumentation.camunda.v7_0.task.CamundaTaskSingletons.getInstumenter; +import static io.opentelemetry.javaagent.instrumentation.camunda.v7_0.task.CamundaTaskSingletons.getOpentelemetry; import static net.bytebuddy.matcher.ElementMatchers.named; import io.opentelemetry.context.Context;