Skip to content

Commit 9df7f20

Browse files
bogdandrutusbylica-splunk
bogdandrutu
authored and
sbylica-splunk
committed
[chore] Remove unnecessary Host implementation funcs (open-telemetry#35773)
Signed-off-by: Bogdan Drutu <[email protected]>
1 parent 163087b commit 9df7f20

File tree

23 files changed

+9
-156
lines changed

23 files changed

+9
-156
lines changed

‎exporter/awss3exporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ require (
1212
go.opentelemetry.io/collector/exporter v0.111.1-0.20241008154146-ea48c09c31ae
1313
go.opentelemetry.io/collector/otelcol/otelcoltest v0.111.1-0.20241008154146-ea48c09c31ae
1414
go.opentelemetry.io/collector/pdata v1.17.1-0.20241008154146-ea48c09c31ae
15-
go.opentelemetry.io/collector/pipeline v0.111.1-0.20241008154146-ea48c09c31ae
1615
go.uber.org/goleak v1.3.0
1716
go.uber.org/multierr v1.11.0
1817
go.uber.org/zap v1.27.0
@@ -80,6 +79,7 @@ require (
8079
go.opentelemetry.io/collector/otelcol v0.111.1-0.20241008154146-ea48c09c31ae // indirect
8180
go.opentelemetry.io/collector/pdata/pprofile v0.111.1-0.20241008154146-ea48c09c31ae // indirect
8281
go.opentelemetry.io/collector/pdata/testdata v0.111.1-0.20241008154146-ea48c09c31ae // indirect
82+
go.opentelemetry.io/collector/pipeline v0.111.1-0.20241008154146-ea48c09c31ae // indirect
8383
go.opentelemetry.io/collector/processor v0.111.1-0.20241008154146-ea48c09c31ae // indirect
8484
go.opentelemetry.io/collector/processor/processorprofiles v0.111.1-0.20241008154146-ea48c09c31ae // indirect
8585
go.opentelemetry.io/collector/receiver v0.111.1-0.20241008154146-ea48c09c31ae // indirect

‎exporter/awss3exporter/marshaler_test.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"github.com/stretchr/testify/require"
1212
"go.opentelemetry.io/collector/component"
1313
"go.opentelemetry.io/collector/component/componenttest"
14-
"go.opentelemetry.io/collector/pipeline"
1514
"go.uber.org/zap"
1615
)
1716

@@ -51,28 +50,12 @@ type hostWithExtensions struct {
5150
encoding encodingExtension
5251
}
5352

54-
func (h hostWithExtensions) Start(context.Context, component.Host) error {
55-
panic("unsupported")
56-
}
57-
58-
func (h hostWithExtensions) Shutdown(context.Context) error {
59-
panic("unsupported")
60-
}
61-
62-
func (h hostWithExtensions) GetFactory(component.Kind, component.Type) component.Factory {
63-
panic("unsupported")
64-
}
65-
6653
func (h hostWithExtensions) GetExtensions() map[component.ID]component.Component {
6754
return map[component.ID]component.Component{
6855
component.MustNewID("foo"): h.encoding,
6956
}
7057
}
7158

72-
func (h hostWithExtensions) GetExportersWithSignal() map[pipeline.Signal]map[component.ID]component.Component {
73-
panic("unsupported")
74-
}
75-
7659
type encodingExtension struct {
7760
}
7861

‎exporter/elasticsearchexporter/exporter_test.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
"go.opentelemetry.io/collector/pdata/plog"
3131
"go.opentelemetry.io/collector/pdata/pmetric"
3232
"go.opentelemetry.io/collector/pdata/ptrace"
33-
"go.opentelemetry.io/collector/pipeline"
3433
)
3534

3635
func TestExporterLogs(t *testing.T) {
@@ -1600,18 +1599,10 @@ type mockHost struct {
16001599
extensions map[component.ID]component.Component
16011600
}
16021601

1603-
func (h *mockHost) GetFactory(kind component.Kind, typ component.Type) component.Factory {
1604-
panic(fmt.Errorf("expected call to GetFactory(%v, %v)", kind, typ))
1605-
}
1606-
16071602
func (h *mockHost) GetExtensions() map[component.ID]component.Component {
16081603
return h.extensions
16091604
}
16101605

1611-
func (h *mockHost) GetExportersWithSignal() map[pipeline.Signal]map[component.ID]component.Component {
1612-
panic(fmt.Errorf("expected call to GetExporters"))
1613-
}
1614-
16151606
type roundTripperFunc func(*http.Request) (*http.Response, error)
16161607

16171608
func (f roundTripperFunc) RoundTrip(r *http.Request) (*http.Response, error) {

‎exporter/elasticsearchexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ require (
2222
go.opentelemetry.io/collector/exporter v0.111.1-0.20241008154146-ea48c09c31ae
2323
go.opentelemetry.io/collector/extension/auth v0.111.1-0.20241008154146-ea48c09c31ae
2424
go.opentelemetry.io/collector/pdata v1.17.1-0.20241008154146-ea48c09c31ae
25-
go.opentelemetry.io/collector/pipeline v0.111.1-0.20241008154146-ea48c09c31ae
2625
go.opentelemetry.io/collector/semconv v0.111.1-0.20241008154146-ea48c09c31ae
2726
go.uber.org/goleak v1.3.0
2827
go.uber.org/zap v1.27.0
@@ -74,6 +73,7 @@ require (
7473
go.opentelemetry.io/collector/extension/experimental/storage v0.111.1-0.20241008154146-ea48c09c31ae // indirect
7574
go.opentelemetry.io/collector/internal/globalsignal v0.111.1-0.20241008154146-ea48c09c31ae // indirect
7675
go.opentelemetry.io/collector/pdata/pprofile v0.111.1-0.20241008154146-ea48c09c31ae // indirect
76+
go.opentelemetry.io/collector/pipeline v0.111.1-0.20241008154146-ea48c09c31ae // indirect
7777
go.opentelemetry.io/collector/receiver v0.111.1-0.20241008154146-ea48c09c31ae // indirect
7878
go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.1-0.20241008154146-ea48c09c31ae // indirect
7979
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect

‎exporter/fileexporter/encoding_test.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"go.opentelemetry.io/collector/pdata/plog"
2020
"go.opentelemetry.io/collector/pdata/pmetric"
2121
"go.opentelemetry.io/collector/pdata/ptrace"
22-
"go.opentelemetry.io/collector/pipeline"
2322

2423
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension"
2524
)
@@ -28,18 +27,10 @@ type hostWithEncoding struct {
2827
encodings map[component.ID]component.Component
2928
}
3029

31-
func (h hostWithEncoding) GetFactory(_ component.Kind, _ component.Type) component.Factory {
32-
panic("unsupported")
33-
}
34-
3530
func (h hostWithEncoding) GetExtensions() map[component.ID]component.Component {
3631
return h.encodings
3732
}
3833

39-
func (h hostWithEncoding) GetExportersWithSignal() map[pipeline.Signal]map[component.ID]component.Component {
40-
panic("unsupported")
41-
}
42-
4334
func TestEncoding(t *testing.T) {
4435
f := NewFactory()
4536
cfg := f.CreateDefaultConfig().(*Config)

‎exporter/fileexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
go.opentelemetry.io/collector/exporter v0.111.1-0.20241008154146-ea48c09c31ae
1616
go.opentelemetry.io/collector/extension v0.111.1-0.20241008154146-ea48c09c31ae
1717
go.opentelemetry.io/collector/pdata v1.17.1-0.20241008154146-ea48c09c31ae
18-
go.opentelemetry.io/collector/pipeline v0.111.1-0.20241008154146-ea48c09c31ae
1918
go.uber.org/goleak v1.3.0
2019
go.uber.org/zap v1.27.0
2120
gopkg.in/natefinch/lumberjack.v2 v2.2.1
@@ -48,6 +47,7 @@ require (
4847
go.opentelemetry.io/collector/extension/experimental/storage v0.111.1-0.20241008154146-ea48c09c31ae // indirect
4948
go.opentelemetry.io/collector/internal/globalsignal v0.111.1-0.20241008154146-ea48c09c31ae // indirect
5049
go.opentelemetry.io/collector/pdata/pprofile v0.111.1-0.20241008154146-ea48c09c31ae // indirect
50+
go.opentelemetry.io/collector/pipeline v0.111.1-0.20241008154146-ea48c09c31ae // indirect
5151
go.opentelemetry.io/collector/receiver v0.111.1-0.20241008154146-ea48c09c31ae // indirect
5252
go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.1-0.20241008154146-ea48c09c31ae // indirect
5353
go.opentelemetry.io/otel v1.30.0 // indirect

‎exporter/rabbitmqexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
go.opentelemetry.io/collector/consumer v0.111.1-0.20241008154146-ea48c09c31ae
1616
go.opentelemetry.io/collector/exporter v0.111.1-0.20241008154146-ea48c09c31ae
1717
go.opentelemetry.io/collector/pdata v1.17.1-0.20241008154146-ea48c09c31ae
18-
go.opentelemetry.io/collector/pipeline v0.111.1-0.20241008154146-ea48c09c31ae
1918
go.uber.org/goleak v1.3.0
2019
go.uber.org/zap v1.27.0
2120
)
@@ -81,6 +80,7 @@ require (
8180
go.opentelemetry.io/collector/extension/experimental/storage v0.111.1-0.20241008154146-ea48c09c31ae // indirect
8281
go.opentelemetry.io/collector/internal/globalsignal v0.111.1-0.20241008154146-ea48c09c31ae // indirect
8382
go.opentelemetry.io/collector/pdata/pprofile v0.111.1-0.20241008154146-ea48c09c31ae // indirect
83+
go.opentelemetry.io/collector/pipeline v0.111.1-0.20241008154146-ea48c09c31ae // indirect
8484
go.opentelemetry.io/collector/receiver v0.111.1-0.20241008154146-ea48c09c31ae // indirect
8585
go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.1-0.20241008154146-ea48c09c31ae // indirect
8686
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect

‎exporter/rabbitmqexporter/marshaler_test.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"go.opentelemetry.io/collector/pdata/plog"
1414
"go.opentelemetry.io/collector/pdata/pmetric"
1515
"go.opentelemetry.io/collector/pdata/ptrace"
16-
"go.opentelemetry.io/collector/pipeline"
1716
)
1817

1918
func TestMarshalUsingEncodingExtension(t *testing.T) {
@@ -40,14 +39,6 @@ type mockEncodingExtension struct {
4039
mock.Mock
4140
}
4241

43-
func (h *mockHostWithEncodings) GetFactory(component.Kind, component.Type) component.Factory {
44-
return nil
45-
}
46-
47-
func (h *mockHostWithEncodings) GetExportersWithSignal() map[pipeline.Signal]map[component.ID]component.Component {
48-
return nil
49-
}
50-
5142
func (h *mockHostWithEncodings) GetExtensions() map[component.ID]component.Component {
5243
args := h.Called()
5344
return args.Get(0).(map[component.ID]component.Component)

‎extension/awsproxy/factory_test.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"go.opentelemetry.io/collector/component/componenttest"
2020
"go.opentelemetry.io/collector/config/confignet"
2121
"go.opentelemetry.io/collector/extension/extensiontest"
22-
"go.opentelemetry.io/collector/pipeline"
2322

2423
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy"
2524
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil"
@@ -101,18 +100,10 @@ type nopHost struct {
101100
reportFunc func(event *componentstatus.Event)
102101
}
103102

104-
func (nh *nopHost) GetFactory(component.Kind, component.Type) component.Factory {
105-
return nil
106-
}
107-
108103
func (nh *nopHost) GetExtensions() map[component.ID]component.Component {
109104
return nil
110105
}
111106

112-
func (nh *nopHost) GetExportersWithSignal() map[pipeline.Signal]map[component.ID]component.Component {
113-
return nil
114-
}
115-
116107
func (nh *nopHost) Report(event *componentstatus.Event) {
117108
nh.reportFunc(event)
118109
}

‎extension/awsproxy/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ require (
1212
go.opentelemetry.io/collector/config/configtls v1.17.1-0.20241008154146-ea48c09c31ae
1313
go.opentelemetry.io/collector/confmap v1.17.1-0.20241008154146-ea48c09c31ae
1414
go.opentelemetry.io/collector/extension v0.111.1-0.20241008154146-ea48c09c31ae
15-
go.opentelemetry.io/collector/pipeline v0.111.1-0.20241008154146-ea48c09c31ae
1615
go.uber.org/zap v1.27.0
1716
)
1817

@@ -38,6 +37,7 @@ require (
3837
go.opentelemetry.io/collector/featuregate v1.17.1-0.20241008154146-ea48c09c31ae // indirect
3938
go.opentelemetry.io/collector/internal/globalsignal v0.111.1-0.20241008154146-ea48c09c31ae // indirect
4039
go.opentelemetry.io/collector/pdata v1.17.1-0.20241008154146-ea48c09c31ae // indirect
40+
go.opentelemetry.io/collector/pipeline v0.111.1-0.20241008154146-ea48c09c31ae // indirect
4141
go.opentelemetry.io/otel v1.30.0 // indirect
4242
go.opentelemetry.io/otel/metric v1.30.0 // indirect
4343
go.opentelemetry.io/otel/sdk v1.30.0 // indirect

0 commit comments

Comments
 (0)