Skip to content

Commit 35ae48e

Browse files
committed
Merge branch 'feature/camunda_instrumentation' of https://github.com/cb645j/opentelemetry-java-instrumentation into feature/camunda_instrumentation
2 parents b6d1b32 + 1298c3f commit 35ae48e

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType;
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;
12-
import static net.bytebuddy.matcher.ElementMatchers.named;
1312
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
13+
import static net.bytebuddy.matcher.ElementMatchers.named;
1414

1515
import io.opentelemetry.api.trace.SpanContext;
1616
import io.opentelemetry.context.Context;

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

Lines changed: 0 additions & 1 deletion
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;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import net.bytebuddy.description.type.TypeDescription;
2525
import net.bytebuddy.matcher.ElementMatcher;
2626
import net.bytebuddy.matcher.ElementMatchers;
27-
import org.camunda.bpm.engine.impl.pvm.delegate.ActivityExecution;
2827
import org.camunda.bpm.engine.impl.bpmn.behavior.ExternalTaskActivityBehavior;
28+
import org.camunda.bpm.engine.impl.pvm.delegate.ActivityExecution;
2929
import org.camunda.bpm.model.bpmn.instance.CompensateEventDefinition;
3030
import org.camunda.bpm.model.bpmn.instance.EndEvent;
3131
import org.camunda.bpm.model.bpmn.instance.ErrorEventDefinition;
@@ -129,8 +129,7 @@ public static void addTracingEnter(
129129
context = getInstumenter().start(Java8BytecodeBridge.currentContext(), request);
130130
scope = context.makeCurrent();
131131

132-
if (target.getClass()
133-
== ExternalTaskActivityBehavior.class) {
132+
if (target.getClass() == ExternalTaskActivityBehavior.class) {
134133

135134
getOpentelemetry()
136135
.getPropagators()

instrumentation/camunda/camunda-7.0/library/src/main/java/io/opentelemetry/instrumentation/camunda/v7_0/common/CamundaVariableAttributeExtractor.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,5 @@ public void onEnd(
3737
Context context,
3838
CamundaCommonRequest request,
3939
String response,
40-
Throwable error) {
41-
42-
}
40+
Throwable error) {}
4341
}

0 commit comments

Comments
 (0)