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

Added OTEL MeterProvider in Telemetery Settings #6144

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Added OTEL MeterProvider in Telemetery Settings #6144

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9692693
added meter provider in telemetery settings
shinigami-777 Oct 31, 2024
1246cd3
Merge branch 'jaegertracing:main' into add-otel-meter-provider
shinigami-777 Nov 2, 2024
53dbac9
added LeveledMeterProvider
shinigami-777 Nov 2, 2024
a431fa7
Merge branch 'jaegertracing:main' into add-otel-meter-provider
shinigami-777 Nov 7, 2024
332c21f
used Leveledmeterprovider setting in query server
shinigami-777 Nov 7, 2024
3c9e58d
error resolved
shinigami-777 Nov 7, 2024
c9a75e7
propagated leveledmeterprovider setting
shinigami-777 Nov 8, 2024
9bc1a11
Merge branch 'main' into add-otel-meter-provider
yurishkuro Nov 10, 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
3 changes: 2 additions & 1 deletion cmd/jaeger/internal/extension/jaegerquery/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ func (s *server) Start(ctx context.Context, host component.Host) error {
ReportStatus: func(event *componentstatus.Event) {
componentstatus.ReportStatus(host, event)
},
Host: host,
Host: host,
LeveledMeterProvider: s.telset.LeveledMeterProvider,
}

s.server, err = queryApp.NewServer(
Expand Down
10 changes: 6 additions & 4 deletions cmd/query/app/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"go.opentelemetry.io/collector/config/confighttp"
"go.opentelemetry.io/collector/config/confignet"
"go.opentelemetry.io/collector/config/configtls"
noopmetric "go.opentelemetry.io/otel/metric/noop"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
"go.uber.org/zap"
Expand Down Expand Up @@ -49,10 +50,11 @@ var testCertKeyLocation = "../../../pkg/config/tlscfg/testdata"

func initTelSet(logger *zap.Logger, tracerProvider *jtracer.JTracer, hc *healthcheck.HealthCheck) telemetery.Setting {
return telemetery.Setting{
Logger: logger,
TracerProvider: tracerProvider.OTEL,
ReportStatus: telemetery.HCAdapter(hc),
Host: componenttest.NewNopHost(),
Logger: logger,
TracerProvider: tracerProvider.OTEL,
ReportStatus: telemetery.HCAdapter(hc),
Host: componenttest.NewNopHost(),
LeveledMeterProvider: noopmetric.NewMeterProvider(),
}
}

Expand Down
13 changes: 8 additions & 5 deletions pkg/telemetery/settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ package telemetery
import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componentstatus"
"go.opentelemetry.io/collector/config/configtelemetry"
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/trace"
"go.uber.org/zap"

Expand All @@ -14,11 +16,12 @@ import (
)

type Setting struct {
Logger *zap.Logger
TracerProvider trace.TracerProvider
Metrics metrics.Factory
ReportStatus func(*componentstatus.Event)
Host component.Host
Logger *zap.Logger
TracerProvider trace.TracerProvider
Metrics metrics.Factory
ReportStatus func(*componentstatus.Event)
Host component.Host
LeveledMeterProvider func(_ configtelemetry.Level) metric.MeterProvider
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that we've got this field available to us - we also want to be able to use it. For example, in the query server we currently hardcode the meter provider but now we can pass it from telset.

Copy link
Author

@shinigami-777 shinigami-777 Nov 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Passed it in the query server.

}

func HCAdapter(hc *healthcheck.HealthCheck) func(*componentstatus.Event) {
Expand Down