[connector/signaltometrics]Drop collector service name and namespace from metrics (open-telemetry#43150)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

`signaltometrics.service.*` fields were added to the metrics produced
from signaltometrics component to ensure single-writer is obeyed
([ref](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/connector/signaltometricsconnector#single-writer)).
However, we don't require all the fields to ensure this. Based on the
description of `service.instance.id` it is alone enough to ensure
single-writer
([ref](https://opentelemetry.io/docs/specs/semconv/registry/attributes/service/)).
The other fields leak information about the service which is not
desirable and also unnecessary for our purpose.

<!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
Fixes
open-telemetry#43148

<!--Describe what testing was performed and which tests were added.-->
#### Testing
Updated in PR

<!--Describe the documentation added.-->
#### Documentation
Updated

<!--Please delete paragraphs that you did not use before submitting.-->

---------

Co-authored-by: Gil Raphaelli <graphaelli@gmail.com>

Author: 2 people

.chloggen/signaltometrics-drop-name-namespace.yaml

@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: signaltometricsconnector
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Drop `signaltometrics.service.{name, namespace}` resource attribute from produced metrics.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [43148]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [user]

connector/signaltometricsconnector/README.md

@@ -297,11 +297,9 @@ principle. However, since `signaltometrics` component produces metrics from all
 types and also allows customizing the resource attributes, there is a possibility
 of violating the single-writer principle. To keep the single-writer principle intact,
 the component adds collector instance information as resource attributes. The following
-resource attributes are added to each produced metrics:
+resource attribute is added to each produced metric:
 
 ```yaml
-signaltometrics.service.name: <service_name_of_the_otel_collector>
-signaltometrics.service.namespace: <service_namespace_of_the_otel_collector>
 signaltometrics.service.instance.id: <service_instance_id_of_the_otel_collector>
 ```
 

connector/signaltometricsconnector/internal/model/collectorinstanceinfo.go

@@ -20,29 +20,16 @@ var prefix = metadata.Type.String()
 type CollectorInstanceInfo struct {
 	size              int
 	serviceInstanceID string
-	serviceName       string
-	serviceNamespace  string
 }
 
 func NewCollectorInstanceInfo(
 	set component.TelemetrySettings,
 ) CollectorInstanceInfo {
 	var info CollectorInstanceInfo
 	for k, v := range set.Resource.Attributes().All() {
-		switch k {
-		case string(semconv.ServiceInstanceIDKey):
+		if k == string(semconv.ServiceInstanceIDKey) {
 			if str := v.Str(); str != "" {
-				info.serviceInstanceID = str
-				info.size++
-			}
-		case string(semconv.ServiceNameKey):
-			if str := v.Str(); str != "" {
-				info.serviceName = str
-				info.size++
-			}
-		case string(semconv.ServiceNamespaceKey):
-			if str := v.Str(); str != "" {
-				info.serviceNamespace = str
+				info.serviceInstanceID = v.Str()
 				info.size++
 			}
 		}
@@ -61,12 +48,6 @@ func (info CollectorInstanceInfo) Copy(to pcommon.Map) {
 	if info.serviceInstanceID != "" {
 		to.PutStr(keyWithPrefix(string(semconv.ServiceInstanceIDKey)), info.serviceInstanceID)
 	}
-	if info.serviceName != "" {
-		to.PutStr(keyWithPrefix(string(semconv.ServiceNameKey)), info.serviceName)
-	}
-	if info.serviceNamespace != "" {
-		to.PutStr(keyWithPrefix(string(semconv.ServiceNamespaceKey)), info.serviceNamespace)
-	}
 }
 
 func keyWithPrefix(key string) string {

connector/signaltometricsconnector/internal/model/collectorinstanceinfo_test.go

@@ -42,32 +42,6 @@ func TestCollectorInstanceInfo(t *testing.T) {
 				return m
 			}(),
 		},
-		{
-			name: "with_all_values",
-			input: func() component.TelemetrySettings {
-				ts := componenttest.NewNopTelemetrySettings()
-				ts.Resource.Attributes().PutStr(string(semconv.ServiceInstanceIDKey), "627cc493-f310-47de-96bd-71410b7dec09")
-				ts.Resource.Attributes().PutStr(string(semconv.ServiceNameKey), "signaltometrics")
-				ts.Resource.Attributes().PutStr(string(semconv.ServiceNamespaceKey), "test")
-				return ts
-			}(),
-			expected: func() pcommon.Map {
-				m := pcommon.NewMap()
-				m.PutStr(
-					"signaltometrics."+string(semconv.ServiceInstanceIDKey),
-					"627cc493-f310-47de-96bd-71410b7dec09",
-				)
-				m.PutStr(
-					"signaltometrics."+string(semconv.ServiceNameKey),
-					"signaltometrics",
-				)
-				m.PutStr(
-					"signaltometrics."+string(semconv.ServiceNamespaceKey),
-					"test",
-				)
-				return m
-			}(),
-		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			ci := NewCollectorInstanceInfo(tc.input)

connector/signaltometricsconnector/internal/model/model_test.go

@@ -18,8 +18,6 @@ import (
 
 const (
 	testServiceInstanceID = "627cc493-f310-47de-96bd-71410b7dec09"
-	testServiceName       = "testsignaltometrics"
-	testNamespace         = "test"
 )
 
 func TestFilterResourceAttributes(t *testing.T) {
@@ -45,8 +43,6 @@ func TestFilterResourceAttributes(t *testing.T) {
 				"key.4": "val.4",
 				// Collector instance info will be added
 				"signaltometrics.service.instance.id": testServiceInstanceID,
-				"signaltometrics.service.name":        testServiceName,
-				"signaltometrics.service.namespace":   testNamespace,
 			},
 		},
 		{
@@ -80,8 +76,6 @@ func TestFilterResourceAttributes(t *testing.T) {
 				"key.302": "anything",
 				// Collector instance info will be added
 				"signaltometrics.service.instance.id": testServiceInstanceID,
-				"signaltometrics.service.name":        testServiceName,
-				"signaltometrics.service.namespace":   testNamespace,
 			},
 		},
 	} {
@@ -175,8 +169,6 @@ func testCollectorInstanceInfo(t *testing.T) CollectorInstanceInfo {
 
 	set := componenttest.NewNopTelemetrySettings()
 	set.Resource.Attributes().PutStr(string(semconv.ServiceInstanceIDKey), testServiceInstanceID)
-	set.Resource.Attributes().PutStr(string(semconv.ServiceNameKey), testServiceName)
-	set.Resource.Attributes().PutStr(string(semconv.ServiceNamespaceKey), testNamespace)
 	return NewCollectorInstanceInfo(set)
 }
 

connector/signaltometricsconnector/testdata/logs/exponential_histograms/output.yaml

@@ -10,12 +10,6 @@ resourceMetrics:
         - key: signaltometrics.service.instance.id
           value:
             stringValue: 627cc493-f310-47de-96bd-71410b7dec09
-        - key: signaltometrics.service.name
-          value:
-            stringValue: signaltometrics
-        - key: signaltometrics.service.namespace
-          value:
-            stringValue: test
     scopeMetrics:
       - metrics:
           - description: Logrecords as exponential histogram with log.duration from attributes
@@ -339,12 +333,6 @@ resourceMetrics:
         - key: signaltometrics.service.instance.id
           value:
             stringValue: 627cc493-f310-47de-96bd-71410b7dec09
-        - key: signaltometrics.service.name
-          value:
-            stringValue: signaltometrics
-        - key: signaltometrics.service.namespace
-          value:
-            stringValue: test
     scopeMetrics:
       - metrics:
           - description: Logrecords with resource attribute foo as exponential histogram with log.duration from attributes

connector/signaltometricsconnector/testdata/logs/gauge/output.yaml

@@ -10,12 +10,6 @@ resourceMetrics:
         - key: signaltometrics.service.instance.id
           value:
             stringValue: 627cc493-f310-47de-96bd-71410b7dec09
-        - key: signaltometrics.service.name
-          value:
-            stringValue: signaltometrics
-        - key: signaltometrics.service.namespace
-          value:
-            stringValue: test
     scopeMetrics:
       - metrics:
           - description: Extract memory_mb from log records
@@ -54,12 +48,6 @@ resourceMetrics:
         - key: signaltometrics.service.instance.id
           value:
             stringValue: 627cc493-f310-47de-96bd-71410b7dec09
-        - key: signaltometrics.service.name
-          value:
-            stringValue: signaltometrics
-        - key: signaltometrics.service.namespace
-          value:
-            stringValue: test
     scopeMetrics:
       - metrics:
           - description: Extract memory_mb from log records with attribute foo
@@ -77,4 +65,4 @@ resourceMetrics:
                       value:
                         stringValue: notfoo
         scope:
-          name: github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector
+          name: github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector

connector/signaltometricsconnector/testdata/logs/histograms/output.yaml

@@ -10,12 +10,6 @@ resourceMetrics:
         - key: signaltometrics.service.instance.id
           value:
             stringValue: 627cc493-f310-47de-96bd-71410b7dec09
-        - key: signaltometrics.service.name
-          value:
-            stringValue: signaltometrics
-        - key: signaltometrics.service.namespace
-          value:
-            stringValue: test
     scopeMetrics:
       - metrics:
           - description: Logrecords as histogram with log.duration from attributes
@@ -139,12 +133,6 @@ resourceMetrics:
         - key: signaltometrics.service.instance.id
           value:
             stringValue: 627cc493-f310-47de-96bd-71410b7dec09
-        - key: signaltometrics.service.name
-          value:
-            stringValue: signaltometrics
-        - key: signaltometrics.service.namespace
-          value:
-            stringValue: test
     scopeMetrics:
       - metrics:
           - description: Logrecords with resource attribute foo as histogram with log.duration from attributes

connector/signaltometricsconnector/testdata/logs/metric_identity/output.yaml

@@ -10,12 +10,6 @@ resourceMetrics:
         - key: signaltometrics.service.instance.id
           value:
             stringValue: 627cc493-f310-47de-96bd-71410b7dec09
-        - key: signaltometrics.service.name
-          value:
-            stringValue: signaltometrics
-        - key: signaltometrics.service.namespace
-          value:
-            stringValue: test
     scopeMetrics:
       - metrics:
           - description: Logrecords as histogram with log.duration from attributes

connector/signaltometricsconnector/testdata/logs/sum/output.yaml

@@ -10,12 +10,6 @@ resourceMetrics:
         - key: signaltometrics.service.instance.id
           value:
             stringValue: 627cc493-f310-47de-96bd-71410b7dec09
-        - key: signaltometrics.service.name
-          value:
-            stringValue: signaltometrics
-        - key: signaltometrics.service.namespace
-          value:
-            stringValue: test
     scopeMetrics:
       - metrics:
           - description: Count total number of log records
@@ -69,12 +63,6 @@ resourceMetrics:
         - key: signaltometrics.service.instance.id
           value:
             stringValue: 627cc493-f310-47de-96bd-71410b7dec09
-        - key: signaltometrics.service.name
-          value:
-            stringValue: signaltometrics
-        - key: signaltometrics.service.namespace
-          value:
-            stringValue: test
     scopeMetrics:
       - metrics:
           - description: Count total number of log records with resource attribute foo