Try explicitly setting service.instance.id in Supervisor

Author: jade-guiton-dd

cmd/opampsupervisor/e2e_test.go

@@ -1239,6 +1239,7 @@ func TestSupervisorAgentDescriptionConfigApplies(t *testing.T) {
 			stringKeyValue("client.id", "my-client-id"),
 			stringKeyValue("service.name", command),
 			stringKeyValue("service.version", version),
+			stringKeyValue("service.instance.id", uuid.UUID(ad.InstanceUid).String()),
 		},
 		NonIdentifyingAttributes: []*protobufs.KeyValue{
 			stringKeyValue("env", "prod"),

cmd/opampsupervisor/supervisor/supervisor.go

@@ -1156,7 +1156,9 @@ func (s *Supervisor) composeOwnTelemetryConfig() []byte {
 
 func (s *Supervisor) composeExtraTelemetryConfig() []byte {
 	var cfg bytes.Buffer
-	resourceAttrs := map[string]string{}
+	resourceAttrs := map[string]string{
+		"service.instance.id": s.persistentState.InstanceID.String(),
+	}
 	ad := s.agentDescription.Load().(*protobufs.AgentDescription)
 	for _, attr := range ad.IdentifyingAttributes {
 		resourceAttrs[attr.Key] = attr.Value.GetStringValue()