Skip to content

Commit c42285d

Browse files
codebotenf7o
authored andcommitted
[chore] update scope name in tests (open-telemetry#34705)
This has no functional impact, just updating the tests for clarity. Related to open-telemetry/opentelemetry-collector#9494 Signed-off-by: Alex Boten <[email protected]>
1 parent a9792ce commit c42285d

File tree

13 files changed

+27
-27
lines changed

13 files changed

+27
-27
lines changed

pkg/pdatatest/pmetrictest/metrics_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -378,10 +378,10 @@ func TestCompareMetrics(t *testing.T) {
378378
IgnoreMetricsOrder(),
379379
},
380380
withoutOptions: multierr.Combine(
381-
errors.New(`resource "map[namespace:test]": scope "otelcol/aerospikereceiver": metrics are out of order: metric "aerospike.namespace.memory.free" expected at index 0, found at index 2`),
382-
errors.New(`resource "map[namespace:test]": scope "otelcol/aerospikereceiver": metrics are out of order: metric "aerospike.namespace.memory.usage" expected at index 1, found at index 3`),
383-
errors.New(`resource "map[namespace:test]": scope "otelcol/aerospikereceiver": metrics are out of order: metric "aerospike.namespace.disk.available" expected at index 2, found at index 1`),
384-
errors.New(`resource "map[namespace:test]": scope "otelcol/aerospikereceiver": metrics are out of order: metric "aerospike.namespace.scan.count" expected at index 3, found at index 0`),
381+
errors.New(`resource "map[namespace:test]": scope "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver": metrics are out of order: metric "aerospike.namespace.memory.free" expected at index 0, found at index 2`),
382+
errors.New(`resource "map[namespace:test]": scope "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver": metrics are out of order: metric "aerospike.namespace.memory.usage" expected at index 1, found at index 3`),
383+
errors.New(`resource "map[namespace:test]": scope "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver": metrics are out of order: metric "aerospike.namespace.disk.available" expected at index 2, found at index 1`),
384+
errors.New(`resource "map[namespace:test]": scope "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver": metrics are out of order: metric "aerospike.namespace.scan.count" expected at index 3, found at index 0`),
385385
),
386386
withOptions: nil,
387387
},
@@ -391,9 +391,9 @@ func TestCompareMetrics(t *testing.T) {
391391
IgnoreMetricDataPointsOrder(),
392392
},
393393
withoutOptions: multierr.Combine(
394-
errors.New(`resource "map[namespace:test]": scope "otelcol/aerospikereceiver": metric "aerospike.namespace.scan.count": datapoints are out of order: datapoint "map[result:complete type:aggr]" expected at index 1, found at index 2`),
395-
errors.New(`resource "map[namespace:test]": scope "otelcol/aerospikereceiver": metric "aerospike.namespace.scan.count": datapoints are out of order: datapoint "map[result:error type:aggr]" expected at index 2, found at index 3`),
396-
errors.New(`resource "map[namespace:test]": scope "otelcol/aerospikereceiver": metric "aerospike.namespace.scan.count": datapoints are out of order: datapoint "map[result:abort type:basic]" expected at index 3, found at index 1`),
394+
errors.New(`resource "map[namespace:test]": scope "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver": metric "aerospike.namespace.scan.count": datapoints are out of order: datapoint "map[result:complete type:aggr]" expected at index 1, found at index 2`),
395+
errors.New(`resource "map[namespace:test]": scope "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver": metric "aerospike.namespace.scan.count": datapoints are out of order: datapoint "map[result:error type:aggr]" expected at index 2, found at index 3`),
396+
errors.New(`resource "map[namespace:test]": scope "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver": metric "aerospike.namespace.scan.count": datapoints are out of order: datapoint "map[result:abort type:basic]" expected at index 3, found at index 1`),
397397
),
398398
withOptions: nil,
399399
},

pkg/pdatatest/pmetrictest/testdata/ignore-data-points-order/actual.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,4 @@ resourceMetrics:
184184
timeUnixNano: "1653329645321022166"
185185
unit: By
186186
scope:
187-
name: otelcol/aerospikereceiver
187+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver

pkg/pdatatest/pmetrictest/testdata/ignore-data-points-order/expected.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,4 @@ resourceMetrics:
184184
timeUnixNano: "1653329645321022166"
185185
unit: By
186186
scope:
187-
name: otelcol/aerospikereceiver
187+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver

pkg/pdatatest/pmetrictest/testdata/ignore-metrics-order/actual.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,4 @@ resourceMetrics:
184184
timeUnixNano: "1653329645321022166"
185185
unit: By
186186
scope:
187-
name: otelcol/aerospikereceiver
187+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver

pkg/pdatatest/pmetrictest/testdata/ignore-metrics-order/expected.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,4 @@ resourceMetrics:
184184
isMonotonic: true
185185
unit: '{scans}'
186186
scope:
187-
name: otelcol/aerospikereceiver
187+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver

pkg/pdatatest/pmetrictest/testdata/ignore-one-resource-attribute-multiple-resources/actual.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ resourceMetrics:
187187
isMonotonic: true
188188
unit: '{scans}'
189189
scope:
190-
name: otelcol/aerospikereceiver
190+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver
191191
- resource:
192192
attributes:
193193
- key: namespace
@@ -376,7 +376,7 @@ resourceMetrics:
376376
isMonotonic: true
377377
unit: '{scans}'
378378
scope:
379-
name: otelcol/aerospikereceiver
379+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver
380380
- resource:
381381
attributes:
382382
- key: namespace
@@ -565,4 +565,4 @@ resourceMetrics:
565565
isMonotonic: true
566566
unit: '{scans}'
567567
scope:
568-
name: otelcol/aerospikereceiver
568+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver

pkg/pdatatest/pmetrictest/testdata/ignore-one-resource-attribute-multiple-resources/expected.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ resourceMetrics:
187187
isMonotonic: true
188188
unit: '{scans}'
189189
scope:
190-
name: otelcol/aerospikereceiver
190+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver
191191
- resource:
192192
attributes:
193193
- key: namespace
@@ -376,7 +376,7 @@ resourceMetrics:
376376
isMonotonic: true
377377
unit: '{scans}'
378378
scope:
379-
name: otelcol/aerospikereceiver
379+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver
380380
- resource:
381381
attributes:
382382
- key: namespace
@@ -565,4 +565,4 @@ resourceMetrics:
565565
isMonotonic: true
566566
unit: '{scans}'
567567
scope:
568-
name: otelcol/aerospikereceiver
568+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver

pkg/pdatatest/pmetrictest/testdata/ignore-one-resource-attribute/actual.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ resourceMetrics:
101101
timeUnixNano: "1652734556334562000"
102102
unit: '{connections}'
103103
scope:
104-
name: otelcol/aerospikereceiver
104+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver

pkg/pdatatest/pmetrictest/testdata/ignore-one-resource-attribute/expected.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ resourceMetrics:
101101
timeUnixNano: "1652734556334562000"
102102
unit: '{connections}'
103103
scope:
104-
name: otelcol/aerospikereceiver
104+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver

pkg/pdatatest/pmetrictest/testdata/ignore-resource-order/actual.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ resourceMetrics:
184184
isMonotonic: true
185185
unit: '{scans}'
186186
scope:
187-
name: otelcol/aerospikereceiver
187+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver
188188
- resource:
189189
attributes:
190190
- key: node_id
@@ -370,7 +370,7 @@ resourceMetrics:
370370
isMonotonic: true
371371
unit: '{scans}'
372372
scope:
373-
name: otelcol/aerospikereceiver
373+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver
374374
- resource:
375375
attributes:
376376
- key: node_id
@@ -556,4 +556,4 @@ resourceMetrics:
556556
isMonotonic: true
557557
unit: '{scans}'
558558
scope:
559-
name: otelcol/aerospikereceiver
559+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver

pkg/pdatatest/pmetrictest/testdata/ignore-resource-order/expected.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ resourceMetrics:
184184
isMonotonic: true
185185
unit: '{scans}'
186186
scope:
187-
name: otelcol/aerospikereceiver
187+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver
188188
- resource:
189189
attributes:
190190
- key: node_id
@@ -370,7 +370,7 @@ resourceMetrics:
370370
isMonotonic: true
371371
unit: '{scans}'
372372
scope:
373-
name: otelcol/aerospikereceiver
373+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver
374374
- resource:
375375
attributes:
376376
- key: node_id
@@ -556,4 +556,4 @@ resourceMetrics:
556556
isMonotonic: true
557557
unit: '{scans}'
558558
scope:
559-
name: otelcol/aerospikereceiver
559+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver

pkg/pdatatest/pmetrictest/testdata/match-one-resource-attribute/actual.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ resourceMetrics:
101101
timeUnixNano: "1652734556334562000"
102102
unit: '{connections}'
103103
scope:
104-
name: otelcol/aerospikereceiver
104+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver

pkg/pdatatest/pmetrictest/testdata/match-one-resource-attribute/expected.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ resourceMetrics:
101101
timeUnixNano: "1652734556334562000"
102102
unit: '{connections}'
103103
scope:
104-
name: otelcol/aerospikereceiver
104+
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver

0 commit comments

Comments
 (0)