Merge branch 'main' into dml-auto-batching

Author: olavloite

generation_config.yaml

@@ -1,5 +1,5 @@
-gapic_generator_version: 2.46.1
-googleapis_commitish: b6a27d13a2f0223051ef720e4e9d0d52323560e6
+gapic_generator_version: 2.47.0
+googleapis_commitish: 10b8dc3b54c9a609dcfda8060b8c4c734a942e8c
 libraries_bom_version: 26.48.0
 libraries:
   - api_shortname: spanner

google-cloud-spanner-executor/src/main/resources/META-INF/native-image/com.google.cloud.spanner.executor.v1/reflect-config.json

@@ -5471,6 +5471,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.spanner.v1.MultiplexedSessionPrecommitToken",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.spanner.v1.MultiplexedSessionPrecommitToken$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.spanner.v1.Mutation",
     "queryAllDeclaredConstructors": true,

google-cloud-spanner/src/main/java/com/google/cloud/spanner/BuiltInOpenTelemetryMetricsProvider.java

@@ -28,6 +28,8 @@
 import com.google.cloud.opentelemetry.detection.AttributeKeys;
 import com.google.cloud.opentelemetry.detection.DetectedPlatform;
 import com.google.cloud.opentelemetry.detection.GCPPlatformDetector;
+import com.google.common.hash.HashFunction;
+import com.google.common.hash.Hashing;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
@@ -83,11 +85,40 @@ Map<String, String> createClientAttributes(String projectId, String client_name)
     // TODO: Replace this with real value.
     clientAttributes.put(INSTANCE_CONFIG_ID_KEY.getKey(), "unknown");
     clientAttributes.put(CLIENT_NAME_KEY.getKey(), client_name);
-    clientAttributes.put(CLIENT_UID_KEY.getKey(), getDefaultTaskValue());
-    clientAttributes.put(CLIENT_HASH_KEY.getKey(), "cloud_spanner_client_raw_metrics");
+    String clientUid = getDefaultTaskValue();
+    clientAttributes.put(CLIENT_UID_KEY.getKey(), clientUid);
+    clientAttributes.put(CLIENT_HASH_KEY.getKey(), generateClientHash(clientUid));
     return clientAttributes;
   }
 
+  /**
+   * Generates a 6-digit zero-padded all lower case hexadecimal representation of hash of the
+   * accounting group. The hash utilizes the 10 most significant bits of the value returned by
+   * `Hashing.goodFastHash(64).hashBytes()`, so effectively the returned values are uniformly
+   * distributed in the range [000000, 0003ff].
+   *
+   * <p>The primary purpose of this function is to generate a hash value for the `client_hash`
+   * resource label using `client_uid` metric field. The range of values is chosen to be small
+   * enough to keep the cardinality of the Resource targets under control. Note: If at later time
+   * the range needs to be increased, it can be done by increasing the value of `kPrefixLength` to
+   * up to 24 bits without changing the format of the returned value.
+   *
+   * @return Returns a 6-digit zero-padded all lower case hexadecimal representation of hash of the
+   *     accounting group.
+   */
+  static String generateClientHash(String clientUid) {
+    if (clientUid == null) {
+      return "000000";
+    }
+
+    HashFunction hashFunction = Hashing.goodFastHash(64);
+    Long hash = hashFunction.hashBytes(clientUid.getBytes()).asLong();
+    // Don't change this value without reading above comment
+    int kPrefixLength = 10;
+    long shiftedValue = hash >>> (64 - kPrefixLength);
+    return String.format("%06x", shiftedValue);
+  }
+
   static String detectClientLocation() {
     GCPPlatformDetector detector = GCPPlatformDetector.DEFAULT_INSTANCE;
     DetectedPlatform detectedPlatform = detector.detectPlatform();

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ClientSideStatementValueConverters.java

@@ -19,6 +19,8 @@
 import static com.google.cloud.spanner.connection.ReadOnlyStalenessUtil.parseTimeUnit;
 import static com.google.cloud.spanner.connection.ReadOnlyStalenessUtil.toChronoUnit;
 
+import com.google.api.gax.core.CredentialsProvider;
+import com.google.cloud.spanner.Dialect;
 import com.google.cloud.spanner.ErrorCode;
 import com.google.cloud.spanner.Options.RpcPriority;
 import com.google.cloud.spanner.SpannerException;
@@ -31,6 +33,8 @@
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.spanner.v1.DirectedReadOptions;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.Base64;
@@ -73,7 +77,11 @@ private E get(String value) {
 
   /** Converter from string to {@link Boolean} */
   static class BooleanConverter implements ClientSideStatementValueConverter<Boolean> {
+    static final BooleanConverter INSTANCE = new BooleanConverter();
 
+    private BooleanConverter() {}
+
+    /** Constructor that is needed for reflection. */
     public BooleanConverter(String allowedValues) {}
 
     @Override
@@ -142,7 +150,11 @@ public Boolean convert(String value) {
 
   /** Converter from string to a non-negative integer. */
   static class NonNegativeIntegerConverter implements ClientSideStatementValueConverter<Integer> {
+    static final NonNegativeIntegerConverter INSTANCE = new NonNegativeIntegerConverter();
+
+    private NonNegativeIntegerConverter() {}
 
+    /** Constructor needed for reflection. */
     public NonNegativeIntegerConverter(String allowedValues) {}
 
     @Override
@@ -167,6 +179,9 @@ public Integer convert(String value) {
 
   /** Converter from string to {@link Duration}. */
   static class DurationConverter implements ClientSideStatementValueConverter<Duration> {
+    static final DurationConverter INSTANCE =
+        new DurationConverter("('(\\d{1,19})(s|ms|us|ns)'|\\d{1,19}|NULL)");
+
     private final String resetValue;
 
     private final Pattern allowedValues;
@@ -227,6 +242,10 @@ public PgDurationConverter(String allowedValues) {
   /** Converter from string to possible values for read only staleness ({@link TimestampBound}). */
   static class ReadOnlyStalenessConverter
       implements ClientSideStatementValueConverter<TimestampBound> {
+    static final ReadOnlyStalenessConverter INSTANCE =
+        new ReadOnlyStalenessConverter(
+            "'((STRONG)|(MIN_READ_TIMESTAMP)[\\t ]+((\\d{4})-(\\d{2})-(\\d{2})([Tt](\\d{2}):(\\d{2}):(\\d{2})(\\.\\d{1,9})?)([Zz]|([+-])(\\d{2}):(\\d{2})))|(READ_TIMESTAMP)[\\t ]+((\\d{4})-(\\d{2})-(\\d{2})([Tt](\\d{2}):(\\d{2}):(\\d{2})(\\.\\d{1,9})?)([Zz]|([+-])(\\d{2}):(\\d{2})))|(MAX_STALENESS)[\\t ]+((\\d{1,19})(s|ms|us|ns))|(EXACT_STALENESS)[\\t ]+((\\d{1,19})(s|ms|us|ns)))'");
+
     private final Pattern allowedValues;
     private final CaseInsensitiveEnumMap<Mode> values = new CaseInsensitiveEnumMap<>(Mode.class);
 
@@ -337,9 +356,14 @@ public DirectedReadOptions convert(String value) {
   /** Converter for converting strings to {@link AutocommitDmlMode} values. */
   static class AutocommitDmlModeConverter
       implements ClientSideStatementValueConverter<AutocommitDmlMode> {
+    static final AutocommitDmlModeConverter INSTANCE = new AutocommitDmlModeConverter();
+
     private final CaseInsensitiveEnumMap<AutocommitDmlMode> values =
         new CaseInsensitiveEnumMap<>(AutocommitDmlMode.class);
 
+    private AutocommitDmlModeConverter() {}
+
+    /** Constructor needed for reflection. */
     public AutocommitDmlModeConverter(String allowedValues) {}
 
     @Override
@@ -353,7 +377,35 @@ public AutocommitDmlMode convert(String value) {
     }
   }
 
+  static class ConnectionStateTypeConverter
+      implements ClientSideStatementValueConverter<ConnectionState.Type> {
+    static final ConnectionStateTypeConverter INSTANCE = new ConnectionStateTypeConverter();
+
+    private final CaseInsensitiveEnumMap<ConnectionState.Type> values =
+        new CaseInsensitiveEnumMap<>(ConnectionState.Type.class);
+
+    private ConnectionStateTypeConverter() {}
+
+    /** Constructor that is needed for reflection. */
+    public ConnectionStateTypeConverter(String allowedValues) {}
+
+    @Override
+    public Class<ConnectionState.Type> getParameterClass() {
+      return ConnectionState.Type.class;
+    }
+
+    @Override
+    public ConnectionState.Type convert(String value) {
+      return values.get(value);
+    }
+  }
+
   static class StringValueConverter implements ClientSideStatementValueConverter<String> {
+    static final StringValueConverter INSTANCE = new StringValueConverter();
+
+    private StringValueConverter() {}
+
+    /** Constructor needed for reflection. */
     public StringValueConverter(String allowedValues) {}
 
     @Override
@@ -481,6 +533,8 @@ public PgTransactionMode convert(String value) {
 
   /** Converter for converting strings to {@link RpcPriority} values. */
   static class RpcPriorityConverter implements ClientSideStatementValueConverter<RpcPriority> {
+    static final RpcPriorityConverter INSTANCE = new RpcPriorityConverter("(HIGH|MEDIUM|LOW|NULL)");
+
     private final CaseInsensitiveEnumMap<RpcPriority> values =
         new CaseInsensitiveEnumMap<>(RpcPriority.class);
     private final Pattern allowedValues;
@@ -512,9 +566,14 @@ public RpcPriority convert(String value) {
   /** Converter for converting strings to {@link SavepointSupport} values. */
   static class SavepointSupportConverter
       implements ClientSideStatementValueConverter<SavepointSupport> {
+    static final SavepointSupportConverter INSTANCE = new SavepointSupportConverter();
+
     private final CaseInsensitiveEnumMap<SavepointSupport> values =
         new CaseInsensitiveEnumMap<>(SavepointSupport.class);
 
+    private SavepointSupportConverter() {}
+
+    /** Constructor needed for reflection. */
     public SavepointSupportConverter(String allowedValues) {}
 
     @Override
@@ -528,6 +587,30 @@ public SavepointSupport convert(String value) {
     }
   }
 
+  /** Converter for converting strings to {@link DdlInTransactionMode} values. */
+  static class DdlInTransactionModeConverter
+      implements ClientSideStatementValueConverter<DdlInTransactionMode> {
+    static final DdlInTransactionModeConverter INSTANCE = new DdlInTransactionModeConverter();
+
+    private final CaseInsensitiveEnumMap<DdlInTransactionMode> values =
+        new CaseInsensitiveEnumMap<>(DdlInTransactionMode.class);
+
+    private DdlInTransactionModeConverter() {}
+
+    /** Constructor needed for reflection. */
+    public DdlInTransactionModeConverter(String allowedValues) {}
+
+    @Override
+    public Class<DdlInTransactionMode> getParameterClass() {
+      return DdlInTransactionMode.class;
+    }
+
+    @Override
+    public DdlInTransactionMode convert(String value) {
+      return values.get(value);
+    }
+  }
+
   static class ExplainCommandConverter implements ClientSideStatementValueConverter<String> {
     @Override
     public Class<String> getParameterClass() {
@@ -588,4 +671,71 @@ public String convert(String filePath) {
       return filePath;
     }
   }
+
+  static class CredentialsProviderConverter
+      implements ClientSideStatementValueConverter<CredentialsProvider> {
+    static final CredentialsProviderConverter INSTANCE = new CredentialsProviderConverter();
+
+    private CredentialsProviderConverter() {}
+
+    @Override
+    public Class<CredentialsProvider> getParameterClass() {
+      return CredentialsProvider.class;
+    }
+
+    @Override
+    public CredentialsProvider convert(String credentialsProviderName) {
+      if (!Strings.isNullOrEmpty(credentialsProviderName)) {
+        try {
+          Class<? extends CredentialsProvider> clazz =
+              (Class<? extends CredentialsProvider>) Class.forName(credentialsProviderName);
+          Constructor<? extends CredentialsProvider> constructor = clazz.getDeclaredConstructor();
+          return constructor.newInstance();
+        } catch (ClassNotFoundException classNotFoundException) {
+          throw SpannerExceptionFactory.newSpannerException(
+              ErrorCode.INVALID_ARGUMENT,
+              "Unknown or invalid CredentialsProvider class name: " + credentialsProviderName,
+              classNotFoundException);
+        } catch (NoSuchMethodException noSuchMethodException) {
+          throw SpannerExceptionFactory.newSpannerException(
+              ErrorCode.INVALID_ARGUMENT,
+              "Credentials provider "
+                  + credentialsProviderName
+                  + " does not have a public no-arg constructor.",
+              noSuchMethodException);
+        } catch (InvocationTargetException
+            | InstantiationException
+            | IllegalAccessException exception) {
+          throw SpannerExceptionFactory.newSpannerException(
+              ErrorCode.INVALID_ARGUMENT,
+              "Failed to create an instance of "
+                  + credentialsProviderName
+                  + ": "
+                  + exception.getMessage(),
+              exception);
+        }
+      }
+      return null;
+    }
+  }
+
+  /** Converter for converting strings to {@link Dialect} values. */
+  static class DialectConverter implements ClientSideStatementValueConverter<Dialect> {
+    static final DialectConverter INSTANCE = new DialectConverter();
+
+    private final CaseInsensitiveEnumMap<Dialect> values =
+        new CaseInsensitiveEnumMap<>(Dialect.class);
+
+    private DialectConverter() {}
+
+    @Override
+    public Class<Dialect> getParameterClass() {
+      return Dialect.class;
+    }
+
+    @Override
+    public Dialect convert(String value) {
+      return values.get(value);
+    }
+  }
 }