hanzoai/krakend-otel
2
0
Fork 0
mirror of https://github.com/hanzoai/krakend-otel.git synced 2026-09-30 22:49:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30 from krakend/fix_backend_level_options

Browse Source 
fix: panic when missing metrics or traces entries
This commit is contained in:
David Hontecillas
2024-07-02 08:22:32 +02:00
committed by GitHub
parent bcfc86250a 05a9e49f3d
commit 67e299d846
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lura/proxy.go
+17 -9
View File
@@ -154,7 +154,9 @@ func BackendFactory(bf proxy.BackendFactory) proxy.BackendFactory {
return next
}
backendOpts := otelCfg.BackendOpts(cfg)
if backendOpts.Metrics.DisableStage && backendOpts.Traces.DisableStage {
metricsDisabled := backendOpts != nil && backendOpts.Metrics != nil && backendOpts.Metrics.DisableStage
tracesDisabled := backendOpts != nil && backendOpts.Traces != nil && backendOpts.Traces.DisableStage
if metricsDisabled && tracesDisabled {
return next
}
@@ -171,19 +173,25 @@ func BackendFactory(bf proxy.BackendFactory) proxy.BackendFactory {
// Add configured static attributes
metricsAttrs := attrs
tracesAttrs := attrs
for _, kv := range backendOpts.Metrics.StaticAttributes {
if len(kv.Key) > 0 && len(kv.Value) > 0 {
metricsAttrs = append(metricsAttrs, attribute.String(kv.Key, kv.Value))
if backendOpts.Metrics != nil {
for _, kv := range backendOpts.Metrics.StaticAttributes {
if len(kv.Key) > 0 && len(kv.Value) > 0 {
metricsAttrs = append(metricsAttrs, attribute.String(kv.Key, kv.Value))
}
}
}
for _, kv := range backendOpts.Traces.StaticAttributes {
if len(kv.Key) > 0 && len(kv.Value) > 0 {
tracesAttrs = append(tracesAttrs, attribute.String(kv.Key, kv.Value))
reportHeaders := false
if backendOpts.Traces != nil {
reportHeaders = backendOpts.Traces.ReportHeaders
for _, kv := range backendOpts.Traces.StaticAttributes {
if len(kv.Key) > 0 && len(kv.Value) > 0 {
tracesAttrs = append(tracesAttrs, attribute.String(kv.Key, kv.Value))
}
}
}
return middleware(gs, !backendOpts.Metrics.DisableStage, !backendOpts.Traces.DisableStage,
"backend", urlPattern, metricsAttrs, tracesAttrs, backendOpts.Traces.ReportHeaders)(next)
return middleware(gs, !metricsDisabled, !tracesDisabled,
"backend", urlPattern, metricsAttrs, tracesAttrs, reportHeaders)(next)
}
}