Skip to content

Commit 1323395

Browse files
lauritlaurit
authored
Add all otel api bridging instrumentations to testing agent (open-telemetry#13423)
1 parent 2707e04 commit 1323395

File tree

22 files changed

+76
-46
lines changed

22 files changed

+76
-46
lines changed

‎instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/build.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,7 @@ configurations.configureEach {
5050
force("io.opentelemetry:opentelemetry-api:1.4.0")
5151
}
5252
}
53+
if (name == "testRuntimeClasspath") {
54+
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
55+
}
5356
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/build.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,7 @@ configurations.configureEach {
1414
force("io.opentelemetry:opentelemetry-api:1.10.0")
1515
}
1616
}
17+
if (name == "testRuntimeClasspath") {
18+
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
19+
}
1720
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/OpenTelemetryApiInstrumentationModule.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55

66
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10;
77

8+
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
89
import static java.util.Collections.singletonList;
910

1011
import com.google.auto.service.AutoService;
1112
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1213
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1314
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
1415
import java.util.List;
16+
import net.bytebuddy.matcher.ElementMatcher;
1517

1618
@AutoService(InstrumentationModule.class)
1719
public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule
@@ -26,6 +28,11 @@ public List<TypeInstrumentation> typeInstrumentations() {
2628
return singletonList(new OpenTelemetryInstrumentation());
2729
}
2830

31+
@Override
32+
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
33+
return hasClassesNamed("application.io.opentelemetry.api.metrics.LongGaugeBuilder");
34+
}
35+
2936
@Override
3037
public String getModuleGroup() {
3138
return "opentelemetry-api-bridge";

‎instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/build.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,7 @@ configurations.configureEach {
1515
force("io.opentelemetry:opentelemetry-api:1.15.0")
1616
}
1717
}
18+
if (name == "testRuntimeClasspath") {
19+
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
20+
}
1821
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/OpenTelemetryApiInstrumentationModule.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55

66
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_15;
77

8+
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
89
import static java.util.Collections.singletonList;
910

1011
import com.google.auto.service.AutoService;
1112
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1213
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1314
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
1415
import java.util.List;
16+
import net.bytebuddy.matcher.ElementMatcher;
1517

1618
@AutoService(InstrumentationModule.class)
1719
public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule
@@ -25,6 +27,11 @@ public List<TypeInstrumentation> typeInstrumentations() {
2527
return singletonList(new OpenTelemetryInstrumentation());
2628
}
2729

30+
@Override
31+
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
32+
return hasClassesNamed("application.io.opentelemetry.api.metrics.BatchCallback");
33+
}
34+
2835
@Override
2936
public String getModuleGroup() {
3037
return "opentelemetry-api-bridge";

‎instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/build.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,7 @@ configurations.configureEach {
1818
force("io.opentelemetry:opentelemetry-sdk-testing:1.27.0")
1919
}
2020
}
21+
if (name == "testRuntimeClasspath") {
22+
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
23+
}
2124
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/OpenTelemetryApiInstrumentationModule.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55

66
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27;
77

8+
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
89
import static java.util.Collections.singletonList;
910

1011
import com.google.auto.service.AutoService;
1112
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1213
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1314
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
1415
import java.util.List;
16+
import net.bytebuddy.matcher.ElementMatcher;
1517

1618
@AutoService(InstrumentationModule.class)
1719
public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule
@@ -25,6 +27,11 @@ public List<TypeInstrumentation> typeInstrumentations() {
2527
return singletonList(new OpenTelemetryInstrumentation());
2628
}
2729

30+
@Override
31+
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
32+
return hasClassesNamed("application.io.opentelemetry.api.logs.LoggerBuilder");
33+
}
34+
2835
@Override
2936
public String getModuleGroup() {
3037
return "opentelemetry-api-bridge";

‎instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/build.gradle.kts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ dependencies {
77
compileOnly("io.opentelemetry:opentelemetry-api-incubator")
88

99
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
10-
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
1110
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
1211
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
13-
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
1412

1513
testImplementation("io.opentelemetry:opentelemetry-extension-incubator:1.31.0-alpha")
1614
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/build.gradle.kts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ dependencies {
77
compileOnly("io.opentelemetry:opentelemetry-api-incubator")
88

99
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
10-
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
1110
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
1211
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
13-
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
1412
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
1513
}
1614

@@ -21,9 +19,9 @@ configurations.configureEach {
2119
resolutionStrategy {
2220
force("io.opentelemetry:opentelemetry-api:1.32.0")
2321
}
24-
if (name.equals("testRuntimeClasspath")) {
25-
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
26-
}
22+
}
23+
if (name == "testRuntimeClasspath") {
24+
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
2725
}
2826
}
2927

‎instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/OpenTelemetryApiInstrumentationModule.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ public OpenTelemetryApiInstrumentationModule() {
2727
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
2828
// skip instrumentation when opentelemetry-extension-incubator is present, instrumentation is
2929
// handled by OpenTelemetryApiIncubatorInstrumentationModule
30-
return not(
31-
hasClassesNamed(
32-
"application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder"));
30+
return hasClassesNamed("application.io.opentelemetry.api.logs.LoggerBuilder")
31+
.and(
32+
not(
33+
hasClassesNamed(
34+
"application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder")));
3335
}
3436

3537
@Override

0 commit comments

Comments
 (0)