pr review

Author: zeitlinger

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

@@ -50,12 +50,20 @@ class DeclarativeConfigurationSmokeTest extends SmokeTest {
     then: "There is one trace"
     traces.size() > 0
 
+    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-javaagent"
+    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