Skip to content

Commit 9ab7c66

Browse files
authored
[chore] Some more fixes of component IDs (open-telemetry#38221)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Fixes some component IDs that did not match the component type. For components that create other components I chose to go with `<child Type>/<parent Type>/<parent Name>` <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Needed for open-telemetry/opentelemetry-collector/pull/12381
1 parent 04d3b43 commit 9ab7c66

File tree

8 files changed

+32
-12
lines changed

8 files changed

+32
-12
lines changed

exporter/elasticsearchexporter/integrationtest/datareceiver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func withBatcherEnabled(enabled bool) dataReceiverOption {
8888

8989
func (es *esDataReceiver) Start(tc consumer.Traces, mc consumer.Metrics, lc consumer.Logs) error {
9090
factory := receiver.NewFactory(
91-
component.MustNewType("mockelasticsearch"),
91+
metadata.Type,
9292
createDefaultConfig,
9393
receiver.WithLogs(createLogsReceiver, component.StabilityLevelDevelopment),
9494
receiver.WithMetrics(createMetricsReceiver, component.StabilityLevelDevelopment),

internal/otelarrow/test/e2e_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,13 @@ func basicTestConfig(t *testing.T, tp testParams, cfgF CfgFunc) (*testConsumer,
169169
}
170170

171171
receiver, err := rfact.CreateTraces(ctx, receiver.Settings{
172-
ID: component.MustNewID("otelarrowreceiver"),
172+
ID: component.NewID(rfact.Type()),
173173
TelemetrySettings: recvTset,
174174
}, receiverCfg, testCon)
175175
require.NoError(t, err)
176176

177177
exporter, err := efact.CreateTraces(ctx, exporter.Settings{
178-
ID: component.MustNewID("otelarrowexporter"),
178+
ID: component.NewID(efact.Type()),
179179
TelemetrySettings: expTset,
180180
}, exporterCfg)
181181
require.NoError(t, err)
@@ -558,7 +558,7 @@ func multiStreamEnding(t *testing.T, p testParams, testCon *testConsumer, td [][
558558

559559
// Number of export requests: exact match. This is the
560560
// exporterhelper's base span.
561-
require.Equal(t, total, expOps["exporter/otelarrowexporter/traces/Unset"])
561+
require.Equal(t, total, expOps["exporter/otelarrow/traces/Unset"])
562562

563563
// Number of export requests: exact match. This span covers
564564
// handling one request in the Arrow exporter.
@@ -585,7 +585,7 @@ func multiStreamEnding(t *testing.T, p testParams, testCon *testConsumer, td [][
585585
require.Equal(t, total, recvOps["otel_arrow_stream_recv/Unset"])
586586

587587
// This is in request context, the receiverhelper's per-request span.
588-
require.Equal(t, total, recvOps["receiver/otelarrowreceiver/TraceDataReceived/Unset"])
588+
require.Equal(t, total, recvOps["receiver/otelarrow/TraceDataReceived/Unset"])
589589

590590
// Exporter and Receiver stream span counts match:
591591
require.Equal(t, expStreamsUnset+expStreamsError, recvStreamsUnset+recvStreamsError)

pkg/stanza/adapter/storage_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func TestFailOnNonStorageExtension(t *testing.T) {
107107

108108
func createReceiver(t *testing.T, storageID component.ID) *receiver {
109109
params := rcvr.Settings{
110-
ID: component.MustNewID("testreceiver"),
110+
ID: component.MustNewID("test"),
111111
TelemetrySettings: componenttest.NewNopTelemetrySettings(),
112112
}
113113

processor/routingprocessor/factory_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ func TestProcessorDoesNotFailToBuildExportersWithMultiplePipelines(t *testing.T)
141141
},
142142
}
143143

144-
otlpTracesExporter, err := otlpExporterFactory.CreateTraces(context.Background(), exportertest.NewNopSettings(metadata.Type), otlpConfig)
144+
otlpTracesExporter, err := otlpExporterFactory.CreateTraces(context.Background(), exportertest.NewNopSettings(otlpExporterFactory.Type()), otlpConfig)
145145
require.NoError(t, err)
146146

147-
otlpMetricsExporter, err := otlpExporterFactory.CreateMetrics(context.Background(), exportertest.NewNopSettings(metadata.Type), otlpConfig)
147+
otlpMetricsExporter, err := otlpExporterFactory.CreateMetrics(context.Background(), exportertest.NewNopSettings(otlpExporterFactory.Type()), otlpConfig)
148148
require.NoError(t, err)
149149

150150
host := newMockHost(map[pipeline.Signal]map[component.ID]component.Component{

receiver/jmxreceiver/receiver.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,12 @@ func (jmx *jmxMetricReceiver) buildOTLPReceiver() (receiver.Metrics, error) {
165165
config.GRPC.NetAddr = confignet.AddrConfig{Endpoint: endpoint, Transport: confignet.TransportTypeTCP}
166166
config.HTTP = nil
167167

168-
return factory.CreateMetrics(context.Background(), jmx.params, config, jmx.nextConsumer)
168+
params := receiver.Settings{
169+
ID: component.NewIDWithName(factory.Type(), jmx.params.ID.String()),
170+
TelemetrySettings: jmx.params.TelemetrySettings,
171+
BuildInfo: jmx.params.BuildInfo,
172+
}
173+
return factory.CreateMetrics(context.Background(), params, config, jmx.nextConsumer)
169174
}
170175

171176
func (jmx *jmxMetricReceiver) buildJMXMetricGathererConfig() (string, error) {

receiver/purefareceiver/receiver.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,12 @@ func (r *purefaReceiver) Start(ctx context.Context, compHost component.Host) err
9191
promRecvCfg := fact.CreateDefaultConfig().(*prometheusreceiver.Config)
9292
promRecvCfg.PrometheusConfig = &prometheusreceiver.PromConfig{ScrapeConfigs: scrapeCfgs}
9393

94-
wrapped, err := fact.CreateMetrics(ctx, r.set, promRecvCfg, r.next)
94+
set := receiver.Settings{
95+
ID: component.NewIDWithName(fact.Type(), r.set.ID.String()),
96+
TelemetrySettings: r.set.TelemetrySettings,
97+
BuildInfo: r.set.BuildInfo,
98+
}
99+
wrapped, err := fact.CreateMetrics(ctx, set, promRecvCfg, r.next)
95100
if err != nil {
96101
return err
97102
}

receiver/purefbreceiver/metrics_receiver.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,12 @@ func (r *purefbMetricsReceiver) Start(ctx context.Context, compHost component.Ho
6767
promRecvCfg := fact.CreateDefaultConfig().(*prometheusreceiver.Config)
6868
promRecvCfg.PrometheusConfig = &prometheusreceiver.PromConfig{ScrapeConfigs: scrapeCfgs}
6969

70-
wrapped, err := fact.CreateMetrics(ctx, r.set, promRecvCfg, r.next)
70+
set := receiver.Settings{
71+
ID: component.NewIDWithName(fact.Type(), r.set.ID.String()),
72+
TelemetrySettings: r.set.TelemetrySettings,
73+
BuildInfo: r.set.BuildInfo,
74+
}
75+
wrapped, err := fact.CreateMetrics(ctx, set, promRecvCfg, r.next)
7176
if err != nil {
7277
return err
7378
}

receiver/simpleprometheusreceiver/receiver.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@ func (prw *prometheusReceiverWrapper) Start(ctx context.Context, host component.
4343
return fmt.Errorf("failed to create prometheus receiver config: %w", err)
4444
}
4545

46-
pr, err := pFactory.CreateMetrics(ctx, prw.params, pConfig, prw.consumer)
46+
params := receiver.Settings{
47+
ID: component.NewIDWithName(pFactory.Type(), prw.params.ID.String()),
48+
TelemetrySettings: prw.params.TelemetrySettings,
49+
BuildInfo: prw.params.BuildInfo,
50+
}
51+
pr, err := pFactory.CreateMetrics(ctx, params, pConfig, prw.consumer)
4752
if err != nil {
4853
return fmt.Errorf("failed to create prometheus receiver: %w", err)
4954
}

0 commit comments

Comments
 (0)