Skip to content

Commit bfe3b31

Browse files
ankitpatel96ankitpatel96
authored
ExporterHelper tests - switch to DataType instead of Type (#10127)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description `newBaseExporter` needs a `DataType` - up until now we've been passing in a `Type`. In preparation of splitting `DataType` and `Type`, pass in a real `DataType`. <!-- Issue number if applicable --> #### Link to tracking issue related to #9429 In preparation for #10069
1 parent c555005 commit bfe3b31

File tree

4 files changed

+30
-29
lines changed

4 files changed

+30
-29
lines changed

‎exporter/exporterhelper/batch_sender_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ func TestBatchSender_Disabled(t *testing.T) {
209209
cfg := exporterbatcher.NewDefaultConfig()
210210
cfg.Enabled = false
211211
cfg.MaxSizeItems = 5
212-
be, err := newBaseExporter(defaultSettings, defaultType, newNoopObsrepSender,
212+
be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender,
213213
WithBatcher(cfg, WithRequestBatchFuncs(fakeBatchMergeFunc, fakeBatchMergeSplitFunc)))
214214
require.NotNil(t, be)
215215
require.NoError(t, err)
@@ -257,7 +257,7 @@ func TestBatchSender_InvalidMergeSplitFunc(t *testing.T) {
257257
}
258258

259259
func TestBatchSender_PostShutdown(t *testing.T) {
260-
be, err := newBaseExporter(defaultSettings, defaultType, newNoopObsrepSender,
260+
be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender,
261261
WithBatcher(exporterbatcher.NewDefaultConfig(), WithRequestBatchFuncs(fakeBatchMergeFunc,
262262
fakeBatchMergeSplitFunc)))
263263
require.NotNil(t, be)
@@ -275,7 +275,7 @@ func TestBatchSender_PostShutdown(t *testing.T) {
275275
func TestBatchSender_ConcurrencyLimitReached(t *testing.T) {
276276
qCfg := exporterqueue.NewDefaultConfig()
277277
qCfg.NumConsumers = 2
278-
be, err := newBaseExporter(defaultSettings, defaultType, newNoopObsrepSender,
278+
be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender,
279279
WithBatcher(exporterbatcher.NewDefaultConfig(), WithRequestBatchFuncs(fakeBatchMergeFunc, fakeBatchMergeSplitFunc)),
280280
WithRequestQueue(qCfg, exporterqueue.NewMemoryQueueFactory[Request]()))
281281
require.NotNil(t, be)
@@ -299,7 +299,7 @@ func TestBatchSender_ConcurrencyLimitReached(t *testing.T) {
299299
func TestBatchSender_BatchBlocking(t *testing.T) {
300300
bCfg := exporterbatcher.NewDefaultConfig()
301301
bCfg.MinSizeItems = 3
302-
be, err := newBaseExporter(defaultSettings, defaultType, newNoopObsrepSender,
302+
be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender,
303303
WithBatcher(bCfg, WithRequestBatchFuncs(fakeBatchMergeFunc, fakeBatchMergeSplitFunc)))
304304
require.NotNil(t, be)
305305
require.NoError(t, err)
@@ -329,7 +329,7 @@ func TestBatchSender_BatchBlocking(t *testing.T) {
329329
func TestBatchSender_BatchCancelled(t *testing.T) {
330330
bCfg := exporterbatcher.NewDefaultConfig()
331331
bCfg.MinSizeItems = 2
332-
be, err := newBaseExporter(defaultSettings, defaultType, newNoopObsrepSender,
332+
be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender,
333333
WithBatcher(bCfg, WithRequestBatchFuncs(fakeBatchMergeFunc, fakeBatchMergeSplitFunc)))
334334
require.NotNil(t, be)
335335
require.NoError(t, err)
@@ -364,7 +364,7 @@ func TestBatchSender_BatchCancelled(t *testing.T) {
364364
func TestBatchSender_DrainActiveRequests(t *testing.T) {
365365
bCfg := exporterbatcher.NewDefaultConfig()
366366
bCfg.MinSizeItems = 2
367-
be, err := newBaseExporter(defaultSettings, defaultType, newNoopObsrepSender,
367+
be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender,
368368
WithBatcher(bCfg, WithRequestBatchFuncs(fakeBatchMergeFunc, fakeBatchMergeSplitFunc)))
369369
require.NotNil(t, be)
370370
require.NoError(t, err)
@@ -427,7 +427,7 @@ func TestBatchSender_WithBatcherOption(t *testing.T) {
427427
}
428428
for _, tt := range tests {
429429
t.Run(tt.name, func(t *testing.T) {
430-
be, err := newBaseExporter(defaultSettings, defaultType, newNoopObsrepSender, tt.opts...)
430+
be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender, tt.opts...)
431431
if tt.expectedErr {
432432
assert.Nil(t, be)
433433
assert.Error(t, err)
@@ -440,7 +440,7 @@ func TestBatchSender_WithBatcherOption(t *testing.T) {
440440
}
441441

442442
func queueBatchExporter(t *testing.T, batchOption Option) *baseExporter {
443-
be, err := newBaseExporter(defaultSettings, defaultType, newNoopObsrepSender, batchOption,
443+
be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender, batchOption,
444444
WithRequestQueue(exporterqueue.NewDefaultConfig(), exporterqueue.NewMemoryQueueFactory[Request]()))
445445
require.NotNil(t, be)
446446
require.NoError(t, err)

‎exporter/exporterhelper/common_test.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424

2525
var (
2626
defaultType = component.MustNewType("test")
27+
defaultDataType = component.DataTypeMetrics
2728
defaultID = component.NewID(defaultType)
2829
defaultSettings = func() exporter.CreateSettings {
2930
set := exportertest.NewNopCreateSettings()
@@ -37,7 +38,7 @@ func newNoopObsrepSender(*ObsReport) requestSender {
3738
}
3839

3940
func TestBaseExporter(t *testing.T) {
40-
be, err := newBaseExporter(defaultSettings, defaultType, newNoopObsrepSender)
41+
be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender)
4142
require.NoError(t, err)
4243
require.NoError(t, be.Start(context.Background(), componenttest.NewNopHost()))
4344
require.NoError(t, be.Shutdown(context.Background()))
@@ -46,7 +47,7 @@ func TestBaseExporter(t *testing.T) {
4647
func TestBaseExporterWithOptions(t *testing.T) {
4748
want := errors.New("my error")
4849
be, err := newBaseExporter(
49-
defaultSettings, defaultType, newNoopObsrepSender,
50+
defaultSettings, defaultDataType, newNoopObsrepSender,
5051
WithStart(func(context.Context, component.Host) error { return want }),
5152
WithShutdown(func(context.Context) error { return want }),
5253
WithTimeout(NewDefaultTimeoutSettings()),
@@ -66,16 +67,16 @@ func checkStatus(t *testing.T, sd sdktrace.ReadOnlySpan, err error) {
6667
}
6768

6869
func TestQueueOptionsWithRequestExporter(t *testing.T) {
69-
bs, err := newBaseExporter(exportertest.NewNopCreateSettings(), defaultType, newNoopObsrepSender,
70+
bs, err := newBaseExporter(exportertest.NewNopCreateSettings(), defaultDataType, newNoopObsrepSender,
7071
WithRetry(configretry.NewDefaultBackOffConfig()))
7172
require.Nil(t, err)
7273
require.Nil(t, bs.marshaler)
7374
require.Nil(t, bs.unmarshaler)
74-
_, err = newBaseExporter(exportertest.NewNopCreateSettings(), defaultType, newNoopObsrepSender,
75+
_, err = newBaseExporter(exportertest.NewNopCreateSettings(), defaultDataType, newNoopObsrepSender,
7576
WithRetry(configretry.NewDefaultBackOffConfig()), WithQueue(NewDefaultQueueSettings()))
7677
require.Error(t, err)
7778

78-
_, err = newBaseExporter(exportertest.NewNopCreateSettings(), defaultType, newNoopObsrepSender,
79+
_, err = newBaseExporter(exportertest.NewNopCreateSettings(), defaultDataType, newNoopObsrepSender,
7980
withMarshaler(mockRequestMarshaler), withUnmarshaler(mockRequestUnmarshaler(&mockRequest{})),
8081
WithRetry(configretry.NewDefaultBackOffConfig()),
8182
WithRequestQueue(exporterqueue.NewDefaultConfig(), exporterqueue.NewMemoryQueueFactory[Request]()))
@@ -88,7 +89,7 @@ func TestBaseExporterLogging(t *testing.T) {
8889
set.Logger = zap.New(logger)
8990
rCfg := configretry.NewDefaultBackOffConfig()
9091
rCfg.Enabled = false
91-
bs, err := newBaseExporter(set, defaultType, newNoopObsrepSender, WithRetry(rCfg))
92+
bs, err := newBaseExporter(set, defaultDataType, newNoopObsrepSender, WithRetry(rCfg))
9293
require.Nil(t, err)
9394
sendErr := bs.send(context.Background(), newErrorRequest())
9495
require.Error(t, sendErr)

‎exporter/exporterhelper/queue_sender_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestQueuedRetry_StopWhileWaiting(t *testing.T) {
2727
qCfg := NewDefaultQueueSettings()
2828
qCfg.NumConsumers = 1
2929
rCfg := configretry.NewDefaultBackOffConfig()
30-
be, err := newBaseExporter(defaultSettings, defaultType, newObservabilityConsumerSender,
30+
be, err := newBaseExporter(defaultSettings, defaultDataType, newObservabilityConsumerSender,
3131
withMarshaler(mockRequestMarshaler), withUnmarshaler(mockRequestUnmarshaler(&mockRequest{})),
3232
WithRetry(rCfg), WithQueue(qCfg))
3333
require.NoError(t, err)
@@ -61,7 +61,7 @@ func TestQueuedRetry_DoNotPreserveCancellation(t *testing.T) {
6161
qCfg := NewDefaultQueueSettings()
6262
qCfg.NumConsumers = 1
6363
rCfg := configretry.NewDefaultBackOffConfig()
64-
be, err := newBaseExporter(defaultSettings, defaultType, newObservabilityConsumerSender,
64+
be, err := newBaseExporter(defaultSettings, defaultDataType, newObservabilityConsumerSender,
6565
withMarshaler(mockRequestMarshaler), withUnmarshaler(mockRequestUnmarshaler(&mockRequest{})),
6666
WithRetry(rCfg), WithQueue(qCfg))
6767
require.NoError(t, err)
@@ -93,7 +93,7 @@ func TestQueuedRetry_RejectOnFull(t *testing.T) {
9393
set := exportertest.NewNopCreateSettings()
9494
logger, observed := observer.New(zap.ErrorLevel)
9595
set.Logger = zap.New(logger)
96-
be, err := newBaseExporter(set, defaultType, newNoopObsrepSender,
96+
be, err := newBaseExporter(set, defaultDataType, newNoopObsrepSender,
9797
withMarshaler(mockRequestMarshaler), withUnmarshaler(mockRequestUnmarshaler(&mockRequest{})),
9898
WithQueue(qCfg))
9999
require.NoError(t, err)
@@ -166,7 +166,7 @@ func TestQueuedRetryHappyPath(t *testing.T) {
166166
t.Cleanup(func() { require.NoError(t, tel.Shutdown(context.Background())) })
167167

168168
set := exporter.CreateSettings{ID: defaultID, TelemetrySettings: tel.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}
169-
be, err := newBaseExporter(set, defaultType, newObservabilityConsumerSender, tt.queueOptions...)
169+
be, err := newBaseExporter(set, defaultDataType, newObservabilityConsumerSender, tt.queueOptions...)
170170
require.NoError(t, err)
171171
ocs := be.obsrepSender.(*observabilityConsumerSender)
172172

@@ -209,7 +209,7 @@ func TestQueuedRetry_QueueMetricsReported(t *testing.T) {
209209
qCfg.NumConsumers = 0 // to make every request go straight to the queue
210210
rCfg := configretry.NewDefaultBackOffConfig()
211211
set := exporter.CreateSettings{ID: defaultID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}
212-
be, err := newBaseExporter(set, defaultType, newObservabilityConsumerSender,
212+
be, err := newBaseExporter(set, defaultDataType, newObservabilityConsumerSender,
213213
withMarshaler(mockRequestMarshaler), withUnmarshaler(mockRequestUnmarshaler(&mockRequest{})),
214214
WithRetry(rCfg), WithQueue(qCfg))
215215
require.NoError(t, err)
@@ -338,7 +338,7 @@ func TestQueuedRetryPersistenceEnabled(t *testing.T) {
338338
qCfg.StorageID = &storageID // enable persistence
339339
rCfg := configretry.NewDefaultBackOffConfig()
340340
set := exporter.CreateSettings{ID: defaultID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}
341-
be, err := newBaseExporter(set, defaultType, newObservabilityConsumerSender,
341+
be, err := newBaseExporter(set, defaultDataType, newObservabilityConsumerSender,
342342
withMarshaler(mockRequestMarshaler), withUnmarshaler(mockRequestUnmarshaler(&mockRequest{})),
343343
WithRetry(rCfg), WithQueue(qCfg))
344344
require.NoError(t, err)
@@ -364,7 +364,7 @@ func TestQueuedRetryPersistenceEnabledStorageError(t *testing.T) {
364364
qCfg.StorageID = &storageID // enable persistence
365365
rCfg := configretry.NewDefaultBackOffConfig()
366366
set := exporter.CreateSettings{ID: defaultID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()}
367-
be, err := newBaseExporter(set, defaultType, newObservabilityConsumerSender, withMarshaler(mockRequestMarshaler),
367+
be, err := newBaseExporter(set, defaultDataType, newObservabilityConsumerSender, withMarshaler(mockRequestMarshaler),
368368
withUnmarshaler(mockRequestUnmarshaler(&mockRequest{})), WithRetry(rCfg), WithQueue(qCfg))
369369
require.NoError(t, err)
370370

@@ -388,7 +388,7 @@ func TestQueuedRetryPersistentEnabled_NoDataLossOnShutdown(t *testing.T) {
388388
rCfg.MaxElapsedTime = 0 // retry infinitely so shutdown can be triggered
389389

390390
mockReq := newErrorRequest()
391-
be, err := newBaseExporter(defaultSettings, defaultType, newNoopObsrepSender, withMarshaler(mockRequestMarshaler),
391+
be, err := newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender, withMarshaler(mockRequestMarshaler),
392392
withUnmarshaler(mockRequestUnmarshaler(mockReq)), WithRetry(rCfg), WithQueue(qCfg))
393393
require.NoError(t, err)
394394

@@ -412,7 +412,7 @@ func TestQueuedRetryPersistentEnabled_NoDataLossOnShutdown(t *testing.T) {
412412

413413
// start the exporter again replacing the preserved mockRequest in the unmarshaler with a new one that doesn't fail.
414414
replacedReq := newMockRequest(1, nil)
415-
be, err = newBaseExporter(defaultSettings, defaultType, newNoopObsrepSender, withMarshaler(mockRequestMarshaler),
415+
be, err = newBaseExporter(defaultSettings, defaultDataType, newNoopObsrepSender, withMarshaler(mockRequestMarshaler),
416416
withUnmarshaler(mockRequestUnmarshaler(replacedReq)), WithRetry(rCfg), WithQueue(qCfg))
417417
require.NoError(t, err)
418418
require.NoError(t, be.Start(context.Background(), host))

‎exporter/exporterhelper/retry_sender_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestQueuedRetry_DropOnPermanentError(t *testing.T) {
3939
qCfg := NewDefaultQueueSettings()
4040
rCfg := configretry.NewDefaultBackOffConfig()
4141
mockR := newMockRequest(2, consumererror.NewPermanent(errors.New("bad data")))
42-
be, err := newBaseExporter(defaultSettings, defaultType, newObservabilityConsumerSender,
42+
be, err := newBaseExporter(defaultSettings, defaultDataType, newObservabilityConsumerSender,
4343
withMarshaler(mockRequestMarshaler), withUnmarshaler(mockRequestUnmarshaler(mockR)), WithRetry(rCfg), WithQueue(qCfg))
4444
require.NoError(t, err)
4545
ocs := be.obsrepSender.(*observabilityConsumerSender)
@@ -63,7 +63,7 @@ func TestQueuedRetry_DropOnNoRetry(t *testing.T) {
6363
qCfg := NewDefaultQueueSettings()
6464
rCfg := configretry.NewDefaultBackOffConfig()
6565
rCfg.Enabled = false
66-
be, err := newBaseExporter(defaultSettings, defaultType, newObservabilityConsumerSender, withMarshaler(mockRequestMarshaler),
66+
be, err := newBaseExporter(defaultSettings, defaultDataType, newObservabilityConsumerSender, withMarshaler(mockRequestMarshaler),
6767
withUnmarshaler(mockRequestUnmarshaler(newMockRequest(2, errors.New("transient error")))),
6868
WithQueue(qCfg), WithRetry(rCfg))
6969
require.NoError(t, err)
@@ -90,7 +90,7 @@ func TestQueuedRetry_OnError(t *testing.T) {
9090
qCfg.NumConsumers = 1
9191
rCfg := configretry.NewDefaultBackOffConfig()
9292
rCfg.InitialInterval = 0
93-
be, err := newBaseExporter(defaultSettings, defaultType, newObservabilityConsumerSender,
93+
be, err := newBaseExporter(defaultSettings, defaultDataType, newObservabilityConsumerSender,
9494
withMarshaler(mockRequestMarshaler), withUnmarshaler(mockRequestUnmarshaler(&mockRequest{})),
9595
WithRetry(rCfg), WithQueue(qCfg))
9696
require.NoError(t, err)
@@ -120,7 +120,7 @@ func TestQueuedRetry_MaxElapsedTime(t *testing.T) {
120120
rCfg := configretry.NewDefaultBackOffConfig()
121121
rCfg.InitialInterval = time.Millisecond
122122
rCfg.MaxElapsedTime = 100 * time.Millisecond
123-
be, err := newBaseExporter(defaultSettings, defaultType, newObservabilityConsumerSender,
123+
be, err := newBaseExporter(defaultSettings, defaultDataType, newObservabilityConsumerSender,
124124
withMarshaler(mockRequestMarshaler), withUnmarshaler(mockRequestUnmarshaler(&mockRequest{})),
125125
WithRetry(rCfg), WithQueue(qCfg))
126126
require.NoError(t, err)
@@ -168,7 +168,7 @@ func TestQueuedRetry_ThrottleError(t *testing.T) {
168168
qCfg.NumConsumers = 1
169169
rCfg := configretry.NewDefaultBackOffConfig()
170170
rCfg.InitialInterval = 10 * time.Millisecond
171-
be, err := newBaseExporter(defaultSettings, defaultType, newObservabilityConsumerSender,
171+
be, err := newBaseExporter(defaultSettings, defaultDataType, newObservabilityConsumerSender,
172172
withMarshaler(mockRequestMarshaler), withUnmarshaler(mockRequestUnmarshaler(&mockRequest{})),
173173
WithRetry(rCfg), WithQueue(qCfg))
174174
require.NoError(t, err)
@@ -202,7 +202,7 @@ func TestQueuedRetry_RetryOnError(t *testing.T) {
202202
qCfg.QueueSize = 1
203203
rCfg := configretry.NewDefaultBackOffConfig()
204204
rCfg.InitialInterval = 0
205-
be, err := newBaseExporter(defaultSettings, defaultType, newObservabilityConsumerSender,
205+
be, err := newBaseExporter(defaultSettings, defaultDataType, newObservabilityConsumerSender,
206206
withMarshaler(mockRequestMarshaler), withUnmarshaler(mockRequestUnmarshaler(&mockRequest{})),
207207
WithRetry(rCfg), WithQueue(qCfg))
208208
require.NoError(t, err)

0 commit comments

Comments
 (0)