Skip to content

Commit 26ff5d3

Browse files
lauritlaurit
committed
Merge branch 'main' into spring-starter-logback-mdc-fix
2 parents d1e344b + edf4abd commit 26ff5d3

File tree

41 files changed

+110
-72
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+110
-72
lines changed

‎.github/workflows/build-common.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ jobs:
415415
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=none --no-daemon ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
416416

417417
- name: Test
418-
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }}${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
418+
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }} ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
419419

420420
- name: Upload jvm crash dump files if any
421421
if: failure()
@@ -489,13 +489,17 @@ jobs:
489489
working-directory: gradle-plugins
490490

491491
- name: Build distro
492-
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
492+
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
493493
working-directory: examples/distro
494494

495495
- name: Build extension
496-
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
496+
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
497497
working-directory: examples/extension
498498

499+
- name: Build benchmark-overhead
500+
run: ./gradlew assemble ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
501+
working-directory: benchmark-overhead
502+
499503
- name: Run muzzle check against extension
500504
run: ./gradlew muzzle --init-script ../../.github/scripts/local.init.gradle.kts
501505
working-directory: examples/extension

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88
`io.opentelemetry.instrumentation.httpclient` was deprecated in favor of the new package name
99
`io.opentelemetry.instrumentation.javahttpclient`
1010

11+
## Version 2.13.3 (2025-02-28)
12+
13+
### 🛠️ Bug fixes
14+
15+
- Backport: Fix failure to start when AWS Resource Provider is enabled
16+
([#13420](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13420))
17+
1118
## Version 2.13.2 (2025-02-27)
1219

1320
### 🛠️ Bug fixes

‎benchmark-overhead/build.gradle.kts

+1-4
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,11 @@ dependencies {
2828
testImplementation("org.slf4j:slf4j-simple:2.0.17")
2929

3030
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
31+
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
3132
}
3233

3334
tasks {
3435
test {
3536
useJUnitPlatform()
36-
testLogging {
37-
exceptionFormat = TestExceptionFormat.FULL
38-
showStandardStreams = true
39-
}
4037
}
4138
}

‎dependencyManagement/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ val DEPENDENCY_BOMS = listOf(
2727
// for some reason boms show up as runtime dependencies in license and vulnerability scans
2828
// even if they are only used by test dependencies, so not using junit bom since it is LGPL
2929

30-
"com.fasterxml.jackson:jackson-bom:2.18.2",
30+
"com.fasterxml.jackson:jackson-bom:2.18.3",
3131
"com.squareup.okio:okio-bom:3.10.2", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
3232
"com.google.guava:guava-bom:33.4.0-jre",
3333
"org.apache.groovy:groovy-bom:${groovyVersion}",

‎docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-instrumentation-annotations-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.13.2.jar
1+
Comparing source compatibility of opentelemetry-instrumentation-annotations-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.13.3.jar
22
No changes.

‎docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-instrumentation-api-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.13.2.jar
1+
Comparing source compatibility of opentelemetry-instrumentation-api-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.13.3.jar
22
No changes.

‎docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.13.2.jar
1+
Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.13.3.jar
22
No changes.

‎docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-spring-boot-starter-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.13.2.jar
1+
Comparing source compatibility of opentelemetry-spring-boot-starter-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.13.3.jar
22
No changes.

‎examples/distro/smoke-tests/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
dependencies {
66
testImplementation("org.testcontainers:testcontainers:1.20.5")
7-
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")
7+
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.3")
88
testImplementation("com.google.protobuf:protobuf-java-util:4.29.3")
99
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
1010
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha")

‎examples/extension/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ dependencies {
9898

9999
//All dependencies below are only for tests
100100
testImplementation("org.testcontainers:testcontainers:1.20.5")
101-
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")
101+
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.3")
102102
testImplementation("com.google.protobuf:protobuf-java-util:4.29.3")
103103
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
104104
testImplementation("io.opentelemetry:opentelemetry-api")

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

+3
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

+3
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

+7
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

+3
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

+7
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

+3
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

+7
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

-2
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

+3-5
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

+5-3
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

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

+3-7
Original file line numberDiff line numberDiff line change
@@ -7,12 +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"))
14-
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
15-
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
1612
}
1713

1814
configurations.configureEach {
@@ -27,9 +23,9 @@ configurations.configureEach {
2723
force("io.opentelemetry:opentelemetry-extension-incubator:1.32.0-alpha")
2824
}
2925
}
30-
if (name.equals("testRuntimeClasspath")) {
31-
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
32-
}
26+
}
27+
if (name == "testRuntimeClasspath") {
28+
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
3329
}
3430
}
3531

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ dependencies {
1010
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
1111
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
1212
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
13-
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
1413
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
1514
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
1615
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.37:javaagent"))
@@ -22,9 +21,9 @@ configurations.configureEach {
2221
force("io.opentelemetry:opentelemetry-api:1.38.0")
2322
force("io.opentelemetry:opentelemetry-api-incubator:1.38.0-alpha")
2423
}
25-
if (name.equals("testRuntimeClasspath")) {
26-
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
27-
}
24+
}
25+
if (name == "testRuntimeClasspath") {
26+
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
2827
}
2928
}
3029

‎instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/OpenTelemetryApiInstrumentationModule.java

+5-3
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-api-incubator is present, instrumentation is
2929
// handled by OpenTelemetryApiIncubatorInstrumentationModule
30-
return not(
31-
hasClassesNamed(
32-
"application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder"));
30+
return hasClassesNamed("application.io.opentelemetry.api.metrics.LongGauge")
31+
.and(
32+
not(
33+
hasClassesNamed(
34+
"application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder")));
3335
}
3436

3537
@Override

‎instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
2727
// skip instrumentation when opentelemetry-api-incubator is not present, instrumentation
2828
// is handled by OpenTelemetryApiInstrumentationModule
2929
return hasClassesNamed(
30+
"application.io.opentelemetry.api.metrics.LongGauge",
3031
"application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder");
3132
}
3233

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

+3
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,7 @@ configurations.configureEach {
1313
force("io.opentelemetry:opentelemetry-api:1.4.0")
1414
}
1515
}
16+
if (name == "testRuntimeClasspath") {
17+
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
18+
}
1619
}

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

-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@ 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"))
1312
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
14-
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
15-
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
1613
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.37:javaagent"))
1714
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.38:javaagent"))
1815

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

+3-10
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@ 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"))
11-
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
12-
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
1310
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
14-
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
15-
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
16-
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.37:javaagent"))
17-
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.38:javaagent"))
1811
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.40:javaagent"))
1912
}
2013

@@ -24,9 +17,9 @@ configurations.configureEach {
2417
force("io.opentelemetry:opentelemetry-api:1.42.0")
2518
force("io.opentelemetry:opentelemetry-api-incubator:1.42.0-alpha")
2619
}
27-
if (name.equals("testRuntimeClasspath")) {
28-
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
29-
}
20+
}
21+
if (name == "testRuntimeClasspath") {
22+
exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
3023
}
3124
}
3225

0 commit comments

Comments
 (0)