Skip to content

Commit

Permalink
[chore] Use NewNopSettingsWithType(metadata.Type) on tests (#38030)
Browse files Browse the repository at this point in the history
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

Tries to fix some of the contrib tests for
open-telemetry/opentelemetry-collector/pull/12381

<!-- Issue number (e.g. #1234) or full URL to issue, if applicable. -->
#### Link to tracking issue

Updates open-telemetry/opentelemetry-collector/issues/12221
  • Loading branch information
mx-psi authored Feb 19, 2025
1 parent 0b92076 commit de6f834
Show file tree
Hide file tree
Showing 493 changed files with 2,004 additions and 1,548 deletions.
2 changes: 1 addition & 1 deletion cmd/telemetrygen/internal/e2etest/logs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestGenerateLogs(t *testing.T) {
rCfg := f.CreateDefaultConfig()
endpoint := testutil.GetAvailableLocalAddress(t)
rCfg.(*otlpreceiver.Config).GRPC.NetAddr.Endpoint = endpoint
r, err := f.CreateLogs(context.Background(), receivertest.NewNopSettings(), rCfg, sink)
r, err := f.CreateLogs(context.Background(), receivertest.NewNopSettingsWithType(f.Type()), rCfg, sink)
require.NoError(t, err)
err = r.Start(context.Background(), componenttest.NewNopHost())
require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion cmd/telemetrygen/internal/e2etest/metrics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestGenerateMetrics(t *testing.T) {
rCfg := f.CreateDefaultConfig()
endpoint := testutil.GetAvailableLocalAddress(t)
rCfg.(*otlpreceiver.Config).GRPC.NetAddr.Endpoint = endpoint
r, err := f.CreateMetrics(context.Background(), receivertest.NewNopSettings(), rCfg, sink)
r, err := f.CreateMetrics(context.Background(), receivertest.NewNopSettingsWithType(f.Type()), rCfg, sink)
require.NoError(t, err)
err = r.Start(context.Background(), componenttest.NewNopHost())
require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion cmd/telemetrygen/internal/e2etest/traces_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestGenerateTraces(t *testing.T) {
rCfg := f.CreateDefaultConfig()
endpoint := testutil.GetAvailableLocalAddress(t)
rCfg.(*otlpreceiver.Config).GRPC.NetAddr.Endpoint = endpoint
r, err := f.CreateTraces(context.Background(), receivertest.NewNopSettings(), rCfg, sink)
r, err := f.CreateTraces(context.Background(), receivertest.NewNopSettingsWithType(f.Type()), rCfg, sink)
require.NoError(t, err)
err = r.Start(context.Background(), componenttest.NewNopHost())
require.NoError(t, err)
Expand Down
7 changes: 4 additions & 3 deletions connector/countconnector/connector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"go.opentelemetry.io/collector/connector/connectortest"
"go.opentelemetry.io/collector/consumer/consumertest"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector/internal/metadata"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/pmetrictest"
)
Expand Down Expand Up @@ -250,7 +251,7 @@ func TestTracesToMetrics(t *testing.T) {
factory := NewFactory()
sink := &consumertest.MetricsSink{}
conn, err := factory.CreateTracesToMetrics(context.Background(),
connectortest.NewNopSettings(), tc.cfg, sink)
connectortest.NewNopSettingsWithType(metadata.Type), tc.cfg, sink)
require.NoError(t, err)
require.NotNil(t, conn)
assert.False(t, conn.Capabilities().MutatesData)
Expand Down Expand Up @@ -492,7 +493,7 @@ func TestMetricsToMetrics(t *testing.T) {
factory := NewFactory()
sink := &consumertest.MetricsSink{}
conn, err := factory.CreateMetricsToMetrics(context.Background(),
connectortest.NewNopSettings(), tc.cfg, sink)
connectortest.NewNopSettingsWithType(metadata.Type), tc.cfg, sink)
require.NoError(t, err)
require.NotNil(t, conn)
assert.False(t, conn.Capabilities().MutatesData)
Expand Down Expand Up @@ -664,7 +665,7 @@ func TestLogsToMetrics(t *testing.T) {
factory := NewFactory()
sink := &consumertest.MetricsSink{}
conn, err := factory.CreateLogsToMetrics(context.Background(),
connectortest.NewNopSettings(), tc.cfg, sink)
connectortest.NewNopSettingsWithType(metadata.Type), tc.cfg, sink)
require.NoError(t, err)
require.NotNil(t, conn)
assert.False(t, conn.Capabilities().MutatesData)
Expand Down
4 changes: 3 additions & 1 deletion connector/datadogconnector/benchmark_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import (
"go.opentelemetry.io/collector/featuregate"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector/internal/metadata"
)

func genTrace() ptrace.Traces {
Expand Down Expand Up @@ -62,7 +64,7 @@ func benchmarkPeerTags(b *testing.B) {
cfg.Traces.TraceBuffer = 0

factory := NewFactory()
creationParams := connectortest.NewNopSettings()
creationParams := connectortest.NewNopSettingsWithType(metadata.Type)
metricsSink := &consumertest.MetricsSink{}

tconn, err := factory.CreateTracesToMetrics(context.Background(), creationParams, cfg, metricsSink)
Expand Down
7 changes: 4 additions & 3 deletions connector/datadogconnector/connector_native_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/testing/protocmp"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector/internal/metadata"
pkgdatadog "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog"
)

Expand All @@ -34,7 +35,7 @@ var _ component.Component = (*traceToMetricConnectorNative)(nil) // testing that
func TestNewConnectorNative(t *testing.T) {
factory := NewFactory()

creationParams := connectortest.NewNopSettings()
creationParams := connectortest.NewNopSettingsWithType(metadata.Type)
cfg := factory.CreateDefaultConfig().(*Config)

tconn, err := factory.CreateTracesToMetrics(context.Background(), creationParams, cfg, consumertest.NewNop())
Expand All @@ -47,7 +48,7 @@ func TestNewConnectorNative(t *testing.T) {
func TestTraceToTraceConnectorNative(t *testing.T) {
factory := NewFactory()

creationParams := connectortest.NewNopSettings()
creationParams := connectortest.NewNopSettingsWithType(metadata.Type)
cfg := factory.CreateDefaultConfig().(*Config)

tconn, err := factory.CreateTracesToTraces(context.Background(), creationParams, cfg, consumertest.NewNop())
Expand All @@ -66,7 +67,7 @@ func creteConnectorNative(t *testing.T) (*traceToMetricConnectorNative, *consume
func creteConnectorNativeWithCfg(t *testing.T, cfg *Config) (*traceToMetricConnectorNative, *consumertest.MetricsSink) {
factory := NewFactory()

creationParams := connectortest.NewNopSettings()
creationParams := connectortest.NewNopSettingsWithType(metadata.Type)
metricsSink := &consumertest.MetricsSink{}

cfg.Traces.BucketInterval = 1 * time.Second
Expand Down
7 changes: 4 additions & 3 deletions connector/datadogconnector/connector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"go.uber.org/zap"
"google.golang.org/protobuf/proto"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector/internal/metadata"
pkgdatadog "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog"
)

Expand All @@ -40,7 +41,7 @@ func TestNewConnector(t *testing.T) {

factory := NewFactory()

creationParams := connectortest.NewNopSettings()
creationParams := connectortest.NewNopSettingsWithType(metadata.Type)
cfg := factory.CreateDefaultConfig().(*Config)

traceToMetricsConnector, err := factory.CreateTracesToMetrics(context.Background(), creationParams, cfg, consumertest.NewNop())
Expand All @@ -59,7 +60,7 @@ func TestTraceToTraceConnector(t *testing.T) {

factory := NewFactory()

creationParams := connectortest.NewNopSettings()
creationParams := connectortest.NewNopSettingsWithType(metadata.Type)
cfg := factory.CreateDefaultConfig().(*Config)

traceToTracesConnector, err := factory.CreateTracesToTraces(context.Background(), creationParams, cfg, consumertest.NewNop())
Expand Down Expand Up @@ -124,7 +125,7 @@ func creteConnector(t *testing.T) (*traceToMetricConnector, *consumertest.Metric

factory := NewFactory()

creationParams := connectortest.NewNopSettings()
creationParams := connectortest.NewNopSettingsWithType(metadata.Type)
cfg := factory.CreateDefaultConfig().(*Config)
cfg.Traces.ResourceAttributesAsContainerTags = []string{semconv.AttributeCloudAvailabilityZone, semconv.AttributeCloudRegion, "az"}
cfg.Traces.BucketInterval = 1 * time.Second
Expand Down
3 changes: 2 additions & 1 deletion connector/exceptionsconnector/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/pdata/pcommon"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector/internal/metadata"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil"
)

Expand Down Expand Up @@ -43,7 +44,7 @@ func TestNewConnector(t *testing.T) {
// Prepare
factory := NewFactory()

creationParams := connectortest.NewNopSettings()
creationParams := connectortest.NewNopSettingsWithType(metadata.Type)
cfg := factory.CreateDefaultConfig().(*Config)
cfg.Dimensions = tc.dimensions

Expand Down
4 changes: 3 additions & 1 deletion connector/failoverconnector/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import (
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/pipeline"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector/internal/metadata"
)

func TestNewFactory(t *testing.T) {
Expand All @@ -34,7 +36,7 @@ func TestNewFactory(t *testing.T) {
})

conn, err := NewFactory().CreateTracesToTraces(context.Background(),
connectortest.NewNopSettings(), cfg, router.(consumer.Traces))
connectortest.NewNopSettingsWithType(metadata.Type), cfg, router.(consumer.Traces))
defer func() {
assert.NoError(t, conn.Shutdown(context.Background()))
}()
Expand Down
8 changes: 5 additions & 3 deletions connector/failoverconnector/failover_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import (
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/pipeline"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector/internal/metadata"
)

func TestFailoverRecovery(t *testing.T) {
Expand All @@ -38,7 +40,7 @@ func TestFailoverRecovery(t *testing.T) {
})

conn, err := NewFactory().CreateTracesToTraces(context.Background(),
connectortest.NewNopSettings(), cfg, router.(consumer.Traces))
connectortest.NewNopSettingsWithType(metadata.Type), cfg, router.(consumer.Traces))

require.NoError(t, err)

Expand Down Expand Up @@ -174,7 +176,7 @@ func TestFailoverRecovery_MaxRetries(t *testing.T) {
})

conn, err := NewFactory().CreateTracesToTraces(context.Background(),
connectortest.NewNopSettings(), cfg, router.(consumer.Traces))
connectortest.NewNopSettingsWithType(metadata.Type), cfg, router.(consumer.Traces))

require.NoError(t, err)

Expand Down Expand Up @@ -239,7 +241,7 @@ func TestFailoverRecovery_MaxRetriesDisabled(t *testing.T) {
})

conn, err := NewFactory().CreateTracesToTraces(context.Background(),
connectortest.NewNopSettings(), cfg, router.(consumer.Traces))
connectortest.NewNopSettingsWithType(metadata.Type), cfg, router.(consumer.Traces))

require.NoError(t, err)

Expand Down
8 changes: 5 additions & 3 deletions connector/failoverconnector/logs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import (
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/pipeline"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector/internal/metadata"
)

var errLogsConsumer = errors.New("Error from ConsumeLogs")
Expand All @@ -40,7 +42,7 @@ func TestLogsRegisterConsumers(t *testing.T) {
})

conn, err := NewFactory().CreateLogsToLogs(context.Background(),
connectortest.NewNopSettings(), cfg, router.(consumer.Logs))
connectortest.NewNopSettingsWithType(metadata.Type), cfg, router.(consumer.Logs))

failoverConnector := conn.(*logsFailover)
defer func() {
Expand Down Expand Up @@ -80,7 +82,7 @@ func TestLogsWithValidFailover(t *testing.T) {
})

conn, err := NewFactory().CreateLogsToLogs(context.Background(),
connectortest.NewNopSettings(), cfg, router.(consumer.Logs))
connectortest.NewNopSettingsWithType(metadata.Type), cfg, router.(consumer.Logs))

require.NoError(t, err)

Expand Down Expand Up @@ -117,7 +119,7 @@ func TestLogsWithFailoverError(t *testing.T) {
})

conn, err := NewFactory().CreateLogsToLogs(context.Background(),
connectortest.NewNopSettings(), cfg, router.(consumer.Logs))
connectortest.NewNopSettingsWithType(metadata.Type), cfg, router.(consumer.Logs))

require.NoError(t, err)

Expand Down
8 changes: 5 additions & 3 deletions connector/failoverconnector/metrics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import (
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pipeline"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector/internal/metadata"
)

var errMetricsConsumer = errors.New("Error from ConsumeMetrics")
Expand All @@ -40,7 +42,7 @@ func TestMetricsRegisterConsumers(t *testing.T) {
})

conn, err := NewFactory().CreateMetricsToMetrics(context.Background(),
connectortest.NewNopSettings(), cfg, router.(consumer.Metrics))
connectortest.NewNopSettingsWithType(metadata.Type), cfg, router.(consumer.Metrics))

failoverConnector := conn.(*metricsFailover)
defer func() {
Expand Down Expand Up @@ -80,7 +82,7 @@ func TestMetricsWithValidFailover(t *testing.T) {
})

conn, err := NewFactory().CreateMetricsToMetrics(context.Background(),
connectortest.NewNopSettings(), cfg, router.(consumer.Metrics))
connectortest.NewNopSettingsWithType(metadata.Type), cfg, router.(consumer.Metrics))

require.NoError(t, err)

Expand Down Expand Up @@ -117,7 +119,7 @@ func TestMetricsWithFailoverError(t *testing.T) {
})

conn, err := NewFactory().CreateMetricsToMetrics(context.Background(),
connectortest.NewNopSettings(), cfg, router.(consumer.Metrics))
connectortest.NewNopSettingsWithType(metadata.Type), cfg, router.(consumer.Metrics))

require.NoError(t, err)

Expand Down
8 changes: 5 additions & 3 deletions connector/failoverconnector/traces_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import (
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/pdata/ptrace"
"go.opentelemetry.io/collector/pipeline"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector/internal/metadata"
)

var errTracesConsumer = errors.New("Error from ConsumeTraces")
Expand All @@ -40,7 +42,7 @@ func TestTracesRegisterConsumers(t *testing.T) {
})

conn, err := NewFactory().CreateTracesToTraces(context.Background(),
connectortest.NewNopSettings(), cfg, router.(consumer.Traces))
connectortest.NewNopSettingsWithType(metadata.Type), cfg, router.(consumer.Traces))

failoverConnector := conn.(*tracesFailover)
defer func() {
Expand Down Expand Up @@ -82,7 +84,7 @@ func TestTracesWithValidFailover(t *testing.T) {
})

conn, err := NewFactory().CreateTracesToTraces(context.Background(),
connectortest.NewNopSettings(), cfg, router.(consumer.Traces))
connectortest.NewNopSettingsWithType(metadata.Type), cfg, router.(consumer.Traces))

require.NoError(t, err)

Expand Down Expand Up @@ -120,7 +122,7 @@ func TestTracesWithFailoverError(t *testing.T) {
})

conn, err := NewFactory().CreateTracesToTraces(context.Background(),
connectortest.NewNopSettings(), cfg, router.(consumer.Traces))
connectortest.NewNopSettingsWithType(metadata.Type), cfg, router.(consumer.Traces))

require.NoError(t, err)

Expand Down
6 changes: 4 additions & 2 deletions connector/grafanacloudconnector/connector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import (
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"
"gotest.tools/assert"

"github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector/internal/metadata"
)

func TestNewConnector(t *testing.T) {
Expand Down Expand Up @@ -46,7 +48,7 @@ func TestNewConnector(t *testing.T) {
cfg.MetricsFlushInterval = *tc.metricsFlushInterval
}

c, err := factory.CreateTracesToMetrics(context.Background(), connectortest.NewNopSettings(), cfg, consumertest.NewNop())
c, err := factory.CreateTracesToMetrics(context.Background(), connectortest.NewNopSettingsWithType(metadata.Type), cfg, consumertest.NewNop())
imp := c.(*connectorImp)

assert.NilError(t, err)
Expand Down Expand Up @@ -76,7 +78,7 @@ func TestConsumeTraces(t *testing.T) {
cfg.MetricsFlushInterval = 50 * time.Millisecond

sink := &consumertest.MetricsSink{}
c, err := factory.CreateTracesToMetrics(context.Background(), connectortest.NewNopSettings(), cfg, sink)
c, err := factory.CreateTracesToMetrics(context.Background(), connectortest.NewNopSettingsWithType(metadata.Type), cfg, sink)
assert.NilError(t, err)

ctx := context.Background()
Expand Down
Loading

0 comments on commit de6f834

Please sign in to comment.