Skip to content

Commit 4fbdbf8

Browse files
cb645jcb645j
committed
Reorganized project structure and fixed gradle settings
1 parent 979c377 commit 4fbdbf8

File tree

35 files changed

+120
-96
lines changed

35 files changed

+120
-96
lines changed

‎instrumentation/camunda/camunda-7.18/javaagent/build.gradle.kts‎ renamed to ‎instrumentation/camunda/camunda-7.0/javaagent/build.gradle.kts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ muzzle {
1414

1515

1616
dependencies {
17-
implementation("org.camunda.bpm:camunda-engine:7.18.0")
18-
implementation("org.camunda.bpm:camunda-external-task-client:7.18.0")
17+
implementation(project(":instrumentation:camunda:camunda-7.0:library"))
1918

2019
api("com.google.auto.value:auto-value-annotations:1.6")
2120
annotationProcessor("com.google.auto.value:auto-value:1.6")

‎instrumentation/camunda/camunda-7.18/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_18/behavior/CamundaBehaviorSingletons.java‎ renamed to ‎instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaBehaviorSingletons.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.opentelemetry.javaagent.instrumentation.camunda.v7_18.behavior;
1+
package io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior;
22

3-
import io.opentelemetry.javaagent.camunda.v7_18.behavior.CamundaBehaviorSpanNameExtractor;
4-
import io.opentelemetry.javaagent.camunda.v7_18.common.CamundaCommonRequest;
5-
import io.opentelemetry.javaagent.camunda.v7_18.common.CamundaVariableAttributeExtractor;
3+
import io.opentelemetry.camunda.v7_0.behavior.CamundaBehaviorSpanNameExtractor;
4+
import io.opentelemetry.camunda.v7_0.common.CamundaCommonRequest;
5+
import io.opentelemetry.camunda.v7_0.common.CamundaVariableAttributeExtractor;
66

77
import io.opentelemetry.api.GlobalOpenTelemetry;
88
import io.opentelemetry.api.OpenTelemetry;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package io.opentelemetry.javaagent.instrumentation.camunda.v7_18.behavior;
1+
package io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior;
22

3-
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_18.behavior.CamundaBehaviorSingletons.getInstumenter;
4-
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_18.behavior.CamundaBehaviorSingletons.getOpentelemetry;
3+
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior.CamundaBehaviorSingletons.getInstumenter;
4+
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior.CamundaBehaviorSingletons.getOpentelemetry;
55
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
66
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType;
77
import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -13,9 +13,9 @@
1313

1414
import java.util.logging.Level;
1515

16-
import io.opentelemetry.javaagent.camunda.v7_18.behavior.CamundaActivityExecutionGetter;
17-
import io.opentelemetry.javaagent.camunda.v7_18.behavior.CamundaVariableMapSetter;
18-
import io.opentelemetry.javaagent.camunda.v7_18.common.CamundaCommonRequest;
16+
import io.opentelemetry.javaagent.camunda.v7_0.behavior.CamundaActivityExecutionGetter;
17+
import io.opentelemetry.javaagent.camunda.v7_0.behavior.CamundaVariableMapSetter;
18+
import io.opentelemetry.javaagent.camunda.v7_0.common.CamundaCommonRequest;
1919

2020
import io.opentelemetry.api.trace.SpanContext;
2121
import io.opentelemetry.context.Context;

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.att.sre.otel.javaagent.instrumentation.camunda.v7_18.behavior;
1+
package io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior;
22

33
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
44

@@ -35,8 +35,9 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
3535
return hasClassesNamed("org.camunda.bpm.engine.impl.bpmn.behavior.CallableElementActivityBehavior");
3636
}
3737

38-
String[] helperClassnames = { "io.opentelemetry.javaagent.instrumentation.camunda.v7_18.behavior",
39-
"io.opentelemetry.javaagent.instrumentation.camunda.v7_18.common" };
38+
String[] helperClassnames = { "io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior",
39+
"io.opentelemetry.instrumentation.camunda.v7_0.behavior",
40+
"io.opentelemetry.instrumentation.camunda.v7_0.common" };
4041

4142
@Override
4243
public boolean isHelperClass(String classname) {

‎instrumentation/camunda/camunda-7.18/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_18/behavior/CamundaEndEventActivityBehaviorInstrumentation.java‎ renamed to ‎instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaEndEventActivityBehaviorInstrumentation.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package io.opentelemetry.javaagent.instrumentation.camunda.v7_18.behavior;
1+
package io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior;
22

3-
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_18.behavior.CamundaBehaviorSingletons.getInstumenter;
4-
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_18.behavior.CamundaBehaviorSingletons.getOpentelemetry;
3+
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior.CamundaBehaviorSingletons.getInstumenter;
4+
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior.CamundaBehaviorSingletons.getOpentelemetry;
55
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
66
import static net.bytebuddy.matcher.ElementMatchers.named;
77
import static net.bytebuddy.matcher.ElementMatchers.anyOf;
@@ -15,8 +15,8 @@
1515
import org.camunda.bpm.model.bpmn.instance.EventDefinition;
1616
import org.camunda.bpm.model.bpmn.instance.TerminateEventDefinition;
1717

18-
import io.opentelemetry.javaagent.camunda.v7_18.behavior.CamundaActivityExecutionGetter;
19-
import io.opentelemetry.javaagent.camunda.v7_18.common.CamundaCommonRequest;
18+
import io.opentelemetry.camunda.v7_0.behavior.CamundaActivityExecutionGetter;
19+
import io.opentelemetry.camunda.v7_0.common.CamundaCommonRequest;
2020

2121
import io.opentelemetry.context.Context;
2222
import io.opentelemetry.context.Scope;

‎instrumentation/camunda/camunda-7.18/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_18/behavior/CamundaEndEventActivityBehaviorModule.java‎ renamed to ‎instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaEndEventActivityBehaviorModule.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.att.sre.otel.javaagent.instrumentation.camunda.v7_18.behavior;
1+
package io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior;
22

33
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
44

@@ -37,8 +37,9 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
3737
"org.camunda.bpm.engine.impl.bpmn.behavior.ErrorEndEventActivityBehavior");
3838
}
3939

40-
String[] helperClassnames = { "com.att.sre.otel.javaagent.instrumentation.camunda.v7_18.behavior",
41-
"com.att.sre.otel.javaagent.instrumentation.camunda.v7_18.common" };
40+
String[] helperClassnames = { "io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior",
41+
"io.opentelemetry.instrumentation.camunda.v7_0.behavior",
42+
"io.opentelemetry.instrumentation.camunda.v7_0.common" };
4243

4344
@Override
4445
public boolean isHelperClass(String classname) {

‎instrumentation/camunda/camunda-7.18/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_18/behavior/CamundaExternalTaskActivityBehaviorInstrumentation.java‎ renamed to ‎instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaExternalTaskActivityBehaviorInstrumentation.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.att.sre.otel.javaagent.instrumentation.camunda.v7_18.behavior;
1+
package io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior;
22

3-
import static com.att.sre.otel.javaagent.instrumentation.camunda.v7_18.behavior.CamundaBehaviorSingletons.getInstumenter;
4-
import static com.att.sre.otel.javaagent.instrumentation.camunda.v7_18.behavior.CamundaBehaviorSingletons.getOpentelemetry;
3+
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior.CamundaBehaviorSingletons.getInstumenter;
4+
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior.CamundaBehaviorSingletons.getOpentelemetry;
55
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
66
import static net.bytebuddy.matcher.ElementMatchers.named;
77

@@ -12,11 +12,11 @@
1212

1313
import org.camunda.bpm.engine.impl.pvm.delegate.ActivityExecution;
1414

15-
import io.opentelemetry.javaagent.camunda.v7_18.behavior.CamundaActivityExecutionGetter;
16-
import io.opentelemetry.javaagent.camunda.v7_18.behavior.CamundaActivityExecutionLocalSetter;
17-
import io.opentelemetry.javaagent.camunda.v7_18.behavior.CamundaActivityExecutionSetter;
18-
import io.opentelemetry.javaagent.camunda.v7_18.behavior.CamundaVariableMapSetter;
19-
import io.opentelemetry.javaagent.camunda.v7_18.common.CamundaCommonRequest;
15+
import io.opentelemetry.camunda.v7_0.behavior.CamundaActivityExecutionGetter;
16+
import io.opentelemetry.camunda.v7_0.behavior.CamundaActivityExecutionLocalSetter;
17+
import io.opentelemetry.camunda.v7_0.behavior.CamundaActivityExecutionSetter;
18+
import io.opentelemetry.camunda.v7_0.behavior.CamundaVariableMapSetter;
19+
import io.opentelemetry.camunda.v7_0.common.CamundaCommonRequest;
2020

2121
import io.opentelemetry.api.trace.SpanContext;
2222
import io.opentelemetry.context.Context;

‎instrumentation/camunda/camunda-7.18/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_18/behavior/CamundaExternalTaskActivityBehaviorModule.java‎ renamed to ‎instrumentation/camunda/camunda-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camunda/v7_0/behavior/CamundaExternalTaskActivityBehaviorModule.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opentelemetry.javaagent.instrumentation.camunda.v7_18.behavior;
1+
package io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior;
22

33
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
44

@@ -35,8 +35,9 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
3535
return hasClassesNamed("org.camunda.bpm.engine.impl.bpmn.behavior.ExternalTaskActivityBehavior");
3636
}
3737

38-
String[] helperClassnames = { "io.opentelemetry.javaagent.instrumentation.camunda.v7_18.behavior",
39-
"io.opentelemetry.javaagent.instrumentation.camunda.v7_18.common" };
38+
String[] helperClassnames = { "io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior",
39+
"io.opentelemetry.instrumentation.camunda.v7_0.behavior",
40+
"io.opentelemetry.instrumentation.camunda.v7_0.common" };
4041

4142
@Override
4243
public boolean isHelperClass(String classname) {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package io.opentelemetry.javaagent.instrumentation.camunda.v7_18.behavior;
1+
package io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior;
22

3-
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_18.behavior.CamundaBehaviorSingletons.getInstumenter;
4-
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_18.behavior.CamundaBehaviorSingletons.getOpentelemetry;
3+
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior.CamundaBehaviorSingletons.getInstumenter;
4+
import static io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior.CamundaBehaviorSingletons.getOpentelemetry;
55
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
66
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType;
77
import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -11,8 +11,8 @@
1111

1212
import org.camunda.bpm.engine.impl.pvm.delegate.ActivityExecution;
1313

14-
import io.opentelemetry.javaagent.camunda.v7_18.behavior.CamundaActivityExecutionGetter;
15-
import io.opentelemetry.javaagent.camunda.v7_18.common.CamundaCommonRequest;
14+
import io.opentelemetry.camunda.v7_0.behavior.CamundaActivityExecutionGetter;
15+
import io.opentelemetry.camunda.v7_0.common.CamundaCommonRequest;
1616

1717
import io.opentelemetry.api.trace.SpanContext;
1818
import io.opentelemetry.context.Context;

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.opentelemetry.javaagent.instrumentation.camunda.v7_18.behavior;
1+
package io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior;
22

33
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
44

@@ -35,8 +35,9 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
3535
return hasClassesNamed("org.camunda.bpm.engine.impl.bpmn.behavior.TaskActivityBehavior");
3636
}
3737

38-
String[] helperClassnames = { "io.opentelemetry.javaagent.instrumentation.camunda.v7_18.behavior",
39-
"io.opentelemetry.javaagent.instrumentation.camunda.v7_18.common"};
38+
String[] helperClassnames = { "io.opentelemetry.javaagent.instrumentation.camunda.v7_0.behavior",
39+
"io.opentelemetry.instrumentation.camunda.v7_0.behavior",
40+
"io.opentelemetry.instrumentation.camunda.v7_0.common"};
4041

4142
@Override
4243
public boolean isHelperClass(String classname) {

0 commit comments

Comments
 (0)