Skip to content

Commit 65d2fab

Browse files
bogdandrutubogdandrutu
authored
[chore] Remove duplicate MockHost, add constructor (#12688)
Signed-off-by: Bogdan Drutu <[email protected]>
1 parent eb876d3 commit 65d2fab

File tree

8 files changed

+31
-41
lines changed

8 files changed

+31
-41
lines changed

‎exporter/exporterhelper/internal/hosttest/hosttest.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ import (
77
"go.opentelemetry.io/collector/component"
88
)
99

10-
var _ component.Host = (*MockHost)(nil)
10+
func NewHost(ext map[component.ID]component.Component) component.Host {
11+
return &mockHost{ext: ext}
12+
}
1113

12-
type MockHost struct {
13-
component.Host
14-
Ext map[component.ID]component.Component
14+
type mockHost struct {
15+
ext map[component.ID]component.Component
1516
}
1617

17-
func (nh *MockHost) GetExtensions() map[component.ID]component.Component {
18-
return nh.Ext
18+
func (nh *mockHost) GetExtensions() map[component.ID]component.Component {
19+
return nh.ext
1920
}

‎exporter/exporterhelper/internal/hosttest/hosttest_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ func TestMockHost(t *testing.T) {
2323
ext := map[component.ID]component.Component{
2424
component.MustNewID("test"): &nopExtension{},
2525
}
26-
host := &MockHost{Ext: ext}
27-
assert.Equal(t, ext, host.Ext)
26+
host := NewHost(ext)
27+
assert.Equal(t, ext, host.GetExtensions())
2828
}

‎exporter/exporterhelper/internal/queue_sender_test.go

+6-9
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,9 @@ func TestQueueBatcherPersistenceEnabled(t *testing.T) {
140140
be, err := NewQueueSender(qSet, qCfg, exporterbatcher.Config{}, "", newNoopExportSender())
141141
require.NoError(t, err)
142142

143-
extensions := map[component.ID]component.Component{
143+
host := hosttest.NewHost(map[component.ID]component.Component{
144144
storageID: storagetest.NewMockStorageExtension(nil),
145-
}
146-
host := &hosttest.MockHost{Ext: extensions}
145+
})
147146

148147
// we start correctly with a file storage extension
149148
require.NoError(t, be.Start(context.Background(), host))
@@ -164,10 +163,9 @@ func TestQueueBatcherPersistenceEnabledStorageError(t *testing.T) {
164163
be, err := NewQueueSender(qSet, qCfg, exporterbatcher.Config{}, "", newNoopExportSender())
165164
require.NoError(t, err)
166165

167-
extensions := map[component.ID]component.Component{
166+
host := hosttest.NewHost(map[component.ID]component.Component{
168167
storageID: storagetest.NewMockStorageExtension(storageError),
169-
}
170-
host := &hosttest.MockHost{Ext: extensions}
168+
})
171169

172170
// we fail to start if we get an error creating the storage client
173171
require.Error(t, be.Start(context.Background(), host), "could not get storage client")
@@ -194,10 +192,9 @@ func TestQueueBatcherPersistentEnabled_NoDataLossOnShutdown(t *testing.T) {
194192
be, err := NewQueueSender(qSet, qCfg, exporterbatcher.Config{}, "", rs)
195193
require.NoError(t, err)
196194

197-
extensions := map[component.ID]component.Component{
195+
host := hosttest.NewHost(map[component.ID]component.Component{
198196
storageID: storagetest.NewMockStorageExtension(nil),
199-
}
200-
host := &hosttest.MockHost{Ext: extensions}
197+
})
201198

202199
require.NoError(t, be.Start(context.Background(), host))
203200

‎exporter/exporterhelper/internal/queuebatch/persistent_queue_test.go

+8-16
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121

2222
"go.opentelemetry.io/collector/component"
2323
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/experr"
24+
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/hosttest"
2425
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/storagetest"
2526
"go.opentelemetry.io/collector/exporter/exportertest"
2627
"go.opentelemetry.io/collector/extension/extensiontest"
@@ -51,15 +52,6 @@ func (uint64Encoding) Unmarshal(bytes []byte) (uint64, error) {
5152
return binary.LittleEndian.Uint64(bytes), nil
5253
}
5354

54-
type mockHost struct {
55-
component.Host
56-
ext map[component.ID]component.Component
57-
}
58-
59-
func (nh *mockHost) GetExtensions() map[component.ID]component.Component {
60-
return nh.ext
61-
}
62-
6355
func newFakeBoundedStorageClient(maxSizeInBytes int) *fakeBoundedStorageClient {
6456
return &fakeBoundedStorageClient{
6557
st: map[string][]byte{},
@@ -233,9 +225,9 @@ func createAndStartTestPersistentQueue(t *testing.T, sizer sizer[uint64], capaci
233225
ac := newAsyncQueue(pq, numConsumers, func(ctx context.Context, item uint64, done Done) {
234226
done.OnDone(consumeFunc(ctx, item))
235227
})
236-
host := &mockHost{ext: map[component.ID]component.Component{
228+
host := hosttest.NewHost(map[component.ID]component.Component{
237229
{}: storagetest.NewMockStorageExtension(nil),
238-
}}
230+
})
239231
require.NoError(t, ac.Start(context.Background(), host))
240232
t.Cleanup(func() {
241233
assert.NoError(t, ac.Shutdown(context.Background()))
@@ -275,7 +267,7 @@ func createTestPersistentQueueWithCapacityLimiter(tb testing.TB, ext storage.Ext
275267
encoding: uint64Encoding{},
276268
set: exportertest.NewNopSettings(exportertest.NopType),
277269
}).(*persistentQueue[uint64])
278-
require.NoError(tb, pq.Start(context.Background(), &mockHost{ext: map[component.ID]component.Component{{}: ext}}))
270+
require.NoError(tb, pq.Start(context.Background(), hosttest.NewHost(map[component.ID]component.Component{{}: ext})))
279271
return pq
280272
}
281273

@@ -427,9 +419,9 @@ func TestPersistentBlockingQueue(t *testing.T) {
427419
consumed.Add(1)
428420
done.OnDone(nil)
429421
})
430-
host := &mockHost{ext: map[component.ID]component.Component{
422+
host := hosttest.NewHost(map[component.ID]component.Component{
431423
{}: storagetest.NewMockStorageExtension(nil),
432-
}}
424+
})
433425
require.NoError(t, ac.Start(context.Background(), host))
434426

435427
td := uint64(10)
@@ -498,7 +490,7 @@ func TestToStorageClient(t *testing.T) {
498490
for i := 0; i < tt.numStorages; i++ {
499491
extensions[component.MustNewIDWithName("file_storage", strconv.Itoa(i))] = storagetest.NewMockStorageExtension(tt.getClientError)
500492
}
501-
host := &mockHost{ext: extensions}
493+
host := hosttest.NewHost(extensions)
502494
ownerID := component.MustNewID("foo_exporter")
503495

504496
// execute
@@ -528,7 +520,7 @@ func TestInvalidStorageExtensionType(t *testing.T) {
528520
extensions := map[component.ID]component.Component{
529521
storageID: extension,
530522
}
531-
host := &mockHost{ext: extensions}
523+
host := hosttest.NewHost(extensions)
532524
ownerID := component.MustNewID("foo_exporter")
533525

534526
// execute

‎exporter/exporterhelper/logs_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ func TestLogs_WithPersistentQueue(t *testing.T) {
179179
te, err := NewLogs(context.Background(), set, &fakeLogsConfig, ts.ConsumeLogs, WithRetry(rCfg), WithQueue(qCfg))
180180
require.NoError(t, err)
181181

182-
host := &hosttest.MockHost{Ext: map[component.ID]component.Component{
182+
host := hosttest.NewHost(map[component.ID]component.Component{
183183
storageID: storagetest.NewMockStorageExtension(nil),
184-
}}
184+
})
185185
require.NoError(t, te.Start(context.Background(), host))
186186
t.Cleanup(func() { require.NoError(t, te.Shutdown(context.Background())) })
187187

‎exporter/exporterhelper/metrics_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ func TestMetrics_WithPersistentQueue(t *testing.T) {
179179
te, err := NewMetrics(context.Background(), set, &fakeMetricsConfig, ms.ConsumeMetrics, WithRetry(rCfg), WithQueue(qCfg))
180180
require.NoError(t, err)
181181

182-
host := &hosttest.MockHost{Ext: map[component.ID]component.Component{
182+
host := hosttest.NewHost(map[component.ID]component.Component{
183183
storageID: storagetest.NewMockStorageExtension(nil),
184-
}}
184+
})
185185
require.NoError(t, te.Start(context.Background(), host))
186186
t.Cleanup(func() { require.NoError(t, te.Shutdown(context.Background())) })
187187

‎exporter/exporterhelper/traces_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,9 @@ func TestTraces_WithPersistentQueue(t *testing.T) {
177177
te, err := NewTraces(context.Background(), set, &fakeTracesConfig, ts.ConsumeTraces, WithRetry(rCfg), WithQueue(qCfg))
178178
require.NoError(t, err)
179179

180-
host := &hosttest.MockHost{Ext: map[component.ID]component.Component{
180+
host := hosttest.NewHost(map[component.ID]component.Component{
181181
storageID: storagetest.NewMockStorageExtension(nil),
182-
}}
182+
})
183183
require.NoError(t, te.Start(context.Background(), host))
184184
t.Cleanup(func() { require.NoError(t, te.Shutdown(context.Background())) })
185185

‎exporter/exporterhelper/xexporterhelper/profiles_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,9 @@ func TestProfilesExporter_WithPersistentQueue(t *testing.T) {
177177
te, err := NewProfilesExporter(context.Background(), set, &fakeProfilesExporterConfig, ts.ConsumeProfiles, exporterhelper.WithRetry(rCfg), exporterhelper.WithQueue(qCfg))
178178
require.NoError(t, err)
179179

180-
host := &hosttest.MockHost{Ext: map[component.ID]component.Component{
180+
host := hosttest.NewHost(map[component.ID]component.Component{
181181
storageID: storagetest.NewMockStorageExtension(nil),
182-
}}
182+
})
183183
require.NoError(t, te.Start(context.Background(), host))
184184
t.Cleanup(func() { require.NoError(t, te.Shutdown(context.Background())) })
185185

0 commit comments

Comments
 (0)