open-telemetry
/
opentelemetry-collector
mirror of https://github.com/open-telemetry/opentelemetry-collector.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[chore] Use NopTelemetrySettings instead of mock providers (#11539) 

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
This commit is contained in:
Bogdan Drutu 2024-10-25 14:57:43 -07:00 committed by GitHub
parent 5f498ac41b
commit 2748e5358d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 19 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry_test.go
View File

@ -14,6 +14,7 @@ import (
nooptrace "go.opentelemetry.io/otel/trace/noop"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configtelemetry"
)
@ -67,13 +68,7 @@ func TestProviders(t *testing.T) {
}
func TestNewTelemetryBuilder(t *testing.T) {
set := component.TelemetrySettings{
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
return mockMeterProvider{}
},
MeterProvider: mockMeterProvider{},
TracerProvider: mockTracerProvider{},
}
set := componenttest.NewNopTelemetrySettings()
applied := false
_, err := NewTelemetryBuilder(set, telemetryBuilderOptionFunc(func(b *TelemetryBuilder) {
applied = true

9
cmd/mdatagen/internal/templates/telemetry_test.go.tmpl
View File

@ -14,6 +14,7 @@ import (
nooptrace "go.opentelemetry.io/otel/trace/noop"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configtelemetry"
)
@ -68,13 +69,7 @@ func TestProviders(t *testing.T) {
{{- if .Telemetry.Metrics }}
func TestNewTelemetryBuilder(t *testing.T) {
set := component.TelemetrySettings{
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
return mockMeterProvider{}
},
MeterProvider: mockMeterProvider{},
TracerProvider: mockTracerProvider{},
}
set := componenttest.NewNopTelemetrySettings()
applied := false
_, err := NewTelemetryBuilder(set, telemetryBuilderOptionFunc(func(b *TelemetryBuilder) {
applied = true

9
exporter/exporterhelper/internal/metadata/generated_telemetry_test.go
View File

@ -14,6 +14,7 @@ import (
nooptrace "go.opentelemetry.io/otel/trace/noop"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configtelemetry"
)
@ -67,13 +68,7 @@ func TestProviders(t *testing.T) {
}
func TestNewTelemetryBuilder(t *testing.T) {
set := component.TelemetrySettings{
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
return mockMeterProvider{}
},
MeterProvider: mockMeterProvider{},
TracerProvider: mockTracerProvider{},
}
set := componenttest.NewNopTelemetrySettings()
applied := false
_, err := NewTelemetryBuilder(set, telemetryBuilderOptionFunc(func(b *TelemetryBuilder) {
applied = true

9
processor/batchprocessor/internal/metadata/generated_telemetry_test.go
View File

@ -14,6 +14,7 @@ import (
nooptrace "go.opentelemetry.io/otel/trace/noop"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configtelemetry"
)
@ -67,13 +68,7 @@ func TestProviders(t *testing.T) {
}
func TestNewTelemetryBuilder(t *testing.T) {
set := component.TelemetrySettings{
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
return mockMeterProvider{}
},
MeterProvider: mockMeterProvider{},
TracerProvider: mockTracerProvider{},
}
set := componenttest.NewNopTelemetrySettings()
applied := false
_, err := NewTelemetryBuilder(set, telemetryBuilderOptionFunc(func(b *TelemetryBuilder) {
applied = true

9
processor/memorylimiterprocessor/internal/metadata/generated_telemetry_test.go
View File

@ -14,6 +14,7 @@ import (
nooptrace "go.opentelemetry.io/otel/trace/noop"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configtelemetry"
)
@ -67,13 +68,7 @@ func TestProviders(t *testing.T) {
}
func TestNewTelemetryBuilder(t *testing.T) {
set := component.TelemetrySettings{
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
return mockMeterProvider{}
},
MeterProvider: mockMeterProvider{},
TracerProvider: mockTracerProvider{},
}
set := componenttest.NewNopTelemetrySettings()
applied := false
_, err := NewTelemetryBuilder(set, telemetryBuilderOptionFunc(func(b *TelemetryBuilder) {
applied = true

9
processor/processorhelper/internal/metadata/generated_telemetry_test.go
View File

@ -14,6 +14,7 @@ import (
nooptrace "go.opentelemetry.io/otel/trace/noop"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configtelemetry"
)
@ -67,13 +68,7 @@ func TestProviders(t *testing.T) {
}
func TestNewTelemetryBuilder(t *testing.T) {
set := component.TelemetrySettings{
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
return mockMeterProvider{}
},
MeterProvider: mockMeterProvider{},
TracerProvider: mockTracerProvider{},
}
set := componenttest.NewNopTelemetrySettings()
applied := false
_, err := NewTelemetryBuilder(set, telemetryBuilderOptionFunc(func(b *TelemetryBuilder) {
applied = true

9
receiver/receiverhelper/internal/metadata/generated_telemetry_test.go
View File

@ -14,6 +14,7 @@ import (
nooptrace "go.opentelemetry.io/otel/trace/noop"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configtelemetry"
)
@ -67,13 +68,7 @@ func TestProviders(t *testing.T) {
}
func TestNewTelemetryBuilder(t *testing.T) {
set := component.TelemetrySettings{
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
return mockMeterProvider{}
},
MeterProvider: mockMeterProvider{},
TracerProvider: mockTracerProvider{},
}
set := componenttest.NewNopTelemetrySettings()
applied := false
_, err := NewTelemetryBuilder(set, telemetryBuilderOptionFunc(func(b *TelemetryBuilder) {
applied = true

9
receiver/scraperhelper/internal/metadata/generated_telemetry_test.go
View File

@ -14,6 +14,7 @@ import (
nooptrace "go.opentelemetry.io/otel/trace/noop"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configtelemetry"
)
@ -67,13 +68,7 @@ func TestProviders(t *testing.T) {
}
func TestNewTelemetryBuilder(t *testing.T) {
set := component.TelemetrySettings{
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
return mockMeterProvider{}
},
MeterProvider: mockMeterProvider{},
TracerProvider: mockTracerProvider{},
}
set := componenttest.NewNopTelemetrySettings()
applied := false
_, err := NewTelemetryBuilder(set, telemetryBuilderOptionFunc(func(b *TelemetryBuilder) {
applied = true

9
service/internal/metadata/generated_telemetry_test.go
View File

@ -14,6 +14,7 @@ import (
nooptrace "go.opentelemetry.io/otel/trace/noop"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configtelemetry"
)
@ -67,13 +68,7 @@ func TestProviders(t *testing.T) {
}
func TestNewTelemetryBuilder(t *testing.T) {
set := component.TelemetrySettings{
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
return mockMeterProvider{}
},
MeterProvider: mockMeterProvider{},
TracerProvider: mockTracerProvider{},
}
set := componenttest.NewNopTelemetrySettings()
applied := false
_, err := NewTelemetryBuilder(set, telemetryBuilderOptionFunc(func(b *TelemetryBuilder) {
applied = true

2
service/service.go
View File

@ -148,7 +148,7 @@ func New(ctx context.Context, set Settings, cfg Config) (*Service, error) {
if level <= cfg.Telemetry.Metrics.Level {
return mp
}
return noop.MeterProvider{}
return noop.NewMeterProvider()
},
Logger: logger,
MeterProvider: mp,