Skip to content

fix(spanner): cache auto-tagging options to avoid system property lock contention #13273

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
sakthivelmanii merged 1 commit into from
May 27, 2026
+6 −9
Merged

fix(spanner): cache auto-tagging options to avoid system property lock contention #13273

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
15 changes: 6 additions & 9 deletions java-spanner/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,11 @@ protected SpannerOptions(Builder builder) {
monitoringHost = builder.monitoringHost;
defaultTransactionOptions = builder.defaultTransactionOptions;
clientContext = builder.clientContext;
autoTaggingEnabled = builder.autoTaggingEnabled;
if (environment.isAutoTaggingDisabled()) {
autoTaggingEnabled = false;
} else {
autoTaggingEnabled = builder.autoTaggingEnabled || environment.isAutoTaggingEnabled();
}
Comment thread
sakthivelmanii marked this conversation as resolved.
autoTaggingPackages = builder.autoTaggingPackages;
autoTaggingTracerLimit = builder.autoTaggingTracerLimit;
}
Expand Down Expand Up @@ -2611,10 +2615,7 @@ public TransactionOptions getDefaultTransactionOptions() {
}

public boolean isAutoTaggingEnabled() {
if (environment.isAutoTaggingDisabled()) {
return false;
}
return autoTaggingEnabled || environment.isAutoTaggingEnabled();
return autoTaggingEnabled;
}

public List<String> getAutoTaggingPackages() {
Expand All @@ -2625,10 +2626,6 @@ public int getAutoTaggingTracerLimit() {
return autoTaggingTracerLimit;
}

public boolean isAutoTaggingDisabled() {
return environment.isAutoTaggingDisabled();
}
Comment on lines 2628 to -2630
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot May 26, 2026

Choose a reason for hiding this comment

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

high

Removing the public method isAutoTaggingDisabled() is a breaking change for the public API of SpannerOptions. To avoid breaking backward compatibility while still preventing system property lock contention, we should keep this method and return a cached value.

Note: You will also need to declare private final boolean autoTaggingDisabled; as a field in the class.

Suggested change
public boolean isAutoTaggingDisabled() {
return environment.isAutoTaggingDisabled();
}
public boolean isAutoTaggingDisabled() {
return autoTaggingDisabled;
}

Copy link
Copy Markdown
Contributor Author

@sakthivelmanii sakthivelmanii May 26, 2026

Choose a reason for hiding this comment

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

This change is not live yet


@BetaApi
public boolean isUseVirtualThreads() {
return useVirtualThreads;
Expand Down
Loading