Skip to content

Commit 850933f

Browse files
zeitlingerrenovate[bot]
zeitlinger
and
renovate[bot]
authored
update otel bom (#2042)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 parent dccc3f0 commit 850933f

File tree

3 files changed

+84
-84
lines changed

3 files changed

+84
-84
lines changed

‎baggage-processor/src/test/java/io/opentelemetry/contrib/baggage/processor/BaggageProcessorCustomizerTest.java

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
import com.google.common.collect.ImmutableMap;
1313
import io.opentelemetry.api.baggage.Baggage;
1414
import io.opentelemetry.api.common.AttributeKey;
15+
import io.opentelemetry.common.ComponentLoader;
1516
import io.opentelemetry.context.Context;
1617
import io.opentelemetry.context.Scope;
1718
import io.opentelemetry.sdk.OpenTelemetrySdk;
1819
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
1920
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdkBuilder;
20-
import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
21-
import io.opentelemetry.sdk.autoconfigure.internal.ComponentLoader;
2221
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
2322
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
2423
import io.opentelemetry.sdk.autoconfigure.spi.logs.ConfigurableLogRecordExporterProvider;
@@ -113,45 +112,45 @@ private static OpenTelemetrySdk getOpenTelemetrySdk(
113112
"none",
114113
"otel.logs.exporter",
115114
MEMORY_EXPORTER))
116-
.addPropertiesSupplier(() -> properties);
117-
AutoConfigureUtil.setComponentLoader(
118-
sdkBuilder,
119-
new ComponentLoader() {
120-
@SuppressWarnings("unchecked")
121-
@Override
122-
public <T> List<T> load(Class<T> spiClass) {
123-
if (spiClass == ConfigurableSpanExporterProvider.class) {
124-
return Collections.singletonList(
125-
(T)
126-
new ConfigurableSpanExporterProvider() {
127-
@Override
128-
public SpanExporter createExporter(ConfigProperties configProperties) {
129-
return spanExporter;
130-
}
131-
132-
@Override
133-
public String getName() {
134-
return MEMORY_EXPORTER;
135-
}
136-
});
137-
} else if (spiClass == ConfigurableLogRecordExporterProvider.class) {
138-
return Collections.singletonList(
139-
(T)
140-
new ConfigurableLogRecordExporterProvider() {
141-
@Override
142-
public LogRecordExporter createExporter(ConfigProperties configProperties) {
143-
return logRecordExporter;
144-
}
145-
146-
@Override
147-
public String getName() {
148-
return MEMORY_EXPORTER;
149-
}
150-
});
151-
}
152-
return spiHelper.load(spiClass);
153-
}
154-
});
115+
.addPropertiesSupplier(() -> properties)
116+
.setComponentLoader(
117+
new ComponentLoader() {
118+
@Override
119+
public <T> List<T> load(Class<T> spiClass) {
120+
if (spiClass == ConfigurableSpanExporterProvider.class) {
121+
return Collections.singletonList(
122+
spiClass.cast(
123+
new ConfigurableSpanExporterProvider() {
124+
@Override
125+
public SpanExporter createExporter(
126+
ConfigProperties configProperties) {
127+
return spanExporter;
128+
}
129+
130+
@Override
131+
public String getName() {
132+
return MEMORY_EXPORTER;
133+
}
134+
}));
135+
} else if (spiClass == ConfigurableLogRecordExporterProvider.class) {
136+
return Collections.singletonList(
137+
spiClass.cast(
138+
new ConfigurableLogRecordExporterProvider() {
139+
@Override
140+
public LogRecordExporter createExporter(
141+
ConfigProperties configProperties) {
142+
return logRecordExporter;
143+
}
144+
145+
@Override
146+
public String getName() {
147+
return MEMORY_EXPORTER;
148+
}
149+
}));
150+
}
151+
return spiHelper.load(spiClass);
152+
}
153+
});
155154
return sdkBuilder.build().getOpenTelemetrySdk();
156155
}
157156

‎dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
`java-platform`
33
}
44

5-
val otelInstrumentationVersion = "2.17.1-alpha"
5+
val otelInstrumentationVersion = "2.18.0-alpha"
66
val semconvVersion = "1.34.0"
77

88
javaPlatform {

‎gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProviderTest.java

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import io.opentelemetry.api.common.Attributes;
2424
import io.opentelemetry.api.metrics.LongCounter;
2525
import io.opentelemetry.api.trace.Span;
26+
import io.opentelemetry.common.ComponentLoader;
2627
import io.opentelemetry.context.Scope;
2728
import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter;
2829
import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder;
@@ -35,8 +36,6 @@
3536
import io.opentelemetry.sdk.OpenTelemetrySdk;
3637
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
3738
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdkBuilder;
38-
import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
39-
import io.opentelemetry.sdk.autoconfigure.internal.ComponentLoader;
4039
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
4140
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
4241
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
@@ -960,46 +959,48 @@ private OpenTelemetrySdk buildOpenTelemetrySdkWithExporter(
960959
SpiHelper spiHelper =
961960
SpiHelper.create(GcpAuthAutoConfigurationCustomizerProviderTest.class.getClassLoader());
962961
AutoConfiguredOpenTelemetrySdkBuilder builder =
963-
AutoConfiguredOpenTelemetrySdk.builder().addPropertiesSupplier(() -> customOtelProperties);
964-
AutoConfigureUtil.setComponentLoader(
965-
builder,
966-
new ComponentLoader() {
967-
@SuppressWarnings("unchecked")
968-
@Override
969-
public <T> List<T> load(Class<T> spiClass) {
970-
if (spiClass == ConfigurableSpanExporterProvider.class) {
971-
return Collections.singletonList(
972-
(T)
973-
new ConfigurableSpanExporterProvider() {
974-
@Override
975-
public SpanExporter createExporter(ConfigProperties configProperties) {
976-
return spanExporter;
977-
}
978-
979-
@Override
980-
public String getName() {
981-
return "otlp";
982-
}
983-
});
984-
}
985-
if (spiClass == ConfigurableMetricExporterProvider.class) {
986-
return Collections.singletonList(
987-
(T)
988-
new ConfigurableMetricExporterProvider() {
989-
@Override
990-
public MetricExporter createExporter(ConfigProperties configProperties) {
991-
return metricExporter;
992-
}
993-
994-
@Override
995-
public String getName() {
996-
return "otlp";
997-
}
998-
});
999-
}
1000-
return spiHelper.load(spiClass);
1001-
}
1002-
});
962+
AutoConfiguredOpenTelemetrySdk.builder()
963+
.addPropertiesSupplier(() -> customOtelProperties)
964+
.setComponentLoader(
965+
new ComponentLoader() {
966+
@Override
967+
public <T> List<T> load(Class<T> spiClass) {
968+
if (spiClass == ConfigurableSpanExporterProvider.class) {
969+
return Collections.singletonList(
970+
spiClass.cast(
971+
new ConfigurableSpanExporterProvider() {
972+
@Override
973+
public SpanExporter createExporter(
974+
ConfigProperties configProperties) {
975+
return spanExporter;
976+
}
977+
978+
@Override
979+
public String getName() {
980+
return "otlp";
981+
}
982+
}));
983+
}
984+
if (spiClass == ConfigurableMetricExporterProvider.class) {
985+
return Collections.singletonList(
986+
spiClass.cast(
987+
new ConfigurableMetricExporterProvider() {
988+
@Override
989+
public MetricExporter createExporter(
990+
ConfigProperties configProperties) {
991+
return metricExporter;
992+
}
993+
994+
@Override
995+
public String getName() {
996+
return "otlp";
997+
}
998+
}));
999+
}
1000+
return spiHelper.load(spiClass);
1001+
}
1002+
});
1003+
10031004
return builder.build().getOpenTelemetrySdk();
10041005
}
10051006

0 commit comments

Comments
 (0)