Skip to content

Commit 96c4922

Browse files
zeitlingeropentelemetrybottrasklaurit
authored
Update the OpenTelemetry SDK version to 1.37.0 (#11066)
Co-authored-by: opentelemetrybot <[email protected]> Co-authored-by: Trask Stalnaker <[email protected]> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 3b7c225 commit 96c4922

File tree

61 files changed

+1398
-157
lines changed

Some content is hidden

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

61 files changed

+1398
-157
lines changed

‎dependencyManagement/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ val dependencyVersions = hashMapOf<String, String>()
88
rootProject.extra["versions"] = dependencyVersions
99

1010
// this line is managed by .github/scripts/update-sdk-version.sh
11-
val otelSdkVersion = "1.36.0"
11+
val otelSdkVersion = "1.37.0"
1212
val otelContribVersion = "1.34.0-alpha"
1313
val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
1414

‎examples/distro/agent/build.gradle

+2-3
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,9 @@ tasks {
7373
// exclude known bootstrap dependencies - they can't appear in the inst/ directory
7474
dependencies {
7575
exclude("io.opentelemetry:opentelemetry-api")
76-
exclude("io.opentelemetry:opentelemetry-api-events")
7776
exclude("io.opentelemetry:opentelemetry-context")
78-
// metrics advice API
79-
exclude("io.opentelemetry:opentelemetry-extension-incubator")
77+
// events API and metrics advice API
78+
exclude("io.opentelemetry:opentelemetry-api-incubator")
8079
}
8180
}
8281

‎examples/distro/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ subprojects {
2727
ext {
2828
versions = [
2929
// this line is managed by .github/scripts/update-sdk-version.sh
30-
opentelemetrySdk : "1.36.0",
30+
opentelemetrySdk : "1.37.0",
3131

3232
// these lines are managed by .github/scripts/update-version.sh
3333
opentelemetryJavaagent : "2.3.0-SNAPSHOT",

‎examples/distro/testing/agent-for-testing/build.gradle

+2-3
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,9 @@ tasks {
7070
// exclude known bootstrap dependencies - they can't appear in the inst/ directory
7171
dependencies {
7272
exclude("io.opentelemetry:opentelemetry-api")
73-
exclude("io.opentelemetry:opentelemetry-api-events")
7473
exclude("io.opentelemetry:opentelemetry-context")
75-
// metrics advice API
76-
exclude("io.opentelemetry:opentelemetry-extension-incubator")
74+
// events API and metrics advice API
75+
exclude("io.opentelemetry:opentelemetry-api-incubator")
7776
}
7877
}
7978

‎examples/extension/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ version '1.0'
2323
ext {
2424
versions = [
2525
// this line is managed by .github/scripts/update-sdk-version.sh
26-
opentelemetrySdk : "1.36.0",
26+
opentelemetrySdk : "1.37.0",
2727

2828
// these lines are managed by .github/scripts/update-version.sh
2929
opentelemetryJavaagent : "2.3.0-SNAPSHOT",

‎instrumentation-api-incubator/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
api("io.opentelemetry.semconv:opentelemetry-semconv")
1515
api("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
1616
api(project(":instrumentation-api"))
17-
implementation("io.opentelemetry:opentelemetry-extension-incubator")
17+
implementation("io.opentelemetry:opentelemetry-api-incubator")
1818

1919
compileOnly("com.google.auto.value:auto-value-annotations")
2020
annotationProcessor("com.google.auto.value:auto-value")

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
import static java.util.Arrays.asList;
99

10+
import io.opentelemetry.api.incubator.metrics.ExtendedLongHistogramBuilder;
11+
import io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder;
1012
import io.opentelemetry.api.metrics.LongHistogramBuilder;
1113
import io.opentelemetry.api.metrics.LongUpDownCounterBuilder;
12-
import io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder;
13-
import io.opentelemetry.extension.incubator.metrics.ExtendedLongUpDownCounterBuilder;
1414
import io.opentelemetry.semconv.ErrorAttributes;
1515
import io.opentelemetry.semconv.HttpAttributes;
1616
import io.opentelemetry.semconv.NetworkAttributes;

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcMetricsAdvice.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
package io.opentelemetry.instrumentation.api.incubator.semconv.rpc;
77

8+
import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder;
89
import io.opentelemetry.api.metrics.DoubleHistogramBuilder;
9-
import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder;
1010
import io.opentelemetry.semconv.NetworkAttributes;
1111
import io.opentelemetry.semconv.ServerAttributes;
1212
import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes;

‎instrumentation-api/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ group = "io.opentelemetry.instrumentation"
1313

1414
dependencies {
1515
api("io.opentelemetry:opentelemetry-api")
16-
implementation("io.opentelemetry:opentelemetry-extension-incubator")
16+
implementation("io.opentelemetry:opentelemetry-api-incubator")
1717
implementation("io.opentelemetry.semconv:opentelemetry-semconv")
1818
implementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
1919

‎instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/OperationMetricsUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
package io.opentelemetry.instrumentation.api.internal;
77

88
import io.opentelemetry.api.common.Attributes;
9+
import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder;
910
import io.opentelemetry.api.metrics.DoubleHistogramBuilder;
1011
import io.opentelemetry.api.metrics.Meter;
1112
import io.opentelemetry.context.Context;
12-
import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder;
1313
import io.opentelemetry.instrumentation.api.instrumenter.OperationListener;
1414
import io.opentelemetry.instrumentation.api.instrumenter.OperationMetrics;
1515
import java.util.function.BiConsumer;

‎instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import static java.util.Arrays.asList;
99
import static java.util.Collections.unmodifiableList;
1010

11+
import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder;
1112
import io.opentelemetry.api.metrics.DoubleHistogramBuilder;
12-
import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder;
1313
import io.opentelemetry.semconv.ErrorAttributes;
1414
import io.opentelemetry.semconv.HttpAttributes;
1515
import io.opentelemetry.semconv.NetworkAttributes;

‎instrumentation/micrometer/micrometer-1.5/library/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
dependencies {
6-
compileOnly("io.opentelemetry:opentelemetry-extension-incubator")
6+
compileOnly("io.opentelemetry:opentelemetry-api-incubator")
77

88
library("io.micrometer:micrometer-core:1.5.0")
99

‎instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/HistogramAdviceUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
1111
import io.micrometer.core.instrument.util.TimeUtils;
12+
import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder;
1213
import io.opentelemetry.api.metrics.DoubleHistogramBuilder;
13-
import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder;
1414
import java.util.ArrayList;
1515
import java.util.List;
1616
import java.util.NavigableSet;

‎instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationSpan.java

+14
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,20 @@ public Span addEvent(
100100
return this;
101101
}
102102

103+
@Override
104+
@CanIgnoreReturnValue
105+
public Span addLink(SpanContext spanContext) {
106+
agentSpan.addLink(Bridging.toAgent(spanContext));
107+
return this;
108+
}
109+
110+
@Override
111+
@CanIgnoreReturnValue
112+
public Span addLink(SpanContext spanContext, Attributes attributes) {
113+
agentSpan.addLink(Bridging.toAgent(spanContext), Bridging.toAgent(attributes));
114+
return this;
115+
}
116+
103117
@Override
104118
@CanIgnoreReturnValue
105119
public Span setStatus(StatusCode status) {

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

+8-2
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,16 @@ public ContextPropagators getPropagators() {
6363
}
6464

6565
private static ApplicationMeterFactory getMeterFactory() {
66-
// this class is defined in opentelemetry-api-1.32
66+
// this class is defined in opentelemetry-api-1.37
6767
ApplicationMeterFactory meterFactory =
6868
getMeterFactory(
69-
"io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_32.incubator.metrics.ApplicationMeterFactory132Incubator");
69+
"io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.ApplicationMeterFactory137Incubator");
70+
if (meterFactory == null) {
71+
// this class is defined in opentelemetry-api-1.32
72+
meterFactory =
73+
getMeterFactory(
74+
"io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_32.incubator.metrics.ApplicationMeterFactory132Incubator");
75+
}
7076
if (meterFactory == null) {
7177
// this class is defined in opentelemetry-api-1.32
7278
meterFactory =

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,21 @@ plugins {
44

55
dependencies {
66
compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "v1_31"))
7-
compileOnly("io.opentelemetry:opentelemetry-extension-incubator")
7+
compileOnly("io.opentelemetry:opentelemetry-api-incubator")
88

99
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
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"))
1313
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
1414

15-
testImplementation("io.opentelemetry:opentelemetry-extension-incubator")
15+
testImplementation("io.opentelemetry:opentelemetry-extension-incubator:1.31.0-alpha")
1616
}
1717

1818
configurations.configureEach {
1919
if (name == "testRuntimeClasspath" || name == "testCompileClasspath") {
2020
resolutionStrategy {
2121
force("io.opentelemetry:opentelemetry-api:1.31.0")
22-
force("io.opentelemetry:opentelemetry-extension-incubator:1.31.0-alpha")
2322
}
2423
}
2524
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/OpenTelemetryApiInstrumentationModule.java

+8
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55

66
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31;
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 java.util.List;
15+
import net.bytebuddy.matcher.ElementMatcher;
1416

1517
@AutoService(InstrumentationModule.class)
1618
public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule {
@@ -27,4 +29,10 @@ public boolean isIndyModule() {
2729
public List<TypeInstrumentation> typeInstrumentations() {
2830
return singletonList(new OpenTelemetryInstrumentation());
2931
}
32+
33+
@Override
34+
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
35+
return hasClassesNamed(
36+
"application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder");
37+
}
3038
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/metrics/ApplicationDoubleCounterBuilder131.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ final class ApplicationDoubleCounterBuilder131 extends ApplicationDoubleCounterB
2424

2525
@Override
2626
public ExtendedDoubleCounterBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
27-
((io.opentelemetry.extension.incubator.metrics.ExtendedDoubleCounterBuilder) agentBuilder)
27+
((io.opentelemetry.api.incubator.metrics.ExtendedDoubleCounterBuilder) agentBuilder)
2828
.setAttributesAdvice(Bridging.toAgent(attributes));
2929
return this;
3030
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/metrics/ApplicationDoubleGaugeBuilder131.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ public LongGaugeBuilder ofLongs() {
3131

3232
@Override
3333
public DoubleGauge build() {
34-
io.opentelemetry.extension.incubator.metrics.DoubleGauge agentDoubleGauge =
35-
((io.opentelemetry.extension.incubator.metrics.ExtendedDoubleGaugeBuilder) agentBuilder)
36-
.build();
34+
io.opentelemetry.api.incubator.metrics.DoubleGauge agentDoubleGauge =
35+
((io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) agentBuilder).build();
3736
return new DoubleGauge() {
3837

3938
@Override
@@ -50,7 +49,7 @@ public void set(double value, Attributes attributes) {
5049

5150
@Override
5251
public ExtendedDoubleGaugeBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
53-
((io.opentelemetry.extension.incubator.metrics.ExtendedDoubleGaugeBuilder) agentBuilder)
52+
((io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) agentBuilder)
5453
.setAttributesAdvice(Bridging.toAgent(attributes));
5554
return this;
5655
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/metrics/ApplicationDoubleHistogramBuilder131.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public ExtendedDoubleHistogramBuilder setExplicitBucketBoundariesAdvice(
3737

3838
@Override
3939
public ExtendedDoubleHistogramBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
40-
((io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder) agentBuilder)
40+
((io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder) agentBuilder)
4141
.setAttributesAdvice(Bridging.toAgent(attributes));
4242
return this;
4343
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/metrics/ApplicationDoubleUpDownCounterBuilder131.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ final class ApplicationDoubleUpDownCounterBuilder131 extends ApplicationDoubleUp
2424

2525
@Override
2626
public ExtendedDoubleUpDownCounterBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
27-
((io.opentelemetry.extension.incubator.metrics.ExtendedDoubleUpDownCounterBuilder) agentBuilder)
27+
((io.opentelemetry.api.incubator.metrics.ExtendedDoubleUpDownCounterBuilder) agentBuilder)
2828
.setAttributesAdvice(Bridging.toAgent(attributes));
2929
return this;
3030
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/metrics/ApplicationLongCounterBuilder131.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public DoubleCounterBuilder ofDoubles() {
2929

3030
@Override
3131
public ExtendedLongCounterBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
32-
((io.opentelemetry.extension.incubator.metrics.ExtendedLongCounterBuilder) agentBuilder)
32+
((io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder) agentBuilder)
3333
.setAttributesAdvice(Bridging.toAgent(attributes));
3434
return this;
3535
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/metrics/ApplicationLongGaugeBuilder131.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ final class ApplicationLongGaugeBuilder131 extends ApplicationLongGaugeBuilder
2525

2626
@Override
2727
public LongGauge build() {
28-
io.opentelemetry.extension.incubator.metrics.LongGauge agentLongGauge =
29-
((io.opentelemetry.extension.incubator.metrics.ExtendedLongGaugeBuilder) agentBuilder)
30-
.build();
28+
io.opentelemetry.api.incubator.metrics.LongGauge agentLongGauge =
29+
((io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder) agentBuilder).build();
3130
return new LongGauge() {
3231
@Override
3332
public void set(long value) {
@@ -43,7 +42,7 @@ public void set(long value, Attributes attributes) {
4342

4443
@Override
4544
public ExtendedLongGaugeBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
46-
((io.opentelemetry.extension.incubator.metrics.ExtendedLongGaugeBuilder) agentBuilder)
45+
((io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder) agentBuilder)
4746
.setAttributesAdvice(Bridging.toAgent(attributes));
4847
return this;
4948
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/metrics/ApplicationLongHistogramBuilder131.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public ExtendedLongHistogramBuilder setExplicitBucketBoundariesAdvice(
3131

3232
@Override
3333
public ExtendedLongHistogramBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
34-
((io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder) agentBuilder)
34+
((io.opentelemetry.api.incubator.metrics.ExtendedLongHistogramBuilder) agentBuilder)
3535
.setAttributesAdvice(Bridging.toAgent(attributes));
3636
return this;
3737
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/metrics/ApplicationLongUpDownCounterBuilder131.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public DoubleUpDownCounterBuilder ofDoubles() {
3030

3131
@Override
3232
public ExtendedLongUpDownCounterBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
33-
((io.opentelemetry.extension.incubator.metrics.ExtendedLongUpDownCounterBuilder) agentBuilder)
33+
((io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder) agentBuilder)
3434
.setAttributesAdvice(Bridging.toAgent(attributes));
3535
return this;
3636
}

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

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

55
dependencies {
66
compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "v1_32"))
7-
compileOnly("io.opentelemetry:opentelemetry-extension-incubator")
7+
compileOnly("io.opentelemetry:opentelemetry-api-incubator")
88

99
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
1010
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
@@ -18,7 +18,7 @@ testing {
1818
suites {
1919
val incubatorTest by registering(JvmTestSuite::class) {
2020
dependencies {
21-
implementation("io.opentelemetry:opentelemetry-extension-incubator")
21+
implementation("io.opentelemetry:opentelemetry-extension-incubator:1.32.0-alpha")
2222
}
2323
}
2424
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationDoubleHistogramBuilder132Incubator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public ExtendedDoubleHistogramBuilder setExplicitBucketBoundariesAdvice(
3737

3838
@Override
3939
public ExtendedDoubleHistogramBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
40-
((io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder) agentBuilder)
40+
((io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder) agentBuilder)
4141
.setAttributesAdvice(Bridging.toAgent(attributes));
4242
return this;
4343
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationLongHistogramBuilder132Incubator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public ExtendedLongHistogramBuilder setExplicitBucketBoundariesAdvice(
3131

3232
@Override
3333
public ExtendedLongHistogramBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
34-
((io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder) agentBuilder)
34+
((io.opentelemetry.api.incubator.metrics.ExtendedLongHistogramBuilder) agentBuilder)
3535
.setAttributesAdvice(Bridging.toAgent(attributes));
3636
return this;
3737
}

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

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
plugins {
2+
id("otel.javaagent-instrumentation")
3+
}
4+
5+
dependencies {
6+
compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "v1_37"))
7+
compileOnly("io.opentelemetry:opentelemetry-api-incubator")
8+
9+
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"))
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"))
16+
}
17+
18+
testing {
19+
suites {
20+
val incubatorTest by registering(JvmTestSuite::class) {
21+
dependencies {
22+
implementation("io.opentelemetry:opentelemetry-api-incubator:1.37.0-alpha")
23+
}
24+
}
25+
}
26+
}
27+
28+
tasks {
29+
check {
30+
dependsOn(testing.suites)
31+
}
32+
}

0 commit comments

Comments
 (0)