add cloud providers in spring starter

open-telemetry · Apr 9, 2024 · 3669dfb · 3669dfb
1 parent 2b4a13c
commit 3669dfb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/instrumentation/spring/starters/spring-boot-starter/build.gradle.kts b/instrumentation/spring/starters/spring-boot-starter/build.gradle.kts
@@ -21,12 +21,12 @@ dependencies {
   api("io.opentelemetry:opentelemetry-sdk")
   api(project(":instrumentation-annotations"))
 
-  implementation("io.opentelemetry.contrib:opentelemetry-aws-resources:1.33.0-alpha") {
+  implementation("io.opentelemetry.contrib:opentelemetry-aws-resources") {
     exclude("com.fasterxml.jackson.core", "jackson-core")
     exclude("com.squareup.okhttp3", "okhttp")
   }
 
-  implementation("io.opentelemetry.contrib:opentelemetry-gcp-resources:1.33.0-alpha") {
+  implementation("io.opentelemetry.contrib:opentelemetry-gcp-resources") {
     exclude("com.fasterxml.jackson.core", "jackson-core")
   }
 }
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/...ResourceProviderPropertiesCustomizer.java → ...ResourceProviderPropertiesCustomizer.java b/...ResourceProviderPropertiesCustomizer.java → ...ResourceProviderPropertiesCustomizer.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.autoconfigure;
+package io.opentelemetry.instrumentation.resources;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
@@ -38,7 +38,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/...urceProviderPropertiesCustomizerTest.java → ...urceProviderPropertiesCustomizerTest.java b/...urceProviderPropertiesCustomizerTest.java → ...urceProviderPropertiesCustomizerTest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.autoconfigure;
+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/.../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