move ServiceInstanceIdResourceProvider to incubator

open-telemetry · Apr 2, 2024 · 5668fe3 · 5668fe3
1 parent 72741df
commit 5668fe3
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/...rc/main/java/io/opentelemetry/sdk/autoconfigure/internal/EnvironmentResourceProvider.java b/...rc/main/java/io/opentelemetry/sdk/autoconfigure/internal/EnvironmentResourceProvider.java
@@ -24,6 +24,6 @@ public Resource createResource(ConfigProperties config) {
   public int order() {
     // Environment resource takes precedent over all other ResourceProviders except
     // ServiceInstanceIdResourceProvider.
-    return ServiceInstanceIdResourceProvider.ORDER - 1;
+    return Integer.MAX_VALUE - 1;
   }
 }
diff --git a/.../main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider b/.../main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider
@@ -1,2 +1 @@
 io.opentelemetry.sdk.autoconfigure.internal.EnvironmentResourceProvider
-io.opentelemetry.sdk.autoconfigure.internal.ServiceInstanceIdResourceProvider
diff --git a/...al/ServiceInstanceIdResourceProvider.java → ...al/ServiceInstanceIdResourceProvider.java b/...al/ServiceInstanceIdResourceProvider.java → ...al/ServiceInstanceIdResourceProvider.java
@@ -41,7 +41,7 @@ public boolean shouldApply(ConfigProperties config, Resource existing) {
   @Override
   public int order() {
     // Run after environment resource provider - only set the service instance ID if it
-    // hasn't been set by any other provider.
+    // hasn't been set by any other provider or the user.
     return ORDER;
   }
 }
diff --git a/.../main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider b/.../main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider
@@ -0,0 +1 @@
+io.opentelemetry.sdk.autoconfigure.internal.ServiceInstanceIdResourceProvider
diff --git a/...erviceInstanceIdResourceProviderTest.java → ...erviceInstanceIdResourceProviderTest.java b/...erviceInstanceIdResourceProviderTest.java → ...erviceInstanceIdResourceProviderTest.java