Skip to content
This repository was archived by the owner on Apr 7, 2026. It is now read-only.

Commit 63ba941

Browse files
rahul2393rahul2393
committed
test fixes
1 parent 4da8a96 commit 63ba941

2 files changed

Lines changed: 85 additions & 391 deletions

File tree

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetrySpanTest.java‎

Lines changed: 49 additions & 188 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,6 @@ public class OpenTelemetrySpanTest {
117117
ImmutableList.of("Request for 1 multiplexed session returned 1 session");
118118

119119
private int expectedCreateMultiplexedSessionsRequestEventsCount = 1;
120-
private List<String> expectedBatchCreateSessionsRequestEvents =
121-
ImmutableList.of("Requesting 2 sessions", "Request for 2 sessions returned 2 sessions");
122-
123-
private int expectedBatchCreateSessionsRequestEventsCount = 2;
124-
125-
private List<String> expectedBatchCreateSessionsEvents = ImmutableList.of("Creating 2 sessions");
126-
127-
private int expectedBatchCreateSessionsEventsCount = 1;
128120

129121
private List<String> expectedExecuteStreamingQueryEvents =
130122
ImmutableList.of("Starting/Resuming stream");
@@ -276,18 +268,10 @@ public void singleUse() {
276268
List<String> expectedReadOnlyTransactionSingleUseEvents =
277269
getExpectedReadOnlyTransactionSingleUseEvents();
278270
List<String> expectedReadOnlyTransactionSpans =
279-
isMultiplexedSessionsEnabled()
280-
? ImmutableList.of(
281-
"CloudSpannerOperation.CreateMultiplexedSession",
282-
"CloudSpannerOperation.BatchCreateSessionsRequest",
283-
"CloudSpannerOperation.ExecuteStreamingQuery",
284-
"CloudSpannerOperation.BatchCreateSessions",
285-
"CloudSpanner.ReadOnlyTransaction")
286-
: ImmutableList.of(
287-
"CloudSpannerOperation.BatchCreateSessionsRequest",
288-
"CloudSpannerOperation.ExecuteStreamingQuery",
289-
"CloudSpannerOperation.BatchCreateSessions",
290-
"CloudSpanner.ReadOnlyTransaction");
271+
ImmutableList.of(
272+
"CloudSpannerOperation.CreateMultiplexedSession",
273+
"CloudSpannerOperation.ExecuteStreamingQuery",
274+
"CloudSpanner.ReadOnlyTransaction");
291275
int expectedReadOnlyTransactionSingleUseEventsCount =
292276
expectedReadOnlyTransactionSingleUseEvents.size();
293277

@@ -314,18 +298,6 @@ public void singleUse() {
314298
expectedCreateMultiplexedSessionsRequestEvents,
315299
expectedCreateMultiplexedSessionsRequestEventsCount);
316300
break;
317-
case "CloudSpannerOperation.BatchCreateSessionsRequest":
318-
verifyRequestEvents(
319-
spanItem,
320-
expectedBatchCreateSessionsRequestEvents,
321-
expectedBatchCreateSessionsRequestEventsCount);
322-
break;
323-
case "CloudSpannerOperation.BatchCreateSessions":
324-
verifyRequestEvents(
325-
spanItem,
326-
expectedBatchCreateSessionsEvents,
327-
expectedBatchCreateSessionsEventsCount);
328-
break;
329301
case "CloudSpannerOperation.ExecuteStreamingQuery":
330302
verifyRequestEvents(
331303
spanItem,
@@ -361,31 +333,12 @@ private List<String> getExpectedReadOnlyTransactionSingleUseEvents() {
361333
@Test
362334
public void multiUse() {
363335
List<String> expectedReadOnlyTransactionSpans =
364-
isMultiplexedSessionsEnabled()
365-
? ImmutableList.of(
366-
"CloudSpannerOperation.CreateMultiplexedSession",
367-
"CloudSpannerOperation.BatchCreateSessionsRequest",
368-
"CloudSpannerOperation.ExecuteStreamingQuery",
369-
"CloudSpannerOperation.BatchCreateSessions",
370-
"CloudSpanner.ReadOnlyTransaction")
371-
: ImmutableList.of(
372-
"CloudSpannerOperation.BatchCreateSessionsRequest",
373-
"CloudSpannerOperation.ExecuteStreamingQuery",
374-
"CloudSpannerOperation.BatchCreateSessions",
375-
"CloudSpanner.ReadOnlyTransaction");
376-
List<String> expectedReadOnlyTransactionMultiUseEvents;
377-
if (isMultiplexedSessionsEnabled()) {
378-
expectedReadOnlyTransactionMultiUseEvents =
379-
ImmutableList.of("Creating Transaction", "Transaction Creation Done");
380-
} else {
381-
expectedReadOnlyTransactionMultiUseEvents =
382-
ImmutableList.of(
383-
"Acquiring session",
384-
"Acquired session",
385-
"Using Session",
386-
"Creating Transaction",
387-
"Transaction Creation Done");
388-
}
336+
ImmutableList.of(
337+
"CloudSpannerOperation.CreateMultiplexedSession",
338+
"CloudSpannerOperation.ExecuteStreamingQuery",
339+
"CloudSpanner.ReadOnlyTransaction");
340+
List<String> expectedReadOnlyTransactionMultiUseEvents =
341+
ImmutableList.of("Creating Transaction", "Transaction Creation Done");
389342
int expectedReadOnlyTransactionMultiUseEventsCount =
390343
expectedReadOnlyTransactionMultiUseEvents.size();
391344

@@ -411,18 +364,6 @@ public void multiUse() {
411364
expectedCreateMultiplexedSessionsRequestEvents,
412365
expectedCreateMultiplexedSessionsRequestEventsCount);
413366
break;
414-
case "CloudSpannerOperation.BatchCreateSessionsRequest":
415-
verifyRequestEvents(
416-
spanItem,
417-
expectedBatchCreateSessionsRequestEvents,
418-
expectedBatchCreateSessionsRequestEventsCount);
419-
break;
420-
case "CloudSpannerOperation.BatchCreateSessions":
421-
verifyRequestEvents(
422-
spanItem,
423-
expectedBatchCreateSessionsEvents,
424-
expectedBatchCreateSessionsEventsCount);
425-
break;
426367
case "CloudSpannerOperation.ExecuteStreamingQuery":
427368
verifyRequestEvents(
428369
spanItem,
@@ -447,38 +388,27 @@ public void multiUse() {
447388
@Test
448389
public void transactionRunner() {
449390
List<String> expectedReadWriteTransactionWithCommitSpans =
450-
isMultiplexedSessionsEnabled()
451-
? ImmutableList.of(
452-
"CloudSpannerOperation.CreateMultiplexedSession",
453-
"CloudSpannerOperation.BatchCreateSessionsRequest",
454-
"CloudSpannerOperation.ExecuteUpdate",
455-
"CloudSpannerOperation.Commit",
456-
"CloudSpannerOperation.BatchCreateSessions",
457-
"CloudSpanner.ReadWriteTransaction")
458-
: ImmutableList.of(
459-
"CloudSpannerOperation.BatchCreateSessionsRequest",
460-
"CloudSpannerOperation.ExecuteUpdate",
461-
"CloudSpannerOperation.Commit",
462-
"CloudSpannerOperation.BatchCreateSessions",
463-
"CloudSpanner.ReadWriteTransaction");
464-
465-
if (isMultiplexedSessionsEnabledForRW()) {
466-
expectedReadWriteTransactionEvents =
467-
ImmutableList.of(
468-
"Starting Transaction Attempt",
469-
"Starting Commit",
470-
"Commit Done",
471-
"Transaction Attempt Succeeded");
472-
expectedReadWriteTransactionEventsCount = 4;
473-
}
391+
ImmutableList.of(
392+
"CloudSpannerOperation.CreateMultiplexedSession",
393+
"CloudSpannerOperation.ExecuteUpdate",
394+
"CloudSpannerOperation.Commit",
395+
"CloudSpanner.ReadWriteTransaction");
396+
397+
expectedReadWriteTransactionEvents =
398+
ImmutableList.of(
399+
"Starting Transaction Attempt",
400+
"Starting Commit",
401+
"Commit Done",
402+
"Transaction Attempt Succeeded");
403+
expectedReadWriteTransactionEventsCount = 4;
474404
DatabaseClient client = getClient();
475405
TransactionRunner runner = client.readWriteTransaction();
476406
runner.run(transaction -> transaction.executeUpdate(UPDATE_STATEMENT));
477-
// Wait until the list of spans contains "CloudSpannerOperation.BatchCreateSessions", as this is
407+
// Wait until the list of spans contains "CloudSpannerOperation.CreateSession", as this is
478408
// an async operation.
479409
Stopwatch stopwatch = Stopwatch.createStarted();
480410
while (spanExporter.getFinishedSpanItems().stream()
481-
.noneMatch(span -> span.getName().equals("CloudSpannerOperation.BatchCreateSessions"))
411+
.noneMatch(span -> span.getName().equals("CloudSpannerOperation.CreateSession"))
482412
&& stopwatch.elapsed(TimeUnit.MILLISECONDS) < 100) {
483413
Thread.yield();
484414
}
@@ -495,18 +425,6 @@ public void transactionRunner() {
495425
expectedCreateMultiplexedSessionsRequestEvents,
496426
expectedCreateMultiplexedSessionsRequestEventsCount);
497427
break;
498-
case "CloudSpannerOperation.BatchCreateSessionsRequest":
499-
verifyRequestEvents(
500-
spanItem,
501-
expectedBatchCreateSessionsRequestEvents,
502-
expectedBatchCreateSessionsRequestEventsCount);
503-
break;
504-
case "CloudSpannerOperation.BatchCreateSessions":
505-
verifyRequestEvents(
506-
spanItem,
507-
expectedBatchCreateSessionsEvents,
508-
expectedBatchCreateSessionsEventsCount);
509-
break;
510428
case "CloudSpannerOperation.Commit":
511429
case "CloudSpannerOperation.ExecuteUpdate":
512430
assertEquals(0, spanItem.getEvents().size());
@@ -529,26 +447,16 @@ public void transactionRunner() {
529447
@Test
530448
public void transactionRunnerWithError() {
531449
List<String> expectedReadWriteTransactionSpans =
532-
isMultiplexedSessionsEnabled()
533-
? ImmutableList.of(
534-
"CloudSpannerOperation.CreateMultiplexedSession",
535-
"CloudSpannerOperation.BatchCreateSessionsRequest",
536-
"CloudSpannerOperation.BatchCreateSessions",
537-
"CloudSpannerOperation.ExecuteUpdate",
538-
"CloudSpanner.ReadWriteTransaction")
539-
: ImmutableList.of(
540-
"CloudSpannerOperation.BatchCreateSessionsRequest",
541-
"CloudSpannerOperation.BatchCreateSessions",
542-
"CloudSpannerOperation.ExecuteUpdate",
543-
"CloudSpanner.ReadWriteTransaction");
544-
if (isMultiplexedSessionsEnabledForRW()) {
545-
expectedReadWriteTransactionErrorEvents =
546-
ImmutableList.of(
547-
"Starting Transaction Attempt",
548-
"Transaction Attempt Failed in user operation",
549-
"exception");
550-
expectedReadWriteTransactionErrorEventsCount = 3;
551-
}
450+
ImmutableList.of(
451+
"CloudSpannerOperation.CreateMultiplexedSession",
452+
"CloudSpannerOperation.ExecuteUpdate",
453+
"CloudSpanner.ReadWriteTransaction");
454+
expectedReadWriteTransactionErrorEvents =
455+
ImmutableList.of(
456+
"Starting Transaction Attempt",
457+
"Transaction Attempt Failed in user operation",
458+
"exception");
459+
expectedReadWriteTransactionErrorEventsCount = 3;
552460
DatabaseClient client = getClient();
553461
TransactionRunner runner = client.readWriteTransaction();
554462
SpannerException e =
@@ -570,18 +478,6 @@ public void transactionRunnerWithError() {
570478
expectedCreateMultiplexedSessionsRequestEvents,
571479
expectedCreateMultiplexedSessionsRequestEventsCount);
572480
break;
573-
case "CloudSpannerOperation.BatchCreateSessionsRequest":
574-
verifyRequestEvents(
575-
spanItem,
576-
expectedBatchCreateSessionsRequestEvents,
577-
expectedBatchCreateSessionsRequestEventsCount);
578-
break;
579-
case "CloudSpannerOperation.BatchCreateSessions":
580-
verifyRequestEvents(
581-
spanItem,
582-
expectedBatchCreateSessionsEvents,
583-
expectedBatchCreateSessionsEventsCount);
584-
break;
585481
case "CloudSpanner.ReadWriteTransaction":
586482
verifyRequestEvents(
587483
spanItem,
@@ -605,23 +501,19 @@ public void transactionRunnerWithFailedAndBeginTransaction() {
605501
List<String> expectedReadWriteTransactionWithCommitAndBeginTransactionSpans =
606502
ImmutableList.of(
607503
"CloudSpannerOperation.BeginTransaction",
608-
"CloudSpannerOperation.BatchCreateSessionsRequest",
609504
"CloudSpannerOperation.ExecuteUpdate",
610505
"CloudSpannerOperation.Commit",
611-
"CloudSpannerOperation.BatchCreateSessions",
612506
"CloudSpanner.ReadWriteTransaction");
613-
if (isMultiplexedSessionsEnabledForRW()) {
614-
expectedReadWriteTransactionErrorWithBeginTransactionEvents =
615-
ImmutableList.of(
616-
"Starting Transaction Attempt",
617-
"Transaction Attempt Aborted in user operation. Retrying",
618-
"Creating Transaction",
619-
"Transaction Creation Done",
620-
"Starting Commit",
621-
"Commit Done",
622-
"Transaction Attempt Succeeded");
623-
expectedReadWriteTransactionErrorWithBeginTransactionEventsCount = 8;
624-
}
507+
expectedReadWriteTransactionErrorWithBeginTransactionEvents =
508+
ImmutableList.of(
509+
"Starting Transaction Attempt",
510+
"Transaction Attempt Aborted in user operation. Retrying",
511+
"Creating Transaction",
512+
"Transaction Creation Done",
513+
"Starting Commit",
514+
"Commit Done",
515+
"Transaction Attempt Succeeded");
516+
expectedReadWriteTransactionErrorWithBeginTransactionEventsCount = 8;
625517
DatabaseClient client = getClient();
626518
assertEquals(
627519
Long.valueOf(1L),
@@ -641,7 +533,7 @@ public void transactionRunnerWithFailedAndBeginTransaction() {
641533
return transaction.executeUpdate(UPDATE_STATEMENT);
642534
}));
643535
// Wait for all spans to finish. Failing to do so can cause the test to miss the
644-
// BatchCreateSessions span, as that span is executed asynchronously in the SessionClient, and
536+
// CreateSession span, as that span is executed asynchronously in the SessionClient, and
645537
// the SessionClient returns the session to the pool before the span has finished fully.
646538
Stopwatch stopwatch = Stopwatch.createStarted();
647539
while (spanExporter.getFinishedSpanItems().size()
@@ -667,18 +559,6 @@ public void transactionRunnerWithFailedAndBeginTransaction() {
667559
expectedCreateMultiplexedSessionsRequestEvents,
668560
expectedCreateMultiplexedSessionsRequestEventsCount);
669561
break;
670-
case "CloudSpannerOperation.BatchCreateSessionsRequest":
671-
verifyRequestEvents(
672-
spanItem,
673-
expectedBatchCreateSessionsRequestEvents,
674-
expectedBatchCreateSessionsRequestEventsCount);
675-
break;
676-
case "CloudSpannerOperation.BatchCreateSessions":
677-
verifyRequestEvents(
678-
spanItem,
679-
expectedBatchCreateSessionsEvents,
680-
expectedBatchCreateSessionsEventsCount);
681-
break;
682562
case "CloudSpannerOperation.Commit":
683563
case "CloudSpannerOperation.BeginTransaction":
684564
case "CloudSpannerOperation.ExecuteUpdate":
@@ -718,7 +598,7 @@ public void testTransactionRunnerWithRetryOnBeginTransaction() {
718598
});
719599

720600
assertEquals(2, mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
721-
int numExpectedSpans = isMultiplexedSessionsEnabled() ? 10 : 8;
601+
int numExpectedSpans = 7;
722602
waitForFinishedSpans(numExpectedSpans);
723603
List<SpanData> finishedSpans = spanExporter.getFinishedSpanItems();
724604
List<String> finishedSpanNames =
@@ -731,13 +611,7 @@ public void testTransactionRunnerWithRetryOnBeginTransaction() {
731611
assertTrue(
732612
actualSpanNames, finishedSpanNames.contains("CloudSpannerOperation.BeginTransaction"));
733613
assertTrue(actualSpanNames, finishedSpanNames.contains("CloudSpannerOperation.Commit"));
734-
assertTrue(
735-
actualSpanNames, finishedSpanNames.contains("CloudSpannerOperation.BatchCreateSessions"));
736-
assertTrue(
737-
actualSpanNames,
738-
finishedSpanNames.contains("CloudSpannerOperation.BatchCreateSessionsRequest"));
739614

740-
assertTrue(actualSpanNames, finishedSpanNames.contains("Spanner.BatchCreateSessions"));
741615
assertTrue(actualSpanNames, finishedSpanNames.contains("Spanner.BeginTransaction"));
742616
assertTrue(actualSpanNames, finishedSpanNames.contains("Spanner.Commit"));
743617

@@ -768,7 +642,7 @@ public void testSingleUseRetryOnExecuteStreamingSql() {
768642
}
769643

770644
assertEquals(2, mockSpanner.countRequestsOfType(ExecuteSqlRequest.class));
771-
int numExpectedSpans = isMultiplexedSessionsEnabled() ? 9 : 7;
645+
int numExpectedSpans = 6;
772646
waitForFinishedSpans(numExpectedSpans);
773647
List<SpanData> finishedSpans = spanExporter.getFinishedSpanItems();
774648
List<String> finishedSpanNames =
@@ -780,13 +654,7 @@ public void testSingleUseRetryOnExecuteStreamingSql() {
780654
assertTrue(actualSpanNames, finishedSpanNames.contains("CloudSpanner.ReadOnlyTransaction"));
781655
assertTrue(
782656
actualSpanNames, finishedSpanNames.contains("CloudSpannerOperation.ExecuteStreamingQuery"));
783-
assertTrue(
784-
actualSpanNames, finishedSpanNames.contains("CloudSpannerOperation.BatchCreateSessions"));
785-
assertTrue(
786-
actualSpanNames,
787-
finishedSpanNames.contains("CloudSpannerOperation.BatchCreateSessionsRequest"));
788657

789-
assertTrue(actualSpanNames, finishedSpanNames.contains("Spanner.BatchCreateSessions"));
790658
assertTrue(actualSpanNames, finishedSpanNames.contains("Spanner.ExecuteStreamingSql"));
791659

792660
// UNAVAILABLE errors on ExecuteStreamingSql are handled manually in the client library, which
@@ -817,7 +685,7 @@ public void testRetryOnExecuteSql() {
817685
.run(transaction -> transaction.executeUpdate(UPDATE_STATEMENT));
818686

819687
assertEquals(2, mockSpanner.countRequestsOfType(ExecuteSqlRequest.class));
820-
int numExpectedSpans = isMultiplexedSessionsEnabled() ? 10 : 8;
688+
int numExpectedSpans = 7;
821689
waitForFinishedSpans(numExpectedSpans);
822690
List<SpanData> finishedSpans = spanExporter.getFinishedSpanItems();
823691
List<String> finishedSpanNames =
@@ -828,13 +696,6 @@ public void testRetryOnExecuteSql() {
828696

829697
assertTrue(actualSpanNames, finishedSpanNames.contains("CloudSpanner.ReadWriteTransaction"));
830698
assertTrue(actualSpanNames, finishedSpanNames.contains("CloudSpannerOperation.Commit"));
831-
assertTrue(
832-
actualSpanNames, finishedSpanNames.contains("CloudSpannerOperation.BatchCreateSessions"));
833-
assertTrue(
834-
actualSpanNames,
835-
finishedSpanNames.contains("CloudSpannerOperation.BatchCreateSessionsRequest"));
836-
837-
assertTrue(actualSpanNames, finishedSpanNames.contains("Spanner.BatchCreateSessions"));
838699
assertTrue(actualSpanNames, finishedSpanNames.contains("Spanner.ExecuteSql"));
839700
assertTrue(actualSpanNames, finishedSpanNames.contains("Spanner.Commit"));
840701

0 commit comments

Comments
 (0)