Skip to content

Put all of the checks in eventually #828

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

Merged
merged 2 commits into from
Oct 29, 2025
Merged

Put all of the checks in eventually #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08f6ccc
put all of the checks in eventually
grcevski Oct 29, 2025
d385ab3
add more logging for elasticsearch to see what's up when it fails
grcevski Oct 29, 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
2 changes: 1 addition & 1 deletion test/integration/test_python_elasticsearchclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func assertElasticsearchOperation(t *testing.T, comm, op, queryText, index strin
var tq jaeger.TracesQuery
require.NoError(t, json.NewDecoder(resp.Body).Decode(&tq))
traces := tq.FindBySpan(jaeger.Tag{Key: "db.operation.name", Type: "string", Value: op})
require.GreaterOrEqual(t, len(traces), 1)
require.GreaterOrEqual(t, len(traces), 1, resp.Body)
lastTrace := traces[len(traces)-1]
span := lastTrace.Spans[0]

Expand Down
14 changes: 6 additions & 8 deletions test/integration/traces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,14 +858,12 @@ func ensureTracesMatch(t *testing.T, urlPath string) {
traces := tq.FindBySpan(jaeger.Tag{Key: "url.path", Type: "string", Value: "/" + urlPath})
require.LessOrEqual(t, 5, len(traces))
multipleTraces = traces
}, test.Interval(500*time.Millisecond))

// Ensure all 5 traces have proper full chain Java -> Node
for _, trace := range multipleTraces {
var traceID string
// Ensure all 5 traces have proper full chain Java -> Node
for _, trace := range multipleTraces {
var traceID string

// Check the information of the java parent span with retry
test.Eventually(t, testTimeout, func(t require.TestingT) {
// Check the information of the java parent span with retry
res := trace.FindByOperationName("GET /"+urlPath, "server")
require.Len(t, res, 1)
parent := res[0]
Expand Down Expand Up @@ -903,8 +901,8 @@ func ensureTracesMatch(t *testing.T, urlPath string) {
jaeger.Tag{Key: "span.kind", Type: "string", Value: "server"},
)
assert.Empty(t, sd, sd.String())
}, test.Interval(30*time.Millisecond))
}
}
}, test.Interval(500*time.Millisecond))
}

func testNestedHTTPSTracesKProbes(t *testing.T) {
Expand Down