Skip to content

Commit b44bc9d

Browse files
committed
Fix import statements and remove dead code
1 parent fb19def commit b44bc9d

File tree

6 files changed

+10
-24
lines changed

6 files changed

+10
-24
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,18 @@
77

88
import io.opentelemetry.api.GlobalOpenTelemetry;
99
import io.opentelemetry.api.OpenTelemetry;
10-
import io.opentelemetry.camunda.v7_0.behavior.CamundaBehaviorSpanNameExtractor;
11-
import io.opentelemetry.camunda.v7_0.common.CamundaCommonRequest;
12-
import io.opentelemetry.camunda.v7_0.common.CamundaVariableAttributeExtractor;
1310
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1411
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
12+
import io.opentelemetry.instrumentation.camunda.v7_0.behavior.CamundaBehaviorSpanNameExtractor;
13+
import io.opentelemetry.instrumentation.camunda.v7_0.common.CamundaCommonRequest;
14+
import io.opentelemetry.instrumentation.camunda.v7_0.common.CamundaVariableAttributeExtractor;
1515

1616
public class CamundaBehaviorSingletons {
1717

1818
private static final Instrumenter<CamundaCommonRequest, String> instrumenter;
1919

2020
private static final OpenTelemetry opentelemetry;
2121

22-
private static final boolean propagationEnabled;
23-
2422
static {
2523
opentelemetry = GlobalOpenTelemetry.get();
2624

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior.CamundaBehaviorSingletons.getOpentelemetry;
1111
import static net.bytebuddy.matcher.ElementMatchers.named;
1212

13-
import io.opentelemetry.camunda.v7_0.behavior.CamundaActivityExecutionGetter;
14-
import io.opentelemetry.camunda.v7_0.common.CamundaCommonRequest;
1513
import io.opentelemetry.context.Context;
1614
import io.opentelemetry.context.Scope;
15+
import io.opentelemetry.instrumentation.camunda.v7_0.behavior.CamundaActivityExecutionGetter;
16+
import io.opentelemetry.instrumentation.camunda.v7_0.common.CamundaCommonRequest;
1717
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
1818
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1919
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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior.CamundaBehaviorSingletons.getOpentelemetry;
1111
import static net.bytebuddy.matcher.ElementMatchers.named;
1212

13-
import io.opentelemetry.camunda.v7_0.behavior.CamundaActivityExecutionGetter;
14-
import io.opentelemetry.camunda.v7_0.behavior.CamundaActivityExecutionLocalSetter;
15-
import io.opentelemetry.camunda.v7_0.common.CamundaCommonRequest;
1613
import io.opentelemetry.context.Context;
1714
import io.opentelemetry.context.Scope;
15+
import io.opentelemetry.instrumentation.camunda.v7_0.behavior.CamundaActivityExecutionGetter;
16+
import io.opentelemetry.instrumentation.camunda.v7_0.behavior.CamundaActivityExecutionLocalSetter;
17+
import io.opentelemetry.instrumentation.camunda.v7_0.common.CamundaCommonRequest;
1818
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
1919
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
2020
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior.CamundaBehaviorSingletons.getOpentelemetry;
1212
import static net.bytebuddy.matcher.ElementMatchers.named;
1313

14-
import io.opentelemetry.camunda.v7_0.behavior.CamundaActivityExecutionGetter;
15-
import io.opentelemetry.camunda.v7_0.common.CamundaCommonRequest;
1614
import io.opentelemetry.context.Context;
1715
import io.opentelemetry.context.Scope;
16+
import io.opentelemetry.instrumentation.camunda.v7_0.behavior.CamundaActivityExecutionGetter;
17+
import io.opentelemetry.instrumentation.camunda.v7_0.common.CamundaCommonRequest;
1818
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
1919
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
2020
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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.google.auto.service.AutoService;
1111
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1212
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
13-
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1413
import java.util.Arrays;
1514
import java.util.Collections;
1615
import java.util.List;
@@ -28,11 +27,6 @@ public List<TypeInstrumentation> typeInstrumentations() {
2827
return Collections.singletonList(new CamundaProcessInstantiationBuilderInstrumentation());
2928
}
3029

31-
@Override
32-
public boolean defaultEnabled(ConfigProperties config) {
33-
return config.getBoolean("otel.instrumentation.common.default-enabled", true);
34-
}
35-
3630
@Override
3731
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
3832

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.google.auto.service.AutoService;
1111
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1212
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
13-
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1413
import java.util.Arrays;
1514
import java.util.Collections;
1615
import java.util.List;
@@ -23,11 +22,6 @@ public CamundaTopicSubscriptionManagerModule() {
2322
super("camunda", "camunda-task", "camunda-task-7_18");
2423
}
2524

26-
@Override
27-
public boolean defaultEnabled(ConfigProperties config) {
28-
return config.getBoolean("otel.instrumentation.common.default-enabled", true);
29-
}
30-
3125
@Override
3226
public List<TypeInstrumentation> typeInstrumentations() {
3327
return Collections.singletonList(new CamundaTopicSubscriptionMangerInstrumentation());

0 commit comments

Comments
 (0)