Skip to content

Commit 8dd2b7b

Browse files
authored
[chore][connector/routing] Refactor metric test examples into code (#36149)
1 parent a5807e5 commit 8dd2b7b

File tree

33 files changed

+329
-5974
lines changed

33 files changed

+329
-5974
lines changed

connector/routingconnector/internal/pmetricutil/metrics_test.go

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,70 +4,79 @@
44
package pmetricutil_test
55

66
import (
7-
"path/filepath"
87
"testing"
98

109
"github.com/stretchr/testify/assert"
11-
"github.com/stretchr/testify/require"
1210
"go.opentelemetry.io/collector/pdata/pmetric"
1311

1412
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/pmetricutil"
15-
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden"
13+
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/pmetricutiltest"
1614
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/pmetrictest"
1715
)
1816

1917
func TestMoveResourcesIf(t *testing.T) {
2018
testCases := []struct {
21-
name string
22-
condition func(pmetric.ResourceMetrics) bool
19+
name string
20+
moveIf func(pmetric.ResourceMetrics) bool
21+
from pmetric.Metrics
22+
to pmetric.Metrics
23+
expectFrom pmetric.Metrics
24+
expectTo pmetric.Metrics
2325
}{
2426
{
2527
name: "move_none",
26-
condition: func(pmetric.ResourceMetrics) bool {
28+
moveIf: func(pmetric.ResourceMetrics) bool {
2729
return false
2830
},
31+
from: pmetricutiltest.NewMetrics("AB", "CD", "EF", "FG"),
32+
to: pmetric.NewMetrics(),
33+
expectFrom: pmetricutiltest.NewMetrics("AB", "CD", "EF", "FG"),
34+
expectTo: pmetric.NewMetrics(),
2935
},
3036
{
3137
name: "move_all",
32-
condition: func(pmetric.ResourceMetrics) bool {
38+
moveIf: func(pmetric.ResourceMetrics) bool {
3339
return true
3440
},
41+
from: pmetricutiltest.NewMetrics("AB", "CD", "EF", "FG"),
42+
to: pmetric.NewMetrics(),
43+
expectFrom: pmetric.NewMetrics(),
44+
expectTo: pmetricutiltest.NewMetrics("AB", "CD", "EF", "FG"),
3545
},
3646
{
3747
name: "move_one",
38-
condition: func(rl pmetric.ResourceMetrics) bool {
48+
moveIf: func(rl pmetric.ResourceMetrics) bool {
3949
rname, ok := rl.Resource().Attributes().Get("resourceName")
4050
return ok && rname.AsString() == "resourceA"
4151
},
52+
from: pmetricutiltest.NewMetrics("AB", "CD", "EF", "FG"),
53+
to: pmetric.NewMetrics(),
54+
expectFrom: pmetricutiltest.NewMetrics("B", "CD", "EF", "FG"),
55+
expectTo: pmetricutiltest.NewMetrics("A", "CD", "EF", "FG"),
4256
},
4357
{
4458
name: "move_to_preexisting",
45-
condition: func(rl pmetric.ResourceMetrics) bool {
59+
moveIf: func(rl pmetric.ResourceMetrics) bool {
4660
rname, ok := rl.Resource().Attributes().Get("resourceName")
4761
return ok && rname.AsString() == "resourceB"
4862
},
63+
from: pmetricutiltest.NewMetrics("AB", "CD", "EF", "FG"),
64+
to: pmetricutiltest.NewMetrics("1", "2", "3", "4"),
65+
expectFrom: pmetricutiltest.NewMetrics("A", "CD", "EF", "FG"),
66+
expectTo: func() pmetric.Metrics {
67+
move := pmetricutiltest.NewMetrics("B", "CD", "EF", "FG")
68+
moveTo := pmetricutiltest.NewMetrics("1", "2", "3", "4")
69+
move.ResourceMetrics().MoveAndAppendTo(moveTo.ResourceMetrics())
70+
return moveTo
71+
}(),
4972
},
5073
}
5174

5275
for _, tt := range testCases {
5376
t.Run(tt.name, func(t *testing.T) {
54-
// Load up a fresh copy of the input for each test, since it may be modified in place.
55-
from, err := golden.ReadMetrics(filepath.Join("testdata", "resource", tt.name, "from.yaml"))
56-
require.NoError(t, err)
57-
58-
to, err := golden.ReadMetrics(filepath.Join("testdata", "resource", tt.name, "to.yaml"))
59-
require.NoError(t, err)
60-
61-
fromModifed, err := golden.ReadMetrics(filepath.Join("testdata", "resource", tt.name, "from_modified.yaml"))
62-
require.NoError(t, err)
63-
64-
toModified, err := golden.ReadMetrics(filepath.Join("testdata", "resource", tt.name, "to_modified.yaml"))
65-
require.NoError(t, err)
66-
67-
pmetricutil.MoveResourcesIf(from, to, tt.condition)
68-
69-
assert.NoError(t, pmetrictest.CompareMetrics(fromModifed, from), "from not modified as expected")
70-
assert.NoError(t, pmetrictest.CompareMetrics(toModified, to), "to not as expected")
77+
pmetricutil.MoveResourcesIf(tt.from, tt.to, tt.moveIf)
78+
assert.NoError(t, pmetrictest.CompareMetrics(tt.expectFrom, tt.from), "from not modified as expected")
79+
assert.NoError(t, pmetrictest.CompareMetrics(tt.expectTo, tt.to), "to not as expected")
7180
})
7281
}
7382
}

0 commit comments

Comments
 (0)