Skip to content

Commit e5aeace

Browse files
authored
[chore] remove more tests check for errors reported on next nil consumer (#31395)
**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.
1 parent a557c1f commit e5aeace

File tree

4 files changed

+2
-55
lines changed

4 files changed

+2
-55
lines changed

receiver/kafkametricsreceiver/factory_test.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,6 @@ func TestCreateDefaultConfig(t *testing.T) {
2121
assert.NoError(t, componenttest.CheckConfigStruct(cfg))
2222
}
2323

24-
func TestCreateMetricsReceiver_errors(t *testing.T) {
25-
factory := NewFactory()
26-
cfg := factory.CreateDefaultConfig().(*Config)
27-
cfg.Brokers = []string{"invalid:9092"}
28-
cfg.ProtocolVersion = "2.0.0"
29-
cfg.Scrapers = []string{"topics"}
30-
r, err := createMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil)
31-
assert.Error(t, err)
32-
assert.Nil(t, r)
33-
}
34-
3524
func TestCreateMetricsReceiver(t *testing.T) {
3625
prev := newMetricsReceiver
3726
newMetricsReceiver = func(context.Context, Config, receiver.CreateSettings, consumer.Metrics) (receiver.Metrics, error) {

receiver/kafkareceiver/factory_test.go

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,6 @@ func TestCreateTracesReceiver(t *testing.T) {
3939
require.Error(t, r.Start(context.Background(), componenttest.NewNopHost()))
4040
}
4141

42-
func TestCreateTracesReceiver_error(t *testing.T) {
43-
cfg := createDefaultConfig().(*Config)
44-
cfg.ProtocolVersion = "2.0.0"
45-
// disable contacting broker at startup
46-
cfg.Metadata.Full = false
47-
f := kafkaReceiverFactory{tracesUnmarshalers: defaultTracesUnmarshalers()}
48-
r, err := f.createTracesReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil)
49-
require.NoError(t, err)
50-
assert.NotNil(t, r)
51-
}
52-
5342
func TestWithTracesUnmarshalers(t *testing.T) {
5443
unmarshaler := &customTracesUnmarshaler{}
5544
f := NewFactory(withTracesUnmarshalers(unmarshaler))
@@ -89,17 +78,6 @@ func TestCreateMetricsReceiver(t *testing.T) {
8978
require.Error(t, r.Start(context.Background(), componenttest.NewNopHost()))
9079
}
9180

92-
func TestCreateMetricsReceiver_error(t *testing.T) {
93-
cfg := createDefaultConfig().(*Config)
94-
cfg.ProtocolVersion = "2.0.0"
95-
// disable contacting broker at startup
96-
cfg.Metadata.Full = false
97-
f := kafkaReceiverFactory{metricsUnmarshalers: defaultMetricsUnmarshalers()}
98-
r, err := f.createMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil)
99-
require.NoError(t, err)
100-
assert.NotNil(t, r)
101-
}
102-
10381
func TestWithMetricsUnmarshalers(t *testing.T) {
10482
unmarshaler := &customMetricsUnmarshaler{}
10583
f := NewFactory(withMetricsUnmarshalers(unmarshaler))
@@ -139,17 +117,6 @@ func TestCreateLogsReceiver(t *testing.T) {
139117
require.Error(t, r.Start(context.Background(), componenttest.NewNopHost()))
140118
}
141119

142-
func TestCreateLogsReceiver_error(t *testing.T) {
143-
cfg := createDefaultConfig().(*Config)
144-
cfg.ProtocolVersion = "2.0.0"
145-
// disable contacting broker at startup
146-
cfg.Metadata.Full = false
147-
f := kafkaReceiverFactory{logsUnmarshalers: defaultLogsUnmarshalers("Test Version", zap.NewNop())}
148-
r, err := f.createLogsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, nil)
149-
require.NoError(t, err)
150-
assert.NotNil(t, r)
151-
}
152-
153120
func TestGetLogsUnmarshaler_encoding_text_error(t *testing.T) {
154121
tests := []struct {
155122
name string

receiver/otelarrowreceiver/factory_test.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -191,16 +191,6 @@ func TestCreateLogReceiver(t *testing.T) {
191191
wantStartErr: true,
192192
sink: new(consumertest.LogsSink),
193193
},
194-
{
195-
name: "no_next_consumer",
196-
cfg: &Config{
197-
Protocols: Protocols{
198-
GRPC: defaultGRPCSettings,
199-
},
200-
},
201-
wantErr: true,
202-
sink: nil,
203-
},
204194
}
205195
ctx := context.Background()
206196
creationSet := receivertest.NewNopCreateSettings()

receiver/prometheusreceiver/factory_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"go.opentelemetry.io/collector/component"
1414
"go.opentelemetry.io/collector/component/componenttest"
1515
"go.opentelemetry.io/collector/confmap/confmaptest"
16+
"go.opentelemetry.io/collector/consumer/consumertest"
1617
"go.opentelemetry.io/collector/receiver/receivertest"
1718

1819
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver/internal/metadata"
@@ -30,7 +31,7 @@ func TestCreateReceiver(t *testing.T) {
3031
// The default config does not provide scrape_config so we expect that metrics receiver
3132
// creation must also fail.
3233
creationSet := receivertest.NewNopCreateSettings()
33-
mReceiver, _ := createMetricsReceiver(context.Background(), creationSet, cfg, nil)
34+
mReceiver, _ := createMetricsReceiver(context.Background(), creationSet, cfg, consumertest.NewNop())
3435
assert.NotNil(t, mReceiver)
3536
assert.NotNil(t, mReceiver.(*pReceiver).cfg.PrometheusConfig.GlobalConfig)
3637
}

0 commit comments

Comments
 (0)