chore: merge main into generate-libraries-main

Author: cloud-java-bot

.github/release-please.yml

@@ -2,26 +2,30 @@ releaseType: java-yoshi
 bumpMinorPreMajor: true
 handleGHRelease: true
 branches:
-    - branch: 3.3.x
-    - branch: 4.0.x
-    - branch: 5.2.x
-    - branch: 6.4.4-sp
-      releaseType: java-lts
-    - branch: 6.14.x
-      releaseType: java-backport
-    - branch: 6.23.x
-    - branch: 6.33.x
-    - branch: 6.55.x
-      releaseType: java-backport
-    - branch: 6.67.x
-      releaseType: java-backport
-    - branch: 6.66.x
-      releaseType: java-backport
-    - branch: 6.88.x
-      releaseType: java-backport
-    - branch: 6.96.x
-      releaseType: java-backport
-    - branch: 6.95.x
-      releaseType: java-backport
-    - branch: protobuf-4.x-rc
-      manifest: true
+  - branch: 3.3.x
+  - branch: 4.0.x
+  - branch: 5.2.x
+  - branch: 6.4.4-sp
+    releaseType: java-lts
+  - branch: 6.14.x
+    releaseType: java-backport
+  - branch: 6.23.x
+  - branch: 6.33.x
+  - branch: 6.55.x
+    releaseType: java-backport
+  - branch: 6.67.x
+    releaseType: java-backport
+  - branch: 6.66.x
+    releaseType: java-backport
+  - branch: 6.88.x
+    releaseType: java-backport
+  - branch: 6.96.x
+    releaseType: java-backport
+  - branch: 6.95.x
+    releaseType: java-backport
+  - branch: protobuf-4.x-rc
+    manifest: true
+  - releaseType: java-backport
+    bumpMinorPreMajor: true
+    handleGHRelease: true
+    branch: 6.109.x

.github/sync-repo-settings.yaml

@@ -217,6 +217,24 @@ branchProtectionRules:
       - units-with-multiplexed-session (11)
       - unmanaged_dependency_check
       - library_generation
+  - pattern: 6.109.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (17)
+      - lint
+      - javadoc
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - checkstyle
+      - compile (8)
+      - compile (11)
+      - unmanaged_dependency_check
+      - library_generation
 permissionRules:
   - team: yoshi-admins
     permission: admin

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

@@ -68,8 +68,49 @@ public class BuiltInMetricsConstant {
           .map(m -> METER_NAME + '/' + m)
           .collect(Collectors.toSet());
 
+  // The following attributes are optional and need to be enabled explicitly.
+  public static final String GRPC_LB_BACKEND_SERVICE_ATTRIBUTE = "grpc.lb.backend_service";
+  public static final String GRPC_LB_LOCALITY_ATTRIBUTE = "grpc.lb.locality";
+  public static final String GRPC_DISCONNECT_ERROR_ATTRIBUTE = "grpc.disconnect_error";
+
+  static final Set<String> GRPC_LB_RLS_ATTRIBUTES =
+      ImmutableSet.of("grpc.lb.rls.data_plane_target", "grpc.lb.pick_result");
+  static final Set<String> GRPC_CLIENT_ATTEMPT_STARTED_ATTRIBUTES =
+      ImmutableSet.of("grpc.method", "grpc.target");
+  static final Set<String> GRPC_SUBCHANNEL_DEFAULT_ATTRIBUTES =
+      ImmutableSet.of("grpc.target", GRPC_LB_BACKEND_SERVICE_ATTRIBUTE, GRPC_LB_LOCALITY_ATTRIBUTE);
+  static final Set<String> GRPC_SUBCHANNEL_DISCONNECTION_ATTRIBUTES =
+      ImmutableSet.of(
+          "grpc.target",
+          GRPC_LB_BACKEND_SERVICE_ATTRIBUTE,
+          GRPC_LB_LOCALITY_ATTRIBUTE,
+          GRPC_DISCONNECT_ERROR_ATTRIBUTE);
+  static final Set<String> GRPC_XDS_CLIENT_RESOURCE_UPDATE_ATTRIBUTES =
+      ImmutableSet.of("grpc.xds.resource_type");
+
+  // Additional gRPC attributes to enable.
+  static final Map<String, Set<String>> GRPC_METRIC_ADDITIONAL_ATTRIBUTES =
+      ImmutableMap.<String, Set<String>>builder()
+          .put("grpc.client.attempt.started", GRPC_CLIENT_ATTEMPT_STARTED_ATTRIBUTES)
+          .put("grpc.subchannel.open_connections", GRPC_SUBCHANNEL_DEFAULT_ATTRIBUTES)
+          .put("grpc.subchannel.disconnections", GRPC_SUBCHANNEL_DISCONNECTION_ATTRIBUTES)
+          .put("grpc.subchannel.connection_attempts_succeeded", GRPC_SUBCHANNEL_DEFAULT_ATTRIBUTES)
+          .put("grpc.subchannel.connection_attempts_failed", GRPC_SUBCHANNEL_DEFAULT_ATTRIBUTES)
+          .put("grpc.lb.rls.default_target_picks", GRPC_LB_RLS_ATTRIBUTES)
+          .put("grpc.lb.rls.target_picks", GRPC_LB_RLS_ATTRIBUTES)
+          .put(
+              "grpc.xds_client.resource_updates_invalid",
+              GRPC_XDS_CLIENT_RESOURCE_UPDATE_ATTRIBUTES)
+          .put("grpc.xds_client.resource_updates_valid", GRPC_XDS_CLIENT_RESOURCE_UPDATE_ATTRIBUTES)
+          .build();
+
   static final Collection<String> GRPC_METRICS_TO_ENABLE =
       ImmutableList.of(
+          "grpc.client.attempt.started",
+          "grpc.subchannel.open_connections",
+          "grpc.subchannel.disconnections",
+          "grpc.subchannel.connection_attempts_succeeded",
+          "grpc.subchannel.connection_attempts_failed",
           "grpc.lb.rls.default_target_picks",
           "grpc.lb.rls.target_picks",
           "grpc.xds_client.server_failure",
@@ -100,8 +141,6 @@ public class BuiltInMetricsConstant {
       AttributeKey.stringKey("directpath_used");
   public static final AttributeKey<String> REQUEST_ID_KEY =
       AttributeKey.stringKey(REQUEST_ID_HEADER_NAME);
-  public static final AttributeKey<String> GRPC_XDS_RESOURCE_TYPE_KEY =
-      AttributeKey.stringKey("grpc.xds.resource_type");
   public static Set<String> ALLOWED_EXEMPLARS_ATTRIBUTES =
       new HashSet<>(Arrays.asList(REQUEST_ID_HEADER_NAME));
 
@@ -124,9 +163,6 @@ public class BuiltInMetricsConstant {
           DIRECT_PATH_ENABLED_KEY,
           DIRECT_PATH_USED_KEY);
 
-  static final Set<String> GRPC_LB_RLS_ATTRIBUTES =
-      ImmutableSet.of("grpc.lb.rls.data_plane_target", "grpc.lb.pick_result");
-
   static List<Double> BUCKET_BOUNDARIES =
       ImmutableList.of(
           0.0, 0.5, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0,
@@ -140,7 +176,6 @@ public class BuiltInMetricsConstant {
       ImmutableList.of(
           "grpc.client.attempt.sent_total_compressed_message_size",
           "grpc.client.attempt.rcvd_total_compressed_message_size",
-          "grpc.client.attempt.started",
           "grpc.client.attempt.duration",
           "grpc.client.call.duration");
 
@@ -235,8 +270,8 @@ private static void defineGRPCView(ImmutableMap.Builder<InstrumentSelector, View
           BuiltInMetricsConstant.COMMON_ATTRIBUTES.stream()
               .map(AttributeKey::getKey)
               .collect(Collectors.toSet());
-      attributesFilter.addAll(BuiltInMetricsConstant.GRPC_LB_RLS_ATTRIBUTES);
-      attributesFilter.add(BuiltInMetricsConstant.GRPC_XDS_RESOURCE_TYPE_KEY.getKey());
+      attributesFilter.addAll(
+          GRPC_METRIC_ADDITIONAL_ATTRIBUTES.getOrDefault(metric, ImmutableSet.of()));
 
       View view =
           View.builder()

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

@@ -150,6 +150,9 @@ void enableGrpcMetrics(
             .enableMetrics(BuiltInMetricsConstant.GRPC_METRICS_TO_ENABLE)
             // Disable gRPCs default metrics as they are not needed for Spanner.
             .disableMetrics(BuiltInMetricsConstant.GRPC_METRICS_ENABLED_BY_DEFAULT)
+            .addOptionalLabel(BuiltInMetricsConstant.GRPC_LB_BACKEND_SERVICE_ATTRIBUTE)
+            .addOptionalLabel(BuiltInMetricsConstant.GRPC_LB_LOCALITY_ATTRIBUTE)
+            .addOptionalLabel(BuiltInMetricsConstant.GRPC_DISCONNECT_ERROR_ATTRIBUTE)
             .build();
     ApiFunction<ManagedChannelBuilder, ManagedChannelBuilder> channelConfigurator =
         channelProviderBuilder.getChannelConfigurator();

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

@@ -116,9 +116,10 @@ private static TimeSeries convertPointToSpannerTimeSeries(
       PointData pointData,
       MonitoredResource.Builder monitoredResourceBuilder,
       String projectId) {
+    MetricKind metricKind = convertMetricKind(metricData);
     TimeSeries.Builder builder =
         TimeSeries.newBuilder()
-            .setMetricKind(convertMetricKind(metricData))
+            .setMetricKind(metricKind)
             .setValueType(convertValueType(metricData.getType()));
     Metric.Builder metricBuilder = Metric.newBuilder().setType(metricData.getName());
 
@@ -143,7 +144,11 @@ private static TimeSeries convertPointToSpannerTimeSeries(
 
     TimeInterval timeInterval =
         TimeInterval.newBuilder()
-            .setStartTime(Timestamps.fromNanos(pointData.getStartEpochNanos()))
+            .setStartTime(
+                // For gauge metrics, the start and end time should be the same.
+                metricKind == MetricKind.GAUGE
+                    ? Timestamps.fromNanos(pointData.getEpochNanos())
+                    : Timestamps.fromNanos(pointData.getStartEpochNanos()))
             .setEndTime(Timestamps.fromNanos(pointData.getEpochNanos()))
             .build();