Skip to content

Allow passing trace/metric SDK options to componenttest.Telemetry #12166

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.

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

Merged
merged 1 commit into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 25 additions & 0 deletions .chloggen/main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: cmd/mdatagen

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Allow passing OTel Metric SDK options to the generated `SetupTelemetry` function.

# One or more tracking issues or pull requests related to the change
issues: [12166]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [api]

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions cmd/mdatagen/internal/templates/telemetrytest.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ type Telemetry struct {
componenttest.Telemetry
}

func SetupTelemetry() Telemetry {
return Telemetry{ Telemetry: componenttest.NewTelemetry() }
func SetupTelemetry(opts ...componenttest.TelemetryOption) Telemetry {
return Telemetry{ Telemetry: componenttest.NewTelemetry(opts...) }
}

{{- if or isConnector isExporter isExtension isProcessor isReceiver isScraper }}
Expand Down
9 changes: 7 additions & 2 deletions component/componenttest/obsreporttest.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@

import (
"go.opentelemetry.io/otel/attribute"
sdkmetric "go.opentelemetry.io/otel/sdk/metric"
"go.opentelemetry.io/otel/sdk/resource"
sdktrace "go.opentelemetry.io/otel/sdk/trace"

"go.opentelemetry.io/collector/component"
)
Expand Down Expand Up @@ -90,7 +93,9 @@
// The caller must defer a call to `Shutdown` on the returned TestTelemetry.
func SetupTelemetry(id component.ID) (TestTelemetry, error) {
return TestTelemetry{
Telemetry: NewTelemetry(),
id: id,
Telemetry: NewTelemetry(
WithMetricOptions(sdkmetric.WithResource(resource.Empty())),
WithTraceOptions(sdktrace.WithResource(resource.Empty()))),
id: id,

Check warning on line 99 in component/componenttest/obsreporttest.go

View check run for this annotation

Codecov / codecov/patch

component/componenttest/obsreporttest.go#L96-L99

Added lines #L96 - L99 were not covered by tests
}, nil
}
39 changes: 35 additions & 4 deletions component/componenttest/telemetry.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,60 @@
"errors"

sdkmetric "go.opentelemetry.io/otel/sdk/metric"
"go.opentelemetry.io/otel/sdk/resource"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"go.opentelemetry.io/otel/sdk/trace/tracetest"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configtelemetry"
)

type TelemetryOption interface {
apply(*telemetryOption)
}

type telemetryOption struct {
metricOpts []sdkmetric.Option
traceOpts []sdktrace.TracerProviderOption
}

type telemetryOptionFunc func(*telemetryOption)

func (f telemetryOptionFunc) apply(o *telemetryOption) { f(o) }

Check warning on line 29 in component/componenttest/telemetry.go

View check run for this annotation

Codecov / codecov/patch

component/componenttest/telemetry.go#L29

Added line #L29 was not covered by tests

func WithMetricOptions(opts ...sdkmetric.Option) TelemetryOption {
return telemetryOptionFunc(func(to *telemetryOption) {
to.metricOpts = append(to.metricOpts, opts...)
})

Check warning on line 34 in component/componenttest/telemetry.go

View check run for this annotation

Codecov / codecov/patch

component/componenttest/telemetry.go#L31-L34

Added lines #L31 - L34 were not covered by tests
}

func WithTraceOptions(opts ...sdktrace.TracerProviderOption) TelemetryOption {
return telemetryOptionFunc(func(to *telemetryOption) {
to.traceOpts = append(to.traceOpts, opts...)
})

Check warning on line 40 in component/componenttest/telemetry.go

View check run for this annotation

Codecov / codecov/patch

component/componenttest/telemetry.go#L37-L40

Added lines #L37 - L40 were not covered by tests
}

type Telemetry struct {
Reader *sdkmetric.ManualReader
SpanRecorder *tracetest.SpanRecorder
meterProvider *sdkmetric.MeterProvider
traceProvider *sdktrace.TracerProvider
}

func NewTelemetry() Telemetry {
func NewTelemetry(opts ...TelemetryOption) Telemetry {
reader := sdkmetric.NewManualReader()
spanRecorder := new(tracetest.SpanRecorder)
tOpts := telemetryOption{
metricOpts: []sdkmetric.Option{sdkmetric.WithReader(reader)},
traceOpts: []sdktrace.TracerProviderOption{sdktrace.WithSpanProcessor(spanRecorder)},
}
for _, opt := range opts {
opt.apply(&tOpts)
}

Check warning on line 59 in component/componenttest/telemetry.go

View check run for this annotation

Codecov / codecov/patch

component/componenttest/telemetry.go#L58-L59

Added lines #L58 - L59 were not covered by tests
return Telemetry{
Reader: reader,
SpanRecorder: spanRecorder,
meterProvider: sdkmetric.NewMeterProvider(sdkmetric.WithResource(resource.Empty()), sdkmetric.WithReader(reader)),
traceProvider: sdktrace.NewTracerProvider(sdktrace.WithResource(resource.Empty()), sdktrace.WithSpanProcessor(spanRecorder)),
meterProvider: sdkmetric.NewMeterProvider(tOpts.metricOpts...),
traceProvider: sdktrace.NewTracerProvider(tOpts.traceOpts...),
}
}

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions service/internal/metadatatest/generated_telemetrytest.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading