From 969f32447716d998f62c139a2796e235b9d297f5 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Thu, 11 Apr 2024 12:54:13 +0200 Subject: [PATCH] addressed review comments --- .../autoconfigure/SdkAutoconfigureAccess.java | 0 sdk-autoconfigure-support/build.gradle.kts | 6 +----- .../ResourceProviderPropertiesCustomizer.java | 2 -- ...igure.spi.AutoConfigurationCustomizerProvider | 1 + .../autoconfigure/SdkAutoconfigureAccess.java | 16 ++++++++++++++++ 5 files changed, 18 insertions(+), 7 deletions(-) rename {sdk-autoconfigure-support => javaagent-tooling}/src/main/java/io/opentelemetry/sdk/autoconfigure/SdkAutoconfigureAccess.java (100%) create mode 100644 sdk-autoconfigure-support/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider create mode 100644 sdk-autoconfigure-support/src/test/java/io/opentelemetry/sdk/autoconfigure/SdkAutoconfigureAccess.java diff --git a/sdk-autoconfigure-support/src/main/java/io/opentelemetry/sdk/autoconfigure/SdkAutoconfigureAccess.java b/javaagent-tooling/src/main/java/io/opentelemetry/sdk/autoconfigure/SdkAutoconfigureAccess.java similarity index 100% rename from sdk-autoconfigure-support/src/main/java/io/opentelemetry/sdk/autoconfigure/SdkAutoconfigureAccess.java rename to javaagent-tooling/src/main/java/io/opentelemetry/sdk/autoconfigure/SdkAutoconfigureAccess.java diff --git a/sdk-autoconfigure-support/build.gradle.kts b/sdk-autoconfigure-support/build.gradle.kts index 1c63cee24722..7a2e5e185912 100644 --- a/sdk-autoconfigure-support/build.gradle.kts +++ b/sdk-autoconfigure-support/build.gradle.kts @@ -3,15 +3,11 @@ plugins { id("otel.publish-conventions") } -group = "io.opentelemetry.javaagent" +group = "io.opentelemetry.instrumentation" dependencies { api("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure") compileOnly("com.google.code.findbugs:annotations") testCompileOnly("com.google.code.findbugs:annotations") - - annotationProcessor("com.google.auto.service:auto-service") - compileOnly("com.google.auto.service:auto-service-annotations") - testCompileOnly("com.google.auto.service:auto-service-annotations") } diff --git a/sdk-autoconfigure-support/src/main/java/io/opentelemetry/instrumentation/resources/ResourceProviderPropertiesCustomizer.java b/sdk-autoconfigure-support/src/main/java/io/opentelemetry/instrumentation/resources/ResourceProviderPropertiesCustomizer.java index f82af6886866..416e6e16c27c 100644 --- a/sdk-autoconfigure-support/src/main/java/io/opentelemetry/instrumentation/resources/ResourceProviderPropertiesCustomizer.java +++ b/sdk-autoconfigure-support/src/main/java/io/opentelemetry/instrumentation/resources/ResourceProviderPropertiesCustomizer.java @@ -5,7 +5,6 @@ package io.opentelemetry.instrumentation.resources; -import com.google.auto.service.AutoService; import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer; import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; @@ -18,7 +17,6 @@ import java.util.Set; import javax.annotation.Nullable; -@AutoService(AutoConfigurationCustomizerProvider.class) public class ResourceProviderPropertiesCustomizer implements AutoConfigurationCustomizerProvider { private static final Map DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS = new HashMap<>(); diff --git a/sdk-autoconfigure-support/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider b/sdk-autoconfigure-support/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider new file mode 100644 index 000000000000..3f8716ab23aa --- /dev/null +++ b/sdk-autoconfigure-support/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider @@ -0,0 +1 @@ +io.opentelemetry.instrumentation.resources.ResourceProviderPropertiesCustomizer diff --git a/sdk-autoconfigure-support/src/test/java/io/opentelemetry/sdk/autoconfigure/SdkAutoconfigureAccess.java b/sdk-autoconfigure-support/src/test/java/io/opentelemetry/sdk/autoconfigure/SdkAutoconfigureAccess.java new file mode 100644 index 000000000000..477f5bcbdee4 --- /dev/null +++ b/sdk-autoconfigure-support/src/test/java/io/opentelemetry/sdk/autoconfigure/SdkAutoconfigureAccess.java @@ -0,0 +1,16 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.sdk.autoconfigure; + +import io.opentelemetry.api.common.Attributes; + +public final class SdkAutoconfigureAccess { + public static Attributes getResourceAttributes(AutoConfiguredOpenTelemetrySdk sdk) { + return sdk.getResource().getAttributes(); + } + + private SdkAutoconfigureAccess() {} +}