Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken spanmetrics counters after span producing service restart #29711

Merged
merged 18 commits into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .chloggen/spanmetrics-fix-resource-metrics-key.yaml
Original file line number Diff line number Diff line change
@@ -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: []
26 changes: 25 additions & 1 deletion connector/spanmetricsconnector/connector.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
portertech marked this conversation as resolved.
Show resolved Hide resolved
conventions.AttributeServiceName,
conventions.AttributeTelemetrySDKName,
conventions.AttributeTelemetrySDKLanguage,
}

m.RemoveIf(func(k string, v pcommon.Value) bool {
for _, sv := range s {
portertech marked this conversation as resolved.
Show resolved Hide resolved
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{
Expand Down
2 changes: 1 addition & 1 deletion connector/spanmetricsconnector/connector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading