Skip to content

Commit 58b745e

Browse files
committed
[chore] Move test only MockHost in a hosttest package
Signed-off-by: Bogdan Drutu <[email protected]>
1 parent 6e64a27 commit 58b745e

File tree

8 files changed

+59
-16
lines changed

8 files changed

+59
-16
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
package hosttest // import "go.opentelemetry.io/collector/exporter/exporterhelper/internal/hosttest"
5+
6+
import (
7+
"go.opentelemetry.io/collector/component"
8+
)
9+
10+
var _ component.Host = (*MockHost)(nil)
11+
12+
type MockHost struct {
13+
component.Host
14+
Ext map[component.ID]component.Component
15+
}
16+
17+
func (nh *MockHost) GetExtensions() map[component.ID]component.Component {
18+
return nh.Ext
19+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
package hosttest
5+
6+
import (
7+
"testing"
8+
9+
"github.com/stretchr/testify/assert"
10+
11+
"go.opentelemetry.io/collector/component"
12+
"go.opentelemetry.io/collector/component/componenttest"
13+
)
14+
15+
// nopExtension acts as an extension for testing purposes.
16+
type nopExtension struct {
17+
component.StartFunc
18+
component.ShutdownFunc
19+
}
20+
21+
func TestMockHost(t *testing.T) {
22+
componenttest.NewNopHost()
23+
ext := map[component.ID]component.Component{
24+
component.MustNewID("test"): &nopExtension{},
25+
}
26+
host := &MockHost{Ext: ext}
27+
assert.Same(t, ext, host.Ext)
28+
}

exporter/exporterhelper/internal/queue_sender.go

-9
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,3 @@ func (qs *QueueSender) Shutdown(ctx context.Context) error {
8686
func (qs *QueueSender) Send(ctx context.Context, req request.Request) error {
8787
return qs.queue.Offer(ctx, req)
8888
}
89-
90-
type MockHost struct {
91-
component.Host
92-
Ext map[component.ID]component.Component
93-
}
94-
95-
func (nh *MockHost) GetExtensions() map[component.ID]component.Component {
96-
return nh.Ext
97-
}

exporter/exporterhelper/internal/queue_sender_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"go.opentelemetry.io/collector/component/componenttest"
2121
"go.opentelemetry.io/collector/config/configretry"
2222
"go.opentelemetry.io/collector/exporter/exporterbatcher"
23+
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/hosttest"
2324
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/queuebatch"
2425
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/request"
2526
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/requesttest"
@@ -141,7 +142,7 @@ func TestQueueBatcherPersistenceEnabled(t *testing.T) {
141142
extensions := map[component.ID]component.Component{
142143
storageID: storagetest.NewMockStorageExtension(nil),
143144
}
144-
host := &MockHost{Ext: extensions}
145+
host := &hosttest.MockHost{Ext: extensions}
145146

146147
// we start correctly with a file storage extension
147148
require.NoError(t, be.Start(context.Background(), host))
@@ -165,7 +166,7 @@ func TestQueueBatcherPersistenceEnabledStorageError(t *testing.T) {
165166
extensions := map[component.ID]component.Component{
166167
storageID: storagetest.NewMockStorageExtension(storageError),
167168
}
168-
host := &MockHost{Ext: extensions}
169+
host := &hosttest.MockHost{Ext: extensions}
169170

170171
// we fail to start if we get an error creating the storage client
171172
require.Error(t, be.Start(context.Background(), host), "could not get storage client")
@@ -195,7 +196,7 @@ func TestQueueBatcherPersistentEnabled_NoDataLossOnShutdown(t *testing.T) {
195196
extensions := map[component.ID]component.Component{
196197
storageID: storagetest.NewMockStorageExtension(nil),
197198
}
198-
host := &MockHost{Ext: extensions}
199+
host := &hosttest.MockHost{Ext: extensions}
199200

200201
require.NoError(t, be.Start(context.Background(), host))
201202

exporter/exporterhelper/logs_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"go.opentelemetry.io/collector/consumer/consumertest"
2929
"go.opentelemetry.io/collector/exporter"
3030
"go.opentelemetry.io/collector/exporter/exporterhelper/internal"
31+
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/hosttest"
3132
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/metadatatest"
3233
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/oteltest"
3334
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/requesttest"
@@ -177,7 +178,7 @@ func TestLogs_WithPersistentQueue(t *testing.T) {
177178
te, err := NewLogs(context.Background(), set, &fakeLogsConfig, ts.ConsumeLogs, WithRetry(rCfg), WithQueue(qCfg))
178179
require.NoError(t, err)
179180

180-
host := &internal.MockHost{Ext: map[component.ID]component.Component{
181+
host := &hosttest.MockHost{Ext: map[component.ID]component.Component{
181182
storageID: storagetest.NewMockStorageExtension(nil),
182183
}}
183184
require.NoError(t, te.Start(context.Background(), host))

exporter/exporterhelper/metrics_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"go.opentelemetry.io/collector/consumer/consumertest"
2929
"go.opentelemetry.io/collector/exporter"
3030
"go.opentelemetry.io/collector/exporter/exporterhelper/internal"
31+
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/hosttest"
3132
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/metadatatest"
3233
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/oteltest"
3334
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/requesttest"
@@ -177,7 +178,7 @@ func TestMetrics_WithPersistentQueue(t *testing.T) {
177178
te, err := NewMetrics(context.Background(), set, &fakeMetricsConfig, ms.ConsumeMetrics, WithRetry(rCfg), WithQueue(qCfg))
178179
require.NoError(t, err)
179180

180-
host := &internal.MockHost{Ext: map[component.ID]component.Component{
181+
host := &hosttest.MockHost{Ext: map[component.ID]component.Component{
181182
storageID: storagetest.NewMockStorageExtension(nil),
182183
}}
183184
require.NoError(t, te.Start(context.Background(), host))

exporter/exporterhelper/traces_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"go.opentelemetry.io/collector/consumer/consumertest"
2929
"go.opentelemetry.io/collector/exporter"
3030
"go.opentelemetry.io/collector/exporter/exporterhelper/internal"
31+
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/hosttest"
3132
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/metadatatest"
3233
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/oteltest"
3334
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/requesttest"
@@ -175,7 +176,7 @@ func TestTraces_WithPersistentQueue(t *testing.T) {
175176
te, err := NewTraces(context.Background(), set, &fakeTracesConfig, ts.ConsumeTraces, WithRetry(rCfg), WithQueue(qCfg))
176177
require.NoError(t, err)
177178

178-
host := &internal.MockHost{Ext: map[component.ID]component.Component{
179+
host := &hosttest.MockHost{Ext: map[component.ID]component.Component{
179180
storageID: storagetest.NewMockStorageExtension(nil),
180181
}}
181182
require.NoError(t, te.Start(context.Background(), host))

exporter/exporterhelper/xexporterhelper/profiles_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
"go.opentelemetry.io/collector/exporter"
3030
"go.opentelemetry.io/collector/exporter/exporterhelper"
3131
"go.opentelemetry.io/collector/exporter/exporterhelper/internal"
32+
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/hosttest"
3233
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/oteltest"
3334
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/requesttest"
3435
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/storagetest"
@@ -175,7 +176,7 @@ func TestProfilesExporter_WithPersistentQueue(t *testing.T) {
175176
te, err := NewProfilesExporter(context.Background(), set, &fakeProfilesExporterConfig, ts.ConsumeProfiles, exporterhelper.WithRetry(rCfg), exporterhelper.WithQueue(qCfg))
176177
require.NoError(t, err)
177178

178-
host := &internal.MockHost{Ext: map[component.ID]component.Component{
179+
host := &hosttest.MockHost{Ext: map[component.ID]component.Component{
179180
storageID: storagetest.NewMockStorageExtension(nil),
180181
}}
181182
require.NoError(t, te.Start(context.Background(), host))

0 commit comments

Comments
 (0)