Skip to content

feat: sanitize structured metadata during ingestion in the distributor #15141

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 7 commits into from
Nov 29, 2024
Merged

feat: sanitize structured metadata during ingestion in the distributor #15141

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
28e31e9
sanitize structured metadata during ingestion in the distributor
cstyan Nov 27, 2024
2bc97f0
add a test for ensuring the labels have been sanitized
cstyan Nov 27, 2024
20fccbd
check if SM is valid in the correct place
cstyan Nov 28, 2024
ea913f4
create write request in each iteration of the benchmark test, otherwise
cstyan Nov 28, 2024
c27b8e3
remove the if check, doesn't impact performance at all
cstyan Nov 28, 2024
d002e93
Merge branch 'main' into callum-distributor-sm-sanitize
cstyan Nov 28, 2024
ba1a96c
update the push benchmark to test structured metadata cases
cstyan Nov 28, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
check if SM is valid in the correct place 
Signed-off-by: Callum Styan <callumstyan@gmail.com>
  • Loading branch information
@cstyan
cstyan committed Nov 28, 2024
commit 20fccbd7f33f2b325f0d9b2e1707b8920eee298f
6 changes: 4 additions & 2 deletions pkg/distributor/distributor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,14 +528,16 @@ func (d *Distributor) Push(ctx context.Context, req *logproto.PushRequest) (*log
}

structuredMetadata := logproto.FromLabelAdaptersToLabels(entry.StructuredMetadata)
if shouldDiscoverLevels {
logLevel, ok := levelDetector.extractLogLevel(lbs, structuredMetadata, entry)
if len(entry.StructuredMetadata) > 0 {
for i := range entry.StructuredMetadata {
structuredMetadata[i].Name = otlptranslate.NormalizeLabel(structuredMetadata[i].Name)
if strings.ContainsRune(structuredMetadata[i].Value, utf8.RuneError) {
structuredMetadata[i].Value = strings.Map(removeInvalidUtf, structuredMetadata[i].Value)
}
}
}
if shouldDiscoverLevels {
logLevel, ok := levelDetector.extractLogLevel(lbs, structuredMetadata, entry)
if ok {
entry.StructuredMetadata = append(entry.StructuredMetadata, logLevel)
}
Expand Down