Merge pull request #16 from observeinc/alew/update-resource-collection

feat: rework resourcedetection configs for cloud

Author: obs-gh-alexlew

packaging/linux/etc/observe-agent/otel-collector.yaml

@@ -68,8 +68,17 @@ processors:
   batch:
 
   resourcedetection:
-    detectors: [gcp, ecs, ec2, azure, system]
-    override: true
+    detectors: [env, system]
+    system:
+      hostname_sources: ["os"]
+      resource_attributes:
+        host.id:
+          enabled: true
+  
+  resourcedetection/cloud:
+    detectors: ["gcp", "ecs", "ec2", "azure"]
+    timeout: 2s
+    override: false
 
 exporters:
   otlphttp/observe:
@@ -86,37 +95,37 @@ service:
   pipelines:
     metrics/agent-filestats:
        receivers: [filestats/agent]
-       processors: [resourcedetection]
+       processors: [resourcedetection, resourcedetection/cloud]
        exporters: [otlphttp/observe]
 
     metrics/agent-internal:
       receivers: [prometheus/agent, count]
-      processors: [memory_limiter, transform/truncate, resourcedetection, batch]
+      processors: [memory_limiter, transform/truncate, resourcedetection, resourcedetection/cloud, batch]
       exporters: [otlphttp/observe]
 
     metrics/forward:
       receivers: [otlp]
-      processors: []
+      processors: [resourcedetection, resourcedetection/cloud]
       exporters: [otlphttp/observe]
 
     logs/agent-journald:
       receivers: [journald/agent]
-      processors: [memory_limiter, transform/truncate, resourcedetection, batch]
+      processors: [memory_limiter, transform/truncate, resourcedetection, resourcedetection/cloud, batch]
       exporters: [otlphttp/observe, count]
 
     logs/agent-config:
        receivers: [filelog/agent-config]
-       processors: [memory_limiter, transform/truncate, resourcedetection, batch]
+       processors: [memory_limiter, transform/truncate, resourcedetection, resourcedetection/cloud, batch]
        exporters: [otlphttp/observe]
 
     logs/forward: 
       receivers: [otlp]
-      processors: []
+      processors: [resourcedetection, resourcedetection/cloud]
       exporters: [otlphttp/observe, count]
 
     traces/forward:
       receivers: [otlp]
-      processors: []
+      processors: [resourcedetection, resourcedetection/cloud]
       exporters: [otlphttp/observe]
 
   extensions: [health_check, file_storage]