mirror of
https://github.com/prometheus/prometheus
synced 2026-05-01 07:30:30 +08:00
Bump otlptranslator to latest SHA
Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>
This commit is contained in:
@@ -155,11 +155,9 @@ func createAttributes(resource pcommon.Resource, attributes pcommon.Map, scope s
|
||||
|
||||
// map ensures no duplicate label names.
|
||||
l := make(map[string]string, maxLabelCount)
|
||||
labelNamer := otlptranslator.LabelNamer{UTF8Allowed: settings.AllowUTF8}
|
||||
for _, label := range labels {
|
||||
finalKey := label.Name
|
||||
if !settings.AllowUTF8 {
|
||||
finalKey = otlptranslator.NormalizeLabel(finalKey)
|
||||
}
|
||||
finalKey := labelNamer.Build(label.Name)
|
||||
if existingValue, alreadyExists := l[finalKey]; alreadyExists {
|
||||
l[finalKey] = existingValue + ";" + label.Value
|
||||
} else {
|
||||
@@ -168,10 +166,7 @@ func createAttributes(resource pcommon.Resource, attributes pcommon.Map, scope s
|
||||
}
|
||||
|
||||
for _, lbl := range promotedAttrs {
|
||||
normalized := lbl.Name
|
||||
if !settings.AllowUTF8 {
|
||||
normalized = otlptranslator.NormalizeLabel(normalized)
|
||||
}
|
||||
normalized := labelNamer.Build(lbl.Name)
|
||||
if _, exists := l[normalized]; !exists {
|
||||
l[normalized] = lbl.Value
|
||||
}
|
||||
@@ -182,9 +177,7 @@ func createAttributes(resource pcommon.Resource, attributes pcommon.Map, scope s
|
||||
l["otel_scope_schema_url"] = scope.schemaURL
|
||||
scope.attributes.Range(func(k string, v pcommon.Value) bool {
|
||||
name := "otel_scope_" + k
|
||||
if !settings.AllowUTF8 {
|
||||
name = otlptranslator.NormalizeLabel(name)
|
||||
}
|
||||
name = labelNamer.Build(name)
|
||||
l[name] = v.AsString()
|
||||
return true
|
||||
})
|
||||
@@ -222,8 +215,8 @@ func createAttributes(resource pcommon.Resource, attributes pcommon.Map, scope s
|
||||
log.Println("label " + name + " is overwritten. Check if Prometheus reserved labels are used.")
|
||||
}
|
||||
// internal labels should be maintained.
|
||||
if !settings.AllowUTF8 && (len(name) <= 4 || name[:2] != "__" || name[len(name)-2:] != "__") {
|
||||
name = otlptranslator.NormalizeLabel(name)
|
||||
if len(name) <= 4 || name[:2] != "__" || name[len(name)-2:] != "__" {
|
||||
name = labelNamer.Build(name)
|
||||
}
|
||||
l[name] = extras[i+1]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user