Skip to content

chore: unflake OpenTelemetrySpanTest.transactionRunnerWithFailedAndBeginTransaction #3254

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 1 commit into from
Aug 8, 2024
Merged

chore: unflake OpenTelemetrySpanTest.transactionRunnerWithFailedAndBeginTransaction #3254

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 13 additions & 18 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetrySpanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,22 +572,13 @@ public void transactionRunnerWithError() {
@Test
public void transactionRunnerWithFailedAndBeginTransaction() {
List<String> expectedReadWriteTransactionWithCommitAndBeginTransactionSpans =
isMultiplexedSessionsEnabled()
? ImmutableList.of(
"CloudSpannerOperation.CreateMultiplexedSession",
"CloudSpannerOperation.BeginTransaction",
"CloudSpannerOperation.BatchCreateSessionsRequest",
"CloudSpannerOperation.ExecuteUpdate",
"CloudSpannerOperation.Commit",
"CloudSpannerOperation.BatchCreateSessions",
"CloudSpanner.ReadWriteTransaction")
: ImmutableList.of(
"CloudSpannerOperation.BeginTransaction",
"CloudSpannerOperation.BatchCreateSessionsRequest",
"CloudSpannerOperation.ExecuteUpdate",
"CloudSpannerOperation.Commit",
"CloudSpannerOperation.BatchCreateSessions",
"CloudSpanner.ReadWriteTransaction");
ImmutableList.of(
"CloudSpannerOperation.BeginTransaction",
"CloudSpannerOperation.BatchCreateSessionsRequest",
"CloudSpannerOperation.ExecuteUpdate",
"CloudSpannerOperation.Commit",
"CloudSpannerOperation.BatchCreateSessions",
"CloudSpanner.ReadWriteTransaction");
DatabaseClient client = getClient();
assertEquals(
Long.valueOf(1L),
Expand All @@ -612,7 +603,7 @@ public void transactionRunnerWithFailedAndBeginTransaction() {
Stopwatch stopwatch = Stopwatch.createStarted();
while (spanExporter.getFinishedSpanItems().size()
< expectedReadWriteTransactionWithCommitAndBeginTransactionSpans.size()
&& stopwatch.elapsed().compareTo(java.time.Duration.ofMillis(1000)) < 0) {
&& stopwatch.elapsed(TimeUnit.MILLISECONDS) < 2000) {
Thread.yield();
}

Expand All @@ -621,7 +612,11 @@ public void transactionRunnerWithFailedAndBeginTransaction() {
.getFinishedSpanItems()
.forEach(
spanItem -> {
actualSpanItems.add(spanItem.getName());
// Ignore multiplexed sessions, as they are not used by this test and can therefore
// best be ignored, as it is not 100% certain that it has already been created.
if (!"CloudSpannerOperation.CreateMultiplexedSession".equals(spanItem.getName())) {
actualSpanItems.add(spanItem.getName());
}
switch (spanItem.getName()) {
case "CloudSpannerOperation.CreateMultiplexedSession":
verifyRequestEvents(
Expand Down