Thanks to visit codestin.com
Credit goes to github.com

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

refactor: remove setSpan() method from SessionImpl class. #3016

Closed
arpan14 wants to merge 2 commits into from
Closed

refactor: remove setSpan() method from SessionImpl class. #3016

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
44c869a
refactor: remove setSpan() method from SessionImpl class.
Apr 5, 2024
26a82be
chore: add features to support multiple transactions.
Apr 9, 2024
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
5 changes: 0 additions & 5 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,11 +451,6 @@ void initTransaction() {
this.tracer = builder.tracer;
}

@Override
public void setSpan(ISpan span) {
this.span = span;
}

long getSeqNo() {
return seqNo.incrementAndGet();
}
Expand Down
5 changes: 0 additions & 5 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/AsyncTransactionManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ final class AsyncTransactionManagerImpl
this.options = Options.fromTransactionOptions(options);
}

@Override
public void setSpan(ISpan span) {
this.span = span;
}

@Override
public void close() {
closeAsync();
Expand Down
17 changes: 11 additions & 6 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.google.cloud.spanner.Options.TransactionOption;
import com.google.cloud.spanner.Options.UpdateOption;
import com.google.cloud.spanner.SessionPool.PooledSessionFuture;
import com.google.cloud.spanner.SessionPool.SessionFuture;
import com.google.cloud.spanner.SpannerImpl.ClosedException;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
Expand Down Expand Up @@ -52,6 +53,10 @@ PooledSessionFuture getSession() {
return pool.getSession();
}

SessionFuture getMultiplexedSession() {
return pool.getMultiplexedSessionWithFallback();
}

@Override
public Dialect getDialect() {
return pool.getDialect();
Expand Down Expand Up @@ -123,7 +128,7 @@ public ServerStream<BatchWriteResponse> batchWriteAtLeastOnce(
public ReadContext singleUse() {
ISpan span = tracer.spanBuilder(READ_ONLY_TRANSACTION);
try (IScope s = tracer.withSpan(span)) {
return getSession().singleUse();
return getMultiplexedSession().singleUse();
} catch (RuntimeException e) {
span.setStatus(e);
span.end();
Expand All @@ -135,7 +140,7 @@ public ReadContext singleUse() {
public ReadContext singleUse(TimestampBound bound) {
ISpan span = tracer.spanBuilder(READ_ONLY_TRANSACTION);
try (IScope s = tracer.withSpan(span)) {
return getSession().singleUse(bound);
return getMultiplexedSession().singleUse(bound);
} catch (RuntimeException e) {
span.setStatus(e);
span.end();
Expand All @@ -147,7 +152,7 @@ public ReadContext singleUse(TimestampBound bound) {
public ReadOnlyTransaction singleUseReadOnlyTransaction() {
ISpan span = tracer.spanBuilder(READ_ONLY_TRANSACTION);
try (IScope s = tracer.withSpan(span)) {
return getSession().singleUseReadOnlyTransaction();
return getMultiplexedSession().singleUseReadOnlyTransaction();
} catch (RuntimeException e) {
span.setStatus(e);
span.end();
Expand All @@ -159,7 +164,7 @@ public ReadOnlyTransaction singleUseReadOnlyTransaction() {
public ReadOnlyTransaction singleUseReadOnlyTransaction(TimestampBound bound) {
ISpan span = tracer.spanBuilder(READ_ONLY_TRANSACTION);
try (IScope s = tracer.withSpan(span)) {
return getSession().singleUseReadOnlyTransaction(bound);
return getMultiplexedSession().singleUseReadOnlyTransaction(bound);
} catch (RuntimeException e) {
span.setStatus(e);
span.end();
Expand All @@ -171,7 +176,7 @@ public ReadOnlyTransaction singleUseReadOnlyTransaction(TimestampBound bound) {
public ReadOnlyTransaction readOnlyTransaction() {
ISpan span = tracer.spanBuilder(READ_ONLY_TRANSACTION);
try (IScope s = tracer.withSpan(span)) {
return getSession().readOnlyTransaction();
return getMultiplexedSession().readOnlyTransaction();
} catch (RuntimeException e) {
span.setStatus(e);
span.end();
Expand All @@ -183,7 +188,7 @@ public ReadOnlyTransaction readOnlyTransaction() {
public ReadOnlyTransaction readOnlyTransaction(TimestampBound bound) {
ISpan span = tracer.spanBuilder(READ_ONLY_TRANSACTION);
try (IScope s = tracer.withSpan(span)) {
return getSession().readOnlyTransaction(bound);
return getMultiplexedSession().readOnlyTransaction(bound);
} catch (RuntimeException e) {
span.setStatus(e);
span.end();
Expand Down
4 changes: 0 additions & 4 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionedDmlTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,6 @@ public void invalidate() {
isValid = false;
}

/** No-op method needed to implement SessionTransaction interface. */
@Override
public void setSpan(ISpan span) {}

private Duration tryUpdateTimeout(final Duration timeout, final Stopwatch stopwatch) {
final Duration remainingTimeout =
timeout.minus(stopwatch.elapsed(TimeUnit.MILLISECONDS), ChronoUnit.MILLIS);
Expand Down
38 changes: 12 additions & 26 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,6 @@ interface SessionTransaction {

/** Invalidates the transaction, generally because a new one has been started on the session. */
void invalidate();

/** Registers the current span on the transaction. */
void setSpan(ISpan span);
}

private final SpannerImpl spanner;
Expand All @@ -105,7 +102,6 @@ interface SessionTransaction {
private volatile Instant lastUseTime;
@Nullable private final Instant createTime;
private final boolean isMultiplexed;
private ISpan currentSpan;

SessionImpl(SpannerImpl spanner, String name, Map<SpannerRpc.Option, ?> options) {
this.spanner = spanner;
Expand Down Expand Up @@ -143,14 +139,6 @@ public String getName() {
return options;
}

void setCurrentSpan(ISpan span) {
currentSpan = span;
}

ISpan getCurrentSpan() {
return currentSpan;
}

Instant getLastUseTime() {
return lastUseTime;
}
Expand Down Expand Up @@ -308,7 +296,7 @@ public ReadContext singleUse(TimestampBound bound) {
.setDefaultPrefetchChunks(spanner.getDefaultPrefetchChunks())
.setDefaultDecodeMode(spanner.getDefaultDecodeMode())
.setDefaultDirectedReadOptions(spanner.getOptions().getDirectedReadOptions())
.setSpan(currentSpan)
.setSpan(tracer.getCurrentSpan())
.setTracer(tracer)
.setExecutorProvider(spanner.getAsyncExecutorProvider())
.build());
Expand All @@ -330,7 +318,7 @@ public ReadOnlyTransaction singleUseReadOnlyTransaction(TimestampBound bound) {
.setDefaultPrefetchChunks(spanner.getDefaultPrefetchChunks())
.setDefaultDecodeMode(spanner.getDefaultDecodeMode())
.setDefaultDirectedReadOptions(spanner.getOptions().getDirectedReadOptions())
.setSpan(currentSpan)
.setSpan(tracer.getCurrentSpan())
.setTracer(tracer)
.setExecutorProvider(spanner.getAsyncExecutorProvider())
.buildSingleUseReadOnlyTransaction());
Expand All @@ -352,7 +340,7 @@ public ReadOnlyTransaction readOnlyTransaction(TimestampBound bound) {
.setDefaultPrefetchChunks(spanner.getDefaultPrefetchChunks())
.setDefaultDecodeMode(spanner.getDefaultDecodeMode())
.setDefaultDirectedReadOptions(spanner.getOptions().getDirectedReadOptions())
.setSpan(currentSpan)
.setSpan(tracer.getCurrentSpan())
.setTracer(tracer)
.setExecutorProvider(spanner.getAsyncExecutorProvider())
.build());
Expand All @@ -370,12 +358,12 @@ public AsyncRunner runAsync(TransactionOption... options) {

@Override
public TransactionManager transactionManager(TransactionOption... options) {
return new TransactionManagerImpl(this, currentSpan, tracer, options);
return new TransactionManagerImpl(this, tracer.getCurrentSpan(), tracer, options);
}

@Override
public AsyncTransactionManagerImpl transactionManagerAsync(TransactionOption... options) {
return new AsyncTransactionManagerImpl(this, currentSpan, options);
return new AsyncTransactionManagerImpl(this, tracer.getCurrentSpan(), options);
}

@Override
Expand Down Expand Up @@ -470,7 +458,7 @@ TransactionContextImpl newTransaction(Options options) {
.setDefaultQueryOptions(spanner.getDefaultQueryOptions(databaseId))
.setDefaultPrefetchChunks(spanner.getDefaultPrefetchChunks())
.setDefaultDecodeMode(spanner.getDefaultDecodeMode())
.setSpan(currentSpan)
.setSpan(tracer.getCurrentSpan())
.setTracer(tracer)
.setExecutorProvider(spanner.getAsyncExecutorProvider())
.setClock(poolMaintainerClock == null ? new Clock() : poolMaintainerClock)
Expand All @@ -479,14 +467,12 @@ TransactionContextImpl newTransaction(Options options) {

<T extends SessionTransaction> T setActive(@Nullable T ctx) {
throwIfTransactionsPending();

if (activeTransaction != null) {
activeTransaction.invalidate();
}
activeTransaction = ctx;
readyTransactionId = null;
if (activeTransaction != null) {

@surbhigarg92 surbhigarg92 Apr 8, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be an issue.

activeTransaction.setSpan(currentSpan);
if (!this.isMultiplexed) {
if (activeTransaction != null) {
activeTransaction.invalidate();
}
activeTransaction = ctx;
readyTransactionId = null;
}
return ctx;
}
Expand Down
5 changes: 0 additions & 5 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1908,15 +1908,11 @@ public void prepareReadWriteTransaction() {

private void keepAlive() {
markUsed();
final ISpan previousSpan = delegate.getCurrentSpan();
delegate.setCurrentSpan(tracer.getBlankSpan());
try (ResultSet resultSet =
delegate
.singleUse(TimestampBound.ofMaxStaleness(60, TimeUnit.SECONDS))
.executeQuery(Statement.newBuilder("SELECT 1").build())) {
resultSet.next();
} finally {
delegate.setCurrentSpan(previousSpan);
}
}

Expand Down Expand Up @@ -1955,7 +1951,6 @@ public SessionImpl getDelegate() {

@Override
public void markBusy(ISpan span) {
this.delegate.setCurrentSpan(span);
this.state = SessionState.BUSY;
}

Expand Down
9 changes: 0 additions & 9 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,6 @@ final class TransactionManagerImpl implements TransactionManager, SessionTransac
this.options = Options.fromTransactionOptions(options);
}

ISpan getSpan() {
return span;
}

@Override
public void setSpan(ISpan span) {
this.span = span;
}

@Override
public TransactionContext begin() {
Preconditions.checkState(txn == null, "begin can only be called once");
Expand Down
6 changes: 1 addition & 5 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,11 +985,7 @@ public TransactionRunner allowNestedTransaction() {
this.options = Options.fromTransactionOptions(options);
this.txn = session.newTransaction(this.options);
this.tracer = session.getTracer();
}

@Override
public void setSpan(ISpan span) {
this.span = span;
this.span = tracer.getCurrentSpan();
}

@Nullable
Expand Down
1 change: 0 additions & 1 deletion google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ public void setUp() {
Span oTspan = mock(Span.class);
ISpan span = new OpenTelemetrySpan(oTspan);
when(oTspan.makeCurrent()).thenReturn(mock(Scope.class));
((SessionImpl) session).setCurrentSpan(span);
// We expect the same options, "options", on all calls on "session".
options = optionsCaptor.getValue();
}
Expand Down
2 changes: 0 additions & 2 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1455,7 +1455,6 @@ public void testSessionNotFoundReadWriteTransaction() {
when(closedSession.beginTransactionAsync(any(), eq(true))).thenThrow(sessionNotFound);
when(closedSession.getTracer()).thenReturn(tracer);
TransactionRunnerImpl closedTransactionRunner = new TransactionRunnerImpl(closedSession);
closedTransactionRunner.setSpan(span);
when(closedSession.readWriteTransaction()).thenReturn(closedTransactionRunner);

final SessionImpl openSession = mock(SessionImpl.class);
Expand All @@ -1470,7 +1469,6 @@ public void testSessionNotFoundReadWriteTransaction() {
.thenReturn(ApiFutures.immediateFuture(ByteString.copyFromUtf8("open-txn")));
when(openSession.getTracer()).thenReturn(tracer);
TransactionRunnerImpl openTransactionRunner = new TransactionRunnerImpl(openSession);
openTransactionRunner.setSpan(span);
when(openSession.readWriteTransaction()).thenReturn(openTransactionRunner);

ResultSet openResultSet = mock(ResultSet.class);
Expand Down
4 changes: 0 additions & 4 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ public void setUp() {
Span oTspan = mock(Span.class);
span = new OpenTelemetrySpan(oTspan);
when(oTspan.makeCurrent()).thenReturn(mock(Scope.class));
transactionRunner.setSpan(span);
}

@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -312,9 +311,7 @@ public void prepareReadWriteTransaction() {
throw new IllegalStateException();
}
};
session.setCurrentSpan(new OpenTelemetrySpan(mock(io.opentelemetry.api.trace.Span.class)));
TransactionRunnerImpl runner = new TransactionRunnerImpl(session);
runner.setSpan(span);
assertThat(usedInlinedBegin).isFalse();
runner.run(
transaction -> {
Expand Down Expand Up @@ -347,7 +344,6 @@ private long[] batchDmlException(int status) {
ApiFutures.immediateFuture(ByteString.copyFromUtf8(UUID.randomUUID().toString())));
when(session.getName()).thenReturn(SessionId.of("p", "i", "d", "test").getName());
TransactionRunnerImpl runner = new TransactionRunnerImpl(session);
runner.setSpan(span);
ExecuteBatchDmlResponse response1 =
ExecuteBatchDmlResponse.newBuilder()
.addResultSets(
Expand Down