Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[chore] Remove unused parameter for sharedcomponent #11439

Merged
merged 1 commit into from
Oct 14, 2024
Merged

[chore] Remove unused parameter for sharedcomponent #11439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions internal/e2e/status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -203,7 +203,6 @@ func createTraces(
func() (*testReceiver, error) {
return &testReceiver{}, nil
},
&set.TelemetrySettings,
)
if err != nil {
return nil, err
Expand All @@ -214,7 +213,7 @@ func createTraces(

func createMetrics(
_ context.Context,
set receiver.Settings,
_ receiver.Settings,
cfg component.Config,
_ consumer.Metrics,
) (receiver.Metrics, error) {
Expand All @@ -224,7 +223,6 @@ func createMetrics(
func() (*testReceiver, error) {
return &testReceiver{}, nil
},
&set.TelemetrySettings,
)
if err != nil {
return nil, err
Expand Down
5 changes: 1 addition & 4 deletions internal/sharedcomponent/sharedcomponent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
Expand All @@ -62,8 +61,6 @@ type Component[V component.Component] struct {
stopOnce sync.Once
removeFunc func()

telemetry *component.TelemetrySettings

hostWrapper *hostWrapper
}

Expand Down
17 changes: 0 additions & 17 deletions internal/sharedcomponent/sharedcomponent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ var id = component.MustNewID("test")
type baseComponent struct {
component.StartFunc
component.ShutdownFunc
telemetry *component.TelemetrySettings
}

func TestNewMap(t *testing.T) {
Expand All @@ -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)
Expand All @@ -49,15 +47,13 @@ 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)
assert.Same(t, nop, got.Unwrap())
gotSecond, err := comps.LoadOrStore(
id,
func() (*baseComponent, error) { panic("should not be called") },
newNopTelemetrySettings(),
)

require.NoError(t, err)
Expand All @@ -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)
Expand All @@ -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()))
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)

Expand Down
4 changes: 0 additions & 4 deletions receiver/otlpreceiver/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ func createTraces(
func() (*otlpReceiver, error) {
return newOtlpReceiver(oCfg, &set)
},
&set.TelemetrySettings,
)
if err != nil {
return nil, err
Expand All @@ -97,7 +96,6 @@ func createMetrics(
func() (*otlpReceiver, error) {
return newOtlpReceiver(oCfg, &set)
},
&set.TelemetrySettings,
)
if err != nil {
return nil, err
Expand All @@ -120,7 +118,6 @@ func createLog(
func() (*otlpReceiver, error) {
return newOtlpReceiver(oCfg, &set)
},
&set.TelemetrySettings,
)
if err != nil {
return nil, err
Expand All @@ -143,7 +140,6 @@ func createProfiles(
func() (*otlpReceiver, error) {
return newOtlpReceiver(oCfg, &set)
},
&set.TelemetrySettings,
)
if err != nil {
return nil, err
Expand Down
Loading