Skip to content

Commit 305c58a

Browse files
cb645jcb645j
committed
Made updates based off of comments
1 parent 4f13543 commit 305c58a

17 files changed

+31
-41
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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515

1616
public class CamundaBehaviorSingletons {
1717

18-
private static final Instrumenter<CamundaCommonRequest, String> instrumenter;
18+
private static final Instrumenter<CamundaCommonRequest, Void> instrumenter;
1919

2020
private static final OpenTelemetry opentelemetry;
2121

2222
static {
2323
opentelemetry = GlobalOpenTelemetry.get();
2424

25-
InstrumenterBuilder<CamundaCommonRequest, String> builder =
25+
InstrumenterBuilder<CamundaCommonRequest, Void> builder =
2626
Instrumenter.<CamundaCommonRequest, String>builder(
2727
opentelemetry,
2828
"io.opentelemetry.camunda-behavior",
@@ -36,7 +36,7 @@ public static OpenTelemetry getOpentelemetry() {
3636
return opentelemetry;
3737
}
3838

39-
public static Instrumenter<CamundaCommonRequest, String> getInstumenter() {
39+
public static Instrumenter<CamundaCommonRequest, Void> getInstumenter() {
4040
return instrumenter;
4141
}
4242

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

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

1415
import io.opentelemetry.api.trace.SpanContext;
1516
import io.opentelemetry.context.Context;
@@ -24,7 +25,6 @@
2425
import net.bytebuddy.asm.Advice;
2526
import net.bytebuddy.description.type.TypeDescription;
2627
import net.bytebuddy.matcher.ElementMatcher;
27-
import net.bytebuddy.matcher.ElementMatchers;
2828
import org.camunda.bpm.engine.impl.pvm.delegate.ActivityExecution;
2929
import org.camunda.bpm.engine.variable.VariableMap;
3030

@@ -45,7 +45,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {
4545
@Override
4646
public void transform(TypeTransformer transformer) {
4747
transformer.applyAdviceToMethod(
48-
ElementMatchers.isMethod().and(ElementMatchers.named("startInstance")),
48+
isMethod().and(named("startInstance")),
4949
this.getClass().getName() + "$CamundaCallableElementActivityBehaviorAdvice");
5050
}
5151

@@ -62,7 +62,6 @@ public static void addTracingEnter(
6262
@Advice.Local("otelScope") Scope scope) {
6363

6464
if (execution == null) {
65-
// log warning
6665
return;
6766
}
6867

@@ -112,7 +111,7 @@ public static void closeTrace(
112111
@Advice.Thrown Throwable throwable) {
113112

114113
if (context != null && scope != null) {
115-
getInstumenter().end(context, request, "NA", throwable);
114+
getInstumenter().end(context, request, null, throwable);
116115
scope.close();
117116
}
118117

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,7 @@
2020
public class CamundaCallableElementActivityBehaviorModule extends InstrumentationModule {
2121

2222
public CamundaCallableElementActivityBehaviorModule() {
23-
super("camunda", "camunda-7.0", "camunda-behavior", "camunda-behavior-7_18");
24-
}
25-
26-
@Override
27-
public boolean defaultEnabled(ConfigProperties config) {
28-
return config.getBoolean("otel.instrumentation.common.default-enabled", true);
23+
super("camunda", "camunda-7.0", "camunda-behavior");
2924
}
3025

3126
@Override

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import net.bytebuddy.matcher.ElementMatcher;
2626
import net.bytebuddy.matcher.ElementMatchers;
2727
import org.camunda.bpm.engine.impl.pvm.delegate.ActivityExecution;
28+
import org.camunda.bpm.engine.impl.bpmn.behavior.ExternalTaskActivityBehavior;
2829
import org.camunda.bpm.model.bpmn.instance.CompensateEventDefinition;
2930
import org.camunda.bpm.model.bpmn.instance.EndEvent;
3031
import org.camunda.bpm.model.bpmn.instance.ErrorEventDefinition;
@@ -83,7 +84,6 @@ public static void addTracingEnter(
8384
request.setBusinessKey(Optional.ofNullable(execution.getProcessBusinessKey()));
8485

8586
if (execution.getBpmnModelElementInstance() != null) {
86-
// TODO lambda does not work due to access modifier
8787
if (execution.getBpmnModelElementInstance() instanceof EndEvent) {
8888
EndEvent e = (EndEvent) execution.getBpmnModelElementInstance();
8989

@@ -102,7 +102,7 @@ public static void addTracingEnter(
102102
}
103103
}
104104
} else if (execution.getBpmnModelElementInstance() instanceof Gateway) {
105-
// TODO
105+
// TODO future enhancement
106106
} else {
107107
request.setActivityName(Optional.ofNullable(execution.getCurrentActivityName()));
108108
}
@@ -121,12 +121,16 @@ public static void addTracingEnter(
121121

122122
parentScope = parentContext.makeCurrent();
123123

124+
if (!getInstumenter().shouldStart(Java8BytecodeBridge.currentContext(), request)) {
125+
return
126+
}
127+
124128
if (getInstumenter().shouldStart(Java8BytecodeBridge.currentContext(), request)) {
125129
context = getInstumenter().start(Java8BytecodeBridge.currentContext(), request);
126130
scope = context.makeCurrent();
127131

128132
if (target.getClass()
129-
== org.camunda.bpm.engine.impl.bpmn.behavior.ExternalTaskActivityBehavior.class) {
133+
== ExternalTaskActivityBehavior.class) {
130134

131135
getOpentelemetry()
132136
.getPropagators()
@@ -146,7 +150,7 @@ public static void closeTrace(
146150
@Advice.Thrown Throwable throwable) {
147151

148152
if (context != null && scope != null) {
149-
getInstumenter().end(context, request, "NA", throwable);
153+
getInstumenter().end(context, request, null, throwable);
150154
scope.close();
151155
}
152156

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
public class CamundaCommonBehaviorModule extends InstrumentationModule {
2020

2121
public CamundaCommonBehaviorModule() {
22-
super("camunda", "camunda-7.0", "camunda-behavior", "camunda-behavior-7_18");
22+
super("camunda", "camunda-7.0", "camunda-behavior");
2323
}
2424

2525
@Override

‎instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/jobs/CamundaAsyncContinuationJobHandlerInstrumentation.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ public static void addTracingEnter(
6969
request.setActivityName(Optional.ofNullable(executionEntity.getActivity().getName()));
7070
}
7171

72-
if (Java8BytecodeBridge.currentContext() == Java8BytecodeBridge.rootContext()) {
73-
// log
74-
}
75-
7672
Context parentContext =
7773
getOpentelemetry()
7874
.getPropagators()
@@ -100,7 +96,7 @@ public static void closeTrace(
10096
@Advice.Thrown Throwable throwable) {
10197

10298
if (context != null && scope != null) {
103-
getInstumenter().end(context, request, "NA", throwable);
99+
getInstumenter().end(context, request, null, throwable);
104100
scope.close();
105101
}
106102

‎instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/jobs/CamundaAsyncContinuationJobHandlerModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
public class CamundaAsyncContinuationJobHandlerModule extends InstrumentationModule {
2020

2121
public CamundaAsyncContinuationJobHandlerModule() {
22-
super("camunda", "camunda-7.0", "camunda-job", "camunda-job-7_18");
22+
super("camunda", "camunda-7.0", "camunda-job");
2323
}
2424

2525
@Override

‎instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/jobs/CamundaJobSingletons.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515

1616
public class CamundaJobSingletons {
1717

18-
private static final Instrumenter<CamundaCommonRequest, String> instrumenter;
18+
private static final Instrumenter<CamundaCommonRequest, Void> instrumenter;
1919

2020
private static final OpenTelemetry opentelemetry;
2121

2222
static {
2323
opentelemetry = GlobalOpenTelemetry.get();
2424

25-
InstrumenterBuilder<CamundaCommonRequest, String> builder =
25+
InstrumenterBuilder<CamundaCommonRequest, Void> builder =
2626
Instrumenter.<CamundaCommonRequest, String>builder(
2727
opentelemetry, "io.opentelemetry.camunda-job", new CamundaJobSpanNameExtractor())
2828
.addAttributesExtractor(new CamundaVariableAttributeExtractor());
@@ -34,7 +34,7 @@ public static OpenTelemetry getOpentelemetry() {
3434
return opentelemetry;
3535
}
3636

37-
public static Instrumenter<CamundaCommonRequest, String> getInstumenter() {
37+
public static Instrumenter<CamundaCommonRequest, Void> getInstumenter() {
3838
return instrumenter;
3939
}
4040

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public static void closeTrace(
9494
@Advice.Return ProcessInstance pi) {
9595

9696
if (context != null && scope != null) {
97-
CamundaProcessSingletons.getInstumenter().end(context, request, "NA", throwable);
97+
CamundaProcessSingletons.getInstumenter().end(context, request, null, throwable);
9898
scope.close();
9999
}
100100
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
public class CamundaProcessInstantiationBuilderModule extends InstrumentationModule {
2020

2121
public CamundaProcessInstantiationBuilderModule() {
22-
super("camunda", "camunda-7.0", "camunda-process", "camunda-process-7_18");
22+
super("camunda", "camunda-7.0", "camunda-process");
2323
}
2424

2525
@Override

0 commit comments

Comments
 (0)