-
Notifications
You must be signed in to change notification settings - Fork 175
[chore] functional_test updates #2255
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.
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
Open
jinja2
wants to merge
1
commit into
main
Choose a base branch
from
fix-expected-sampling
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -140,6 +140,16 @@ func MaybeWriteUpdateExpectedTracesResults(t *testing.T, file string, traces *pt | |
| } | ||
| } | ||
|
|
||
| // ClearTraceSchemaURLs strips schema URLs from all ResourceSpans and ScopeSpans | ||
| func ClearTraceSchemaURLs(td ptrace.Traces) { | ||
| for i := 0; i < td.ResourceSpans().Len(); i++ { | ||
| td.ResourceSpans().At(i).SetSchemaUrl("") | ||
| for j := 0; j < td.ResourceSpans().At(i).ScopeSpans().Len(); j++ { | ||
| td.ResourceSpans().At(i).ScopeSpans().At(j).SetSchemaUrl("") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func MaybeUpdateExpectedMetricsResults(t *testing.T, file string, metrics *pmetric.Metrics) { | ||
| if shouldUpdateExpectedResults() { | ||
| require.NoError(t, golden.WriteMetrics(t, file, *metrics)) | ||
|
|
@@ -420,49 +430,67 @@ func DeleteObject(t *testing.T, k8sClient *k8stest.K8sClient, objYAML string) { | |
| } | ||
| } | ||
|
|
||
| // SelectMetricSet finds a metrics payload containing a target metric without any re-checking logic. | ||
| func SelectMetricSet(t *testing.T, expected pmetric.Metrics, targetMetric string, metricSink *consumertest.MetricsSink, ignoreLen bool) *pmetric.Metrics { | ||
| var selectedMetrics *pmetric.Metrics | ||
| // SelectMetricSet finds a metrics payload containing a target metric. | ||
| // It first tries to find a payload with an exact ResourceMetrics and MetricCount | ||
| // match to expected (best candidate for CompareMetrics). If none is found, it | ||
| // falls back to the payload with the highest MetricCount (most complete batch, | ||
| // suitable for updating golden files). | ||
| // Returns the selected payload and whether it was an exact match. | ||
| func SelectMetricSet(t *testing.T, expected pmetric.Metrics, targetMetric string, metricSink *consumertest.MetricsSink) (*pmetric.Metrics, bool) { | ||
| var exactMatch *pmetric.Metrics | ||
| var fallback *pmetric.Metrics | ||
| fallbackCount := -1 | ||
|
|
||
| for h := len(metricSink.AllMetrics()) - 1; h >= 0; h-- { | ||
| m := metricSink.AllMetrics()[h] | ||
| foundTargetMetric := false | ||
|
|
||
| OUTER: | ||
| for i := 0; i < m.ResourceMetrics().Len(); i++ { | ||
| for j := 0; j < m.ResourceMetrics().At(i).ScopeMetrics().Len(); j++ { | ||
| for k := 0; k < m.ResourceMetrics().At(i).ScopeMetrics().At(j).Metrics().Len(); k++ { | ||
| metric := m.ResourceMetrics().At(i).ScopeMetrics().At(j).Metrics().At(k) | ||
| if metric.Name() == targetMetric { | ||
| foundTargetMetric = true | ||
| break OUTER | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if !foundTargetMetric { | ||
| if !containsMetric(m, targetMetric) { | ||
| continue | ||
| } | ||
|
|
||
| if ignoreLen || (m.ResourceMetrics().Len() == expected.ResourceMetrics().Len() && m.MetricCount() == expected.MetricCount()) { | ||
| selectedMetrics = &m | ||
| t.Logf("Found target metric '%s' in payload with %d total metrics", targetMetric, m.MetricCount()) | ||
| if m.ResourceMetrics().Len() == expected.ResourceMetrics().Len() && m.MetricCount() == expected.MetricCount() { | ||
| exactMatch = &m | ||
| break | ||
| } | ||
| if m.MetricCount() > fallbackCount { | ||
| fallback = &m | ||
| fallbackCount = m.MetricCount() | ||
|
Comment on lines
444
to
+455
|
||
| } | ||
| } | ||
|
|
||
| if exactMatch != nil { | ||
| t.Logf("Selected exact-match payload with target metric '%s': %d metrics, %d resources", | ||
| targetMetric, exactMatch.MetricCount(), exactMatch.ResourceMetrics().Len()) | ||
| return exactMatch, true | ||
| } | ||
| if fallback != nil { | ||
| t.Logf("No exact match for expected counts (%d metrics, %d resources); selected best-effort payload with '%s': %d metrics, %d resources", | ||
| expected.MetricCount(), expected.ResourceMetrics().Len(), targetMetric, fallback.MetricCount(), fallback.ResourceMetrics().Len()) | ||
| } | ||
| return fallback, false | ||
| } | ||
|
|
||
| return selectedMetrics | ||
| func containsMetric(m pmetric.Metrics, name string) bool { | ||
| for i := 0; i < m.ResourceMetrics().Len(); i++ { | ||
| for j := 0; j < m.ResourceMetrics().At(i).ScopeMetrics().Len(); j++ { | ||
| for k := 0; k < m.ResourceMetrics().At(i).ScopeMetrics().At(j).Metrics().Len(); k++ { | ||
| if m.ResourceMetrics().At(i).ScopeMetrics().At(j).Metrics().At(k).Name() == name { | ||
| return true | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| // SelectMetricSetWithTimeout finds a metrics payload containing a target metric with Eventually timeout | ||
| func SelectMetricSetWithTimeout(t *testing.T, expected pmetric.Metrics, targetMetric string, metricSink *consumertest.MetricsSink, ignoreLen bool, timeout time.Duration, interval time.Duration) *pmetric.Metrics { | ||
| // SelectMetricSetWithTimeout retries SelectMetricSet until a payload is found or the timeout expires. | ||
| // Returns the selected payload and whether it was an exact match on counts. | ||
| func SelectMetricSetWithTimeout(t *testing.T, expected pmetric.Metrics, targetMetric string, metricSink *consumertest.MetricsSink, timeout time.Duration, interval time.Duration) (*pmetric.Metrics, bool) { | ||
| var selectedMetrics *pmetric.Metrics | ||
| var exactMatch bool | ||
|
|
||
| require.Eventuallyf(t, func() bool { | ||
| selectedMetrics = SelectMetricSet(t, expected, targetMetric, metricSink, ignoreLen) | ||
| selectedMetrics, exactMatch = SelectMetricSet(t, expected, targetMetric, metricSink) | ||
| return selectedMetrics != nil | ||
| }, timeout, interval, "Failed to find target metric %s within timeout period of %v", targetMetric, timeout) | ||
|
Comment on lines
490
to
493
|
||
|
|
||
| return selectedMetrics | ||
| return selectedMetrics, exactMatch | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps I'm being guided by the diff above in which exactMatch was a boolean, but felt that this nit makes more readable: