Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@mx-psi
mx-psi committed Feb 14, 2025
1 parent f75a406 commit 480e080
Show file tree
Hide file tree
Showing 10 changed files with 77 additions and 66 deletions.
20 changes: 10 additions & 10 deletions connector/connector_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

var (
testType = component.MustNewType("test")
testID = component.MustNewIDWithName("type", "name")
testID = component.MustNewIDWithName("test", "name")
)

func TestNewFactoryNoOptions(t *testing.T) {
Expand Down Expand Up @@ -147,33 +147,33 @@ func TestNewFactoryWithAllTypes(t *testing.T) {
assert.EqualValues(t, &defaultCfg, factory.CreateDefaultConfig())

assert.Equal(t, component.StabilityLevelAlpha, factory.TracesToTracesStability())
_, err := factory.CreateTracesToTraces(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop())
_, err := factory.CreateTracesToTraces(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop())
require.NoError(t, err)
assert.Equal(t, component.StabilityLevelDevelopment, factory.TracesToMetricsStability())
_, err = factory.CreateTracesToMetrics(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop())
_, err = factory.CreateTracesToMetrics(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop())
require.NoError(t, err)
assert.Equal(t, component.StabilityLevelAlpha, factory.TracesToLogsStability())
_, err = factory.CreateTracesToLogs(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop())
_, err = factory.CreateTracesToLogs(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop())
require.NoError(t, err)

assert.Equal(t, component.StabilityLevelBeta, factory.MetricsToTracesStability())
_, err = factory.CreateMetricsToTraces(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop())
_, err = factory.CreateMetricsToTraces(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop())
require.NoError(t, err)
assert.Equal(t, component.StabilityLevelBeta, factory.MetricsToMetricsStability())
_, err = factory.CreateMetricsToMetrics(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop())
_, err = factory.CreateMetricsToMetrics(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop())
require.NoError(t, err)
assert.Equal(t, component.StabilityLevelStable, factory.MetricsToLogsStability())
_, err = factory.CreateMetricsToLogs(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop())
_, err = factory.CreateMetricsToLogs(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop())
require.NoError(t, err)

assert.Equal(t, component.StabilityLevelDeprecated, factory.LogsToTracesStability())
_, err = factory.CreateLogsToTraces(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop())
_, err = factory.CreateLogsToTraces(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop())
require.NoError(t, err)
assert.Equal(t, component.StabilityLevelUnmaintained, factory.LogsToMetricsStability())
_, err = factory.CreateLogsToMetrics(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop())
_, err = factory.CreateLogsToMetrics(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop())
require.NoError(t, err)
assert.Equal(t, component.StabilityLevelUnmaintained, factory.LogsToLogsStability())
_, err = factory.CreateLogsToLogs(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop())
_, err = factory.CreateLogsToLogs(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop())
assert.NoError(t, err)
}

Expand Down
19 changes: 11 additions & 8 deletions exporter/exporter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,27 @@ import (
"go.opentelemetry.io/collector/pipeline"
)

var (
testType = component.MustNewType("test")
testID = component.NewID(testType)
)

func TestNewFactory(t *testing.T) {
testType := component.MustNewType("test")
defaultCfg := struct{}{}
f := NewFactory(
testType,
func() component.Config { return &defaultCfg })
assert.EqualValues(t, testType, f.Type())
assert.EqualValues(t, &defaultCfg, f.CreateDefaultConfig())
_, err := f.CreateTraces(context.Background(), Settings{}, &defaultCfg)
_, err := f.CreateTraces(context.Background(), Settings{ID: testID}, &defaultCfg)
require.ErrorIs(t, err, pipeline.ErrSignalNotSupported)
_, err = f.CreateMetrics(context.Background(), Settings{}, &defaultCfg)
_, err = f.CreateMetrics(context.Background(), Settings{ID: testID}, &defaultCfg)
require.ErrorIs(t, err, pipeline.ErrSignalNotSupported)
_, err = f.CreateLogs(context.Background(), Settings{}, &defaultCfg)
_, err = f.CreateLogs(context.Background(), Settings{ID: testID}, &defaultCfg)
require.ErrorIs(t, err, pipeline.ErrSignalNotSupported)
}

func TestNewFactoryWithOptions(t *testing.T) {
testType := component.MustNewType("test")
defaultCfg := struct{}{}
f := NewFactory(
testType,
Expand All @@ -44,15 +47,15 @@ func TestNewFactoryWithOptions(t *testing.T) {
assert.EqualValues(t, &defaultCfg, f.CreateDefaultConfig())

assert.Equal(t, component.StabilityLevelDevelopment, f.TracesStability())
_, err := f.CreateTraces(context.Background(), Settings{}, &defaultCfg)
_, err := f.CreateTraces(context.Background(), Settings{ID: testID}, &defaultCfg)
require.NoError(t, err)

assert.Equal(t, component.StabilityLevelAlpha, f.MetricsStability())
_, err = f.CreateMetrics(context.Background(), Settings{}, &defaultCfg)
_, err = f.CreateMetrics(context.Background(), Settings{ID: testID}, &defaultCfg)
require.NoError(t, err)

assert.Equal(t, component.StabilityLevelDeprecated, f.LogsStability())
_, err = f.CreateLogs(context.Background(), Settings{}, &defaultCfg)
_, err = f.CreateLogs(context.Background(), Settings{ID: testID}, &defaultCfg)
assert.NoError(t, err)
}

Expand Down
4 changes: 2 additions & 2 deletions exporter/exportertest/contract_checker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func checkTraces(t *testing.T, params CheckConsumeContractParams, mockReceiver c
ctx := context.Background()
var exp exporter.Traces
var err error
exp, err = params.ExporterFactory.CreateTraces(ctx, NewNopSettingsWithType(NopType), params.ExporterConfig)
exp, err = params.ExporterFactory.CreateTraces(ctx, NewNopSettingsWithType(params.ExporterFactory.Type()), params.ExporterConfig)
require.NoError(t, err)
require.NotNil(t, exp)

Expand Down Expand Up @@ -191,7 +191,7 @@ func checkLogs(t *testing.T, params CheckConsumeContractParams, mockReceiver com
ctx := context.Background()
var exp exporter.Logs
var err error
exp, err = params.ExporterFactory.CreateLogs(ctx, NewNopSettingsWithType(NopType), params.ExporterConfig)
exp, err = params.ExporterFactory.CreateLogs(ctx, NewNopSettingsWithType(params.ExporterFactory.Type()), params.ExporterConfig)
require.NoError(t, err)
require.NotNil(t, exp)

Expand Down
35 changes: 18 additions & 17 deletions processor/batchprocessor/batch_processor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"
"go.opentelemetry.io/collector/pdata/testdata"
"go.opentelemetry.io/collector/processor/batchprocessor/internal/metadata"
"go.opentelemetry.io/collector/processor/batchprocessor/internal/metadatatest"
"go.opentelemetry.io/collector/processor/processortest"
)
Expand All @@ -35,7 +36,7 @@ func TestProcessorShutdown(t *testing.T) {
factory := NewFactory()

ctx := context.Background()
processorCreationSet := processortest.NewNopSettingsWithType(processortest.NopType)
processorCreationSet := processortest.NewNopSettingsWithType(metadata.Type)

for i := 0; i < 5; i++ {
require.NotPanics(t, func() {
Expand All @@ -62,7 +63,7 @@ func TestProcessorLifecycle(t *testing.T) {
factory := NewFactory()

ctx := context.Background()
processorCreationSet := processortest.NewNopSettingsWithType(processortest.NopType)
processorCreationSet := processortest.NewNopSettingsWithType(metadata.Type)

for i := 0; i < 5; i++ {
tProc, err := factory.CreateTraces(ctx, processorCreationSet, factory.CreateDefaultConfig(), consumertest.NewNop())
Expand All @@ -86,7 +87,7 @@ func TestBatchProcessorSpansDelivered(t *testing.T) {
sink := new(consumertest.TracesSink)
cfg := createDefaultConfig().(*Config)
cfg.SendBatchSize = 128
traces, err := NewFactory().CreateTraces(context.Background(), processortest.NewNopSettingsWithType(processortest.NopType), cfg, sink)
traces, err := NewFactory().CreateTraces(context.Background(), processortest.NewNopSettingsWithType(metadata.Type), cfg, sink)
require.NoError(t, err)
require.NoError(t, traces.Start(context.Background(), componenttest.NewNopHost()))

Expand Down Expand Up @@ -127,7 +128,7 @@ func TestBatchProcessorSpansDeliveredEnforceBatchSize(t *testing.T) {
cfg := createDefaultConfig().(*Config)
cfg.SendBatchSize = 128
cfg.SendBatchMaxSize = 130
traces, err := NewFactory().CreateTraces(context.Background(), processortest.NewNopSettingsWithType(processortest.NopType), cfg, sink)
traces, err := NewFactory().CreateTraces(context.Background(), processortest.NewNopSettingsWithType(metadata.Type), cfg, sink)
require.NoError(t, err)
require.NoError(t, traces.Start(context.Background(), componenttest.NewNopHost()))

Expand Down Expand Up @@ -368,7 +369,7 @@ func TestBatchProcessorSentByTimeout(t *testing.T) {
spansPerRequest := 10
start := time.Now()

traces, err := NewFactory().CreateTraces(context.Background(), processortest.NewNopSettingsWithType(processortest.NopType), cfg, sink)
traces, err := NewFactory().CreateTraces(context.Background(), processortest.NewNopSettingsWithType(metadata.Type), cfg, sink)
require.NoError(t, err)
require.NoError(t, traces.Start(context.Background(), componenttest.NewNopHost()))

Expand Down Expand Up @@ -413,7 +414,7 @@ func TestBatchProcessorTraceSendWhenClosing(t *testing.T) {
}
sink := new(consumertest.TracesSink)

traces, err := NewFactory().CreateTraces(context.Background(), processortest.NewNopSettingsWithType(processortest.NopType), cfg, sink)
traces, err := NewFactory().CreateTraces(context.Background(), processortest.NewNopSettingsWithType(metadata.Type), cfg, sink)
require.NoError(t, err)
require.NoError(t, traces.Start(context.Background(), componenttest.NewNopHost()))

Expand Down Expand Up @@ -442,7 +443,7 @@ func TestBatchMetricProcessor_ReceivingData(t *testing.T) {
metricsPerRequest := 5
sink := new(consumertest.MetricsSink)

metrics, err := NewFactory().CreateMetrics(context.Background(), processortest.NewNopSettingsWithType(processortest.NopType), cfg, sink)
metrics, err := NewFactory().CreateMetrics(context.Background(), processortest.NewNopSettingsWithType(metadata.Type), cfg, sink)
require.NoError(t, err)
require.NoError(t, metrics.Start(context.Background(), componenttest.NewNopHost()))

Expand Down Expand Up @@ -603,7 +604,7 @@ func TestBatchMetricsProcessor_Timeout(t *testing.T) {
metricsPerRequest := 10
sink := new(consumertest.MetricsSink)

metrics, err := NewFactory().CreateMetrics(context.Background(), processortest.NewNopSettingsWithType(processortest.NopType), cfg, sink)
metrics, err := NewFactory().CreateMetrics(context.Background(), processortest.NewNopSettingsWithType(metadata.Type), cfg, sink)
require.NoError(t, err)
require.NoError(t, metrics.Start(context.Background(), componenttest.NewNopHost()))

Expand Down Expand Up @@ -650,7 +651,7 @@ func TestBatchMetricProcessor_Shutdown(t *testing.T) {
metricsPerRequest := 10
sink := new(consumertest.MetricsSink)

metrics, err := NewFactory().CreateMetrics(context.Background(), processortest.NewNopSettingsWithType(processortest.NopType), cfg, sink)
metrics, err := NewFactory().CreateMetrics(context.Background(), processortest.NewNopSettingsWithType(metadata.Type), cfg, sink)
require.NoError(t, err)
require.NoError(t, metrics.Start(context.Background(), componenttest.NewNopHost()))

Expand Down Expand Up @@ -746,7 +747,7 @@ func BenchmarkMultiBatchMetricProcessor(b *testing.B) {
func runMetricsProcessorBenchmark(b *testing.B, cfg *Config) {
ctx := context.Background()
sink := new(metricsSink)
metrics, err := NewFactory().CreateMetrics(context.Background(), processortest.NewNopSettingsWithType(processortest.NopType), cfg, sink)
metrics, err := NewFactory().CreateMetrics(context.Background(), processortest.NewNopSettingsWithType(metadata.Type), cfg, sink)
require.NoError(b, err)
require.NoError(b, metrics.Start(ctx, componenttest.NewNopHost()))

Expand Down Expand Up @@ -792,7 +793,7 @@ func TestBatchLogProcessor_ReceivingData(t *testing.T) {
logsPerRequest := 5
sink := new(consumertest.LogsSink)

logs, err := NewFactory().CreateLogs(context.Background(), processortest.NewNopSettingsWithType(processortest.NopType), cfg, sink)
logs, err := NewFactory().CreateLogs(context.Background(), processortest.NewNopSettingsWithType(metadata.Type), cfg, sink)
require.NoError(t, err)
require.NoError(t, logs.Start(context.Background(), componenttest.NewNopHost()))

Expand Down Expand Up @@ -931,7 +932,7 @@ func TestBatchLogsProcessor_Timeout(t *testing.T) {
logsPerRequest := 10
sink := new(consumertest.LogsSink)

logs, err := NewFactory().CreateLogs(context.Background(), processortest.NewNopSettingsWithType(processortest.NopType), cfg, sink)
logs, err := NewFactory().CreateLogs(context.Background(), processortest.NewNopSettingsWithType(metadata.Type), cfg, sink)
require.NoError(t, err)
require.NoError(t, logs.Start(context.Background(), componenttest.NewNopHost()))

Expand Down Expand Up @@ -978,7 +979,7 @@ func TestBatchLogProcessor_Shutdown(t *testing.T) {
logsPerRequest := 10
sink := new(consumertest.LogsSink)

logs, err := NewFactory().CreateLogs(context.Background(), processortest.NewNopSettingsWithType(processortest.NopType), cfg, sink)
logs, err := NewFactory().CreateLogs(context.Background(), processortest.NewNopSettingsWithType(metadata.Type), cfg, sink)
require.NoError(t, err)
require.NoError(t, logs.Start(context.Background(), componenttest.NewNopHost()))

Expand Down Expand Up @@ -1055,7 +1056,7 @@ func TestBatchProcessorSpansBatchedByMetadata(t *testing.T) {
cfg.SendBatchSize = 1000
cfg.Timeout = 10 * time.Minute
cfg.MetadataKeys = []string{"token1", "token2"}
traces, err := NewFactory().CreateTraces(context.Background(), processortest.NewNopSettingsWithType(processortest.NopType), cfg, sink)
traces, err := NewFactory().CreateTraces(context.Background(), processortest.NewNopSettingsWithType(metadata.Type), cfg, sink)
require.NoError(t, err)
require.NoError(t, traces.Start(context.Background(), componenttest.NewNopHost()))

Expand Down Expand Up @@ -1146,7 +1147,7 @@ func TestBatchProcessorMetadataCardinalityLimit(t *testing.T) {
cfg := createDefaultConfig().(*Config)
cfg.MetadataKeys = []string{"token"}
cfg.MetadataCardinalityLimit = cardLimit
traces, err := NewFactory().CreateTraces(context.Background(), processortest.NewNopSettingsWithType(processortest.NopType), cfg, sink)
traces, err := NewFactory().CreateTraces(context.Background(), processortest.NewNopSettingsWithType(metadata.Type), cfg, sink)
require.NoError(t, err)
require.NoError(t, traces.Start(context.Background(), componenttest.NewNopHost()))

Expand Down Expand Up @@ -1187,7 +1188,7 @@ func TestBatchZeroConfig(t *testing.T) {
const requestCount = 5
const logsPerRequest = 10
sink := new(consumertest.LogsSink)
logs, err := NewFactory().CreateLogs(context.Background(), processortest.NewNopSettingsWithType(processortest.NopType), cfg, sink)
logs, err := NewFactory().CreateLogs(context.Background(), processortest.NewNopSettingsWithType(metadata.Type), cfg, sink)
require.NoError(t, err)
require.NoError(t, logs.Start(context.Background(), componenttest.NewNopHost()))
defer func() { require.NoError(t, logs.Shutdown(context.Background())) }()
Expand Down Expand Up @@ -1226,7 +1227,7 @@ func TestBatchSplitOnly(t *testing.T) {
require.NoError(t, cfg.Validate())

sink := new(consumertest.LogsSink)
logs, err := NewFactory().CreateLogs(context.Background(), processortest.NewNopSettingsWithType(processortest.NopType), cfg, sink)
logs, err := NewFactory().CreateLogs(context.Background(), processortest.NewNopSettingsWithType(metadata.Type), cfg, sink)
require.NoError(t, err)
require.NoError(t, logs.Start(context.Background(), componenttest.NewNopHost()))
defer func() { require.NoError(t, logs.Shutdown(context.Background())) }()
Expand Down
19 changes: 11 additions & 8 deletions processor/processor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,27 @@ import (
"go.opentelemetry.io/collector/pipeline"
)

var (
testType = component.MustNewType("test")
testID = component.NewID(testType)
)

func TestNewFactory(t *testing.T) {
testType := component.MustNewType("test")
defaultCfg := struct{}{}
f := NewFactory(
testType,
func() component.Config { return &defaultCfg })
assert.EqualValues(t, testType, f.Type())
assert.EqualValues(t, &defaultCfg, f.CreateDefaultConfig())
_, err := f.CreateTraces(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop())
_, err := f.CreateTraces(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop())
require.ErrorIs(t, err, pipeline.ErrSignalNotSupported)
_, err = f.CreateMetrics(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop())
_, err = f.CreateMetrics(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop())
require.ErrorIs(t, err, pipeline.ErrSignalNotSupported)
_, err = f.CreateLogs(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop())
_, err = f.CreateLogs(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop())
require.ErrorIs(t, err, pipeline.ErrSignalNotSupported)
}

func TestNewFactoryWithOptions(t *testing.T) {
testType := component.MustNewType("test")
defaultCfg := struct{}{}
f := NewFactory(
testType,
Expand All @@ -45,15 +48,15 @@ func TestNewFactoryWithOptions(t *testing.T) {
assert.EqualValues(t, &defaultCfg, f.CreateDefaultConfig())

assert.Equal(t, component.StabilityLevelAlpha, f.TracesStability())
_, err := f.CreateTraces(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop())
_, err := f.CreateTraces(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop())
require.NoError(t, err)

assert.Equal(t, component.StabilityLevelBeta, f.MetricsStability())
_, err = f.CreateMetrics(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop())
_, err = f.CreateMetrics(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop())
require.NoError(t, err)

assert.Equal(t, component.StabilityLevelUnmaintained, f.LogsStability())
_, err = f.CreateLogs(context.Background(), Settings{}, &defaultCfg, consumertest.NewNop())
_, err = f.CreateLogs(context.Background(), Settings{ID: testID}, &defaultCfg, consumertest.NewNop())
assert.NoError(t, err)
}

Expand Down
6 changes: 3 additions & 3 deletions processor/processortest/shutdown_verifier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
func verifyTracesDoesNotProduceAfterShutdown(t *testing.T, factory processor.Factory, cfg component.Config) {
// Create a proc and output its produce to a sink.
nextSink := new(consumertest.TracesSink)
proc, err := factory.CreateTraces(context.Background(), NewNopSettingsWithType(NopType), cfg, nextSink)
proc, err := factory.CreateTraces(context.Background(), NewNopSettingsWithType(factory.Type()), cfg, nextSink)
if errors.Is(err, pipeline.ErrSignalNotSupported) {
return
}
Expand All @@ -46,7 +46,7 @@ func verifyTracesDoesNotProduceAfterShutdown(t *testing.T, factory processor.Fac
func verifyLogsDoesNotProduceAfterShutdown(t *testing.T, factory processor.Factory, cfg component.Config) {
// Create a proc and output its produce to a sink.
nextSink := new(consumertest.LogsSink)
proc, err := factory.CreateLogs(context.Background(), NewNopSettingsWithType(NopType), cfg, nextSink)
proc, err := factory.CreateLogs(context.Background(), NewNopSettingsWithType(factory.Type()), cfg, nextSink)
if errors.Is(err, pipeline.ErrSignalNotSupported) {
return
}
Expand All @@ -70,7 +70,7 @@ func verifyLogsDoesNotProduceAfterShutdown(t *testing.T, factory processor.Facto
func verifyMetricsDoesNotProduceAfterShutdown(t *testing.T, factory processor.Factory, cfg component.Config) {
// Create a proc and output its produce to a sink.
nextSink := new(consumertest.MetricsSink)
proc, err := factory.CreateMetrics(context.Background(), NewNopSettingsWithType(NopType), cfg, nextSink)
proc, err := factory.CreateMetrics(context.Background(), NewNopSettingsWithType(factory.Type()), cfg, nextSink)
if errors.Is(err, pipeline.ErrSignalNotSupported) {
return
}
Expand Down
Loading

0 comments on commit 480e080

Please sign in to comment.