fix formatting and add required aliases

cb645j · cb645j · commit cc9016067563 · 2025-03-26T14:19:49.000-04:00
diff --git a/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaCallableElementActivityBehaviorModule.java b/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaCallableElementActivityBehaviorModule.java
@@ -20,7 +20,7 @@
 public class CamundaCallableElementActivityBehaviorModule extends InstrumentationModule {
 
   public CamundaCallableElementActivityBehaviorModule() {
-    super("camunda", "camunda-behavior", "camunda-behavior-7_18");
+    super("camunda", "camunda-7.0", "camunda-behavior", "camunda-behavior-7_18");
   }
 
   @Override
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
@@ -19,7 +19,7 @@
 public class CamundaAsyncContinuationJobHandlerModule extends InstrumentationModule {
 
   public CamundaAsyncContinuationJobHandlerModule() {
-    super("camunda", "camunda-job", "camunda-job-7_18");
+    super("camunda", "camunda-7.0", "camunda-job", "camunda-job-7_18");
   }
 
   @Override
diff --git a/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/processes/CamundaProcessInstantiationBuilderModule.java b/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/processes/CamundaProcessInstantiationBuilderModule.java
@@ -19,7 +19,7 @@
 public class CamundaProcessInstantiationBuilderModule extends InstrumentationModule {
 
   public CamundaProcessInstantiationBuilderModule() {
-    super("camunda", "camunda-process", "camunda-process-7_18");
+    super("camunda", "camunda-7.0", "camunda-process", "camunda-process-7_18");
   }
 
   @Override
diff --git a/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/task/CamundaTopicSubscriptionManagerModule.java b/instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/task/CamundaTopicSubscriptionManagerModule.java
@@ -19,7 +19,7 @@
 public class CamundaTopicSubscriptionManagerModule extends InstrumentationModule {
 
   public CamundaTopicSubscriptionManagerModule() {
-    super("camunda", "camunda-task", "camunda-task-7_18");
+    super("camunda", "camunda-7.0", "camunda-task", "camunda-task-7_18");
   }
 
   @Override
diff --git a/instrumentation/camunda/camunda-7.0/testing/build.gradle.kts b/instrumentation/camunda/camunda-7.0/testing/build.gradle.kts
@@ -11,5 +11,4 @@ dependencies {
   implementation("io.opentelemetry:opentelemetry-api")
   implementation("org.spockframework:spock-core")
   implementation("com.h2database:h2:2.2.224")
-
 }
diff --git a/instrumentation/camunda/camunda-7.0/testing/src/main/java/io/opentelemetry/instrumentation/camunda/v7_0/AbstractCamundaTest.java b/instrumentation/camunda/camunda-7.0/testing/src/main/java/io/opentelemetry/instrumentation/camunda/v7_0/AbstractCamundaTest.java
@@ -1,116 +1,141 @@
-package io.opentelemetry.instrumentation.camunda.v7_0;
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
+package io.opentelemetry.instrumentation.camunda.v7_0;
 
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
-
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
-
+import org.camunda.bpm.engine.HistoryService;
 import org.camunda.bpm.engine.ProcessEngine;
 import org.camunda.bpm.engine.ProcessEngineConfiguration;
-import org.camunda.bpm.engine.HistoryService;
 import org.camunda.bpm.engine.RuntimeService;
 import org.camunda.bpm.engine.repository.Deployment;
 import org.camunda.bpm.engine.runtime.ProcessInstance;
 import org.camunda.bpm.engine.test.mock.Mocks;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
-import io.opentelemetry.api.trace.SpanKind;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public abstract class AbstractCamundaTest {
 
-    @RegisterExtension
-    private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
-
-    private ProcessEngine processEngine;
-    private RuntimeService runtimeService;
-    private HistoryService historyService;
-
-    @BeforeEach
-    void setUp() {
-        processEngine = ProcessEngineConfiguration.createStandaloneInMemProcessEngineConfiguration()
-                .buildProcessEngine();
-        runtimeService = processEngine.getRuntimeService();
-        historyService = processEngine.getHistoryService();
-
-        Product mockDelegate = new Product();
-
-        Mocks.register("Product", mockDelegate);
-    }
-
-    @AfterEach
-    void tearDown() {
-        processEngine.close();
-    }
-
-    @Test
-    void testProcessExecutionAllSuccess() {
-        Deployment deployment = processEngine.getRepositoryService().createDeployment()
-                .addClasspathResource("testMainProcess.bpmn").addClasspathResource("customerSubProcess.bpmn")
-                .deploy();
-
-        ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("testMainProcess");
-
-        assertNotNull(processInstance);
-
-        testing.waitAndAssertTracesWithoutScopeVersionVerification(
-            trace ->
-                trace.hasSpansSatisfyingExactly(
-                    span ->
-                        span.hasName("testMainProcess")
-                            .hasKind(SpanKind.INTERNAL)
-                            .hasAttributesSatisfyingExactly(
-                                equalTo(stringKey("camunda.processdefinitionkey"), "testMainProcess")),
-                    span ->
-                        span.hasName("Get Product Info Task")
-                            .hasKind(SpanKind.INTERNAL)
-                            .hasAttributesSatisfyingExactly(
-                                equalTo(stringKey("camunda.activityid"), "getProductInfo"),
-                                satisfies(stringKey("camunda.processdefinitionid"), value -> value.startsWith("testMainProcess")),
-                                satisfies(stringKey("camunda.processinstanceid"), value -> assertNotNull(value)),
-                                equalTo(stringKey("camunda.activityname"), "Get Product Info")),
-                    span ->
-                        span.hasName("Verify Customer Task")
-                            .hasKind(SpanKind.INTERNAL)
-                            .hasAttributesSatisfyingExactly(
-                                equalTo(stringKey("camunda.activityid"), "verifyCustomer"),
-                                satisfies(stringKey("camunda.processdefinitionid"), value -> value.startsWith("testMainProcess")),
-                                satisfies(stringKey("camunda.processinstanceid"), value -> assertNotNull(value)),
-                                equalTo(stringKey("camunda.activityname"), "Verify Customer")),
-                    span ->
-                        span.hasName("End Event")
-                            .hasKind(SpanKind.INTERNAL)
-                            .hasAttributesSatisfyingExactly(
-                                satisfies(stringKey("camunda.processdefinitionid"), value -> value.startsWith("customerSubProcess")),
-                                equalTo(stringKey("camunda.activityid"), "Event_12mjag6"),
-                                satisfies(stringKey("camunda.processinstanceid"), value -> assertNotNull(value)),
-                                equalTo(stringKey("camunda.activityname"), "End")),
-                    span ->
-                        span.hasName("Send Product Info Task")
-                            .hasKind(SpanKind.INTERNAL)
-                            .hasAttributesSatisfyingExactly(
-                                equalTo(stringKey("camunda.activityid"), "sendProductInfo"),
-                                satisfies(stringKey("camunda.processdefinitionid"), value -> value.startsWith("testMainProcess")),
-                                satisfies(stringKey("camunda.processinstanceid"), value -> assertNotNull(value)),
-                                equalTo(stringKey("camunda.activityname"), "Send Product Info")),
-                    span ->
-                        span.hasName("End Event")
-                            .hasKind(SpanKind.INTERNAL)
-                            .hasAttributesSatisfyingExactly(
-                                satisfies(stringKey("camunda.processdefinitionid"), value -> value.startsWith("testMainProcess")),
-                                equalTo(stringKey("camunda.activityid"), "Event_110t6od"),
-                                satisfies(stringKey("camunda.processinstanceid"), value -> assertNotNull(value)),
-                                equalTo(stringKey("camunda.activityname"), "End"))));
-
-        historyService.deleteHistoricProcessInstanceIfExists(processInstance.getId());
-        processEngine.getRepositoryService().deleteDeployment(deployment.getId(), true);
-    }
-    
+  @RegisterExtension
+  private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
+
+  private ProcessEngine processEngine;
+  private RuntimeService runtimeService;
+  private HistoryService historyService;
+
+  @BeforeEach
+  void setUp() {
+    processEngine =
+        ProcessEngineConfiguration.createStandaloneInMemProcessEngineConfiguration()
+            .buildProcessEngine();
+    runtimeService = processEngine.getRuntimeService();
+    historyService = processEngine.getHistoryService();
+
+    Product mockDelegate = new Product();
+
+    Mocks.register("Product", mockDelegate);
+  }
+
+  @AfterEach
+  void tearDown() {
+    processEngine.close();
+  }
+
+  @Test
+  void testProcessExecutionAllSuccess() {
+    Deployment deployment =
+        processEngine
+            .getRepositoryService()
+            .createDeployment()
+            .addClasspathResource("testMainProcess.bpmn")
+            .addClasspathResource("customerSubProcess.bpmn")
+            .deploy();
+
+    ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("testMainProcess");
+
+    assertNotNull(processInstance);
+
+    testing.waitAndAssertTracesWithoutScopeVersionVerification(
+        trace ->
+            trace.hasSpansSatisfyingExactly(
+                span ->
+                    span.hasName("testMainProcess")
+                        .hasKind(SpanKind.INTERNAL)
+                        .hasAttributesSatisfyingExactly(
+                            equalTo(stringKey("camunda.processdefinitionkey"), "testMainProcess")),
+                span ->
+                    span.hasName("Get Product Info Task")
+                        .hasKind(SpanKind.INTERNAL)
+                        .hasAttributesSatisfyingExactly(
+                            equalTo(stringKey("camunda.activityid"), "getProductInfo"),
+                            satisfies(
+                                stringKey("camunda.processdefinitionid"),
+                                value -> value.startsWith("testMainProcess")),
+                            satisfies(
+                                stringKey("camunda.processinstanceid"),
+                                value -> assertNotNull(value)),
+                            equalTo(stringKey("camunda.activityname"), "Get Product Info")),
+                span ->
+                    span.hasName("Verify Customer Task")
+                        .hasKind(SpanKind.INTERNAL)
+                        .hasAttributesSatisfyingExactly(
+                            equalTo(stringKey("camunda.activityid"), "verifyCustomer"),
+                            satisfies(
+                                stringKey("camunda.processdefinitionid"),
+                                value -> value.startsWith("testMainProcess")),
+                            satisfies(
+                                stringKey("camunda.processinstanceid"),
+                                value -> assertNotNull(value)),
+                            equalTo(stringKey("camunda.activityname"), "Verify Customer")),
+                span ->
+                    span.hasName("End Event")
+                        .hasKind(SpanKind.INTERNAL)
+                        .hasAttributesSatisfyingExactly(
+                            satisfies(
+                                stringKey("camunda.processdefinitionid"),
+                                value -> value.startsWith("customerSubProcess")),
+                            equalTo(stringKey("camunda.activityid"), "Event_12mjag6"),
+                            satisfies(
+                                stringKey("camunda.processinstanceid"),
+                                value -> assertNotNull(value)),
+                            equalTo(stringKey("camunda.activityname"), "End")),
+                span ->
+                    span.hasName("Send Product Info Task")
+                        .hasKind(SpanKind.INTERNAL)
+                        .hasAttributesSatisfyingExactly(
+                            equalTo(stringKey("camunda.activityid"), "sendProductInfo"),
+                            satisfies(
+                                stringKey("camunda.processdefinitionid"),
+                                value -> value.startsWith("testMainProcess")),
+                            satisfies(
+                                stringKey("camunda.processinstanceid"),
+                                value -> assertNotNull(value)),
+                            equalTo(stringKey("camunda.activityname"), "Send Product Info")),
+                span ->
+                    span.hasName("End Event")
+                        .hasKind(SpanKind.INTERNAL)
+                        .hasAttributesSatisfyingExactly(
+                            satisfies(
+                                stringKey("camunda.processdefinitionid"),
+                                value -> value.startsWith("testMainProcess")),
+                            equalTo(stringKey("camunda.activityid"), "Event_110t6od"),
+                            satisfies(
+                                stringKey("camunda.processinstanceid"),
+                                value -> assertNotNull(value)),
+                            equalTo(stringKey("camunda.activityname"), "End"))));
+
+    historyService.deleteHistoricProcessInstanceIfExists(processInstance.getId());
+    processEngine.getRepositoryService().deleteDeployment(deployment.getId(), true);
+  }
 }
diff --git a/instrumentation/camunda/camunda-7.0/testing/src/main/java/io/opentelemetry/instrumentation/camunda/v7_0/Product.java b/instrumentation/camunda/camunda-7.0/testing/src/main/java/io/opentelemetry/instrumentation/camunda/v7_0/Product.java
@@ -1,9 +1,13 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package io.opentelemetry.instrumentation.camunda.v7_0;
 
 import org.camunda.bpm.engine.delegate.DelegateExecution;
 
 public class Product {
 
-    public void getInfo(DelegateExecution execution) {
-    }
-}
+  public void getInfo(DelegateExecution execution) {}
+}

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`public class CamundaCallableElementActivityBehaviorModule extends InstrumentationModule {`
`21`	`21`
`22`	`22`	`public CamundaCallableElementActivityBehaviorModule() {`
`23`		`- super("camunda", "camunda-behavior", "camunda-behavior-7_18");`
	`23`	`+ super("camunda", "camunda-7.0", "camunda-behavior", "camunda-behavior-7_18");`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`public class CamundaAsyncContinuationJobHandlerModule extends InstrumentationModule {`
`20`	`20`
`21`	`21`	`public CamundaAsyncContinuationJobHandlerModule() {`
`22`		`- super("camunda", "camunda-job", "camunda-job-7_18");`
	`22`	`+ super("camunda", "camunda-7.0", "camunda-job", "camunda-job-7_18");`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,4 @@ dependencies {`
`11`	`11`	`implementation("io.opentelemetry:opentelemetry-api")`
`12`	`12`	`implementation("org.spockframework:spock-core")`
`13`	`13`	`implementation("com.h2database:h2:2.2.224")`
`14`		`-`
`15`	`14`	`}`