Cloud provider in spring starter (#11014)

open-telemetry · Apr 11, 2024 · 62116dd · 62116dd
1 parent 7de246b
commit 62116dd
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 8 deletions.
diff --git a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts
@@ -38,6 +38,7 @@ dependencies {
   library("org.springframework.boot:spring-boot-starter-webflux:$springBootVersion")
 
   implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
+  implementation(project(":sdk-autoconfigure-support"))
   compileOnly("io.opentelemetry:opentelemetry-extension-trace-propagators")
   compileOnly("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator")
   compileOnly("io.opentelemetry:opentelemetry-exporter-logging")

diff --git a/instrumentation/spring/starters/spring-boot-starter/build.gradle.kts b/instrumentation/spring/starters/spring-boot-starter/build.gradle.kts
@@ -21,4 +21,7 @@ dependencies {
   api("io.opentelemetry:opentelemetry-exporter-otlp")
   api("io.opentelemetry:opentelemetry-sdk")
   api(project(":instrumentation-annotations"))
+
+  implementation("io.opentelemetry.contrib:opentelemetry-aws-resources")
+  implementation("io.opentelemetry.contrib:opentelemetry-gcp-resources")
 }
diff --git a/javaagent-tooling/build.gradle.kts b/javaagent-tooling/build.gradle.kts
@@ -15,11 +15,11 @@ dependencies {
   implementation(project(":instrumentation-api"))
   implementation(project(":instrumentation-annotations-support"))
   implementation(project(":muzzle"))
+  implementation(project(":sdk-autoconfigure-support"))
 
   implementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry:opentelemetry-api-incubator")
   implementation("io.opentelemetry:opentelemetry-sdk")
-  implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   implementation("io.opentelemetry:opentelemetry-extension-kotlin")
   implementation("io.opentelemetry:opentelemetry-extension-trace-propagators")
   // the incubator's ViewConfigCustomizer is used to support loading yaml-based metric views

diff --git a/.../test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider b/.../test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider
diff --git a/sdk-autoconfigure-support/build.gradle.kts b/sdk-autoconfigure-support/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+  id("otel.java-conventions")
+  id("otel.publish-conventions")
+}
+
+group = "io.opentelemetry.instrumentation"
+
+dependencies {
+  api("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
+
+  compileOnly("com.google.code.findbugs:annotations")
+  testCompileOnly("com.google.code.findbugs:annotations")
+}
diff --git a/...ResourceProviderPropertiesCustomizer.java → ...ResourceProviderPropertiesCustomizer.java b/...ResourceProviderPropertiesCustomizer.java → ...ResourceProviderPropertiesCustomizer.java
@@ -3,9 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.tooling.config;
+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<>();
@@ -38,7 +36,7 @@ public class ResourceProviderPropertiesCustomizer implements AutoConfigurationCu
         "io.opentelemetry.contrib.gcp.resource.GCPResourceProvider", "gcp");
     // for testing
     DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS.put(
-        "io.opentelemetry.javaagent.tooling.config.ResourceProviderPropertiesCustomizerTest$Provider",
+        "io.opentelemetry.instrumentation.resources.ResourceProviderPropertiesCustomizerTest$Provider",
         "test");
   }
 

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/...urceProviderPropertiesCustomizerTest.java → ...urceProviderPropertiesCustomizerTest.java b/...urceProviderPropertiesCustomizerTest.java → ...urceProviderPropertiesCustomizerTest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.tooling.config;
+package io.opentelemetry.instrumentation.resources;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -58,7 +58,7 @@ private EnabledTestCase(
   @TestFactory
   Stream<DynamicTest> enabledTestCases() {
     String className =
-        "io.opentelemetry.javaagent.tooling.config.ResourceProviderPropertiesCustomizerTest$Provider";
+        "io.opentelemetry.instrumentation.resources.ResourceProviderPropertiesCustomizerTest$Provider";
     return Stream.of(
             new EnabledTestCase(
                 "explicitEnabled", true, Collections.emptySet(), Collections.emptySet(), true),
@@ -119,6 +119,10 @@ Stream<DynamicTest> enabledTestCases() {
                             Boolean.toString(tc.explicitEnabled));
                       }
 
+                      props.put("otel.traces.exporter", "none");
+                      props.put("otel.metrics.exporter", "none");
+                      props.put("otel.logs.exporter", "none");
+
                       Attributes attributes =
                           SdkAutoconfigureAccess.getResourceAttributes(
                               AutoConfiguredOpenTelemetrySdk.builder()

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() {}
+}
diff --git a/.../test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider b/.../test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider
@@ -0,0 +1 @@
+io.opentelemetry.instrumentation.resources.ResourceProviderPropertiesCustomizerTest$Provider
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -107,6 +107,7 @@ include(":javaagent-tooling:javaagent-tooling-java9")
 include(":javaagent-internal-logging-application")
 include(":javaagent-internal-logging-simple")
 include(":javaagent")
+include(":sdk-autoconfigure-support")
 
 include(":bom")
 include(":bom-alpha")