Consolidated similiar type instrumentations into single module

Author: cb645j

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

@@ -25,27 +25,36 @@
 import net.bytebuddy.matcher.ElementMatchers;
 import org.camunda.bpm.engine.impl.pvm.delegate.ActivityExecution;
 
-public class CamundaTaskActivityBehaviorInstrumentation implements TypeInstrumentation {
+public class CamundaCommonBehaviorInstrumentation implements TypeInstrumentation {
 
   @Override
   public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.camunda.bpm.engine.impl.bpmn.behavior.TaskActivityBehavior");
   }
 
-  @Override
-  public ElementMatcher<TypeDescription> typeMatcher() {
-    return hasSuperType(named("org.camunda.bpm.engine.impl.bpmn.behavior.TaskActivityBehavior"));
-  }
+	@Override
+	public ElementMatcher<TypeDescription> typeMatcher() {
+		return hasSuperType(named("org.camunda.bpm.engine.impl.bpmn.behavior.TaskActivityBehavior"))
+				.or(named("org.camunda.bpm.engine.impl.bpmn.behavior.ExternalTaskActivityBehavior"))
+				.or(named("org.camunda.bpm.engine.impl.bpmn.behavior.TerminateEndEventActivityBehavior"))
+				.or(named("org.camunda.bpm.engine.impl.bpmn.behavior.NoneEndEventActivityBehavior"))
+				.or(named("org.camunda.bpm.engine.impl.bpmn.behavior.ErrorEndEventActivityBehavior"));
+		// elements that have been tested with instrumentation, eventually this can be
+		// replaced by the supertype AbstractBpmnActivityBehavior, once all elements
+		// instrumentations have been certified and instrumented, but will need to make
+		// sure its not callable element as the instrumentation should remain separate
+		// due to logic
+	}
 
   @Override
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
-        ElementMatchers.isMethod().and(ElementMatchers.named("performExecution")),
-        this.getClass().getName() + "$CamundaTaskActivityBehaviorAdvice");
+        ElementMatchers.isMethod().and(ElementMatchers.named("execute")),
+        this.getClass().getName() + "$CamundaCommonBehaviorAdvice");
   }
 
   @SuppressWarnings("unused")
-  public static class CamundaTaskActivityBehaviorAdvice {
+  public static class CamundaCommonBehaviorAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void addTracingEnter(
@@ -63,7 +72,35 @@ public static void addTracingEnter(
       request.setProcessDefinitionId(Optional.ofNullable(execution.getProcessDefinitionId()));
       request.setProcessInstanceId(Optional.ofNullable(execution.getProcessInstanceId()));
       request.setActivityId(Optional.ofNullable(execution.getCurrentActivityId()));
-      request.setActivityName(Optional.ofNullable(execution.getCurrentActivityName()));
+
+      name: {
+				if (execution.getBpmnModelElementInstance() != null) {
+					// TODO lambda does not work due to access modifier
+					if (execution.getBpmnModelElementInstance() instanceof EndEvent) {
+						getLogger().info("instance of EndEvent");
+						EndEvent e = (EndEvent) execution.getBpmnModelElementInstance();
+
+						if (e.getEventDefinitions() == null || e.getEventDefinitions().isEmpty()) {
+							request.setActivityName(Optional.of("End"));
+						}
+						for (EventDefinition ed : e.getEventDefinitions()) {
+							if (ed instanceof TerminateEventDefinition) {
+								request.setActivityName(Optional.of("End"));
+							} else if (ed instanceof ErrorEventDefinition) {
+								request.setActivityName(Optional.of("Error End"));
+							} else if (ed instanceof CompensateEventDefinition) {
+								request.setActivityName(Optional.of("Compensation End"));
+							} else {
+								request.setActivityName(Optional.of("End"));
+							}
+						}
+						break name;
+					} else if (execution.getBpmnModelElementInstance() instanceof Gateway) {
+						// TODO
+					} 
+				}
+				request.setActivityName(Optional.ofNullable(execution.getCurrentActivityName()));
+			}
 
       Context parentContext =
           getOpentelemetry()
@@ -79,12 +116,18 @@ public static void addTracingEnter(
       if (getInstumenter().shouldStart(Java8BytecodeBridge.currentContext(), request)) {
         context = getInstumenter().start(Java8BytecodeBridge.currentContext(), request);
         scope = context.makeCurrent();
+
+        if (target.getClass() == org.camunda.bpm.engine.impl.bpmn.behavior.ExternalTaskActivityBehavior.class) {
+
+					getOpentelemetry().getPropagators().getTextMapPropagator().inject(context, execution,
+							new CamundaActivityExecutionLocalSetter());
+				}
       }
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void closeTrace(
-        @Advice.Local("request") CamundaCommonRequest request,
+        @Advice.Local("request") CamundaCommonRequest request, @Advice.This Object target,
         @Advice.Local("otelParentScope") Scope parentScope,
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelScope") Scope scope,

instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaTaskActivityBehaviorModule.java renamed to instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaCommonBehaviorModule.java

@@ -16,20 +16,22 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
-public class CamundaTaskActivityBehaviorModule extends InstrumentationModule {
+public class CamundaCommonBehaviorModule extends InstrumentationModule {
 
   public CamundaTaskActivityBehaviorModule() {
     super("camunda", "camunda-behavior", "camunda-behavior-7_18");
   }
 
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
-    return Collections.singletonList(new CamundaTaskActivityBehaviorInstrumentation());
+    return Collections.singletonList(new CamundaCommonBehaviorInstrumentation());
   }
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassesNamed("org.camunda.bpm.engine.impl.bpmn.behavior.TaskActivityBehavior");
+		return hasClassesNamed("org.camunda.bpm.engine.impl.bpmn.behavior.TaskActivityBehavior",
+				"org.camunda.bpm.engine.impl.bpmn.behavior.NoneEndEventActivityBehavior",
+				"org.camunda.bpm.engine.impl.bpmn.behavior.ErrorEndEventActivityBehavior");
   }
 
   String[] helperClassnames = {