Skip to content

Commit cab8ce6

Browse files
opentelemetrybotlaurit
opentelemetrybot
and
laurit
authored
Update the OpenTelemetry SDK version to 1.42.0 (#12186)
Co-authored-by: Lauri Tulmin <[email protected]>
1 parent a1ad82a commit cab8ce6

File tree

21 files changed

+83
-115
lines changed

21 files changed

+83
-115
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.41.0"
11+
val otelSdkVersion = "1.42.0"
1212
val otelContribVersion = "1.38.0-alpha"
1313
val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
1414

‎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.41.0",
30+
opentelemetrySdk : "1.42.0",
3131

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

‎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.41.0",
26+
opentelemetrySdk : "1.42.0",
2727

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class ApplicationDoubleGaugeBuilder implements DoubleGaugeBuilder {
1616

1717
private final io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder;
1818

19-
public ApplicationDoubleGaugeBuilder(
19+
protected ApplicationDoubleGaugeBuilder(
2020
io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder) {
2121
this.agentBuilder = agentBuilder;
2222
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class ApplicationDoubleHistogramBuilder implements DoubleHistogramBuilder
1414

1515
private final io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder;
1616

17-
public ApplicationDoubleHistogramBuilder(
17+
protected ApplicationDoubleHistogramBuilder(
1818
io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder) {
1919
this.agentBuilder = agentBuilder;
2020
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class ApplicationLongCounterBuilder implements LongCounterBuilder {
1717

1818
private final io.opentelemetry.api.metrics.LongCounterBuilder agentBuilder;
1919

20-
public ApplicationLongCounterBuilder(
20+
protected ApplicationLongCounterBuilder(
2121
io.opentelemetry.api.metrics.LongCounterBuilder agentBuilder) {
2222
this.agentBuilder = agentBuilder;
2323
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class ApplicationLongUpDownCounterBuilder implements LongUpDownCounterBui
1717

1818
private final io.opentelemetry.api.metrics.LongUpDownCounterBuilder agentBuilder;
1919

20-
public ApplicationLongUpDownCounterBuilder(
20+
protected ApplicationLongUpDownCounterBuilder(
2121
io.opentelemetry.api.metrics.LongUpDownCounterBuilder agentBuilder) {
2222
this.agentBuilder = agentBuilder;
2323
}

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

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ configurations.configureEach {
1414
if (name == "testRuntimeClasspath" || name == "testCompileClasspath") {
1515
resolutionStrategy {
1616
force("io.opentelemetry:opentelemetry-api:1.27.0")
17+
force("io.opentelemetry:opentelemetry-sdk-logs:1.27.0")
18+
force("io.opentelemetry:opentelemetry-sdk-testing:1.27.0")
1719
}
1820
}
1921
}

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

+4-26
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder;
1010
import application.io.opentelemetry.api.metrics.LongCounterBuilder;
1111
import application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder;
12-
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleGaugeBuilder;
13-
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleHistogramBuilder;
14-
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongCounterBuilder;
15-
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongUpDownCounterBuilder;
1612
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_15.metrics.ApplicationMeter115;
1713

1814
public class ApplicationMeter131 extends ApplicationMeter115 {
@@ -26,39 +22,21 @@ protected ApplicationMeter131(io.opentelemetry.api.metrics.Meter agentMeter) {
2622

2723
@Override
2824
public LongCounterBuilder counterBuilder(String name) {
29-
io.opentelemetry.api.metrics.LongCounterBuilder builder = agentMeter.counterBuilder(name);
30-
if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder) {
31-
return new ApplicationLongCounterBuilder131(builder);
32-
}
33-
return new ApplicationLongCounterBuilder(builder);
25+
return new ApplicationLongCounterBuilder131(agentMeter.counterBuilder(name));
3426
}
3527

3628
@Override
3729
public LongUpDownCounterBuilder upDownCounterBuilder(String name) {
38-
io.opentelemetry.api.metrics.LongUpDownCounterBuilder builder =
39-
agentMeter.upDownCounterBuilder(name);
40-
if (builder
41-
instanceof io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder) {
42-
return new ApplicationLongUpDownCounterBuilder131(builder);
43-
}
44-
return new ApplicationLongUpDownCounterBuilder(builder);
30+
return new ApplicationLongUpDownCounterBuilder131(agentMeter.upDownCounterBuilder(name));
4531
}
4632

4733
@Override
4834
public DoubleHistogramBuilder histogramBuilder(String name) {
49-
io.opentelemetry.api.metrics.DoubleHistogramBuilder builder = agentMeter.histogramBuilder(name);
50-
if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder) {
51-
return new ApplicationDoubleHistogramBuilder131(builder);
52-
}
53-
return new ApplicationDoubleHistogramBuilder(builder);
35+
return new ApplicationDoubleHistogramBuilder131(agentMeter.histogramBuilder(name));
5436
}
5537

5638
@Override
5739
public DoubleGaugeBuilder gaugeBuilder(String name) {
58-
io.opentelemetry.api.metrics.DoubleGaugeBuilder builder = agentMeter.gaugeBuilder(name);
59-
if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) {
60-
return new ApplicationDoubleGaugeBuilder131(builder);
61-
}
62-
return new ApplicationDoubleGaugeBuilder(builder);
40+
return new ApplicationDoubleGaugeBuilder131(agentMeter.gaugeBuilder(name));
6341
}
6442
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/metrics/NoopTest.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
77

8+
import static java.util.Collections.emptyList;
89
import static org.assertj.core.api.Assertions.assertThat;
910

1011
import io.opentelemetry.api.metrics.DoubleGaugeBuilder;
@@ -29,15 +30,19 @@ void noopInstance() {
2930
Meter meter = testing.getOpenTelemetry().getMeter("test");
3031

3132
LongCounterBuilder counterBuilder = meter.counterBuilder("test");
32-
assertThat(counterBuilder).isNotInstanceOf(ExtendedLongCounterBuilder.class);
33+
assertThat(counterBuilder).isInstanceOf(ExtendedLongCounterBuilder.class);
34+
((ExtendedLongCounterBuilder) counterBuilder).setAttributesAdvice(emptyList());
3335

3436
LongUpDownCounterBuilder upDownCounterBuilder = meter.upDownCounterBuilder("test");
35-
assertThat(upDownCounterBuilder).isNotInstanceOf(ExtendedLongUpDownCounterBuilder.class);
37+
assertThat(upDownCounterBuilder).isInstanceOf(ExtendedLongUpDownCounterBuilder.class);
38+
((ExtendedLongUpDownCounterBuilder) upDownCounterBuilder).setAttributesAdvice(emptyList());
3639

3740
DoubleGaugeBuilder gaugeBuilder = meter.gaugeBuilder("test");
38-
assertThat(gaugeBuilder).isNotInstanceOf(ExtendedDoubleGaugeBuilder.class);
41+
assertThat(gaugeBuilder).isInstanceOf(ExtendedDoubleGaugeBuilder.class);
42+
((ExtendedDoubleGaugeBuilder) gaugeBuilder).setAttributesAdvice(emptyList());
3943

4044
DoubleHistogramBuilder histogramBuilder = meter.histogramBuilder("test");
41-
assertThat(histogramBuilder).isNotInstanceOf(ExtendedDoubleHistogramBuilder.class);
45+
assertThat(histogramBuilder).isInstanceOf(ExtendedDoubleHistogramBuilder.class);
46+
((ExtendedDoubleHistogramBuilder) histogramBuilder).setAttributesAdvice(emptyList());
4247
}
4348
}

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

+1-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_32.incubator.metrics;
77

88
import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder;
9-
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleHistogramBuilder;
109
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics.ApplicationMeter131;
1110

1211
class ApplicationMeter132Incubator extends ApplicationMeter131 {
@@ -20,10 +19,6 @@ class ApplicationMeter132Incubator extends ApplicationMeter131 {
2019

2120
@Override
2221
public DoubleHistogramBuilder histogramBuilder(String name) {
23-
io.opentelemetry.api.metrics.DoubleHistogramBuilder builder = agentMeter.histogramBuilder(name);
24-
if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder) {
25-
return new ApplicationDoubleHistogramBuilder132Incubator(builder);
26-
}
27-
return new ApplicationDoubleHistogramBuilder(builder);
22+
return new ApplicationDoubleHistogramBuilder132Incubator(agentMeter.histogramBuilder(name));
2823
}
2924
}

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

+9-4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_32.incubator.metrics;
77

8+
import static java.util.Collections.emptyList;
89
import static org.assertj.core.api.Assertions.assertThat;
910

1011
import io.opentelemetry.api.metrics.DoubleGaugeBuilder;
@@ -29,15 +30,19 @@ void noopInstance() {
2930
Meter meter = testing.getOpenTelemetry().getMeter("test");
3031

3132
LongCounterBuilder counterBuilder = meter.counterBuilder("test");
32-
assertThat(counterBuilder).isNotInstanceOf(ExtendedLongCounterBuilder.class);
33+
assertThat(counterBuilder).isInstanceOf(ExtendedLongCounterBuilder.class);
34+
((ExtendedLongCounterBuilder) counterBuilder).setAttributesAdvice(emptyList());
3335

3436
LongUpDownCounterBuilder upDownCounterBuilder = meter.upDownCounterBuilder("test");
35-
assertThat(upDownCounterBuilder).isNotInstanceOf(ExtendedLongUpDownCounterBuilder.class);
37+
assertThat(upDownCounterBuilder).isInstanceOf(ExtendedLongUpDownCounterBuilder.class);
38+
((ExtendedLongUpDownCounterBuilder) upDownCounterBuilder).setAttributesAdvice(emptyList());
3639

3740
DoubleGaugeBuilder gaugeBuilder = meter.gaugeBuilder("test");
38-
assertThat(gaugeBuilder).isNotInstanceOf(ExtendedDoubleGaugeBuilder.class);
41+
assertThat(gaugeBuilder).isInstanceOf(ExtendedDoubleGaugeBuilder.class);
42+
((ExtendedDoubleGaugeBuilder) gaugeBuilder).setAttributesAdvice(emptyList());
3943

4044
DoubleHistogramBuilder histogramBuilder = meter.histogramBuilder("test");
41-
assertThat(histogramBuilder).isNotInstanceOf(ExtendedDoubleHistogramBuilder.class);
45+
assertThat(histogramBuilder).isInstanceOf(ExtendedDoubleHistogramBuilder.class);
46+
((ExtendedDoubleHistogramBuilder) histogramBuilder).setAttributesAdvice(emptyList());
4247
}
4348
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationMeter137.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics;
77

88
import application.io.opentelemetry.api.metrics.DoubleGaugeBuilder;
9-
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleGaugeBuilder;
109

1110
class ApplicationMeter137 extends BaseApplicationMeter137 {
1211

@@ -19,10 +18,6 @@ protected ApplicationMeter137(io.opentelemetry.api.metrics.Meter agentMeter) {
1918

2019
@Override
2120
public DoubleGaugeBuilder gaugeBuilder(String name) {
22-
io.opentelemetry.api.metrics.DoubleGaugeBuilder builder = agentMeter.gaugeBuilder(name);
23-
if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) {
24-
return new ApplicationDoubleGaugeBuilder137(builder);
25-
}
26-
return new ApplicationDoubleGaugeBuilder(builder);
21+
return new ApplicationDoubleGaugeBuilder137(agentMeter.gaugeBuilder(name));
2722
}
2823
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/BaseApplicationMeter137.java

+3-20
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder;
99
import application.io.opentelemetry.api.metrics.LongCounterBuilder;
1010
import application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder;
11-
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleHistogramBuilder;
12-
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongCounterBuilder;
13-
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongUpDownCounterBuilder;
1411
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_15.metrics.ApplicationMeter115;
1512

1613
// used by both 1.37 and 1.38
@@ -25,30 +22,16 @@ protected BaseApplicationMeter137(io.opentelemetry.api.metrics.Meter agentMeter)
2522

2623
@Override
2724
public LongCounterBuilder counterBuilder(String name) {
28-
io.opentelemetry.api.metrics.LongCounterBuilder builder = agentMeter.counterBuilder(name);
29-
if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder) {
30-
return new ApplicationLongCounterBuilder137(builder);
31-
}
32-
return new ApplicationLongCounterBuilder(builder);
25+
return new ApplicationLongCounterBuilder137(agentMeter.counterBuilder(name));
3326
}
3427

3528
@Override
3629
public LongUpDownCounterBuilder upDownCounterBuilder(String name) {
37-
io.opentelemetry.api.metrics.LongUpDownCounterBuilder builder =
38-
agentMeter.upDownCounterBuilder(name);
39-
if (builder
40-
instanceof io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder) {
41-
return new ApplicationLongUpDownCounterBuilder137(builder);
42-
}
43-
return new ApplicationLongUpDownCounterBuilder(builder);
30+
return new ApplicationLongUpDownCounterBuilder137(agentMeter.upDownCounterBuilder(name));
4431
}
4532

4633
@Override
4734
public DoubleHistogramBuilder histogramBuilder(String name) {
48-
io.opentelemetry.api.metrics.DoubleHistogramBuilder builder = agentMeter.histogramBuilder(name);
49-
if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder) {
50-
return new ApplicationDoubleHistogramBuilder137(builder);
51-
}
52-
return new ApplicationDoubleHistogramBuilder(builder);
35+
return new ApplicationDoubleHistogramBuilder137(agentMeter.histogramBuilder(name));
5336
}
5437
}

‎instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/NoopTest.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics;
77

8+
import static java.util.Collections.emptyList;
89
import static org.assertj.core.api.Assertions.assertThat;
910

1011
import io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder;
@@ -29,15 +30,19 @@ void noopInstance() {
2930
Meter meter = testing.getOpenTelemetry().getMeter("test");
3031

3132
LongCounterBuilder counterBuilder = meter.counterBuilder("test");
32-
assertThat(counterBuilder).isNotInstanceOf(ExtendedLongCounterBuilder.class);
33+
assertThat(counterBuilder).isInstanceOf(ExtendedLongCounterBuilder.class);
34+
((ExtendedLongCounterBuilder) counterBuilder).setAttributesAdvice(emptyList());
3335

3436
LongUpDownCounterBuilder upDownCounterBuilder = meter.upDownCounterBuilder("test");
35-
assertThat(upDownCounterBuilder).isNotInstanceOf(ExtendedLongUpDownCounterBuilder.class);
37+
assertThat(upDownCounterBuilder).isInstanceOf(ExtendedLongUpDownCounterBuilder.class);
38+
((ExtendedLongUpDownCounterBuilder) upDownCounterBuilder).setAttributesAdvice(emptyList());
3639

3740
DoubleGaugeBuilder gaugeBuilder = meter.gaugeBuilder("test");
38-
assertThat(gaugeBuilder).isNotInstanceOf(ExtendedDoubleGaugeBuilder.class);
41+
assertThat(gaugeBuilder).isInstanceOf(ExtendedDoubleGaugeBuilder.class);
42+
((ExtendedDoubleGaugeBuilder) gaugeBuilder).setAttributesAdvice(emptyList());
3943

4044
DoubleHistogramBuilder histogramBuilder = meter.histogramBuilder("test");
41-
assertThat(histogramBuilder).isNotInstanceOf(ExtendedDoubleHistogramBuilder.class);
45+
assertThat(histogramBuilder).isInstanceOf(ExtendedDoubleHistogramBuilder.class);
46+
((ExtendedDoubleHistogramBuilder) histogramBuilder).setAttributesAdvice(emptyList());
4247
}
4348
}

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

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import application.io.opentelemetry.api.metrics.DoubleGaugeBuilder;
99
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.BaseApplicationMeter137;
10-
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.metrics.ApplicationDoubleGaugeBuilder138;
1110

1211
class ApplicationMeter138Incubator extends BaseApplicationMeter137 {
1312

@@ -20,10 +19,6 @@ class ApplicationMeter138Incubator extends BaseApplicationMeter137 {
2019

2120
@Override
2221
public DoubleGaugeBuilder gaugeBuilder(String name) {
23-
io.opentelemetry.api.metrics.DoubleGaugeBuilder builder = agentMeter.gaugeBuilder(name);
24-
if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) {
25-
return new ApplicationDoubleGaugeBuilder138Incubator(builder);
26-
}
27-
return new ApplicationDoubleGaugeBuilder138(builder);
22+
return new ApplicationDoubleGaugeBuilder138Incubator(agentMeter.gaugeBuilder(name));
2823
}
2924
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class ApplicationDoubleGaugeBuilder138 extends ApplicationDoubleGaugeBuil
1717

1818
private final io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder;
1919

20-
public ApplicationDoubleGaugeBuilder138(
20+
protected ApplicationDoubleGaugeBuilder138(
2121
io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder) {
2222
super(agentBuilder);
2323
this.agentBuilder = agentBuilder;

‎instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/noopTest/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/NoopTest.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.incubator.metrics;
77

8+
import static java.util.Collections.emptyList;
89
import static org.assertj.core.api.Assertions.assertThat;
910

1011
import io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder;
@@ -29,15 +30,19 @@ void noopInstance() {
2930
Meter meter = testing.getOpenTelemetry().getMeter("test");
3031

3132
LongCounterBuilder counterBuilder = meter.counterBuilder("test");
32-
assertThat(counterBuilder).isNotInstanceOf(ExtendedLongCounterBuilder.class);
33+
assertThat(counterBuilder).isInstanceOf(ExtendedLongCounterBuilder.class);
34+
((ExtendedLongCounterBuilder) counterBuilder).setAttributesAdvice(emptyList());
3335

3436
LongUpDownCounterBuilder upDownCounterBuilder = meter.upDownCounterBuilder("test");
35-
assertThat(upDownCounterBuilder).isNotInstanceOf(ExtendedLongUpDownCounterBuilder.class);
37+
assertThat(upDownCounterBuilder).isInstanceOf(ExtendedLongUpDownCounterBuilder.class);
38+
((ExtendedLongUpDownCounterBuilder) upDownCounterBuilder).setAttributesAdvice(emptyList());
3639

3740
DoubleGaugeBuilder gaugeBuilder = meter.gaugeBuilder("test");
38-
assertThat(gaugeBuilder).isNotInstanceOf(ExtendedDoubleGaugeBuilder.class);
41+
assertThat(gaugeBuilder).isInstanceOf(ExtendedDoubleGaugeBuilder.class);
42+
((ExtendedDoubleGaugeBuilder) gaugeBuilder).setAttributesAdvice(emptyList());
3943

4044
DoubleHistogramBuilder histogramBuilder = meter.histogramBuilder("test");
41-
assertThat(histogramBuilder).isNotInstanceOf(ExtendedDoubleHistogramBuilder.class);
45+
assertThat(histogramBuilder).isInstanceOf(ExtendedDoubleHistogramBuilder.class);
46+
((ExtendedDoubleHistogramBuilder) histogramBuilder).setAttributesAdvice(emptyList());
4247
}
4348
}

‎instrumentation/spring/spring-boot-autoconfigure/src/testLogbackAppender/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/LogbackAppenderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void shouldInitializeAppender() {
8181
// be added a second time by LogbackAppenderApplicationListener
8282
logRecord -> {
8383
assertThat(logRecord.getInstrumentationScopeInfo().getName()).isEqualTo("test");
84-
assertThat(logRecord.getBody().asString()).contains("test log message");
84+
assertThat(logRecord.getBodyValue().asString()).contains("test log message");
8585

8686
Attributes attributes = logRecord.getAttributes();
8787
// key1 and key2, the code attributes should not be present because they are enabled

0 commit comments

Comments
 (0)