Skip to content

Commit fa1989e

Browse files
committed
more renaming
1 parent 5287fbf commit fa1989e

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

processor/schemaprocessor/processor_test.go

+27-27
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/schemaprocessor/internal/translation"
2929
)
3030

31-
func newTestTransformer(t *testing.T) *schemaprocessor {
31+
func newTestProcessor(t *testing.T) *schemaprocessor {
3232
trans, err := newSchemaProcessor(context.Background(), newDefaultConfiguration(), processor.Settings{
3333
TelemetrySettings: component.TelemetrySettings{
3434
Logger: zaptest.NewLogger(t),
@@ -39,10 +39,10 @@ func newTestTransformer(t *testing.T) *schemaprocessor {
3939
return trans
4040
}
4141

42-
func TestTransformerStart(t *testing.T) {
42+
func TestProcessorStart(t *testing.T) {
4343
t.Parallel()
4444

45-
trans := newTestTransformer(t)
45+
trans := newTestProcessor(t)
4646
assert.NoError(t, trans.start(context.Background(), componenttest.NewNopHost()))
4747
}
4848

@@ -85,23 +85,23 @@ func pmetricsFromJSON(t *testing.T, path string) pmetric.Metrics {
8585
return inSignals
8686
}
8787

88-
func buildTestTransformer(t *testing.T, targetURL string) *schemaprocessor {
88+
func buildTestProcessor(t *testing.T, targetURL string) *schemaprocessor {
8989
t.Helper()
9090
defaultConfig := newDefaultConfiguration()
9191
castedConfig := defaultConfig.(*Config)
9292
castedConfig.Targets = []string{targetURL}
93-
transform, err := newSchemaProcessor(context.Background(), castedConfig, processor.Settings{
93+
processor, err := newSchemaProcessor(context.Background(), castedConfig, processor.Settings{
9494
TelemetrySettings: component.TelemetrySettings{
9595
Logger: zaptest.NewLogger(t),
9696
},
9797
})
9898
require.NoError(t, err, "Must not error when creating schemaprocessor")
99-
err = transform.manager.SetProviders(translation.NewTestProvider(&f))
99+
err = processor.manager.SetProviders(translation.NewTestProvider(&f))
100100
require.NoError(t, err)
101-
return transform
101+
return processor
102102
}
103103

104-
func TestTransformerSchemaBySections(t *testing.T) {
104+
func TestProcessorSchemaBySections(t *testing.T) {
105105
tests := []struct {
106106
name string
107107
section string
@@ -152,30 +152,30 @@ func TestTransformerSchemaBySections(t *testing.T) {
152152
}
153153
for _, tc := range tests {
154154
t.Run(tc.name, func(t *testing.T) {
155-
transformerTarget := fmt.Sprintf("https://example.com/testdata/schema_sections/%s/1.0.0", tc.section)
156-
transform := buildTestTransformer(t, transformerTarget)
155+
processorTarget := fmt.Sprintf("https://example.com/testdata/schema_sections/%s/1.0.0", tc.section)
156+
processor := buildTestProcessor(t, processorTarget)
157157
inDataPath := fmt.Sprintf("testdata/schema_sections/%s/%s_in.json", tc.section, tc.dataType)
158158
outDataPath := fmt.Sprintf("testdata/schema_sections/%s/%s_out.json", tc.section, tc.dataType)
159159
switch tc.dataType {
160160
case pipeline.SignalLogs:
161161
inLogs := plogsFromJSON(t, inDataPath)
162162
expected := plogsFromJSON(t, outDataPath)
163163

164-
logs, err := transform.processLogs(context.Background(), inLogs)
164+
logs, err := processor.processLogs(context.Background(), inLogs)
165165
require.NoError(t, err)
166166
require.NoError(t, plogtest.CompareLogs(expected, logs), "Must match the expected values")
167167
case pipeline.SignalMetrics:
168168
inMetrics := pmetricsFromJSON(t, inDataPath)
169169
expected := pmetricsFromJSON(t, outDataPath)
170170

171-
metrics, err := transform.processMetrics(context.Background(), inMetrics)
171+
metrics, err := processor.processMetrics(context.Background(), inMetrics)
172172
require.NoError(t, err)
173173
require.NoError(t, pmetrictest.CompareMetrics(expected, metrics), "Must match the expected values")
174174
case pipeline.SignalTraces:
175175
inTraces := ptracesFromJSON(t, inDataPath)
176176
expected := ptracesFromJSON(t, outDataPath)
177177

178-
traces, err := transform.processTraces(context.Background(), inTraces)
178+
traces, err := processor.processTraces(context.Background(), inTraces)
179179
require.NoError(t, err)
180180
require.NoError(t, ptracetest.CompareTraces(expected, traces), "Must match the expected values")
181181
default:
@@ -186,10 +186,10 @@ func TestTransformerSchemaBySections(t *testing.T) {
186186
}
187187
}
188188

189-
func TestTransformerProcessing(t *testing.T) {
189+
func TestProcessorProcessing(t *testing.T) {
190190
t.Parallel()
191191

192-
trans := newTestTransformer(t)
192+
trans := newTestProcessor(t)
193193
t.Run("metrics", func(t *testing.T) {
194194
in := pmetric.NewMetrics()
195195
in.ResourceMetrics().AppendEmpty()
@@ -263,7 +263,7 @@ var testdataFiles embed.FS
263263
// case 2: resource schema not set, scope schema set, use scope schema inside
264264
// case 3: resource schema set, scope schema set, use scope schema
265265
// case 4: resource schema not set, scope schema not set, noop translation
266-
func TestTransformerScopeLogSchemaPrecedence(t *testing.T) {
266+
func TestProcessorScopeLogSchemaPrecedence(t *testing.T) {
267267
t.Parallel()
268268
tests := []struct {
269269
name string
@@ -319,16 +319,16 @@ func TestTransformerScopeLogSchemaPrecedence(t *testing.T) {
319319
defaultConfig := newDefaultConfiguration()
320320
castedConfig := defaultConfig.(*Config)
321321
castedConfig.Targets = []string{"https://example.com/testdata/testschemas/schemaprecedence/1.2.0"}
322-
transform, err := newSchemaProcessor(context.Background(), defaultConfig, processor.Settings{
322+
processor, err := newSchemaProcessor(context.Background(), defaultConfig, processor.Settings{
323323
TelemetrySettings: component.TelemetrySettings{
324324
Logger: zaptest.NewLogger(t),
325325
},
326326
})
327327
require.NoError(t, err, "Must not error when creating schemaprocessor")
328328

329-
err = transform.manager.SetProviders(translation.NewTestProvider(&testdataFiles))
329+
err = processor.manager.SetProviders(translation.NewTestProvider(&testdataFiles))
330330
require.NoError(t, err)
331-
got, err := transform.processLogs(context.Background(), tt.input())
331+
got, err := processor.processLogs(context.Background(), tt.input())
332332
if !tt.wantErr(t, err, fmt.Sprintf("processLogs(%v)", tt.input())) {
333333
return
334334
}
@@ -364,7 +364,7 @@ func generateTraceForTest() ptrace.Traces {
364364
// case 2: resource schema not set, scope schema set, use scope schema inside
365365
// case 3: resource schema set, scope schema set, use scope schema
366366
// case 4: resource schema not set, scope schema not set, noop translation
367-
func TestTransformerScopeTraceSchemaPrecedence(t *testing.T) {
367+
func TestProcessorScopeTraceSchemaPrecedence(t *testing.T) {
368368
t.Parallel()
369369
tests := []struct {
370370
name string
@@ -420,16 +420,16 @@ func TestTransformerScopeTraceSchemaPrecedence(t *testing.T) {
420420
defaultConfig := newDefaultConfiguration()
421421
castedConfig := defaultConfig.(*Config)
422422
castedConfig.Targets = []string{"https://example.com/testdata/testschemas/schemaprecedence/1.2.0"}
423-
transform, err := newSchemaProcessor(context.Background(), defaultConfig, processor.Settings{
423+
processor, err := newSchemaProcessor(context.Background(), defaultConfig, processor.Settings{
424424
TelemetrySettings: component.TelemetrySettings{
425425
Logger: zaptest.NewLogger(t),
426426
},
427427
})
428428
require.NoError(t, err, "Must not error when creating schemaprocessor")
429429

430-
err = transform.manager.SetProviders(translation.NewTestProvider(&testdataFiles))
430+
err = processor.manager.SetProviders(translation.NewTestProvider(&testdataFiles))
431431
require.NoError(t, err)
432-
got, err := transform.processTraces(context.Background(), tt.input())
432+
got, err := processor.processTraces(context.Background(), tt.input())
433433
if !tt.wantErr(t, err, fmt.Sprintf("processTraces(%v)", tt.input())) {
434434
return
435435
}
@@ -464,7 +464,7 @@ func generateMetricForTest() pmetric.Metrics {
464464
// case 2: resource schema not set, scope schema set, use scope schema inside
465465
// case 3: resource schema set, scope schema set, use scope schema
466466
// case 4: resource schema not set, scope schema not set, noop translation
467-
func TestTransformerScopeMetricSchemaPrecedence(t *testing.T) {
467+
func TestProcessorScopeMetricSchemaPrecedence(t *testing.T) {
468468
t.Parallel()
469469
tests := []struct {
470470
name string
@@ -520,16 +520,16 @@ func TestTransformerScopeMetricSchemaPrecedence(t *testing.T) {
520520
defaultConfig := newDefaultConfiguration()
521521
castedConfig := defaultConfig.(*Config)
522522
castedConfig.Targets = []string{"https://example.com/testdata/testschemas/schemaprecedence/1.2.0"}
523-
transform, err := newSchemaProcessor(context.Background(), defaultConfig, processor.Settings{
523+
processor, err := newSchemaProcessor(context.Background(), defaultConfig, processor.Settings{
524524
TelemetrySettings: component.TelemetrySettings{
525525
Logger: zaptest.NewLogger(t),
526526
},
527527
})
528528
require.NoError(t, err, "Must not error when creating schemaprocessor")
529529

530-
err = transform.manager.SetProviders(translation.NewTestProvider(&testdataFiles))
530+
err = processor.manager.SetProviders(translation.NewTestProvider(&testdataFiles))
531531
require.NoError(t, err)
532-
got, err := transform.processMetrics(context.Background(), tt.input())
532+
got, err := processor.processMetrics(context.Background(), tt.input())
533533
if !tt.wantErr(t, err, fmt.Sprintf("processMetrics(%v)", tt.input())) {
534534
return
535535
}

0 commit comments

Comments
 (0)