Skip to content

fix(daemon): Adds escaping for log forwarded labels #1035

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 14, 2025
Merged

fix(daemon): Adds escaping for log forwarded labels #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0eece15
fix(daemon): Properly escape UTF-8 in log labels
mfulb Mar 13, 2025
f0f4568
test(daemon): Adds test cases where label key or value is empty
mfulb Mar 13, 2025
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
26 changes: 15 additions & 11 deletions daemon/internal/newrelic/log_events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,21 +76,25 @@ func (events *LogEvents) CollectorJSON(id AgentRunID) ([]byte, error) {
estimate := len(es) * 128
buf.Grow(estimate)
buf.WriteString(`[{` +
`"common": {"attributes": {`)
`"common": {"attributes": `)
nwrit := 0
for _, value := range events.LogForwardingLabels {
if nwrit > 0 {
buf.WriteByte(',')
labelMap := make(map[string]string)
for _, label := range events.LogForwardingLabels {
// safegaurd against invalid labels
if len(label.LabelType) != 0 && len(label.LabelValue) != 0 {
labelMap["tags."+label.LabelType] = label.LabelValue
}
nwrit++
buf.WriteString(`"tags.`)
buf.WriteString(value.LabelType)
buf.WriteString(`":"`)
buf.WriteString(value.LabelValue)
buf.WriteString(`"`)
}

buf.WriteString(`}},` +
j, e := json.Marshal(labelMap)
if e != nil {
log.Errorf("failed to marshal log label: %s", e)
buf.WriteString("{}")
} else {
buf.Write(j)
}

buf.WriteString(`},` +
`"logs": [`)

nwrit = 0
Expand Down
2 changes: 2 additions & 0 deletions daemon/internal/newrelic/log_events_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ var (
LogForwardingLabelsTestCase{name: "Invalid keys", labels: `[{"label_tipe":"type1","label_valyue":"value1"}]`, expected: `{}`},
LogForwardingLabelsTestCase{name: "Space in value", labels: `[{"label_type":"type1","label_value":"value 1"}]`, expected: `{"tags.type1":"value 1"}`},
LogForwardingLabelsTestCase{name: "Space in key", labels: `[{"label_type":"type 1","label_value":"value1"}]`, expected: `{"tags.type 1":"value1"}`},
LogForwardingLabelsTestCase{name: "Empty value", labels: `[{"label_type":"type1","label_value":""}]`, expected: `{}`},
LogForwardingLabelsTestCase{name: "Empty key", labels: `[{"label_type":"","label_value":"value1"}]`, expected: `{}`},
}
)

Expand Down