Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add all otel api bridging instrumentations to testing agent #13423

Merged
merged 2 commits into from
Feb 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,7 @@ configurations.configureEach {
force("io.opentelemetry:opentelemetry-api:1.4.0")
}
}
if (name == "testRuntimeClasspath") {
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,7 @@ configurations.configureEach {
force("io.opentelemetry:opentelemetry-api:1.10.0")
}
}
if (name == "testRuntimeClasspath") {
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@

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

import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
import static java.util.Collections.singletonList;

import com.google.auto.service.AutoService;
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
import java.util.List;
import net.bytebuddy.matcher.ElementMatcher;

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

@Override
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
return hasClassesNamed("application.io.opentelemetry.api.metrics.LongGaugeBuilder");
}

@Override
public String getModuleGroup() {
return "opentelemetry-api-bridge";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ configurations.configureEach {
force("io.opentelemetry:opentelemetry-api:1.15.0")
}
}
if (name == "testRuntimeClasspath") {
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@

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

import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
import static java.util.Collections.singletonList;

import com.google.auto.service.AutoService;
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
import java.util.List;
import net.bytebuddy.matcher.ElementMatcher;

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

@Override
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
return hasClassesNamed("application.io.opentelemetry.api.metrics.BatchCallback");
}

@Override
public String getModuleGroup() {
return "opentelemetry-api-bridge";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,7 @@ configurations.configureEach {
force("io.opentelemetry:opentelemetry-sdk-testing:1.27.0")
}
}
if (name == "testRuntimeClasspath") {
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@

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

import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
import static java.util.Collections.singletonList;

import com.google.auto.service.AutoService;
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
import java.util.List;
import net.bytebuddy.matcher.ElementMatcher;

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

@Override
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
return hasClassesNamed("application.io.opentelemetry.api.logs.LoggerBuilder");
}

@Override
public String getModuleGroup() {
return "opentelemetry-api-bridge";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ dependencies {
compileOnly("io.opentelemetry:opentelemetry-api-incubator")

implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))

testImplementation("io.opentelemetry:opentelemetry-extension-incubator:1.31.0-alpha")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ dependencies {
compileOnly("io.opentelemetry:opentelemetry-api-incubator")

implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
}

Expand All @@ -21,9 +19,9 @@ configurations.configureEach {
resolutionStrategy {
force("io.opentelemetry:opentelemetry-api:1.32.0")
}
if (name.equals("testRuntimeClasspath")) {
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
}
}
if (name == "testRuntimeClasspath") {
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ public OpenTelemetryApiInstrumentationModule() {
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
// skip instrumentation when opentelemetry-extension-incubator is present, instrumentation is
// handled by OpenTelemetryApiIncubatorInstrumentationModule
return not(
hasClassesNamed(
"application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder"));
return hasClassesNamed("application.io.opentelemetry.api.logs.LoggerBuilder")
.and(
not(
hasClassesNamed(
"application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder")));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,8 @@ dependencies {
compileOnly("io.opentelemetry:opentelemetry-api-incubator")

implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
}

configurations.configureEach {
Expand All @@ -27,9 +23,9 @@ configurations.configureEach {
force("io.opentelemetry:opentelemetry-extension-incubator:1.32.0-alpha")
}
}
if (name.equals("testRuntimeClasspath")) {
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
}
}
if (name == "testRuntimeClasspath") {
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies {
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.37:javaagent"))
Expand All @@ -22,9 +21,9 @@ configurations.configureEach {
force("io.opentelemetry:opentelemetry-api:1.38.0")
force("io.opentelemetry:opentelemetry-api-incubator:1.38.0-alpha")
}
if (name.equals("testRuntimeClasspath")) {
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
}
}
if (name == "testRuntimeClasspath") {
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ public OpenTelemetryApiInstrumentationModule() {
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
// skip instrumentation when opentelemetry-api-incubator is present, instrumentation is
// handled by OpenTelemetryApiIncubatorInstrumentationModule
return not(
hasClassesNamed(
"application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder"));
return hasClassesNamed("application.io.opentelemetry.api.metrics.LongGauge")
.and(
not(
hasClassesNamed(
"application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder")));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
// skip instrumentation when opentelemetry-api-incubator is not present, instrumentation
// is handled by OpenTelemetryApiInstrumentationModule
return hasClassesNamed(
"application.io.opentelemetry.api.metrics.LongGauge",
"application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@ configurations.configureEach {
force("io.opentelemetry:opentelemetry-api:1.4.0")
}
}
if (name == "testRuntimeClasspath") {
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@ dependencies {
compileOnly("io.opentelemetry:opentelemetry-api-incubator")

implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.37:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.38:javaagent"))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,7 @@ dependencies {
compileOnly("io.opentelemetry:opentelemetry-api-incubator")

implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.37:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.38:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.40:javaagent"))
}

Expand All @@ -24,9 +17,9 @@ configurations.configureEach {
force("io.opentelemetry:opentelemetry-api:1.42.0")
force("io.opentelemetry:opentelemetry-api-incubator:1.42.0-alpha")
}
if (name.equals("testRuntimeClasspath")) {
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
}
}
if (name == "testRuntimeClasspath") {
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ public OpenTelemetryApiInstrumentationModule() {

@Override
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
return not(hasClassesNamed("application.io.opentelemetry.api.incubator.logs.ExtendedLogger"));
return hasClassesNamed("application.io.opentelemetry.api.common.Value")
.and(
not(hasClassesNamed("application.io.opentelemetry.api.incubator.logs.ExtendedLogger")));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
// EventLogger was removed in 1.47, including it here prevents the instrumentation from applying
// to 1.47
return hasClassesNamed(
"application.io.opentelemetry.api.common.Value",
"application.io.opentelemetry.api.incubator.logs.ExtendedLogger",
"application.io.opentelemetry.api.incubator.events.EventLogger");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,7 @@ dependencies {
compileOnly("io.opentelemetry:opentelemetry-api-incubator")

implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.37:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.38:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.40:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.42:javaagent"))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ public OpenTelemetryApiIncubatorInstrumentationModule() {

@Override
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
return hasClassesNamed("application.io.opentelemetry.api.incubator.logs.ExtendedLogger");
return hasClassesNamed(
"application.io.opentelemetry.api.common.Value",
"application.io.opentelemetry.api.incubator.logs.ExtendedLogger");
}

@Override
Expand Down
10 changes: 10 additions & 0 deletions javaagent/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,16 @@ dependencies {
baseJavaagentLibs(project(":muzzle"))
baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.37:javaagent"))
baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.38:javaagent"))
baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.40:javaagent"))
baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.42:javaagent"))
baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.47:javaagent"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How did you get such a specific list of javaagent versions?

Copy link
Contributor Author

@laurit laurit Feb 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are not agent versions but instrumentations for specific opentelemetry-api versions that introduce new features. In our tests we mostly test instrumentations that use the shaded opentelemetry api provided by the agent. Your test brings its own opentelemetry api so it requires the instrumentations that bridge the api you have to the agent api.

baseJavaagentLibs(project(":instrumentation:opentelemetry-instrumentation-api:javaagent"))
baseJavaagentLibs(project(":instrumentation:opentelemetry-instrumentation-annotations-1.16:javaagent"))
baseJavaagentLibs(project(":instrumentation:executors:javaagent"))
Expand Down
Loading