Merge branch 'main' into renovate/com.google.cloud-google-cloud-trace-2.x

Author: rahul2393

.github/workflows/hermetic_library_generation.yaml

@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.67.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.68.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

.github/workflows/unmanaged_dependency_check.yaml

@@ -17,6 +17,6 @@ jobs:
           # repository
           .kokoro/build.sh
       - name: Unmanaged dependency check
-        uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.57.0
+        uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.58.0
         with:
           bom-path: google-cloud-spanner-bom/pom.xml

google-cloud-spanner-bom/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.57.0</version>
+    <version>3.58.0</version>
   </parent>
 
   <name>Google Cloud Spanner BOM</name>

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

@@ -41,6 +41,7 @@ public class BuiltInMetricsConstant {
 
   public static final String METER_NAME = "spanner.googleapis.com/internal/client";
   public static final String GAX_METER_NAME = OpenTelemetryMetricsRecorder.GAX_METER_NAME;
+  public static final String GRPC_GCP_METER_NAME = "grpc-gcp";
   static final String SPANNER_METER_NAME = "spanner-java";
   static final String GRPC_METER_NAME = "grpc-java";
   static final String GFE_LATENCIES_NAME = "gfe_latencies";
@@ -53,6 +54,8 @@ public class BuiltInMetricsConstant {
   static final String ATTEMPT_LATENCY_NAME = "attempt_latency";
   static final String OPERATION_COUNT_NAME = "operation_count";
   static final String ATTEMPT_COUNT_NAME = "attempt_count";
+  static final String EEF_FALLBACK_COUNT_NAME = "eef.fallback_count";
+  static final String EEF_CALL_STATUS_NAME = "eef.call_status";
 
   public static final Set<String> SPANNER_METRICS =
       ImmutableSet.of(
@@ -117,6 +120,29 @@ public class BuiltInMetricsConstant {
           "grpc.xds_client.resource_updates_invalid",
           "grpc.xds_client.resource_updates_valid");
 
+  public static final AttributeKey<String> CHANNEL_NAME_KEY =
+      AttributeKey.stringKey("channel_name");
+  public static final AttributeKey<String> FROM_CHANNEL_NAME_KEY =
+      AttributeKey.stringKey("from_channel_name");
+  public static final AttributeKey<String> TO_CHANNEL_NAME_KEY =
+      AttributeKey.stringKey("to_channel_name");
+  public static final AttributeKey<String> STATUS_CODE_KEY = AttributeKey.stringKey("status_code");
+
+  static final Set<String> GRPC_GCP_EEF_FALLBACK_COUNT_ATTRIBUTES =
+      ImmutableSet.of(FROM_CHANNEL_NAME_KEY.getKey(), TO_CHANNEL_NAME_KEY.getKey());
+
+  static final Set<String> GRPC_GCP_EEF_CALL_STATUS_ATTRIBUTES =
+      ImmutableSet.of(CHANNEL_NAME_KEY.getKey(), STATUS_CODE_KEY.getKey());
+
+  static final Map<String, Set<String>> GRPC_GCP_METRIC_ADDITIONAL_ATTRIBUTES =
+      ImmutableMap.<String, Set<String>>builder()
+          .put(EEF_FALLBACK_COUNT_NAME, GRPC_GCP_EEF_FALLBACK_COUNT_ATTRIBUTES)
+          .put(EEF_CALL_STATUS_NAME, GRPC_GCP_EEF_CALL_STATUS_ATTRIBUTES)
+          .build();
+
+  static final Collection<String> GRPC_GCP_METRICS_TO_ENABLE =
+      ImmutableList.of(EEF_FALLBACK_COUNT_NAME, EEF_CALL_STATUS_NAME);
+
   public static final String SPANNER_RESOURCE_TYPE = "spanner_instance_client";
 
   public static final AttributeKey<String> PROJECT_ID_KEY = AttributeKey.stringKey("project_id");
@@ -215,6 +241,7 @@ static Map<InstrumentSelector, View> getAllViews() {
         "1");
     defineSpannerView(views);
     defineGRPCView(views);
+    defineGrpcGcpView(views);
     return views.build();
   }
 
@@ -281,4 +308,31 @@ private static void defineGRPCView(ImmutableMap.Builder<InstrumentSelector, View
       viewMap.put(selector, view);
     }
   }
+
+  private static void defineGrpcGcpView(ImmutableMap.Builder<InstrumentSelector, View> viewMap) {
+    for (String metric : GRPC_GCP_METRICS_TO_ENABLE) {
+      InstrumentSelector selector =
+          InstrumentSelector.builder()
+              .setName(metric)
+              .setMeterName(BuiltInMetricsConstant.GRPC_GCP_METER_NAME)
+              .build();
+
+      Set<String> attributesFilter =
+          BuiltInMetricsConstant.COMMON_ATTRIBUTES.stream()
+              .map(AttributeKey::getKey)
+              .collect(Collectors.toSet());
+
+      attributesFilter.addAll(
+          GRPC_GCP_METRIC_ADDITIONAL_ATTRIBUTES.getOrDefault(metric, ImmutableSet.of()));
+
+      View view =
+          View.builder()
+              .setName(BuiltInMetricsConstant.METER_NAME + '/' + metric.replace(".", "/"))
+              .setAggregation(Aggregation.sum())
+              .setAttributeFilter(attributesFilter)
+              .build();
+
+      viewMap.put(selector, view);
+    }
+  }
 }

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

@@ -24,6 +24,7 @@
 import static com.google.api.MetricDescriptor.ValueType.INT64;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.ALLOWED_EXEMPLARS_ATTRIBUTES;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.GAX_METER_NAME;
+import static com.google.cloud.spanner.BuiltInMetricsConstant.GRPC_GCP_METER_NAME;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.GRPC_METER_NAME;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.PROJECT_ID_KEY;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.SPANNER_METER_NAME;
@@ -86,7 +87,8 @@ static List<TimeSeries> convertToSpannerTimeSeries(
       // Get metrics data from GAX library, GRPC library and Spanner library
       if (!(metricData.getInstrumentationScopeInfo().getName().equals(GAX_METER_NAME)
           || metricData.getInstrumentationScopeInfo().getName().equals(SPANNER_METER_NAME)
-          || metricData.getInstrumentationScopeInfo().getName().equals(GRPC_METER_NAME))) {
+          || metricData.getInstrumentationScopeInfo().getName().equals(GRPC_METER_NAME)
+          || metricData.getInstrumentationScopeInfo().getName().equals(GRPC_GCP_METER_NAME))) {
         // Filter out metric data for instruments that are not part of the spanner metrics list
         continue;
       }

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

@@ -2380,6 +2380,13 @@ public ApiTracerFactory getApiTracerFactory() {
     return createApiTracerFactory(false, false);
   }
 
+  /** Returns the internal OpenTelemetry instance used for built-in metrics. */
+  @InternalApi
+  public OpenTelemetry getBuiltInOpenTelemetry() {
+    return this.builtInMetricsProvider.getOrCreateOpenTelemetry(
+        this.getProjectId(), getCredentials(), this.monitoringHost, getUniverseDomain());
+  }
+
   public void enablegRPCMetrics(InstantiatingGrpcChannelProvider.Builder channelProviderBuilder) {
     if (SpannerOptions.environment.isEnableGRPCBuiltInMetrics()) {
       this.builtInMetricsProvider.enableGrpcMetrics(

google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java

@@ -201,6 +201,7 @@
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.MethodDescriptor;
 import io.grpc.auth.MoreCallCredentials;
+import io.opentelemetry.api.OpenTelemetry;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -567,6 +568,17 @@ GcpFallbackChannelOptions createFallbackChannelOptions(
         .build();
   }
 
+  @VisibleForTesting
+  OpenTelemetry getFallbackOpenTelemetry(SpannerOptions options) {
+    if (options.isEnableBuiltInMetrics()) {
+      OpenTelemetry builtInOtel = options.getBuiltInOpenTelemetry();
+      if (builtInOtel != null) {
+        return builtInOtel;
+      }
+    }
+    return OpenTelemetry.noop();
+  }
+
   private static KeyAwareChannel extractKeyAwareChannel(TransportChannel transportChannel) {
     if (transportChannel instanceof GrpcTransportChannel) {
       Channel channel = ((GrpcTransportChannel) transportChannel).getChannel();
@@ -671,7 +683,7 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
 
           GcpFallbackOpenTelemetry fallbackTelemetry =
               GcpFallbackOpenTelemetry.newBuilder()
-                  .withSdk(options.getOpenTelemetry())
+                  .withSdk(getFallbackOpenTelemetry(options))
                   .disableAllMetrics()
                   .enableMetrics(Arrays.asList("fallback_count", "call_status"))
                   .build();

google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpcTest.java

@@ -1136,6 +1136,11 @@ public TestableGapicSpannerRpc(SpannerOptions options) {
       super(options);
     }
 
+    @Override
+    OpenTelemetry getFallbackOpenTelemetry(SpannerOptions options) {
+      return options.getOpenTelemetry();
+    }
+
     @Override
     GcpFallbackChannelOptions createFallbackChannelOptions(
         GcpFallbackOpenTelemetry fallbackTelemetry, int minFailedCalls) {
@@ -1222,6 +1227,11 @@ public TestableGapicSpannerRpcWithLowerMinFailedCalls(SpannerOptions options) {
       super(options);
     }
 
+    @Override
+    OpenTelemetry getFallbackOpenTelemetry(SpannerOptions options) {
+      return options.getOpenTelemetry();
+    }
+
     @Override
     GcpFallbackChannelOptions createFallbackChannelOptions(
         GcpFallbackOpenTelemetry fallbackTelemetry, int minFailedCalls) {

pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.57.0</version>
+    <version>3.58.0</version>
   </parent>
 
   <developers>

samples/snippets/pom.xml

@@ -34,7 +34,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>26.76.0</version>
+        <version>26.78.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>