Skip to content

Commit

Permalink
[chore] remove tests checking for component.ErrNilNextConsumer (#31301)
Browse files Browse the repository at this point in the history
**Description:**
We are looking to deprecate component.ErrNilNextConsumer and have
pipelines check it rather than set it the expectation on every component
that the next component may be nil.

See open-telemetry/opentelemetry-collector#9526
for context.
  • Loading branch information
atoulme committed Feb 16, 2024
1 parent 5f81014 commit 21d12c5
Show file tree
Hide file tree
Showing 10 changed files with 1 addition and 106 deletions.
6 changes: 1 addition & 5 deletions processor/spanprocessor/span_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/pdata/ptrace"
"go.opentelemetry.io/collector/processor"
Expand All @@ -27,11 +26,8 @@ func TestNewTracesProcessor(t *testing.T) {
cfg := factory.CreateDefaultConfig()
oCfg := cfg.(*Config)
oCfg.Rename.FromAttributes = []string{"foo"}
tp, err := factory.CreateTracesProcessor(context.Background(), processortest.NewNopCreateSettings(), cfg, nil)
require.Error(t, component.ErrNilNextConsumer, err)
require.Nil(t, tp)

tp, err = factory.CreateTracesProcessor(context.Background(), processortest.NewNopCreateSettings(), cfg, consumertest.NewNop())
tp, err := factory.CreateTracesProcessor(context.Background(), processortest.NewNopCreateSettings(), cfg, consumertest.NewNop())
require.NoError(t, err)
require.NotNil(t, tp)
}
Expand Down
4 changes: 0 additions & 4 deletions receiver/awsfirehosereceiver/metrics_receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"testing"

"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/pdata/pmetric"
Expand Down Expand Up @@ -41,9 +40,6 @@ func TestNewMetricsReceiver(t *testing.T) {
recordType string
wantErr error
}{
"WithNilConsumer": {
wantErr: component.ErrNilNextConsumer,
},
"WithInvalidRecordType": {
consumer: consumertest.NewNop(),
recordType: "test",
Expand Down
22 changes: 0 additions & 22 deletions receiver/awsxrayreceiver/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,6 @@ const (
mockRegion = "us-west-2"
)

func TestConsumerCantBeNil(t *testing.T) {
addr, err := net.ResolveUDPAddr(udppoller.Transport, "localhost:0")
assert.NoError(t, err, "should resolve UDP address")

sock, err := net.ListenUDP(udppoller.Transport, addr)
assert.NoError(t, err, "should be able to listen")
defer sock.Close()
address := sock.LocalAddr().String()

_, err = newReceiver(
&Config{
NetAddr: confignet.NetAddr{
Endpoint: address,
Transport: udppoller.Transport,
},
},
nil,
receivertest.NewNopCreateSettings(),
)
assert.True(t, errors.Is(err, component.ErrNilNextConsumer), "consumer is nil should be detected")
}

func TestProxyCreationFailed(t *testing.T) {
addr, err := findAvailableUDPAddress()
assert.NoError(t, err, "there should be address available")
Expand Down
13 changes: 0 additions & 13 deletions receiver/collectdreceiver/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/confighttp"
"go.opentelemetry.io/collector/consumer"
Expand Down Expand Up @@ -43,18 +42,6 @@ func TestNewReceiver(t *testing.T) {
args args
wantErr error
}{
{
name: "nil next Consumer",
args: args{
config: &Config{
ServerConfig: confighttp.ServerConfig{
Endpoint: ":0",
},
},
attrsPrefix: "default_attr_",
},
wantErr: component.ErrNilNextConsumer,
},
{
name: "happy path",
args: args{
Expand Down
13 changes: 0 additions & 13 deletions receiver/couchdbreceiver/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,6 @@ func TestCreateMetricsReceiver(t *testing.T) {

},
},
{
desc: "Nil consumer",
run: func(t *testing.T) {
t.Parallel()
_, err := createMetricsReceiver(
context.Background(),
receivertest.NewNopCreateSettings(),
createDefaultConfig(),
nil,
)
require.ErrorIs(t, err, component.ErrNilNextConsumer)
},
},
}

for _, testCase := range testCases {
Expand Down
14 changes: 0 additions & 14 deletions receiver/elasticsearchreceiver/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"testing"

"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/receiver/receivertest"
)
Expand Down Expand Up @@ -47,19 +46,6 @@ func TestCreateMetricsReceiver(t *testing.T) {
require.ErrorIs(t, err, errConfigNotES)
},
},
{
desc: "Nil consumer",
run: func(t *testing.T) {
t.Parallel()
_, err := createMetricsReceiver(
context.Background(),
receivertest.NewNopCreateSettings(),
createDefaultConfig(),
nil,
)
require.ErrorIs(t, err, component.ErrNilNextConsumer)
},
},
}

for _, testCase := range testCases {
Expand Down
9 changes: 0 additions & 9 deletions receiver/skywalkingreceiver/skywalking_receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,6 @@ var traceJSON = []byte(`
"traceSegmentId": "a12ff60b-5807-463b-a1f8-fb1c8608219e"
}]`)

func TestTraceSource(t *testing.T) {
set := receivertest.NewNopCreateSettings()
set.ID = skywalkingReceiver
mockSwReceiver := newSkywalkingReceiver(&configuration{}, set)
err := mockSwReceiver.registerTraceConsumer(nil)
assert.Equal(t, err, component.ErrNilNextConsumer)
require.NotNil(t, mockSwReceiver)
}

func TestStartAndShutdown(t *testing.T) {
port := 12800
config := &configuration{
Expand Down
7 changes: 0 additions & 7 deletions receiver/solacereceiver/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,6 @@ func TestCreateTracesReceiverWrongConfig(t *testing.T) {
assert.Equal(t, component.ErrDataTypeIsNotSupported, err)
}

func TestCreateTracesReceiverNilConsumer(t *testing.T) {
cfg := createDefaultConfig()
factory := NewFactory()
_, err := factory.CreateTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil)
assert.Equal(t, component.ErrNilNextConsumer, err)
}

func TestCreateTracesReceiverBadConfigNoAuth(t *testing.T) {
cfg := createDefaultConfig().(*Config)
cfg.Queue = "some-queue"
Expand Down
14 changes: 0 additions & 14 deletions receiver/vcenterreceiver/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"testing"

"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/receiver/receivertest"
)
Expand Down Expand Up @@ -44,19 +43,6 @@ func TestCreateMetricsReceiver(t *testing.T) {
require.ErrorIs(t, err, errConfigNotVcenter)
},
},
{
desc: "Nil consumer",
testFn: func(t *testing.T) {
t.Parallel()
_, err := createMetricsReceiver(
context.Background(),
receivertest.NewNopCreateSettings(),
createDefaultConfig(),
nil,
)
require.ErrorIs(t, err, component.ErrNilNextConsumer)
},
},
}

for _, testCase := range testCases {
Expand Down
5 changes: 0 additions & 5 deletions receiver/zipkinreceiver/trace_receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ func TestNew(t *testing.T) {
args args
wantErr error
}{
{
name: "nil next Consumer",
args: args{},
wantErr: component.ErrNilNextConsumer,
},
{
name: "happy path",
args: args{
Expand Down

0 comments on commit 21d12c5

Please sign in to comment.