diff --git a/custom/src/test/java/co/elastic/otel/ElasticAutoConfigurationCustomizerProviderTest.java b/custom/src/test/java/co/elastic/otel/ElasticAutoConfigurationCustomizerProviderTest.java index f04ac0ae..984c8de3 100644 --- a/custom/src/test/java/co/elastic/otel/ElasticAutoConfigurationCustomizerProviderTest.java +++ b/custom/src/test/java/co/elastic/otel/ElasticAutoConfigurationCustomizerProviderTest.java @@ -23,6 +23,7 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import co.elastic.otel.testing.OtelReflectionUtils; +import io.opentelemetry.common.ComponentLoader; import io.opentelemetry.javaagent.tooling.EmptyConfigProperties; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; @@ -39,6 +40,10 @@ class ElasticAutoConfigurationCustomizerProviderTest { + private static final ComponentLoader componentLoader = + ComponentLoader.forClassLoader( + ElasticAutoConfigurationCustomizerProviderTest.class.getClassLoader()); + @Test void defaultConfiguration() { Map config = propertiesCustomizer(EmptyConfigProperties.INSTANCE); @@ -58,7 +63,8 @@ void defaultConfiguration() { void disableCustomResourceProvider() { Map userConfig = new HashMap<>(); userConfig.put("otel.java.disabled.resource.providers", "my.disabled.provider.Provider"); - Map config = propertiesCustomizer(DefaultConfigProperties.create(userConfig)); + Map config = + propertiesCustomizer(DefaultConfigProperties.create(userConfig, componentLoader)); String value = config.get("otel.java.disabled.resource.providers"); assertThat(value) .satisfies( @@ -73,7 +79,8 @@ void disableCustomResourceProvider() { void disableExperimentalRuntimeMetrics() { Map userConfig = new HashMap<>(); userConfig.put("otel.instrumentation.runtime-telemetry.emit-experimental-telemetry", "false"); - Map config = propertiesCustomizer(DefaultConfigProperties.create(userConfig)); + Map config = + propertiesCustomizer(DefaultConfigProperties.create(userConfig, componentLoader)); String value = config.get("otel.instrumentation.runtime-telemetry.emit-experimental-telemetry"); assertThat(value).isEqualTo("false"); } @@ -81,7 +88,7 @@ void disableExperimentalRuntimeMetrics() { @Test void ensureDefaultMetricTemporalityIsDelta() { Map config = - propertiesCustomizer(DefaultConfigProperties.create(new HashMap<>())); + propertiesCustomizer(DefaultConfigProperties.create(new HashMap<>(), componentLoader)); String value = config.get("otel.exporter.otlp.metrics.temporality.preference"); assertThat(value).isEqualTo("DELTA"); } @@ -90,7 +97,8 @@ void ensureDefaultMetricTemporalityIsDelta() { void customizeMetricTemporalityPreference() { Map userConfig = new HashMap<>(); userConfig.put("otel.exporter.otlp.metrics.temporality.preference", "LOWMEMORY"); - Map config = propertiesCustomizer(DefaultConfigProperties.create(userConfig)); + Map config = + propertiesCustomizer(DefaultConfigProperties.create(userConfig, componentLoader)); String value = config.get("otel.exporter.otlp.metrics.temporality.preference"); assertThat(value).isEqualTo("LOWMEMORY"); } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d9c2e4b6..96ae0197 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,11 +11,11 @@ opentelemetryProto = "1.3.2-alpha" # otel agent, we rely on the '*-alpha' and get the non-alpha dependencies transitively # updated from upstream agent with gradle/update-upstream.sh -opentelemetryJavaagentAlpha = "2.17.1-alpha" +opentelemetryJavaagentAlpha = "2.19.0-alpha" # otel contrib # updated from upstream agent with gradle/update-upstream.sh -opentelemetryContribAlpha = "1.46.0-alpha" +opentelemetryContribAlpha = "1.48.0-alpha" # otel semconv # updated from upstream agent with gradle/update-upstream.sh