Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

try to match against metric received by the sink #5850

Merged
merged 4 commits into from
Jan 31, 2025
Merged

try to match against metric received by the sink #5850

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc6811c
try to match against metric received by the sink
atoulme Jan 30, 2025
3338e6f
flexible match on postgres test as well
atoulme Jan 30, 2025
7ce8f15
retry only new batches
atoulme Jan 31, 2025
bdf9c07
fix and remove errors.Join
atoulme Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 34 additions & 29 deletions tests/receivers/envoy/bundled_k8s_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package tests

import (
"context"
"errors"
"fmt"
"os"
"path/filepath"
Expand Down Expand Up @@ -124,39 +125,43 @@ func TestEnvoyK8sObserver(t *testing.T) {
expected, err := golden.ReadMetrics(filepath.Join("testdata", "expected_k8s.yaml"))
require.NoError(t, err)

i := 0
require.EventuallyWithT(t, func(tt *assert.CollectT) {
if len(sink.AllMetrics()) == 0 {
assert.Fail(tt, "No metrics collected")
return
}

i++
err := pmetrictest.CompareMetrics(expected, sink.AllMetrics()[len(sink.AllMetrics())-1],
pmetrictest.IgnoreResourceAttributeValue("service.instance.id"),
pmetrictest.IgnoreResourceAttributeValue("net.host.port"),
pmetrictest.IgnoreResourceAttributeValue("net.host.name"),
pmetrictest.IgnoreResourceAttributeValue("server.address"),
pmetrictest.IgnoreResourceAttributeValue("container.name"),
pmetrictest.IgnoreResourceAttributeValue("server.port"),
pmetrictest.IgnoreResourceAttributeValue("service.name"),
pmetrictest.IgnoreResourceAttributeValue("service_instance_id"),
pmetrictest.IgnoreResourceAttributeValue("service_version"),
pmetrictest.IgnoreResourceAttributeValue("discovery.endpoint.id"),
pmetrictest.IgnoreMetricAttributeValue("service_version"),
pmetrictest.IgnoreMetricAttributeValue("service_instance_id"),
pmetrictest.IgnoreResourceAttributeValue("server.address"),
pmetrictest.IgnoreResourceAttributeValue("k8s.pod.name"),
pmetrictest.IgnoreResourceAttributeValue("k8s.pod.uid"),
pmetrictest.IgnoreTimestamp(),
pmetrictest.IgnoreStartTimestamp(),
pmetrictest.IgnoreMetricDataPointsOrder(),
pmetrictest.IgnoreScopeMetricsOrder(),
pmetrictest.IgnoreScopeVersion(),
pmetrictest.IgnoreResourceMetricsOrder(),
pmetrictest.IgnoreMetricsOrder(),
pmetrictest.IgnoreMetricValues(),
)
assert.NoError(tt, err)
var errs error
for _, m := range sink.AllMetrics() {
err := pmetrictest.CompareMetrics(expected, m,
pmetrictest.IgnoreResourceAttributeValue("service.instance.id"),
pmetrictest.IgnoreResourceAttributeValue("net.host.port"),
pmetrictest.IgnoreResourceAttributeValue("net.host.name"),
pmetrictest.IgnoreResourceAttributeValue("server.address"),
pmetrictest.IgnoreResourceAttributeValue("container.name"),
pmetrictest.IgnoreResourceAttributeValue("server.port"),
pmetrictest.IgnoreResourceAttributeValue("service.name"),
pmetrictest.IgnoreResourceAttributeValue("service_instance_id"),
pmetrictest.IgnoreResourceAttributeValue("service_version"),
pmetrictest.IgnoreResourceAttributeValue("discovery.endpoint.id"),
pmetrictest.IgnoreMetricAttributeValue("service_version"),
pmetrictest.IgnoreMetricAttributeValue("service_instance_id"),
pmetrictest.IgnoreResourceAttributeValue("server.address"),
pmetrictest.IgnoreResourceAttributeValue("k8s.pod.name"),
pmetrictest.IgnoreResourceAttributeValue("k8s.pod.uid"),
pmetrictest.IgnoreTimestamp(),
pmetrictest.IgnoreStartTimestamp(),
pmetrictest.IgnoreMetricDataPointsOrder(),
pmetrictest.IgnoreScopeMetricsOrder(),
pmetrictest.IgnoreScopeVersion(),
pmetrictest.IgnoreResourceMetricsOrder(),
pmetrictest.IgnoreMetricsOrder(),
pmetrictest.IgnoreMetricValues(),
)
if err == nil {
return
}
errs = errors.Join(errs, err)
}
assert.NoError(tt, errs)
}, 120*time.Second, 1*time.Second)
}
57 changes: 28 additions & 29 deletions tests/receivers/smartagent/postgresql/postgresql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package tests

import (
"errors"
"path"
"path/filepath"
"testing"
Expand All @@ -26,7 +27,6 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/pmetrictest"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/pdata/pmetric"

"github.com/signalfx/splunk-otel-collector/tests/testutils"
)
Expand Down Expand Up @@ -60,38 +60,37 @@ func TestPostgresReceiverProvidesAllMetrics(t *testing.T) {
assert.Fail(tt, "No metrics collected")
return
}
var selected *pmetric.Metrics
var errs error
for i := len(tc.OTLPReceiverSink.AllMetrics()) - 1; i >= 0; i-- {
m := tc.OTLPReceiverSink.AllMetrics()[i]
if m.MetricCount() == expected.MetricCount() {
selected = &m
break
err := pmetrictest.CompareMetrics(expected, m,
pmetrictest.IgnoreResourceAttributeValue("service.instance.id"),
pmetrictest.IgnoreResourceAttributeValue("net.host.port"),
pmetrictest.IgnoreResourceAttributeValue("server.port"),
pmetrictest.IgnoreResourceAttributeValue("service.name"),
pmetrictest.IgnoreResourceAttributeValue("service_instance_id"),
pmetrictest.IgnoreResourceAttributeValue("service_version"),
pmetrictest.IgnoreMetricAttributeValue("service_version"),
pmetrictest.IgnoreMetricAttributeValue("service_instance_id"),
pmetrictest.IgnoreMetricAttributeValue("queryid"),
pmetrictest.IgnoreMetricAttributeValue("table"),
pmetrictest.IgnoreSubsequentDataPoints(),
pmetrictest.IgnoreTimestamp(),
pmetrictest.IgnoreStartTimestamp(),
pmetrictest.IgnoreMetricDataPointsOrder(),
pmetrictest.IgnoreScopeMetricsOrder(),
pmetrictest.IgnoreMetricsOrder(),
pmetrictest.IgnoreScopeVersion(),
pmetrictest.IgnoreResourceMetricsOrder(),
pmetrictest.IgnoreMetricValues(),
)
if err == nil {
return
}
errs = errors.Join(errs, err)
}
}

require.NotNil(tt, selected)

err := pmetrictest.CompareMetrics(expected, *selected,
pmetrictest.IgnoreResourceAttributeValue("service.instance.id"),
pmetrictest.IgnoreResourceAttributeValue("net.host.port"),
pmetrictest.IgnoreResourceAttributeValue("server.port"),
pmetrictest.IgnoreResourceAttributeValue("service.name"),
pmetrictest.IgnoreResourceAttributeValue("service_instance_id"),
pmetrictest.IgnoreResourceAttributeValue("service_version"),
pmetrictest.IgnoreMetricAttributeValue("service_version"),
pmetrictest.IgnoreMetricAttributeValue("service_instance_id"),
pmetrictest.IgnoreMetricAttributeValue("queryid"),
pmetrictest.IgnoreMetricAttributeValue("table"),
pmetrictest.IgnoreSubsequentDataPoints(),
pmetrictest.IgnoreTimestamp(),
pmetrictest.IgnoreStartTimestamp(),
pmetrictest.IgnoreMetricDataPointsOrder(),
pmetrictest.IgnoreScopeMetricsOrder(),
pmetrictest.IgnoreMetricsOrder(),
pmetrictest.IgnoreScopeVersion(),
pmetrictest.IgnoreResourceMetricsOrder(),
pmetrictest.IgnoreMetricValues(),
)
assert.NoError(tt, err)
assert.NoError(tt, errs)
}, 30*time.Second, 1*time.Second)
}
14 changes: 11 additions & 3 deletions tests/testutils/golden.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package testutils

import (
"context"
"errors"
"fmt"
"path/filepath"
"runtime"
Expand Down Expand Up @@ -128,8 +129,15 @@ func RunMetricsCollectionTest(t *testing.T, configFile string, expectedFilePath
assert.Fail(tt, "No metrics collected")
return
}
err := pmetrictest.CompareMetrics(expected, sink.AllMetrics()[len(sink.AllMetrics())-1],
opts.compareMetricsOptions...)
assert.NoError(tt, err)
var errs error
for _, m := range sink.AllMetrics() {
err := pmetrictest.CompareMetrics(expected, m,
opts.compareMetricsOptions...)
if err == nil {
return
}
errs = errors.Join(errs, err)
}
assert.NoError(tt, errs)
}, 30*time.Second, 1*time.Second)
}
Loading