Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func withBatcherEnabled(enabled bool) dataReceiverOption {

func (es *esDataReceiver) Start(tc consumer.Traces, mc consumer.Metrics, lc consumer.Logs) error {
factory := receiver.NewFactory(
component.MustNewType("mockelasticsearch"),
metadata.Type,
createDefaultConfig,
receiver.WithLogs(createLogsReceiver, component.StabilityLevelDevelopment),
receiver.WithMetrics(createMetricsReceiver, component.StabilityLevelDevelopment),
Expand Down
8 changes: 4 additions & 4 deletions internal/otelarrow/test/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,13 +169,13 @@ func basicTestConfig(t *testing.T, tp testParams, cfgF CfgFunc) (*testConsumer,
}

receiver, err := rfact.CreateTraces(ctx, receiver.Settings{
ID: component.MustNewID("otelarrowreceiver"),
ID: component.NewID(rfact.Type()),
TelemetrySettings: recvTset,
}, receiverCfg, testCon)
require.NoError(t, err)

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

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

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

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

// Exporter and Receiver stream span counts match:
require.Equal(t, expStreamsUnset+expStreamsError, recvStreamsUnset+recvStreamsError)
Expand Down
2 changes: 1 addition & 1 deletion pkg/stanza/adapter/storage_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func TestFailOnNonStorageExtension(t *testing.T) {

func createReceiver(t *testing.T, storageID component.ID) *receiver {
params := rcvr.Settings{
ID: component.MustNewID("testreceiver"),
ID: component.MustNewID("test"),
TelemetrySettings: componenttest.NewNopTelemetrySettings(),
}

Expand Down
4 changes: 2 additions & 2 deletions processor/routingprocessor/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ func TestProcessorDoesNotFailToBuildExportersWithMultiplePipelines(t *testing.T)
},
}

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

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

host := newMockHost(map[pipeline.Signal]map[component.ID]component.Component{
Expand Down
7 changes: 6 additions & 1 deletion receiver/jmxreceiver/receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,12 @@ func (jmx *jmxMetricReceiver) buildOTLPReceiver() (receiver.Metrics, error) {
config.GRPC.NetAddr = confignet.AddrConfig{Endpoint: endpoint, Transport: confignet.TransportTypeTCP}
config.HTTP = nil

return factory.CreateMetrics(context.Background(), jmx.params, config, jmx.nextConsumer)
params := receiver.Settings{
ID: component.NewIDWithName(factory.Type(), jmx.params.ID.String()),
TelemetrySettings: jmx.params.TelemetrySettings,
BuildInfo: jmx.params.BuildInfo,
}
return factory.CreateMetrics(context.Background(), params, config, jmx.nextConsumer)
}

func (jmx *jmxMetricReceiver) buildJMXMetricGathererConfig() (string, error) {
Expand Down
7 changes: 6 additions & 1 deletion receiver/purefareceiver/receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,12 @@ func (r *purefaReceiver) Start(ctx context.Context, compHost component.Host) err
promRecvCfg := fact.CreateDefaultConfig().(*prometheusreceiver.Config)
promRecvCfg.PrometheusConfig = &prometheusreceiver.PromConfig{ScrapeConfigs: scrapeCfgs}

wrapped, err := fact.CreateMetrics(ctx, r.set, promRecvCfg, r.next)
set := receiver.Settings{
ID: component.NewIDWithName(fact.Type(), r.set.ID.String()),
TelemetrySettings: r.set.TelemetrySettings,
BuildInfo: r.set.BuildInfo,
}
wrapped, err := fact.CreateMetrics(ctx, set, promRecvCfg, r.next)
if err != nil {
return err
}
Expand Down
7 changes: 6 additions & 1 deletion receiver/purefbreceiver/metrics_receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,12 @@ func (r *purefbMetricsReceiver) Start(ctx context.Context, compHost component.Ho
promRecvCfg := fact.CreateDefaultConfig().(*prometheusreceiver.Config)
promRecvCfg.PrometheusConfig = &prometheusreceiver.PromConfig{ScrapeConfigs: scrapeCfgs}

wrapped, err := fact.CreateMetrics(ctx, r.set, promRecvCfg, r.next)
set := receiver.Settings{
ID: component.NewIDWithName(fact.Type(), r.set.ID.String()),
TelemetrySettings: r.set.TelemetrySettings,
BuildInfo: r.set.BuildInfo,
}
wrapped, err := fact.CreateMetrics(ctx, set, promRecvCfg, r.next)
if err != nil {
return err
}
Expand Down
7 changes: 6 additions & 1 deletion receiver/simpleprometheusreceiver/receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,12 @@ func (prw *prometheusReceiverWrapper) Start(ctx context.Context, host component.
return fmt.Errorf("failed to create prometheus receiver config: %w", err)
}

pr, err := pFactory.CreateMetrics(ctx, prw.params, pConfig, prw.consumer)
params := receiver.Settings{
ID: component.NewIDWithName(pFactory.Type(), prw.params.ID.String()),
TelemetrySettings: prw.params.TelemetrySettings,
BuildInfo: prw.params.BuildInfo,
}
pr, err := pFactory.CreateMetrics(ctx, params, pConfig, prw.consumer)
if err != nil {
return fmt.Errorf("failed to create prometheus receiver: %w", err)
}
Expand Down