From 100cfc2ba9aa8ef90084e23756ae66d433a82b41 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Mon, 14 Oct 2024 08:23:19 -0700 Subject: [PATCH] [chore] Remove unused parameter for sharedcomponent Signed-off-by: Bogdan Drutu --- internal/e2e/status_test.go | 6 ++---- internal/sharedcomponent/sharedcomponent.go | 5 +---- .../sharedcomponent/sharedcomponent_test.go | 17 ----------------- receiver/otlpreceiver/factory.go | 4 ---- 4 files changed, 3 insertions(+), 29 deletions(-) diff --git a/internal/e2e/status_test.go b/internal/e2e/status_test.go index 55311d99372..2871400102d 100644 --- a/internal/e2e/status_test.go +++ b/internal/e2e/status_test.go @@ -193,7 +193,7 @@ func createDefaultReceiverConfig() component.Config { func createTraces( _ context.Context, - set receiver.Settings, + _ receiver.Settings, cfg component.Config, _ consumer.Traces, ) (receiver.Traces, error) { @@ -203,7 +203,6 @@ func createTraces( func() (*testReceiver, error) { return &testReceiver{}, nil }, - &set.TelemetrySettings, ) if err != nil { return nil, err @@ -214,7 +213,7 @@ func createTraces( func createMetrics( _ context.Context, - set receiver.Settings, + _ receiver.Settings, cfg component.Config, _ consumer.Metrics, ) (receiver.Metrics, error) { @@ -224,7 +223,6 @@ func createMetrics( func() (*testReceiver, error) { return &testReceiver{}, nil }, - &set.TelemetrySettings, ) if err != nil { return nil, err diff --git a/internal/sharedcomponent/sharedcomponent.go b/internal/sharedcomponent/sharedcomponent.go index f9c8193c6ff..6c9a94bb6b5 100644 --- a/internal/sharedcomponent/sharedcomponent.go +++ b/internal/sharedcomponent/sharedcomponent.go @@ -29,7 +29,7 @@ type Map[K comparable, V component.Component] struct { // LoadOrStore returns the already created instance if exists, otherwise creates a new instance // and adds it to the map of references. -func (m *Map[K, V]) LoadOrStore(key K, create func() (V, error), telemetrySettings *component.TelemetrySettings) (*Component[V], error) { +func (m *Map[K, V]) LoadOrStore(key K, create func() (V, error)) (*Component[V], error) { m.lock.Lock() defer m.lock.Unlock() if c, ok := m.components[key]; ok { @@ -47,7 +47,6 @@ func (m *Map[K, V]) LoadOrStore(key K, create func() (V, error), telemetrySettin defer m.lock.Unlock() delete(m.components, key) }, - telemetry: telemetrySettings, } m.components[key] = newComp return newComp, nil @@ -62,8 +61,6 @@ type Component[V component.Component] struct { stopOnce sync.Once removeFunc func() - telemetry *component.TelemetrySettings - hostWrapper *hostWrapper } diff --git a/internal/sharedcomponent/sharedcomponent_test.go b/internal/sharedcomponent/sharedcomponent_test.go index 4637b4a0d3a..c65e59918ed 100644 --- a/internal/sharedcomponent/sharedcomponent_test.go +++ b/internal/sharedcomponent/sharedcomponent_test.go @@ -21,7 +21,6 @@ var id = component.MustNewID("test") type baseComponent struct { component.StartFunc component.ShutdownFunc - telemetry *component.TelemetrySettings } func TestNewMap(t *testing.T) { @@ -36,7 +35,6 @@ func TestNewSharedComponentsCreateError(t *testing.T) { _, err := comps.LoadOrStore( id, func() (*baseComponent, error) { return nil, myErr }, - newNopTelemetrySettings(), ) require.ErrorIs(t, err, myErr) assert.Empty(t, comps.components) @@ -49,7 +47,6 @@ func TestSharedComponentsLoadOrStore(t *testing.T) { got, err := comps.LoadOrStore( id, func() (*baseComponent, error) { return nop, nil }, - newNopTelemetrySettings(), ) require.NoError(t, err) assert.Len(t, comps.components, 1) @@ -57,7 +54,6 @@ func TestSharedComponentsLoadOrStore(t *testing.T) { gotSecond, err := comps.LoadOrStore( id, func() (*baseComponent, error) { panic("should not be called") }, - newNopTelemetrySettings(), ) require.NoError(t, err) @@ -69,7 +65,6 @@ func TestSharedComponentsLoadOrStore(t *testing.T) { gotThird, err := comps.LoadOrStore( id, func() (*baseComponent, error) { return nop, nil }, - newNopTelemetrySettings(), ) require.NoError(t, err) assert.NotSame(t, got, gotThird) @@ -93,7 +88,6 @@ func TestSharedComponent(t *testing.T) { got, err := comps.LoadOrStore( id, func() (*baseComponent, error) { return comp, nil }, - newNopTelemetrySettings(), ) require.NoError(t, err) assert.Equal(t, wantErr, got.Start(context.Background(), componenttest.NewNopHost())) @@ -171,14 +165,9 @@ func TestReportStatusOnStartShutdown(t *testing.T) { var comp *Component[*baseComponent] var err error for i := 0; i < 3; i++ { - telemetrySettings := newNopTelemetrySettings() - if i == 0 { - base.telemetry = telemetrySettings - } comp, err = comps.LoadOrStore( id, func() (*baseComponent, error) { return base, nil }, - telemetrySettings, ) require.NoError(t, err) } @@ -209,12 +198,6 @@ func TestReportStatusOnStartShutdown(t *testing.T) { } } -// newNopTelemetrySettings streamlines getting a pointer to a NopTelemetrySettings -func newNopTelemetrySettings() *component.TelemetrySettings { - set := componenttest.NewNopTelemetrySettings() - return &set -} - var _ component.Host = (*testHost)(nil) var _ componentstatus.Reporter = (*testHost)(nil) diff --git a/receiver/otlpreceiver/factory.go b/receiver/otlpreceiver/factory.go index f2feeb7383a..9ffc0d987f8 100644 --- a/receiver/otlpreceiver/factory.go +++ b/receiver/otlpreceiver/factory.go @@ -74,7 +74,6 @@ func createTraces( func() (*otlpReceiver, error) { return newOtlpReceiver(oCfg, &set) }, - &set.TelemetrySettings, ) if err != nil { return nil, err @@ -97,7 +96,6 @@ func createMetrics( func() (*otlpReceiver, error) { return newOtlpReceiver(oCfg, &set) }, - &set.TelemetrySettings, ) if err != nil { return nil, err @@ -120,7 +118,6 @@ func createLog( func() (*otlpReceiver, error) { return newOtlpReceiver(oCfg, &set) }, - &set.TelemetrySettings, ) if err != nil { return nil, err @@ -143,7 +140,6 @@ func createProfiles( func() (*otlpReceiver, error) { return newOtlpReceiver(oCfg, &set) }, - &set.TelemetrySettings, ) if err != nil { return nil, err