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

[service] add internal factory method for meter provider #10415

Merged
merged 4 commits into from
Jul 5, 2024
Merged

[service] add internal factory method for meter provider #10415

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0e100d
[service] add internal factory method for meter provider
codeboten Jun 17, 2024
5a0897c
Apply suggestions from code review
codeboten Jul 5, 2024
ce49197
Merge branch 'main' into codeboten/add-meterprovider-factory
codeboten Jul 5, 2024
db09796
Apply suggestions from code review
codeboten Jul 5, 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
21 changes: 20 additions & 1 deletion service/telemetry/internal/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import (
"context"

"go.opentelemetry.io/otel/metric"
metricnoop "go.opentelemetry.io/otel/metric/noop"
"go.opentelemetry.io/otel/trace"
tracenoop "go.opentelemetry.io/otel/trace/noop"
"go.uber.org/zap"
Expand Down Expand Up @@ -34,7 +36,8 @@
// CreateTracerProvider creates a TracerProvider.
CreateTracerProvider(ctx context.Context, set CreateSettings, cfg component.Config) (trace.TracerProvider, error)

// TODO: Add CreateMeterProvider.
// CreateMeterProvider creates a MeterProvider.
CreateMeterProvider(ctx context.Context, set CreateSettings, cfg component.Config) (metric.MeterProvider, error)
codeboten marked this conversation as resolved.
Show resolved Hide resolved

// unexportedFactoryFunc is used to prevent external implementations of Factory.
unexportedFactoryFunc()
Expand Down Expand Up @@ -62,6 +65,7 @@
createDefaultConfig component.CreateDefaultConfigFunc
CreateLoggerFunc
CreateTracerProviderFunc
CreateMeterProviderFunc
}

func (f *factory) CreateDefaultConfig() component.Config {
Expand Down Expand Up @@ -102,6 +106,21 @@
return f.CreateTracerProviderFunc(ctx, set, cfg)
}

type CreateMeterProviderFunc func(context.Context, CreateSettings, component.Config) (metric.MeterProvider, error)
codeboten marked this conversation as resolved.
Show resolved Hide resolved
codeboten marked this conversation as resolved.
Show resolved Hide resolved

func WithMeterProvier(createMeterProvider CreateMeterProviderFunc) FactoryOption {
codeboten marked this conversation as resolved.
Show resolved Hide resolved
return factoryOptionFunc(func(o *factory) {
o.CreateMeterProviderFunc = createMeterProvider
})

Check warning on line 114 in service/telemetry/internal/factory.go

View check run for this annotation

Codecov / codecov/patch

service/telemetry/internal/factory.go#L111-L114 

Added lines #L111 - L114 were not covered by tests
}

func (f *factory) CreateMeterProvider(ctx context.Context, set CreateSettings, cfg component.Config) (metric.MeterProvider, error) {
codeboten marked this conversation as resolved.
Show resolved Hide resolved
if f.CreateMeterProviderFunc == nil {
return metricnoop.NewMeterProvider(), nil

Check warning on line 119 in service/telemetry/internal/factory.go

View check run for this annotation

Codecov / codecov/patch

service/telemetry/internal/factory.go#L117-L119 

Added lines #L117 - L119 were not covered by tests
}
return f.CreateMeterProviderFunc(ctx, set, cfg)

Check warning on line 121 in service/telemetry/internal/factory.go

View check run for this annotation

Codecov / codecov/patch

service/telemetry/internal/factory.go#L121 

Added line #L121 was not covered by tests
}

func (f *factory) unexportedFactoryFunc() {}

// NewFactory returns a new Factory.
Expand Down
Loading