Skip to content

Commit 941d873

Browse files
rohitgoranamx-psi
andauthored
[cmd/telemetrygen] Fix logs telemetry attributes key mapping (open-telemetry#31309)
**Description:** This PR addresses a bug in the telemetry attribute key mapping for the logs. Previously, the attribute key was incorrectly mapped to the value property, leading to incorrect data representation on the exported logs. **Changes:** Corrected the attribute key mapping logic to ensure the key is mapped to the key, not the value. **Testing:** The changes have been thoroughly tested under various scenarios to ensure the bug has been fixed. --------- Co-authored-by: Pablo Baeyens <[email protected]>
1 parent dcf6e9d commit 941d873

File tree

3 files changed

+36
-2
lines changed

3 files changed

+36
-2
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: cmd/telemetrygen
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fixed key mapping for logs telemetry attributes.
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [31309]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

cmd/telemetrygen/internal/logs/worker.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ func (w worker) simulateLogs(res *resource.Resource, exporter exporter, telemetr
4949
lattrs := log.Attributes()
5050
lattrs.PutStr("app", "server")
5151

52-
for i, key := range telemetryAttributes {
53-
lattrs.PutStr(key.Value.AsString(), telemetryAttributes[i].Value.AsString())
52+
for i, attr := range telemetryAttributes {
53+
lattrs.PutStr(string(attr.Key), telemetryAttributes[i].Value.AsString())
5454
}
5555

5656
if err := exporter.export(logs); err != nil {

cmd/telemetrygen/internal/logs/worker_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,13 @@ func TestLogsWithOneTelemetryAttributes(t *testing.T) {
145145
for i := 0; i < rlogs.Len(); i++ {
146146
attrs := rlogs.At(i).ScopeLogs().At(0).LogRecords().At(0).Attributes()
147147
assert.Equal(t, 2, attrs.Len(), "shouldn't have less than 2 attributes")
148+
149+
val, ok := attrs.Get(telemetryAttrKeyOne)
150+
assert.Truef(t, ok, "there should be an attribute with key %s", telemetryAttrKeyOne)
151+
if ok {
152+
assert.EqualValues(t, val.AsString(), telemetryAttrValueOne)
153+
}
154+
148155
}
149156
}
150157
}

0 commit comments

Comments
 (0)