Skip to content

Commit a5024ae

Browse files
committed
Fix telemetry factory
1 parent 585bddd commit a5024ae

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

internal/collector/factories.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
"go.opentelemetry.io/collector/processor/memorylimiterprocessor"
3939
"go.opentelemetry.io/collector/receiver"
4040
"go.opentelemetry.io/collector/receiver/otlpreceiver"
41-
"go.opentelemetry.io/collector/service/telemetry"
41+
"go.opentelemetry.io/collector/service/telemetry/otelconftelemetry"
4242
)
4343

4444
// OTelComponentFactories returns all the OTel collector components supported
@@ -56,9 +56,7 @@ func OTelComponentFactories() (otelcol.Factories, error) {
5656
Receivers: receivers,
5757
Processors: processors,
5858
Exporters: exporters,
59-
Telemetry: telemetry.NewFactory(func() component.Config {
60-
return nil
61-
}),
59+
Telemetry: otelconftelemetry.NewFactory(),
6260
}
6361

6462
return factories, nil

test/mock/collector/mock-collector/main.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"go.opentelemetry.io/collector/confmap/provider/httpprovider"
1414
"go.opentelemetry.io/collector/confmap/provider/httpsprovider"
1515
"go.opentelemetry.io/collector/confmap/provider/yamlprovider"
16-
"go.opentelemetry.io/collector/service/telemetry"
16+
"go.opentelemetry.io/collector/service/telemetry/otelconftelemetry"
1717

1818
"github.com/nginx/agent/v3/test/mock/collector/mock-collector/auth"
1919
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter"
@@ -100,9 +100,7 @@ func components() (otelcol.Factories, error) {
100100

101101
factories.Connectors = make(map[component.Type]connector.Factory)
102102

103-
factories.Telemetry = telemetry.NewFactory(func() component.Config {
104-
return nil
105-
})
103+
factories.Telemetry = otelconftelemetry.NewFactory()
106104

107105
return factories, nil
108106
}

0 commit comments

Comments
 (0)