Fix broken spanmetrics counters after span producing service restart

.chloggen/spanmetrics-fix-resource-metrics-key.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: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: connector/spanmetrics
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Fix broken spanmetrics counters after span producing service restart, be more selective of the resource attributes used to create the resource metrics key.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [29711]
+
+# (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: []

connector/spanmetricsconnector/connector.go

@@ -390,8 +390,32 @@ func (p *connectorImp) addExemplar(span ptrace.Span, duration float64, h metrics
 
 type resourceKey [16]byte
 
+func filterResourceAttr(attr pcommon.Map) pcommon.Map {
+	m := pcommon.NewMap()
+	attr.CopyTo(m)
+
+	s := []string{
+		conventions.AttributeServiceName,
+		conventions.AttributeTelemetrySDKName,
+		conventions.AttributeTelemetrySDKLanguage,
+	}
+
+	m.RemoveIf(func(k string, v pcommon.Value) bool {
+		for _, sv := range s {
+			if k == sv {
+				return false
+			}
+		}
+
+		return true
+	})
+
+	return m
+}
+
 func (p *connectorImp) getOrCreateResourceMetrics(attr pcommon.Map) *resourceMetrics {
-	key := resourceKey(pdatautil.MapHash(attr))
+	h := pdatautil.MapHash(filterResourceAttr(attr))
+	key := resourceKey(h)
 	v, ok := p.resourceMetrics.Get(key)
 	if !ok {
 		v = &resourceMetrics{

connector/spanmetricsconnector/connector_test.go

@@ -922,7 +922,7 @@ func TestResourceMetricsCache(t *testing.T) {
 
 		// add resource attributes to simulate additional resources providing data
 		for j := 0; j < traces.ResourceSpans().Len(); j++ {
-			traces.ResourceSpans().At(j).Resource().Attributes().PutStr("dummy", fmt.Sprintf("%d", i))
+			traces.ResourceSpans().At(j).Resource().Attributes().PutStr(conventions.AttributeTelemetrySDKName, fmt.Sprintf("%d", i))
 		}
 
 		err = p.ConsumeTraces(ctx, traces)