Skip to content

Commit 503075d

Browse files
jinja2jinja2
authored
add test for istio metrics (#1657)
1 parent 0163085 commit 503075d

15 files changed

+48435
-25
lines changed

‎.github/workflows/functional_test_v2.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
- functional
4545
- histogram
4646
- configuration_switching
47+
- istio
4748
runs-on: ubuntu-latest
4849
steps:
4950
- uses: actions/checkout@v4

‎.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ repos:
2121
exclude: "^helm-charts|operator-webhook.yaml"
2222
args: [ --allow-multiple-documents ]
2323
- id: check-added-large-files
24+
args: [ --maxkb=1500 ]

‎functional_tests/common.go

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@ package functional_tests
55

66
import (
77
"context"
8+
"fmt"
89
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden"
10+
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver"
11+
"go.opentelemetry.io/collector/component/componenttest"
912
"go.opentelemetry.io/collector/consumer/consumertest"
1013
"go.opentelemetry.io/collector/pdata/pmetric"
1114
"go.opentelemetry.io/collector/pdata/ptrace"
15+
"go.opentelemetry.io/collector/receiver/receivertest"
1216
"os"
1317
"path/filepath"
1418
"runtime"
@@ -17,6 +21,7 @@ import (
1721

1822
"github.com/docker/docker/api/types"
1923
docker "github.com/docker/docker/client"
24+
"github.com/stretchr/testify/assert"
2025
"github.com/stretchr/testify/require"
2126
)
2227

@@ -100,3 +105,21 @@ func writeNewExpectedMetricsResult(t *testing.T, file string, metric *pmetric.Me
100105
require.NoError(t, os.MkdirAll("results", 0755))
101106
require.NoError(t, golden.WriteMetrics(t, filepath.Join("results", filepath.Base(file)), *metric))
102107
}
108+
109+
func setupSignalfxReceiver(t *testing.T, port int) *consumertest.MetricsSink {
110+
mc := new(consumertest.MetricsSink)
111+
f := signalfxreceiver.NewFactory()
112+
cfg := f.CreateDefaultConfig().(*signalfxreceiver.Config)
113+
cfg.Endpoint = fmt.Sprintf("0.0.0.0:%d", port)
114+
115+
rcvr, err := f.CreateMetrics(context.Background(), receivertest.NewNopSettings(), cfg, mc)
116+
require.NoError(t, err)
117+
118+
require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost()))
119+
require.NoError(t, err, "failed creating metrics receiver")
120+
t.Cleanup(func() {
121+
assert.NoError(t, rcvr.Shutdown(context.Background()))
122+
})
123+
124+
return mc
125+
}

‎functional_tests/functional_test.go

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden"
2222
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/pmetrictest"
2323
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/ptracetest"
24-
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver"
2524
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver"
2625
"github.com/stretchr/testify/assert"
2726
"github.com/stretchr/testify/require"
@@ -1473,24 +1472,6 @@ func setupTraces(t *testing.T) *consumertest.TracesSink {
14731472
return tc
14741473
}
14751474

1476-
func setupSignalfxReceiver(t *testing.T, port int) *consumertest.MetricsSink {
1477-
mc := new(consumertest.MetricsSink)
1478-
f := signalfxreceiver.NewFactory()
1479-
cfg := f.CreateDefaultConfig().(*signalfxreceiver.Config)
1480-
cfg.Endpoint = fmt.Sprintf("0.0.0.0:%d", port)
1481-
1482-
rcvr, err := f.CreateMetrics(context.Background(), receivertest.NewNopSettings(), cfg, mc)
1483-
require.NoError(t, err)
1484-
1485-
require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost()))
1486-
require.NoError(t, err, "failed creating metrics receiver")
1487-
t.Cleanup(func() {
1488-
assert.NoError(t, rcvr.Shutdown(context.Background()))
1489-
})
1490-
1491-
return mc
1492-
}
1493-
14941475
func setupHEC(t *testing.T) (*consumertest.LogsSink, *consumertest.MetricsSink) {
14951476
// the splunkhecreceiver does poorly at receiving logs and metrics. Use separate ports for now.
14961477
f := splunkhecreceiver.NewFactory()

‎functional_tests/go.mod

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ go 1.22.0
88
toolchain go1.22.5
99

1010
require (
11-
github.com/docker/docker v27.3.1+incompatible
11+
github.com/docker/docker v27.5.1+incompatible
1212
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.117.0
1313
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.117.0
14+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.119.0
1415
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.117.0
1516
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.115.0
1617
github.com/stretchr/testify v1.10.0
@@ -25,6 +26,7 @@ require (
2526
k8s.io/apiextensions-apiserver v0.31.3
2627
k8s.io/apimachinery v0.31.3
2728
k8s.io/client-go v0.31.3
29+
sigs.k8s.io/yaml v1.4.0
2830
)
2931

3032
require (
@@ -199,7 +201,7 @@ require (
199201
golang.org/x/sys v0.29.0 // indirect
200202
golang.org/x/term v0.28.0 // indirect
201203
golang.org/x/text v0.21.0 // indirect
202-
golang.org/x/time v0.3.0 // indirect
204+
golang.org/x/time v0.4.0 // indirect
203205
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
204206
google.golang.org/grpc v1.69.2 // indirect
205207
google.golang.org/protobuf v1.36.2 // indirect
@@ -218,7 +220,6 @@ require (
218220
sigs.k8s.io/kustomize/api v0.17.2 // indirect
219221
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
220222
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
221-
sigs.k8s.io/yaml v1.4.0 // indirect
222223
)
223224

224225
// ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules

‎functional_tests/go.sum

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -685,8 +685,8 @@ github.com/docker/cli v25.0.1+incompatible h1:mFpqnrS6Hsm3v1k7Wa/BO23oz0k121MTbT
685685
github.com/docker/cli v25.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
686686
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
687687
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
688-
github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI=
689-
github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
688+
github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8=
689+
github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
690690
github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
691691
github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
692692
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -1124,6 +1124,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.117.0
11241124
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.117.0/go.mod h1:OGylX+Bp+urSNNGoI1XG7U6vaRDZk1wN/w6fHP1F7IY=
11251125
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.117.0 h1:vHARTwGkDJV3Y3nVeQuJ4c7N19IkXXAK6aRB8beWJRw=
11261126
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.117.0/go.mod h1:bK0QUJnoCwWoU3Pu+3jSfR6yCqM+WgRNC/MOBEz6aC8=
1127+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.119.0 h1:ptDhiLTpUJY+NIq2FoERwipKcZbNW5m62Sd8VXzbt/g=
1128+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.119.0/go.mod h1:qAg6wgkUiX8Ue6cLLsZS//d5TvRPmj8j7ieJbtnpHgY=
11271129
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.117.0 h1:ppbkkWk6o1r2Pktr45YOfqPWvQcyC71/9/cAUJ8a7Q4=
11281130
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.117.0/go.mod h1:o0v6sN20f3CQE4cInrC6CKbBs1WH+kNEAnqLoPmpVwY=
11291131
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.115.0 h1:3BJLq6lX2P+RoJ0vSW7sAeGXFKbUw3m57EQ+g+mYnzQ=
@@ -1663,8 +1665,9 @@ golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
16631665
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
16641666
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
16651667
golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
1666-
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
16671668
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
1669+
golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY=
1670+
golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
16681671
golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
16691672
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
16701673
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

0 commit comments

Comments
 (0)