From 18907e493acd0bc8aac4355e9d803e289f389a3f Mon Sep 17 00:00:00 2001 From: Sushan Bhattarai Date: Tue, 25 Nov 2025 18:12:40 -0500 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"feat(bigtable):=20add=20internal?= =?UTF-8?q?=20grpc=20subconnections=20metric=20and=20add=20outst=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e3e6e993ee197f897c166fb8959755db0cb9c3fc. --- .../stub/metrics/BuiltinMetricsConstants.java | 81 +++---------------- 1 file changed, 10 insertions(+), 71 deletions(-) diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsConstants.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsConstants.java index 38024cfa7a3b..2e14f6666d08 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsConstants.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsConstants.java @@ -55,30 +55,6 @@ public class BuiltinMetricsConstants { static final AttributeKey TRANSPORT_ZONE = AttributeKey.stringKey("transport_zone"); static final AttributeKey TRANSPORT_SUBZONE = AttributeKey.stringKey("transport_subzone"); - // gRPC attribute keys - // Note that these attributes keys from transformed from - // A.B.C to A_B_C before exporting to Cloud Monitoring. - static final AttributeKey GRPC_LB_BACKEND_SERVICE_KEY = - AttributeKey.stringKey("grpc.lb.backend_service"); - static final AttributeKey GRPC_DISCONNECT_ERROR_KEY = - AttributeKey.stringKey("grpc.disconnect_error"); - static final AttributeKey GRPC_LB_LOCALITY_KEY = - AttributeKey.stringKey("grpc.lb.locality"); - static final AttributeKey GRPC_TARGET_KEY = AttributeKey.stringKey("grpc.target"); - static final AttributeKey GRPC_SECURITY_LEVEL_KEY = - AttributeKey.stringKey("grpc.security_level"); - static final AttributeKey GRPC_METHOD_KEY = AttributeKey.stringKey("grpc.method"); - static final AttributeKey GRPC_STATUS_KEY = AttributeKey.stringKey("grpc.status"); - static final AttributeKey GRPC_LB_RLS_DATA_PLANE_TARGET_KEY = - AttributeKey.stringKey("grpc.lb.rls.data_plane_target"); - static final AttributeKey GRPC_LB_PICK_RESULT_KEY = - AttributeKey.stringKey("grpc.lb.pick_result"); - static final AttributeKey GRPC_LB_RLS_SERVER_TARGET_KEY = - AttributeKey.stringKey("grpc.lb.rls.server_target"); - static final AttributeKey GRPC_XDS_SERVER_KEY = AttributeKey.stringKey("grpc.xds.server"); - static final AttributeKey GRPC_XDS_RESOURCE_TYPE_KEY = - AttributeKey.stringKey("grpc.xds.resource_type"); - public static final String METER_NAME = "bigtable.googleapis.com/internal/client/"; // Metric names @@ -101,68 +77,31 @@ public class BuiltinMetricsConstants { ImmutableMap.>builder() .put( "grpc.client.attempt.duration", - ImmutableSet.of( - GRPC_LB_LOCALITY_KEY.getKey(), - GRPC_METHOD_KEY.getKey(), - GRPC_TARGET_KEY.getKey(), - GRPC_STATUS_KEY.getKey())) + ImmutableSet.of("grpc.lb.locality", "grpc.method", "grpc.target", "grpc.status")) .put( "grpc.lb.rls.default_target_picks", - ImmutableSet.of( - GRPC_LB_RLS_DATA_PLANE_TARGET_KEY.getKey(), GRPC_LB_PICK_RESULT_KEY.getKey())) + ImmutableSet.of("grpc.lb.rls.data_plane_target", "grpc.lb.pick_result")) .put( "grpc.lb.rls.target_picks", ImmutableSet.of( - GRPC_TARGET_KEY.getKey(), - GRPC_LB_RLS_SERVER_TARGET_KEY.getKey(), - GRPC_LB_RLS_DATA_PLANE_TARGET_KEY.getKey(), - GRPC_LB_PICK_RESULT_KEY.getKey())) + "grpc.target", + "grpc.lb.rls.server_target", + "grpc.lb.rls.data_plane_target", + "grpc.lb.pick_result")) .put( "grpc.lb.rls.failed_picks", - ImmutableSet.of(GRPC_TARGET_KEY.getKey(), GRPC_LB_RLS_SERVER_TARGET_KEY.getKey())) + ImmutableSet.of("grpc.target", "grpc.lb.rls.server_target")) // TODO: "grpc.xds_client.connected" - .put( - "grpc.xds_client.server_failure", - ImmutableSet.of(GRPC_TARGET_KEY.getKey(), GRPC_XDS_SERVER_KEY.getKey())) + .put("grpc.xds_client.server_failure", ImmutableSet.of("grpc.target", "grpc.xds.server")) // TODO: "grpc.xds_client.resource_updates_valid", .put( "grpc.xds_client.resource_updates_invalid", - ImmutableSet.of( - GRPC_TARGET_KEY.getKey(), - GRPC_XDS_SERVER_KEY.getKey(), - GRPC_XDS_RESOURCE_TYPE_KEY.getKey())) + ImmutableSet.of("grpc.target", "grpc.xds.server", "grpc.xds.resource_type")) // TODO: "grpc.xds_client.resources" - // gRPC subchannel metrics - .put( - "grpc.subchannel.disconnections", - ImmutableSet.of( - GRPC_LB_BACKEND_SERVICE_KEY.getKey(), - GRPC_DISCONNECT_ERROR_KEY.getKey(), - GRPC_LB_LOCALITY_KEY.getKey(), - GRPC_TARGET_KEY.getKey())) - .put( - "grpc.subchannel.connection_attempts_succeeded", - ImmutableSet.of( - GRPC_LB_BACKEND_SERVICE_KEY.getKey(), - GRPC_LB_LOCALITY_KEY.getKey(), - GRPC_TARGET_KEY.getKey())) - .put( - "grpc.subchannel.connection_attempts_failed", - ImmutableSet.of( - GRPC_LB_BACKEND_SERVICE_KEY.getKey(), - GRPC_LB_LOCALITY_KEY.getKey(), - GRPC_TARGET_KEY.getKey())) - .put( - "grpc.subchannel.open_connections", - ImmutableSet.of( - GRPC_LB_BACKEND_SERVICE_KEY.getKey(), - GRPC_LB_LOCALITY_KEY.getKey(), - GRPC_SECURITY_LEVEL_KEY.getKey(), - GRPC_TARGET_KEY.getKey())) .build(); public static final Set INTERNAL_METRICS = - ImmutableSet.of(PER_CONNECTION_ERROR_COUNT_NAME, OUTSTANDING_RPCS_PER_CHANNEL_NAME).stream() + ImmutableSet.of(PER_CONNECTION_ERROR_COUNT_NAME).stream() .map(m -> METER_NAME + m) .collect(ImmutableSet.toImmutableSet()); // End allow list of metrics that will be exported From 9f1e6d2027c733abc0aa134ba99c3167fe520cac Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Tue, 25 Nov 2025 23:17:37 +0000 Subject: [PATCH 2/2] chore: generate libraries at Tue Nov 25 23:15:10 UTC 2025 --- .kokoro/presubmit/graalvm-native-a.cfg | 2 +- .kokoro/presubmit/graalvm-native-b.cfg | 2 +- .kokoro/presubmit/graalvm-native-c.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg index 55c5543e2605..b772eac66cd8 100644 --- a/.kokoro/presubmit/graalvm-native-a.cfg +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg index 5c981b984828..baf136cf8233 100644 --- a/.kokoro/presubmit/graalvm-native-b.cfg +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg index f2032499dff9..2fb2fc87c418 100644 --- a/.kokoro/presubmit/graalvm-native-c.cfg +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: {