diff --git a/custom/src/main/java/com/splunk/opentelemetry/RealmAccessTokenChecker.java b/custom/src/main/java/com/splunk/opentelemetry/RealmAccessTokenChecker.java index e20db7fe1..de4f0f529 100644 --- a/custom/src/main/java/com/splunk/opentelemetry/RealmAccessTokenChecker.java +++ b/custom/src/main/java/com/splunk/opentelemetry/RealmAccessTokenChecker.java @@ -16,6 +16,8 @@ package com.splunk.opentelemetry; +import static io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil.getConfig; + import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.tooling.BeforeAgentListener; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; @@ -41,7 +43,7 @@ public RealmAccessTokenChecker() { @Override public void beforeAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) { - ConfigProperties config = autoConfiguredOpenTelemetrySdk.getConfig(); + ConfigProperties config = getConfig(autoConfiguredOpenTelemetrySdk); if (isRealmConfigured(config) && !isAccessTokenConfigured(config)) { logWarn.accept( diff --git a/custom/src/main/java/com/splunk/opentelemetry/micrometer/MicrometerInstaller.java b/custom/src/main/java/com/splunk/opentelemetry/micrometer/MicrometerInstaller.java index 89ab20d0b..c8801c292 100644 --- a/custom/src/main/java/com/splunk/opentelemetry/micrometer/MicrometerInstaller.java +++ b/custom/src/main/java/com/splunk/opentelemetry/micrometer/MicrometerInstaller.java @@ -16,6 +16,9 @@ package com.splunk.opentelemetry.micrometer; +import static io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil.getConfig; +import static io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil.getResource; + import com.google.auto.service.AutoService; import io.micrometer.core.instrument.Clock; import io.micrometer.core.instrument.Metrics; @@ -33,8 +36,8 @@ public class MicrometerInstaller implements BeforeAgentListener { @Override public void beforeAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) { - ConfigProperties config = autoConfiguredOpenTelemetrySdk.getConfig(); - Resource resource = autoConfiguredOpenTelemetrySdk.getResource(); + ConfigProperties config = getConfig(autoConfiguredOpenTelemetrySdk); + Resource resource = getResource(autoConfiguredOpenTelemetrySdk); SplunkMetricsConfig splunkMetricsConfig = new SplunkMetricsConfig(config, resource); if (splunkMetricsConfig.enabled()) { diff --git a/custom/src/main/java/com/splunk/opentelemetry/resource/ResourceAttributesToSystemProperties.java b/custom/src/main/java/com/splunk/opentelemetry/resource/ResourceAttributesToSystemProperties.java index ab83dee36..73ce1846b 100644 --- a/custom/src/main/java/com/splunk/opentelemetry/resource/ResourceAttributesToSystemProperties.java +++ b/custom/src/main/java/com/splunk/opentelemetry/resource/ResourceAttributesToSystemProperties.java @@ -16,11 +16,14 @@ package com.splunk.opentelemetry.resource; +import static io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil.getResource; + import com.google.auto.service.AutoService; import io.opentelemetry.api.common.AttributeType; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.javaagent.extension.AgentListener; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; +import io.opentelemetry.sdk.resources.Resource; /** * This component exposes String resource attributes as system properties with otel.resource. @@ -33,7 +36,8 @@ public class ResourceAttributesToSystemProperties implements AgentListener { @Override public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) { - Attributes attributes = autoConfiguredOpenTelemetrySdk.getResource().getAttributes(); + Resource resource = getResource(autoConfiguredOpenTelemetrySdk); + Attributes attributes = resource.getAttributes(); attributes.forEach( (k, v) -> { if (k.getType() == AttributeType.STRING) { diff --git a/custom/src/main/java/com/splunk/opentelemetry/servertiming/ServerTimingHeaderActivator.java b/custom/src/main/java/com/splunk/opentelemetry/servertiming/ServerTimingHeaderActivator.java index c8e96db2a..0536963a7 100644 --- a/custom/src/main/java/com/splunk/opentelemetry/servertiming/ServerTimingHeaderActivator.java +++ b/custom/src/main/java/com/splunk/opentelemetry/servertiming/ServerTimingHeaderActivator.java @@ -16,6 +16,8 @@ package com.splunk.opentelemetry.servertiming; +import static io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil.getConfig; + import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.AgentListener; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; @@ -27,7 +29,7 @@ public class ServerTimingHeaderActivator implements AgentListener { @Override public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) { - ConfigProperties config = autoConfiguredOpenTelemetrySdk.getConfig(); + ConfigProperties config = getConfig(autoConfiguredOpenTelemetrySdk); if (config.getBoolean(EMIT_RESPONSE_HEADERS, true)) { ServerTimingHeaderCustomizer.enabled = true; } diff --git a/custom/src/main/java/com/splunk/opentelemetry/servicename/ServiceNameChecker.java b/custom/src/main/java/com/splunk/opentelemetry/servicename/ServiceNameChecker.java index 7310969fc..c89db5629 100644 --- a/custom/src/main/java/com/splunk/opentelemetry/servicename/ServiceNameChecker.java +++ b/custom/src/main/java/com/splunk/opentelemetry/servicename/ServiceNameChecker.java @@ -16,6 +16,9 @@ package com.splunk.opentelemetry.servicename; +import static io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil.getConfig; +import static io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil.getResource; + import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.tooling.BeforeAgentListener; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; @@ -44,8 +47,8 @@ public ServiceNameChecker() { @Override public void beforeAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) { - ConfigProperties config = autoConfiguredOpenTelemetrySdk.getConfig(); - Resource resource = autoConfiguredOpenTelemetrySdk.getResource(); + ConfigProperties config = getConfig(autoConfiguredOpenTelemetrySdk); + Resource resource = getResource(autoConfiguredOpenTelemetrySdk); if (serviceNameNotConfigured(config, resource)) { logWarn.accept( "Resource attribute 'service.name' is not set: your service is unnamed and will be difficult to identify." diff --git a/custom/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfigureUtil.java b/custom/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfigureUtil.java new file mode 100644 index 000000000..affdf0ccc --- /dev/null +++ b/custom/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfigureUtil.java @@ -0,0 +1,44 @@ +/* + * Copyright Splunk Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.opentelemetry.sdk.autoconfigure; + +import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; +import io.opentelemetry.sdk.resources.Resource; + +/** + * This class is a hack to allows us to call getResource() and getConfig() on the + * AutoConfiguredOpenTelemetrySdk. This is merely here as a stop-gap measure until other means are + * in place. + * + *

See the discussion here: + * https://github.com/open-telemetry/opentelemetry-java/pull/5467#discussion_r1239559127 + * + *

This class is internal and is not intended for public use. + */ +public final class AutoConfigureUtil { + + private AutoConfigureUtil() {} + + /** Returns the {@link ConfigProperties} used for auto-configuration. */ + public static ConfigProperties getConfig(AutoConfiguredOpenTelemetrySdk sdk) { + return sdk.getConfig(); + } + + public static Resource getResource(AutoConfiguredOpenTelemetrySdk sdk) { + return sdk.getResource(); + } +} diff --git a/custom/src/test/java/com/splunk/opentelemetry/RealmAccessTokenCheckerTest.java b/custom/src/test/java/com/splunk/opentelemetry/RealmAccessTokenCheckerTest.java index 1fa89d8f3..e0e46e19e 100644 --- a/custom/src/test/java/com/splunk/opentelemetry/RealmAccessTokenCheckerTest.java +++ b/custom/src/test/java/com/splunk/opentelemetry/RealmAccessTokenCheckerTest.java @@ -38,8 +38,7 @@ class RealmAccessTokenCheckerTest { @Test void shouldNotLogWarnWhenNoRealmSet() { // given - var autoConfiguredSdk = - AutoConfiguredOpenTelemetrySdk.builder().setResultAsGlobal(false).build(); + var autoConfiguredSdk = AutoConfiguredOpenTelemetrySdk.builder().build(); var underTest = new RealmAccessTokenChecker(logWarn); // when @@ -54,7 +53,6 @@ void shouldNotLogWarnWhenRealmIsNone() { // given var autoConfiguredSdk = AutoConfiguredOpenTelemetrySdk.builder() - .setResultAsGlobal(false) .addPropertiesSupplier(() -> Map.of(SPLUNK_REALM_PROPERTY, SPLUNK_REALM_NONE)) .build(); var underTest = new RealmAccessTokenChecker(logWarn); @@ -71,7 +69,6 @@ void shouldNotLogWarnWhenAccessTokenIsConfigured() { // given var autoConfiguredSdk = AutoConfiguredOpenTelemetrySdk.builder() - .setResultAsGlobal(false) .addPropertiesSupplier( () -> Map.of(SPLUNK_REALM_PROPERTY, "test0", SPLUNK_ACCESS_TOKEN, "token")) .build(); @@ -89,7 +86,6 @@ void shouldLogWarnWhenOnlyRealmIsConfigured() { // given var autoConfiguredSdk = AutoConfiguredOpenTelemetrySdk.builder() - .setResultAsGlobal(false) .addPropertiesSupplier(() -> Map.of(SPLUNK_REALM_PROPERTY, "test0")) .build(); var underTest = new RealmAccessTokenChecker(logWarn); diff --git a/custom/src/test/java/com/splunk/opentelemetry/SplunkConfigurationTest.java b/custom/src/test/java/com/splunk/opentelemetry/SplunkConfigurationTest.java index 539b44c7f..7a506b940 100644 --- a/custom/src/test/java/com/splunk/opentelemetry/SplunkConfigurationTest.java +++ b/custom/src/test/java/com/splunk/opentelemetry/SplunkConfigurationTest.java @@ -20,6 +20,7 @@ import static com.splunk.opentelemetry.SplunkConfiguration.METRICS_IMPLEMENTATION; import static com.splunk.opentelemetry.SplunkConfiguration.PROFILER_MEMORY_ENABLED_PROPERTY; import static com.splunk.opentelemetry.SplunkConfiguration.SPLUNK_REALM_NONE; +import static io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil.getConfig; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; @@ -148,15 +149,15 @@ private static ConfigProperties configuration() { private static ConfigProperties configuration( Supplier> testPropertiesSupplier) { - return AutoConfiguredOpenTelemetrySdk.builder() - .setResultAsGlobal(false) - // don't create the SDK - .addPropertiesSupplier(() -> Map.of("otel.experimental.sdk.enabled", "false")) - // run in a customizer so that it executes after SplunkConfiguration#defaultProperties() - .addPropertiesCustomizer(config -> testPropertiesSupplier.get()) - // implicitly loads SplunkConfiguration through SPI - .build() - .getConfig(); + AutoConfiguredOpenTelemetrySdk sdk = + AutoConfiguredOpenTelemetrySdk.builder() + // don't create the SDK + .addPropertiesSupplier(() -> Map.of("otel.experimental.sdk.enabled", "false")) + // run in a customizer so that it executes after SplunkConfiguration#defaultProperties() + .addPropertiesCustomizer(config -> testPropertiesSupplier.get()) + // implicitly loads SplunkConfiguration through SPI + .build(); + return getConfig(sdk); } private static void verifyThatOtelMetricsInstrumentationsAreDisabled(ConfigProperties config) { diff --git a/custom/src/test/java/com/splunk/opentelemetry/micrometer/SplunkMetricsConfigTest.java b/custom/src/test/java/com/splunk/opentelemetry/micrometer/SplunkMetricsConfigTest.java index 7de1510cb..de444c274 100644 --- a/custom/src/test/java/com/splunk/opentelemetry/micrometer/SplunkMetricsConfigTest.java +++ b/custom/src/test/java/com/splunk/opentelemetry/micrometer/SplunkMetricsConfigTest.java @@ -24,6 +24,7 @@ import static com.splunk.opentelemetry.SplunkConfiguration.SPLUNK_REALM_NONE; import static com.splunk.opentelemetry.SplunkConfiguration.SPLUNK_REALM_PROPERTY; import static com.splunk.opentelemetry.micrometer.SplunkMetricsConfig.DEFAULT_METRICS_ENDPOINT; +import static io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil.getConfig; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; @@ -42,10 +43,9 @@ class SplunkMetricsConfigTest { @Test void testDefaultValues() { // given - var autoConfiguredSdk = - AutoConfiguredOpenTelemetrySdk.builder().setResultAsGlobal(false).build(); + var autoConfiguredSdk = AutoConfiguredOpenTelemetrySdk.builder().build(); var resource = Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, "test-service")); - var splunkMetricsConfig = new SplunkMetricsConfig(autoConfiguredSdk.getConfig(), resource); + var splunkMetricsConfig = new SplunkMetricsConfig(getConfig(autoConfiguredSdk), resource); // when & then assertFalse(splunkMetricsConfig.enabled()); @@ -60,7 +60,6 @@ void testDefaultValues() { void testCustomValues() { var autoConfiguredSdk = AutoConfiguredOpenTelemetrySdk.builder() - .setResultAsGlobal(false) // make it a customizer so that it overrides SplunkConfiguration .addPropertiesCustomizer( config -> @@ -78,7 +77,7 @@ void testCustomValues() { .build(); var resource = Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, "test-service")); - var splunkMetricsConfig = new SplunkMetricsConfig(autoConfiguredSdk.getConfig(), resource); + var splunkMetricsConfig = new SplunkMetricsConfig(getConfig(autoConfiguredSdk), resource); // when & then assertTrue(splunkMetricsConfig.enabled()); @@ -92,10 +91,9 @@ void testCustomValues() { @Test void emptyServiceNameIsNotValid() { // given - var autoConfiguredSdk = - AutoConfiguredOpenTelemetrySdk.builder().setResultAsGlobal(false).build(); + var autoConfiguredSdk = AutoConfiguredOpenTelemetrySdk.builder().build(); var resource = Resource.empty(); - var splunkMetricsConfig = new SplunkMetricsConfig(autoConfiguredSdk.getConfig(), resource); + var splunkMetricsConfig = new SplunkMetricsConfig(getConfig(autoConfiguredSdk), resource); // when Validated validated = splunkMetricsConfig.validate(); @@ -109,11 +107,10 @@ void emptyEndpointIsNotValid() { // given var autoConfiguredSdk = AutoConfiguredOpenTelemetrySdk.builder() - .setResultAsGlobal(false) .addPropertiesSupplier(() -> Map.of(METRICS_ENDPOINT_PROPERTY, "")) .build(); var resource = Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, "test-service")); - var splunkMetricsConfig = new SplunkMetricsConfig(autoConfiguredSdk.getConfig(), resource); + var splunkMetricsConfig = new SplunkMetricsConfig(getConfig(autoConfiguredSdk), resource); // when Validated validated = splunkMetricsConfig.validate(); @@ -126,10 +123,9 @@ void emptyEndpointIsNotValid() { void usesRealmUrlDefaultIfRealmDefined() { var autoConfiguredSdk = AutoConfiguredOpenTelemetrySdk.builder() - .setResultAsGlobal(false) .addPropertiesSupplier(() -> Map.of(SPLUNK_REALM_PROPERTY, "test0")) .build(); - var config = new SplunkMetricsConfig(autoConfiguredSdk.getConfig(), Resource.getDefault()); + var config = new SplunkMetricsConfig(getConfig(autoConfiguredSdk), Resource.getDefault()); assertEquals(config.uri(), "https://ingest.test0.signalfx.com"); } @@ -138,10 +134,9 @@ void usesRealmUrlDefaultIfRealmDefined() { void usesLocalUrlDefaultIfRealmIsNone() { var autoConfiguredSdk = AutoConfiguredOpenTelemetrySdk.builder() - .setResultAsGlobal(false) .addPropertiesSupplier(() -> Map.of(SPLUNK_REALM_PROPERTY, SPLUNK_REALM_NONE)) .build(); - var config = new SplunkMetricsConfig(autoConfiguredSdk.getConfig(), Resource.getDefault()); + var config = new SplunkMetricsConfig(getConfig(autoConfiguredSdk), Resource.getDefault()); assertEquals(config.uri(), DEFAULT_METRICS_ENDPOINT); } diff --git a/custom/src/test/java/com/splunk/opentelemetry/servicename/ServiceNameCheckerTest.java b/custom/src/test/java/com/splunk/opentelemetry/servicename/ServiceNameCheckerTest.java index 9bde080b6..3fa9d4660 100644 --- a/custom/src/test/java/com/splunk/opentelemetry/servicename/ServiceNameCheckerTest.java +++ b/custom/src/test/java/com/splunk/opentelemetry/servicename/ServiceNameCheckerTest.java @@ -35,8 +35,7 @@ class ServiceNameCheckerTest { @Test void shouldLogWarnWhenNeitherServiceNameNorResourceAttributeIsConfigured() { // given - var autoConfiguredSdk = - AutoConfiguredOpenTelemetrySdk.builder().setResultAsGlobal(false).build(); + var autoConfiguredSdk = AutoConfiguredOpenTelemetrySdk.builder().build(); var underTest = new ServiceNameChecker(logWarn); @@ -52,7 +51,6 @@ void shouldNotLogWarnWhenServiceNameIsConfigured() { // given var autoConfiguredSdk = AutoConfiguredOpenTelemetrySdk.builder() - .setResultAsGlobal(false) .addPropertiesSupplier(() -> Map.of("otel.service.name", "test")) .build(); @@ -70,7 +68,6 @@ void shouldNotLogWarnWhenResourceAttributeIsConfigured() { // given var autoConfiguredSdk = AutoConfiguredOpenTelemetrySdk.builder() - .setResultAsGlobal(false) .addPropertiesSupplier(() -> Map.of("otel.resource.attributes", "service.name=test")) .build(); diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index a76bfecdc..f57459d9a 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -2,7 +2,7 @@ plugins { `java-platform` } -val otelVersion = "1.27.0" +val otelVersion = "1.28.0" val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1") val otelInstrumentationVersion = "1.28.0-SNAPSHOT" val otelInstrumentationAlphaVersion = otelInstrumentationVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1") @@ -28,7 +28,7 @@ dependencies { // BOMs api(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.15.2")) - api(enforcedPlatform("com.google.protobuf:protobuf-bom:3.23.2")) + api(enforcedPlatform("com.google.protobuf:protobuf-bom:3.23.4")) api(enforcedPlatform("com.squareup.okhttp3:okhttp-bom:4.11.0")) api(enforcedPlatform("io.grpc:grpc-bom:1.56.1")) api(platform("io.micrometer:micrometer-bom:$micrometerVersion")) diff --git a/instrumentation/jvm-metrics/src/main/java/com/splunk/opentelemetry/instrumentation/jvmmetrics/JvmMetricsInstaller.java b/instrumentation/jvm-metrics/src/main/java/com/splunk/opentelemetry/instrumentation/jvmmetrics/JvmMetricsInstaller.java index a9e0d1036..e36a3bd4d 100644 --- a/instrumentation/jvm-metrics/src/main/java/com/splunk/opentelemetry/instrumentation/jvmmetrics/JvmMetricsInstaller.java +++ b/instrumentation/jvm-metrics/src/main/java/com/splunk/opentelemetry/instrumentation/jvmmetrics/JvmMetricsInstaller.java @@ -19,6 +19,7 @@ import static com.splunk.opentelemetry.SplunkConfiguration.METRICS_ENABLED_PROPERTY; import static com.splunk.opentelemetry.SplunkConfiguration.METRICS_IMPLEMENTATION; import static com.splunk.opentelemetry.SplunkConfiguration.PROFILER_MEMORY_ENABLED_PROPERTY; +import static io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil.getConfig; import com.google.auto.service.AutoService; import com.splunk.opentelemetry.instrumentation.jvmmetrics.micrometer.MicrometerAllocatedMemoryMetrics; @@ -41,7 +42,7 @@ public class JvmMetricsInstaller implements AgentListener { @Override public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) { - ConfigProperties config = autoConfiguredOpenTelemetrySdk.getConfig(); + ConfigProperties config = getConfig(autoConfiguredOpenTelemetrySdk); boolean metricsEnabled = config.getBoolean(METRICS_ENABLED_PROPERTY, false); if (!config.getBoolean("otel.instrumentation.jvm-metrics.splunk.enabled", metricsEnabled)) { return; diff --git a/licenses/licenses.md b/licenses/licenses.md index 048396563..c876e9827 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ # splunk-otel-javaagent ## Dependency License Report -_2023-06-22 14:59:25 PDT_ +_2023-07-07 10:23:36 PDT_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.15.2` @@ -84,114 +84,118 @@ _2023-06-22 14:59:25 PDT_ > - **Embedded license files**: [micrometer-registry-signalfx-1.11.1.jar/META-INF/LICENSE](micrometer-registry-signalfx-1.11.1.jar/META-INF/LICENSE) - [micrometer-registry-signalfx-1.11.1.jar/META-INF/NOTICE](micrometer-registry-signalfx-1.11.1.jar/META-INF/NOTICE) -**16** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.27.0` +**16** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.28.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**17** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-events` **Version:** `1.27.0-alpha` +**17** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-events` **Version:** `1.28.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**18** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.27.0` +**18** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.28.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**19** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-common` **Version:** `1.27.0` +**19** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-common` **Version:** `1.28.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**20** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp` **Version:** `1.27.0` +**20** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp` **Version:** `1.28.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**21** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-common` **Version:** `1.27.0` +**21** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-common` **Version:** `1.28.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**22** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-incubator` **Version:** `1.27.0-alpha` +**22** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-sender-okhttp` **Version:** `1.28.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**23** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.27.0` +**23** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-incubator` **Version:** `1.28.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**24** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.27.0` +**24** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.28.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**25** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.27.0` +**25** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.28.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**26** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.27.0` +**26** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.28.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**27** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.27.0` +**27** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.28.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**28** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.27.0` +**28** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.28.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**29** **Group:** `io.opentelemetry` **Name:** `opentelemetry-semconv` **Version:** `1.27.0-alpha` +**29** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.28.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**30** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-resource-providers` **Version:** `1.27.0-alpha` +**30** **Group:** `io.opentelemetry` **Name:** `opentelemetry-semconv` **Version:** `1.28.0-alpha` +> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) +> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) + +**31** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-resource-providers` **Version:** `1.27.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**31** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-samplers` **Version:** `1.27.0-alpha` +**32** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-samplers` **Version:** `1.27.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**32** **Group:** `org.apache.commons` **Name:** `commons-lang3` **Version:** `3.12.0` +**33** **Group:** `org.apache.commons` **Name:** `commons-lang3` **Version:** `3.12.0` > - **Project URL**: [https://commons.apache.org/proper/commons-lang/](https://commons.apache.org/proper/commons-lang/) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **Embedded license files**: [commons-lang3-3.12.0.jar/META-INF/LICENSE.txt](commons-lang3-3.12.0.jar/META-INF/LICENSE.txt) - [commons-lang3-3.12.0.jar/META-INF/NOTICE.txt](commons-lang3-3.12.0.jar/META-INF/NOTICE.txt) -**33** **Group:** `org.apache.httpcomponents` **Name:** `httpclient` **Version:** `4.5.14` +**34** **Group:** `org.apache.httpcomponents` **Name:** `httpclient` **Version:** `4.5.14` > - **POM Project URL**: [http://hc.apache.org/httpcomponents-client-ga](http://hc.apache.org/httpcomponents-client-ga) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **Embedded license files**: [httpclient-4.5.14.jar/META-INF/LICENSE](httpclient-4.5.14.jar/META-INF/LICENSE) - [httpclient-4.5.14.jar/META-INF/NOTICE](httpclient-4.5.14.jar/META-INF/NOTICE) -**34** **Group:** `org.apache.httpcomponents` **Name:** `httpcore` **Version:** `4.4.16` +**35** **Group:** `org.apache.httpcomponents` **Name:** `httpcore` **Version:** `4.4.16` > - **POM Project URL**: [http://hc.apache.org/httpcomponents-core-ga](http://hc.apache.org/httpcomponents-core-ga) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **Embedded license files**: [httpcore-4.4.16.jar/META-INF/LICENSE](httpcore-4.4.16.jar/META-INF/LICENSE) - [httpcore-4.4.16.jar/META-INF/NOTICE](httpcore-4.4.16.jar/META-INF/NOTICE) -**35** **Group:** `org.jetbrains` **Name:** `annotations` **Version:** `13.0` +**36** **Group:** `org.jetbrains` **Name:** `annotations` **Version:** `13.0` > - **POM Project URL**: [http://www.jetbrains.org](http://www.jetbrains.org) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**36** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib` **Version:** `1.6.20` +**37** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib` **Version:** `1.6.20` > - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**37** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-common` **Version:** `1.6.20` +**38** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-common` **Version:** `1.6.20` > - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**38** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk7` **Version:** `1.6.20` +**39** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk7` **Version:** `1.6.20` > - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**39** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk8` **Version:** `1.6.20` +**40** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk8` **Version:** `1.6.20` > - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**40** **Group:** `org.lz4` **Name:** `lz4-java` **Version:** `1.8.0` +**41** **Group:** `org.lz4` **Name:** `lz4-java` **Version:** `1.8.0` > - **POM Project URL**: [https://github.com/lz4/lz4-java](https://github.com/lz4/lz4-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**41** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `2.0.7` +**42** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `2.0.7` > - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) @@ -200,49 +204,49 @@ _2023-06-22 14:59:25 PDT_ ## Creative Commons Legal Code -**42** **Group:** `org.hdrhistogram` **Name:** `HdrHistogram` **Version:** `2.1.12` +**43** **Group:** `org.hdrhistogram` **Name:** `HdrHistogram` **Version:** `2.1.12` > - **Manifest License**: The 2-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://hdrhistogram.github.io/HdrHistogram/](http://hdrhistogram.github.io/HdrHistogram/) > - **POM License**: Creative Commons Legal Code - [https://creativecommons.org/publicdomain/zero/1.0/legalcode](https://creativecommons.org/publicdomain/zero/1.0/legalcode) > - **POM License**: PUBLIC DOMAIN - [http://creativecommons.org/publicdomain/zero/1.0/](http://creativecommons.org/publicdomain/zero/1.0/) > - **POM License**: The 2-Clause BSD License - [https://opensource.org/licenses/BSD-2-Clause](https://opensource.org/licenses/BSD-2-Clause) -**43** **Group:** `org.latencyutils` **Name:** `LatencyUtils` **Version:** `2.0.3` +**44** **Group:** `org.latencyutils` **Name:** `LatencyUtils` **Version:** `2.0.3` > - **POM Project URL**: [http://latencyutils.github.io/LatencyUtils/](http://latencyutils.github.io/LatencyUtils/) > - **POM License**: Creative Commons Legal Code - [https://creativecommons.org/publicdomain/zero/1.0/legalcode](https://creativecommons.org/publicdomain/zero/1.0/legalcode) > - **POM License**: PUBLIC DOMAIN - [http://creativecommons.org/publicdomain/zero/1.0/](http://creativecommons.org/publicdomain/zero/1.0/) ## MIT License -**44** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `2.0.7` +**45** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `2.0.7` > - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) > - **Embedded license files**: [jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt](jcl-over-slf4j-2.0.7.jar/META-INF/LICENSE.txt) -**45** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.7` +**46** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.7` > - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) > - **Embedded license files**: [slf4j-api-2.0.7.jar/META-INF/LICENSE.txt](slf4j-api-2.0.7.jar/META-INF/LICENSE.txt) ## PUBLIC DOMAIN -**46** **Group:** `org.hdrhistogram` **Name:** `HdrHistogram` **Version:** `2.1.12` +**47** **Group:** `org.hdrhistogram` **Name:** `HdrHistogram` **Version:** `2.1.12` > - **Manifest License**: The 2-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://hdrhistogram.github.io/HdrHistogram/](http://hdrhistogram.github.io/HdrHistogram/) > - **POM License**: Creative Commons Legal Code - [https://creativecommons.org/publicdomain/zero/1.0/legalcode](https://creativecommons.org/publicdomain/zero/1.0/legalcode) > - **POM License**: PUBLIC DOMAIN - [http://creativecommons.org/publicdomain/zero/1.0/](http://creativecommons.org/publicdomain/zero/1.0/) > - **POM License**: The 2-Clause BSD License - [https://opensource.org/licenses/BSD-2-Clause](https://opensource.org/licenses/BSD-2-Clause) -**47** **Group:** `org.latencyutils` **Name:** `LatencyUtils` **Version:** `2.0.3` +**48** **Group:** `org.latencyutils` **Name:** `LatencyUtils` **Version:** `2.0.3` > - **POM Project URL**: [http://latencyutils.github.io/LatencyUtils/](http://latencyutils.github.io/LatencyUtils/) > - **POM License**: Creative Commons Legal Code - [https://creativecommons.org/publicdomain/zero/1.0/legalcode](https://creativecommons.org/publicdomain/zero/1.0/legalcode) > - **POM License**: PUBLIC DOMAIN - [http://creativecommons.org/publicdomain/zero/1.0/](http://creativecommons.org/publicdomain/zero/1.0/) ## The 2-Clause BSD License -**48** **Group:** `org.hdrhistogram` **Name:** `HdrHistogram` **Version:** `2.1.12` +**49** **Group:** `org.hdrhistogram` **Name:** `HdrHistogram` **Version:** `2.1.12` > - **Manifest License**: The 2-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://hdrhistogram.github.io/HdrHistogram/](http://hdrhistogram.github.io/HdrHistogram/) > - **POM License**: Creative Commons Legal Code - [https://creativecommons.org/publicdomain/zero/1.0/legalcode](https://creativecommons.org/publicdomain/zero/1.0/legalcode) @@ -251,12 +255,12 @@ _2023-06-22 14:59:25 PDT_ ## The 3-Clause BSD License -**49** **Group:** `com.google.protobuf` **Name:** `protobuf-java` **Version:** `3.23.2` +**50** **Group:** `com.google.protobuf` **Name:** `protobuf-java` **Version:** `3.23.4` > - **Manifest Project URL**: [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**50** **Group:** `org.owasp.encoder` **Name:** `encoder` **Version:** `1.2.3` +**51** **Group:** `org.owasp.encoder` **Name:** `encoder` **Version:** `1.2.3` > - **Manifest Project URL**: [https://www.owasp.org/](https://www.owasp.org/) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) @@ -264,11 +268,11 @@ _2023-06-22 14:59:25 PDT_ ## Universal Permissive License Version 1.0 or The 3-Clause BSD License -**51** **Group:** `org.openjdk.jmc` **Name:** `common` **Version:** `8.3.1` +**52** **Group:** `org.openjdk.jmc` **Name:** `common` **Version:** `8.3.1` > - **POM License**: Universal Permissive License Version 1.0 or The 3-Clause BSD License - [https://github.com/openjdk/jmc/blob/master/core/license/LICENSE.txt](https://github.com/openjdk/jmc/blob/master/core/license/LICENSE.txt) > - **Embedded license files**: [common-8.3.1.jar/LICENSE.txt](common-8.3.1.jar/LICENSE.txt) -**52** **Group:** `org.openjdk.jmc` **Name:** `flightrecorder` **Version:** `8.3.1` +**53** **Group:** `org.openjdk.jmc` **Name:** `flightrecorder` **Version:** `8.3.1` > - **POM License**: Universal Permissive License Version 1.0 or The 3-Clause BSD License - [https://github.com/openjdk/jmc/blob/master/core/license/LICENSE.txt](https://github.com/openjdk/jmc/blob/master/core/license/LICENSE.txt) > - **Embedded license files**: [flightrecorder-8.3.1.jar/LICENSE.txt](flightrecorder-8.3.1.jar/LICENSE.txt) diff --git a/profiler/src/main/java/com/splunk/opentelemetry/profiler/JfrActivator.java b/profiler/src/main/java/com/splunk/opentelemetry/profiler/JfrActivator.java index 37e009519..906eedeb4 100644 --- a/profiler/src/main/java/com/splunk/opentelemetry/profiler/JfrActivator.java +++ b/profiler/src/main/java/com/splunk/opentelemetry/profiler/JfrActivator.java @@ -21,6 +21,8 @@ import static com.splunk.opentelemetry.profiler.Configuration.CONFIG_KEY_PROFILER_DIRECTORY; import static com.splunk.opentelemetry.profiler.Configuration.CONFIG_KEY_RECORDING_DURATION; import static com.splunk.opentelemetry.profiler.util.Runnables.logUncaught; +import static io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil.getConfig; +import static io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil.getResource; import static java.util.logging.Level.WARNING; import com.google.auto.service.AutoService; @@ -58,7 +60,7 @@ public class JfrActivator implements AgentListener { @Override public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) { - ConfigProperties config = autoConfiguredOpenTelemetrySdk.getConfig(); + ConfigProperties config = getConfig(autoConfiguredOpenTelemetrySdk); if (notClearForTakeoff(config)) { return; } @@ -67,7 +69,7 @@ public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetr logger.info("Profiler is active."); executor.submit( logUncaught( - () -> activateJfrAndRunForever(config, autoConfiguredOpenTelemetrySdk.getResource()))); + () -> activateJfrAndRunForever(config, getResource(autoConfiguredOpenTelemetrySdk)))); } private boolean notClearForTakeoff(ConfigProperties config) { diff --git a/testing/agent-test-extension/build.gradle.kts b/testing/agent-test-extension/build.gradle.kts index 050a97442..2b6923580 100644 --- a/testing/agent-test-extension/build.gradle.kts +++ b/testing/agent-test-extension/build.gradle.kts @@ -9,6 +9,7 @@ dependencies { compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling") compileOnly("io.micrometer:micrometer-core") compileOnly(project(":bootstrap")) + compileOnly(project(":custom")) } tasks { diff --git a/testing/agent-test-extension/src/main/java/com/splunk/opentelemetry/testing/TestMicrometerInstaller.java b/testing/agent-test-extension/src/main/java/com/splunk/opentelemetry/testing/TestMicrometerInstaller.java index dfaa9f8f4..801713ab6 100644 --- a/testing/agent-test-extension/src/main/java/com/splunk/opentelemetry/testing/TestMicrometerInstaller.java +++ b/testing/agent-test-extension/src/main/java/com/splunk/opentelemetry/testing/TestMicrometerInstaller.java @@ -16,6 +16,7 @@ package com.splunk.opentelemetry.testing; +import static io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil.getConfig; import static java.util.Collections.emptyMap; import com.google.auto.service.AutoService; @@ -33,7 +34,7 @@ public class TestMicrometerInstaller implements BeforeAgentListener { @Override public void beforeAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) { - ConfigProperties config = autoConfiguredOpenTelemetrySdk.getConfig(); + ConfigProperties config = getConfig(autoConfiguredOpenTelemetrySdk); // splunk.testing.metrics.global-tags is normalized to splunk.testing.metrics.global.tags Tags globalMetricsTags = config.getMap("splunk.testing.metrics.global.tags", emptyMap()).entrySet().stream()