Skip to content
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

Jump to bottom

[v2] Use "jaeger" namespace for metrics from storage extension #5798

Merged
merged 8 commits into from
Aug 1, 2024
Merged

[v2] Use "jaeger" namespace for metrics from storage extension #5798

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2b91c96
Added Jaeger as Base Factory
Wise-Wizard Jul 29, 2024
e53e74a
Add Address field
Wise-Wizard Jul 29, 2024
1c080d1
Strip otelcol prefix while comparing metrics
Wise-Wizard Jul 30, 2024
ce0c039
Merge branch 'main' into V2/Metrics_Parity
Wise-Wizard Jul 30, 2024
3f5c5ce
Merge branch 'main' into V2/Metrics_Parity
Wise-Wizard Jul 30, 2024
5051a59
Merge branch 'main' into V2/Metrics_Parity
Wise-Wizard Aug 1, 2024
86748d7
Merge branch 'main' into V2/Metrics_Parity
Wise-Wizard Aug 1, 2024
04ea6ce
Add Jaeger prefix to Storage metrics
Wise-Wizard Aug 1, 2024
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
4 changes: 3 additions & 1 deletion cmd/jaeger/internal/extension/jaegerstorage/extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage/factoryadapter"
"github.com/jaegertracing/jaeger/internal/metrics/otelmetrics"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/plugin/metrics/prometheus"
"github.com/jaegertracing/jaeger/plugin/storage/badger"
"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
Expand Down Expand Up @@ -112,7 +113,8 @@
}

func (s *storageExt) Start(_ context.Context, _ component.Host) error {
mf := otelmetrics.NewFactory(s.telset.MeterProvider)
baseFactory := otelmetrics.NewFactory(s.telset.MeterProvider)
mf := baseFactory.Namespace(metrics.NSOptions{Name: "jaeger"})

Check warning on line 117 in cmd/jaeger/internal/extension/jaegerstorage/extension.go

View check run for this annotation

Codecov / codecov/patch

cmd/jaeger/internal/extension/jaegerstorage/extension.go#L116-L117 

Added lines #L116 - L117 were not covered by tests
for storageName, cfg := range s.config.Backends {
s.telset.Logger.Sugar().Infof("Initializing storage '%s'", storageName)
var factory storage.Factory
Expand Down
Loading