Skip to content

Update the OpenTelemetry SDK version to 1.42.0 #12186

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Sep 12, 2024
Merged

Update the OpenTelemetry SDK version to 1.42.0 #12186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b359519
Update the OpenTelemetry SDK version to 1.42.0
opentelemetrybot Sep 6, 2024
3cb6f14
LogRecordData.getBody() is deprecated
laurit Sep 9, 2024
e412447
force older version of sdk for testing to get around LogRecordData.ge…
laurit Sep 9, 2024
bafe1d7
noop instances now implement incubating api
laurit Sep 9, 2024
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
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ val dependencyVersions = hashMapOf<String, String>()
rootProject.extra["versions"] = dependencyVersions

// this line is managed by .github/scripts/update-sdk-version.sh
val otelSdkVersion = "1.41.0"
val otelSdkVersion = "1.42.0"
val otelContribVersion = "1.38.0-alpha"
val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")

Expand Down
2 changes: 1 addition & 1 deletion examples/distro/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ subprojects {
ext {
versions = [
// this line is managed by .github/scripts/update-sdk-version.sh
opentelemetrySdk : "1.41.0",
opentelemetrySdk : "1.42.0",

// these lines are managed by .github/scripts/update-version.sh
opentelemetryJavaagent : "2.8.0-SNAPSHOT",
Expand Down
2 changes: 1 addition & 1 deletion examples/extension/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ version '1.0'
ext {
versions = [
// this line is managed by .github/scripts/update-sdk-version.sh
opentelemetrySdk : "1.41.0",
opentelemetrySdk : "1.42.0",

// these lines are managed by .github/scripts/update-version.sh
opentelemetryJavaagent : "2.8.0-SNAPSHOT",
Expand Down
2 changes: 1 addition & 1 deletion ...vaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleGaugeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class ApplicationDoubleGaugeBuilder implements DoubleGaugeBuilder {

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

public ApplicationDoubleGaugeBuilder(
protected ApplicationDoubleGaugeBuilder(
io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder) {
this.agentBuilder = agentBuilder;
}
Expand Down
2 changes: 1 addition & 1 deletion ...ent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleHistogramBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class ApplicationDoubleHistogramBuilder implements DoubleHistogramBuilder

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

public ApplicationDoubleHistogramBuilder(
protected ApplicationDoubleHistogramBuilder(
io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder) {
this.agentBuilder = agentBuilder;
}
Expand Down
2 changes: 1 addition & 1 deletion ...vaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounterBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class ApplicationLongCounterBuilder implements LongCounterBuilder {

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

public ApplicationLongCounterBuilder(
protected ApplicationLongCounterBuilder(
io.opentelemetry.api.metrics.LongCounterBuilder agentBuilder) {
this.agentBuilder = agentBuilder;
}
Expand Down
2 changes: 1 addition & 1 deletion ...t/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounterBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class ApplicationLongUpDownCounterBuilder implements LongUpDownCounterBui

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

public ApplicationLongUpDownCounterBuilder(
protected ApplicationLongUpDownCounterBuilder(
io.opentelemetry.api.metrics.LongUpDownCounterBuilder agentBuilder) {
this.agentBuilder = agentBuilder;
}
Expand Down
2 changes: 2 additions & 0 deletions instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ configurations.configureEach {
if (name == "testRuntimeClasspath" || name == "testCompileClasspath") {
resolutionStrategy {
force("io.opentelemetry:opentelemetry-api:1.27.0")
force("io.opentelemetry:opentelemetry-sdk-logs:1.27.0")
force("io.opentelemetry:opentelemetry-sdk-testing:1.27.0")
}
}
}
30 changes: 4 additions & 26 deletions ...vaagent/instrumentation/opentelemetryapi/v1_31/incubator/metrics/ApplicationMeter131.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder;
import application.io.opentelemetry.api.metrics.LongCounterBuilder;
import application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleGaugeBuilder;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleHistogramBuilder;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongCounterBuilder;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongUpDownCounterBuilder;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_15.metrics.ApplicationMeter115;

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

@Override
public LongCounterBuilder counterBuilder(String name) {
io.opentelemetry.api.metrics.LongCounterBuilder builder = agentMeter.counterBuilder(name);
if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder) {
return new ApplicationLongCounterBuilder131(builder);
}
return new ApplicationLongCounterBuilder(builder);
return new ApplicationLongCounterBuilder131(agentMeter.counterBuilder(name));
}

@Override
public LongUpDownCounterBuilder upDownCounterBuilder(String name) {
io.opentelemetry.api.metrics.LongUpDownCounterBuilder builder =
agentMeter.upDownCounterBuilder(name);
if (builder
instanceof io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder) {
return new ApplicationLongUpDownCounterBuilder131(builder);
}
return new ApplicationLongUpDownCounterBuilder(builder);
return new ApplicationLongUpDownCounterBuilder131(agentMeter.upDownCounterBuilder(name));
}

@Override
public DoubleHistogramBuilder histogramBuilder(String name) {
io.opentelemetry.api.metrics.DoubleHistogramBuilder builder = agentMeter.histogramBuilder(name);
if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder) {
return new ApplicationDoubleHistogramBuilder131(builder);
}
return new ApplicationDoubleHistogramBuilder(builder);
return new ApplicationDoubleHistogramBuilder131(agentMeter.histogramBuilder(name));
}

@Override
public DoubleGaugeBuilder gaugeBuilder(String name) {
io.opentelemetry.api.metrics.DoubleGaugeBuilder builder = agentMeter.gaugeBuilder(name);
if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) {
return new ApplicationDoubleGaugeBuilder131(builder);
}
return new ApplicationDoubleGaugeBuilder(builder);
return new ApplicationDoubleGaugeBuilder131(agentMeter.gaugeBuilder(name));
}
}
13 changes: 9 additions & 4 deletions ...a/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_31/metrics/NoopTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

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

import static java.util.Collections.emptyList;
import static org.assertj.core.api.Assertions.assertThat;

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

LongCounterBuilder counterBuilder = meter.counterBuilder("test");
assertThat(counterBuilder).isNotInstanceOf(ExtendedLongCounterBuilder.class);
assertThat(counterBuilder).isInstanceOf(ExtendedLongCounterBuilder.class);
((ExtendedLongCounterBuilder) counterBuilder).setAttributesAdvice(emptyList());

LongUpDownCounterBuilder upDownCounterBuilder = meter.upDownCounterBuilder("test");
assertThat(upDownCounterBuilder).isNotInstanceOf(ExtendedLongUpDownCounterBuilder.class);
assertThat(upDownCounterBuilder).isInstanceOf(ExtendedLongUpDownCounterBuilder.class);
((ExtendedLongUpDownCounterBuilder) upDownCounterBuilder).setAttributesAdvice(emptyList());

DoubleGaugeBuilder gaugeBuilder = meter.gaugeBuilder("test");
assertThat(gaugeBuilder).isNotInstanceOf(ExtendedDoubleGaugeBuilder.class);
assertThat(gaugeBuilder).isInstanceOf(ExtendedDoubleGaugeBuilder.class);
((ExtendedDoubleGaugeBuilder) gaugeBuilder).setAttributesAdvice(emptyList());

DoubleHistogramBuilder histogramBuilder = meter.histogramBuilder("test");
assertThat(histogramBuilder).isNotInstanceOf(ExtendedDoubleHistogramBuilder.class);
assertThat(histogramBuilder).isInstanceOf(ExtendedDoubleHistogramBuilder.class);
((ExtendedDoubleHistogramBuilder) histogramBuilder).setAttributesAdvice(emptyList());
}
}
7 changes: 1 addition & 6 deletions ...nstrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationMeter132Incubator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_32.incubator.metrics;

import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleHistogramBuilder;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics.ApplicationMeter131;

class ApplicationMeter132Incubator extends ApplicationMeter131 {
Expand All @@ -20,10 +19,6 @@ class ApplicationMeter132Incubator extends ApplicationMeter131 {

@Override
public DoubleHistogramBuilder histogramBuilder(String name) {
io.opentelemetry.api.metrics.DoubleHistogramBuilder builder = agentMeter.histogramBuilder(name);
if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder) {
return new ApplicationDoubleHistogramBuilder132Incubator(builder);
}
return new ApplicationDoubleHistogramBuilder(builder);
return new ApplicationDoubleHistogramBuilder132Incubator(agentMeter.histogramBuilder(name));
}
}
13 changes: 9 additions & 4 deletions ...elemetry/javaagent/instrumentation/opentelemetryapi/v1_32/incubator/metrics/NoopTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

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

import static java.util.Collections.emptyList;
import static org.assertj.core.api.Assertions.assertThat;

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

LongCounterBuilder counterBuilder = meter.counterBuilder("test");
assertThat(counterBuilder).isNotInstanceOf(ExtendedLongCounterBuilder.class);
assertThat(counterBuilder).isInstanceOf(ExtendedLongCounterBuilder.class);
((ExtendedLongCounterBuilder) counterBuilder).setAttributesAdvice(emptyList());

LongUpDownCounterBuilder upDownCounterBuilder = meter.upDownCounterBuilder("test");
assertThat(upDownCounterBuilder).isNotInstanceOf(ExtendedLongUpDownCounterBuilder.class);
assertThat(upDownCounterBuilder).isInstanceOf(ExtendedLongUpDownCounterBuilder.class);
((ExtendedLongUpDownCounterBuilder) upDownCounterBuilder).setAttributesAdvice(emptyList());

DoubleGaugeBuilder gaugeBuilder = meter.gaugeBuilder("test");
assertThat(gaugeBuilder).isNotInstanceOf(ExtendedDoubleGaugeBuilder.class);
assertThat(gaugeBuilder).isInstanceOf(ExtendedDoubleGaugeBuilder.class);
((ExtendedDoubleGaugeBuilder) gaugeBuilder).setAttributesAdvice(emptyList());

DoubleHistogramBuilder histogramBuilder = meter.histogramBuilder("test");
assertThat(histogramBuilder).isNotInstanceOf(ExtendedDoubleHistogramBuilder.class);
assertThat(histogramBuilder).isInstanceOf(ExtendedDoubleHistogramBuilder.class);
((ExtendedDoubleHistogramBuilder) histogramBuilder).setAttributesAdvice(emptyList());
}
}
7 changes: 1 addition & 6 deletions ...vaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/ApplicationMeter137.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics;

import application.io.opentelemetry.api.metrics.DoubleGaugeBuilder;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleGaugeBuilder;

class ApplicationMeter137 extends BaseApplicationMeter137 {

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

@Override
public DoubleGaugeBuilder gaugeBuilder(String name) {
io.opentelemetry.api.metrics.DoubleGaugeBuilder builder = agentMeter.gaugeBuilder(name);
if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) {
return new ApplicationDoubleGaugeBuilder137(builder);
}
return new ApplicationDoubleGaugeBuilder(builder);
return new ApplicationDoubleGaugeBuilder137(agentMeter.gaugeBuilder(name));
}
}
23 changes: 3 additions & 20 deletions ...ent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/BaseApplicationMeter137.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder;
import application.io.opentelemetry.api.metrics.LongCounterBuilder;
import application.io.opentelemetry.api.metrics.LongUpDownCounterBuilder;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationDoubleHistogramBuilder;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongCounterBuilder;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationLongUpDownCounterBuilder;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_15.metrics.ApplicationMeter115;

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

@Override
public LongCounterBuilder counterBuilder(String name) {
io.opentelemetry.api.metrics.LongCounterBuilder builder = agentMeter.counterBuilder(name);
if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder) {
return new ApplicationLongCounterBuilder137(builder);
}
return new ApplicationLongCounterBuilder(builder);
return new ApplicationLongCounterBuilder137(agentMeter.counterBuilder(name));
}

@Override
public LongUpDownCounterBuilder upDownCounterBuilder(String name) {
io.opentelemetry.api.metrics.LongUpDownCounterBuilder builder =
agentMeter.upDownCounterBuilder(name);
if (builder
instanceof io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder) {
return new ApplicationLongUpDownCounterBuilder137(builder);
}
return new ApplicationLongUpDownCounterBuilder(builder);
return new ApplicationLongUpDownCounterBuilder137(agentMeter.upDownCounterBuilder(name));
}

@Override
public DoubleHistogramBuilder histogramBuilder(String name) {
io.opentelemetry.api.metrics.DoubleHistogramBuilder builder = agentMeter.histogramBuilder(name);
if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder) {
return new ApplicationDoubleHistogramBuilder137(builder);
}
return new ApplicationDoubleHistogramBuilder(builder);
return new ApplicationDoubleHistogramBuilder137(agentMeter.histogramBuilder(name));
}
}
13 changes: 9 additions & 4 deletions ...elemetry/javaagent/instrumentation/opentelemetryapi/v1_37/incubator/metrics/NoopTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

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

import static java.util.Collections.emptyList;
import static org.assertj.core.api.Assertions.assertThat;

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

LongCounterBuilder counterBuilder = meter.counterBuilder("test");
assertThat(counterBuilder).isNotInstanceOf(ExtendedLongCounterBuilder.class);
assertThat(counterBuilder).isInstanceOf(ExtendedLongCounterBuilder.class);
((ExtendedLongCounterBuilder) counterBuilder).setAttributesAdvice(emptyList());

LongUpDownCounterBuilder upDownCounterBuilder = meter.upDownCounterBuilder("test");
assertThat(upDownCounterBuilder).isNotInstanceOf(ExtendedLongUpDownCounterBuilder.class);
assertThat(upDownCounterBuilder).isInstanceOf(ExtendedLongUpDownCounterBuilder.class);
((ExtendedLongUpDownCounterBuilder) upDownCounterBuilder).setAttributesAdvice(emptyList());

DoubleGaugeBuilder gaugeBuilder = meter.gaugeBuilder("test");
assertThat(gaugeBuilder).isNotInstanceOf(ExtendedDoubleGaugeBuilder.class);
assertThat(gaugeBuilder).isInstanceOf(ExtendedDoubleGaugeBuilder.class);
((ExtendedDoubleGaugeBuilder) gaugeBuilder).setAttributesAdvice(emptyList());

DoubleHistogramBuilder histogramBuilder = meter.histogramBuilder("test");
assertThat(histogramBuilder).isNotInstanceOf(ExtendedDoubleHistogramBuilder.class);
assertThat(histogramBuilder).isInstanceOf(ExtendedDoubleHistogramBuilder.class);
((ExtendedDoubleHistogramBuilder) histogramBuilder).setAttributesAdvice(emptyList());
}
}
7 changes: 1 addition & 6 deletions ...nstrumentation/opentelemetryapi/v1_38/incubator/metrics/ApplicationMeter138Incubator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import application.io.opentelemetry.api.metrics.DoubleGaugeBuilder;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.BaseApplicationMeter137;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.metrics.ApplicationDoubleGaugeBuilder138;

class ApplicationMeter138Incubator extends BaseApplicationMeter137 {

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

@Override
public DoubleGaugeBuilder gaugeBuilder(String name) {
io.opentelemetry.api.metrics.DoubleGaugeBuilder builder = agentMeter.gaugeBuilder(name);
if (builder instanceof io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) {
return new ApplicationDoubleGaugeBuilder138Incubator(builder);
}
return new ApplicationDoubleGaugeBuilder138(builder);
return new ApplicationDoubleGaugeBuilder138Incubator(agentMeter.gaugeBuilder(name));
}
}
2 changes: 1 addition & 1 deletion ...gent/instrumentation/opentelemetryapi/v1_38/metrics/ApplicationDoubleGaugeBuilder138.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class ApplicationDoubleGaugeBuilder138 extends ApplicationDoubleGaugeBuil

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

public ApplicationDoubleGaugeBuilder138(
protected ApplicationDoubleGaugeBuilder138(
io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder) {
super(agentBuilder);
this.agentBuilder = agentBuilder;
Expand Down
13 changes: 9 additions & 4 deletions ...elemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/metrics/NoopTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

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

import static java.util.Collections.emptyList;
import static org.assertj.core.api.Assertions.assertThat;

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

LongCounterBuilder counterBuilder = meter.counterBuilder("test");
assertThat(counterBuilder).isNotInstanceOf(ExtendedLongCounterBuilder.class);
assertThat(counterBuilder).isInstanceOf(ExtendedLongCounterBuilder.class);
((ExtendedLongCounterBuilder) counterBuilder).setAttributesAdvice(emptyList());
Copy link
Contributor

Choose a reason for hiding this comment

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

what is the purpose of this setting empty attributesAdvice?

Copy link
Contributor

Choose a reason for hiding this comment

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

This test was introduced in #11934 We verified that when the underlying instrument is noop then our bridge did not implement the incubating api, because the noop instrument itself didn't implement it making bridging impossible. Now noop instruments implement the incubating api and so does our bridge, we call setAttributesAdvice as was done in #11928 to verify that this works and there are no exceptions. The argument list doesn't really matter for this test and using empty list should be fine.


LongUpDownCounterBuilder upDownCounterBuilder = meter.upDownCounterBuilder("test");
assertThat(upDownCounterBuilder).isNotInstanceOf(ExtendedLongUpDownCounterBuilder.class);
assertThat(upDownCounterBuilder).isInstanceOf(ExtendedLongUpDownCounterBuilder.class);
((ExtendedLongUpDownCounterBuilder) upDownCounterBuilder).setAttributesAdvice(emptyList());
Copy link
Contributor

Choose a reason for hiding this comment

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

same question for the rest.


DoubleGaugeBuilder gaugeBuilder = meter.gaugeBuilder("test");
assertThat(gaugeBuilder).isNotInstanceOf(ExtendedDoubleGaugeBuilder.class);
assertThat(gaugeBuilder).isInstanceOf(ExtendedDoubleGaugeBuilder.class);
((ExtendedDoubleGaugeBuilder) gaugeBuilder).setAttributesAdvice(emptyList());

DoubleHistogramBuilder histogramBuilder = meter.histogramBuilder("test");
assertThat(histogramBuilder).isNotInstanceOf(ExtendedDoubleHistogramBuilder.class);
assertThat(histogramBuilder).isInstanceOf(ExtendedDoubleHistogramBuilder.class);
((ExtendedDoubleHistogramBuilder) histogramBuilder).setAttributesAdvice(emptyList());
}
}
2 changes: 1 addition & 1 deletion ...umentation/spring/autoconfigure/internal/instrumentation/logging/LogbackAppenderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void shouldInitializeAppender() {
// be added a second time by LogbackAppenderApplicationListener
logRecord -> {
assertThat(logRecord.getInstrumentationScopeInfo().getName()).isEqualTo("test");
assertThat(logRecord.getBody().asString()).contains("test log message");
assertThat(logRecord.getBodyValue().asString()).contains("test log message");

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