Adjust tests that don't expect the service.instance.id resource attribute

Author: jade-guiton-dd

cmd/opampsupervisor/supervisor/supervisor_test.go

@@ -554,7 +554,8 @@ service:
                 - stderr
             output_paths:
                 - stdout
-        resource: null
+        resource:
+            service.instance.id: 018fee23-4a51-7303-a441-73faed7d9deb
 `
 
 		remoteConfig := &protobufs.AgentRemoteConfig{
@@ -655,7 +656,8 @@ service:
                 - stderr
             output_paths:
                 - stdout
-        resource: null
+        resource:
+            service.instance.id: 018fee23-4a51-7303-a441-73faed7d9deb
 `
 
 		remoteConfig := &protobufs.AgentRemoteConfig{
@@ -841,7 +843,8 @@ service:
                 - stderr
             output_paths:
                 - stdout
-        resource: null
+        resource:
+            service.instance.id: 018fee23-4a51-7303-a441-73faed7d9deb
 `
 
 		// store the initial remote config message so the supervisor is initialized with it
@@ -1722,6 +1725,7 @@ service:
                             endpoint: localhost-metrics
                             protocol: http/protobuf
         resource:
+            service.instance.id: 018fee23-4a51-7303-a441-73faed7d9deb
             service.name: otelcol
         traces:
             processors:
@@ -1841,6 +1845,9 @@ service:
                 - nop
             receivers:
                 - nop
+    telemetry:
+        resource:
+            service.instance.id: 018fee23-4a51-7303-a441-73faed7d9deb
 `
 	s := Supervisor{
 		persistentState: &persistentState{
@@ -1884,6 +1891,9 @@ service:
                 - nop
             receivers:
                 - nop
+    telemetry:
+        resource:
+            service.instance.id: 018fee23-4a51-7303-a441-73faed7d9deb
 `
 	s := Supervisor{
 		persistentState: &persistentState{

cmd/opampsupervisor/supervisor/testdata/merged_effective_config.yaml

@@ -47,4 +47,5 @@ service:
       error_output_paths: ["stderr"]
       output_paths: ["stdout"]
     resource:
+      service.instance.id: 00000000-0000-0000-0000-000000000000
       service.name: otelcol

cmd/opampsupervisor/supervisor/testdata/merged_local_config.yaml

@@ -36,4 +36,5 @@ service:
       error_output_paths: ["stderr"]
       output_paths: ["stdout"]
     resource:
+      service.instance.id: 00000000-0000-0000-0000-000000000000
       service.name: otelcol

cmd/opampsupervisor/testdata/collector/effective_config.yaml

@@ -40,4 +40,5 @@ service:
             error_output_paths: ["stderr"]
             output_paths: ["stdout"]
         resource:
+            service.instance.id: 00000000-0000-0000-0000-000000000000
             service.name: otelcol