add missing declarative config resource providers

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/resources/DistroComponentProvider.java

@@ -21,11 +21,11 @@ public Class<Resource> getType() {
 
   @Override
   public String getName() {
-    return "distribution";
+    return "opentelemetry-javaagent-distribution";
   }
 
   @Override
   public Resource create(DeclarativeConfigProperties config) {
-    return DistroResourceProvider.get();
+    return DistroResourceProvider.get("opentelemetry-javaagent");
   }
 }

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/resources/DistroResourceProvider.java

@@ -20,17 +20,14 @@ public class DistroResourceProvider implements ResourceProvider {
 
   @Override
   public Resource createResource(ConfigProperties config) {
-    return get();
+    return get("opentelemetry-java-instrumentation");
   }
 
-  static Resource get() {
+  static Resource get(String distroName) {
     return AgentVersion.VERSION == null
         ? Resource.empty()
         : Resource.create(
             Attributes.of(
-                TELEMETRY_DISTRO_NAME,
-                "opentelemetry-java-instrumentation",
-                TELEMETRY_DISTRO_VERSION,
-                AgentVersion.VERSION));
+                TELEMETRY_DISTRO_NAME, distroName, TELEMETRY_DISTRO_VERSION, AgentVersion.VERSION));
   }
 }

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/resources/ResourceCustomizerProvider.java

@@ -11,7 +11,7 @@
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectionModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectorModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ResourceModel;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -24,11 +24,10 @@
 @AutoService(DeclarativeConfigurationCustomizerProvider.class)
 public class ResourceCustomizerProvider implements DeclarativeConfigurationCustomizerProvider {
 
-  // distribution: adds "distro.name" and "distro.version" attributes
+  // opentelemetry-javaagent-distribution: adds "distro.name" and "distro.version" attributes
   // (DistroComponentProvider in this package)
-  // service: adds "service.name" and "service.instance.id" attributes
-  // (https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ServiceResourceDetector.java)
-  private static final List<String> REQUIRED_DETECTORS = Arrays.asList("distribution", "service");
+  private static final List<String> REQUIRED_DETECTORS =
+      Collections.singletonList("opentelemetry-javaagent-distribution");
 
   @Override
   public void customize(DeclarativeConfigurationCustomizer customizer) {
@@ -55,7 +54,9 @@ public void customize(DeclarativeConfigurationCustomizer customizer) {
             if (!names.contains(name)) {
               ExperimentalResourceDetectorModel detector = new ExperimentalResourceDetectorModel();
               detector.getAdditionalProperties().put(name, null);
-              detectors.add(detector);
+              // add first (the least precedence)
+              // so that the user can add a differently named detector that takes precedence
+              detectors.add(0, detector);
             }
           }
           return model;

smoke-tests/src/test/groovy/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.groovy

@@ -50,25 +50,20 @@ class DeclarativeConfigurationSmokeTest extends SmokeTest {
     then: "There is one trace"
     traces.size() > 0
 
-    then: "declarative config is applied"
-    def serviceName = findResourceAttribute(traces, "service.name")
-        .map { it.stringValue }
-        .findAny()
-    serviceName.isPresent()
-    serviceName.get() == "declarative-config-smoke-test"
-
-    then: "service detector is added by customizer"
-    def serviceInstanceId = findResourceAttribute(traces, "service.instance.id")
-        .map { it.stringValue }
-        .findAny()
-    serviceInstanceId.isPresent()
+    then: "explicitly set attribute is present"
+    hasResourceAttribute(traces, "service.name", "declarative-config-smoke-test")
+
+    then: "explicitly set container detector is used"
+    findResourceAttribute(traces, "container.id").findAny().isPresent()
+
+    then: "explicitly set container process detector is used"
+    findResourceAttribute(traces, "process.executable.path").findAny().isPresent()
+
+    then: "explicitly set container host detector is used"
+    findResourceAttribute(traces, "host.name").findAny().isPresent()
 
     then: "distro detector is added by customizer"
-    def distroName = findResourceAttribute(traces, "telemetry.distro.name")
-        .map { it.stringValue }
-        .findAny()
-    distroName.isPresent()
-    distroName.get() == "opentelemetry-java-instrumentation"
+    hasResourceAttribute(traces, "telemetry.distro.name", "opentelemetry-javaagent")
 
     cleanup:
     stopTarget()

smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SmokeTest.groovy

@@ -118,6 +118,15 @@ abstract class SmokeTest extends Specification {
       .map { it.value }
   }
 
+  protected static boolean hasResourceAttribute(Collection<ExportTraceServiceRequest> traces,
+                                                String attributeKey,
+                                                String attributeValue) {
+    return findResourceAttribute(traces, attributeKey)
+        .filter { it.stringValue == attributeValue }
+        .findAny()
+        .isPresent()
+  }
+
   protected static int countSpansByName(Collection<ExportTraceServiceRequest> traces, String spanName) {
     return getSpanStream(traces).filter { it.name == spanName }.count()
   }

smoke-tests/src/test/resources/declarative-config.yaml

@@ -11,6 +11,11 @@ tracer_provider:
 
 # add extra resource attributes to verify that declarative config is picked up
 resource:
+  detection/development:
+    detectors:
+      - container:
+      - host:
+      - process:
   attributes:
     - name: service.name
       value: declarative-config-smoke-test