addressed review comments

open-telemetry · Apr 11, 2024 · 969f324 · 969f324
1 parent 7960534
commit 969f324
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/...autoconfigure/SdkAutoconfigureAccess.java → ...autoconfigure/SdkAutoconfigureAccess.java b/...autoconfigure/SdkAutoconfigureAccess.java → ...autoconfigure/SdkAutoconfigureAccess.java
diff --git 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/...java/io/opentelemetry/instrumentation/resources/ResourceProviderPropertiesCustomizer.java b/...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<String, String> DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS = new HashMap<>();

diff --git a/...A-INF/services/io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider b/...A-INF/services/io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider
@@ -0,0 +1 @@
+io.opentelemetry.instrumentation.resources.ResourceProviderPropertiesCustomizer
diff --git a/...gure-support/src/test/java/io/opentelemetry/sdk/autoconfigure/SdkAutoconfigureAccess.java b/...gure-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() {}
+}