rebase fix

Author: surbhigarg92

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

@@ -123,9 +123,9 @@ public void start(Listener<RespT> responseListener, Metadata headers) {
           Span span = Span.current();
           DatabaseName databaseName = extractDatabaseName(headers);
           String key = databaseName + method.getFullMethodName();
-          TagContext tagContext = getTagContext(key, method.getFullMethodName(), databaseName);
-          Attributes attributes =
-              getMetricAttributes(key, method.getFullMethodName(), databaseName);
+          TagContext openCensusTagContext = getOpenCensusTagContext(key, method.getFullMethodName(), databaseName);
+          Attributes customMetricAttributes =
+              getCustomMetricAttributes(key, method.getFullMethodName(), databaseName);
           Map<String, String> builtInMetricsAttributes =
               getBuiltInMetricAttributes(key, databaseName);
           addBuiltInMetricAttributes(compositeTracer, builtInMetricsAttributes);
@@ -154,12 +154,12 @@ public void onHeaders(Metadata metadata) {
     };
   }
 
-  private void processServerTimingHeader(
+  private void processHeader(
       Metadata metadata,
       TagContext tagContext,
       Attributes attributes,
       Span span,
-      Map<String, String> builtInMetricsAttributes, 
+      Map<String, String> builtInMetricsAttributes,
       Boolean isDirectPathUsed) {
     MeasureMap measureMap = STATS_RECORDER.newMeasureMap();
     String serverTiming = metadata.get(SERVER_TIMING_HEADER_KEY);
@@ -182,7 +182,7 @@ private void processServerTimingHeader(
         spannerRpcMetrics.recordGfeLatency(gfeLatency, attributes);
         spannerRpcMetrics.recordGfeHeaderMissingCount(0L, attributes);
         // TODO: Also pass directpath used
-        builtInOpenTelemetryMetricsRecorder.recordGFELatency(latency, builtInMetricsAttributes);
+        builtInOpenTelemetryMetricsRecorder.recordGFELatency(gfeLatency, builtInMetricsAttributes);
 
         if (span != null) {
           span.setAttribute("gfe_latency", String.valueOf(gfeLatency));
@@ -254,7 +254,7 @@ private TagContext getOpenCensusTagContext(String key, String method, DatabaseNa
                 .build());
   }
 
-  private Attributes buildCustomMetricAttributes(
+  private Attributes getCustomMetricAttributes(
       String key, String method, DatabaseName databaseName) throws ExecutionException {
     return attributesCache.get(
         key,

google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryBuiltInMetricsTracerTest.java

@@ -106,13 +106,13 @@ public static void setup() {
             .put(BuiltInMetricsConstant.CLIENT_NAME_KEY, client_name)
             .put(BuiltInMetricsConstant.CLIENT_UID_KEY, attributes.get("client_uid"))
             .put(BuiltInMetricsConstant.CLIENT_HASH_KEY, attributes.get("client_hash"))
+            .put(BuiltInMetricsConstant.INSTANCE_ID_KEY, "i")
+            .put(BuiltInMetricsConstant.DATABASE_KEY, "d")
+            .put(BuiltInMetricsConstant.DIRECT_PATH_ENABLED_KEY, "false")
             .build();
 
     expectedCommonRequestAttributes =
         Attributes.builder()
-            .put(BuiltInMetricsConstant.INSTANCE_ID_KEY, "i")
-            .put(BuiltInMetricsConstant.DATABASE_KEY, "d")
-            .put(BuiltInMetricsConstant.DIRECT_PATH_ENABLED_KEY, "false")
             .put(BuiltInMetricsConstant.DIRECT_PATH_USED_KEY, "false")
             .build();
   }
@@ -308,7 +308,7 @@ public void testNoNetworkConnection() {
             .setApiTracerFactory(metricsTracerFactory)
             .build()
             .getService();
-    String instance = "test-instance";
+    String instance = "i";
     DatabaseClient client = spanner.getDatabaseClient(DatabaseId.of("test-project", instance, "d"));
 
     // Using this client will return UNAVAILABLE, as the server is not reachable and we have
@@ -319,29 +319,24 @@ public void testNoNetworkConnection() {
     assertEquals(ErrorCode.UNAVAILABLE, exception.getErrorCode());
 
     Attributes expectedAttributesCreateSessionOK =
-        expectedBaseAttributes
+        expectedCommonBaseAttributes
             .toBuilder()
+            .putAll(expectedCommonRequestAttributes)
             .put(BuiltInMetricsConstant.STATUS_KEY, "OK")
             .put(BuiltInMetricsConstant.METHOD_KEY, "Spanner.CreateSession")
             // Include the additional attributes that are added by the HeaderInterceptor in the
             // filter. Note that the DIRECT_PATH_USED attribute is not added, as the request never
             // leaves the client.
-            .put(BuiltInMetricsConstant.INSTANCE_ID_KEY, instance)
-            .put(BuiltInMetricsConstant.DATABASE_KEY, "d")
-            .put(BuiltInMetricsConstant.DIRECT_PATH_ENABLED_KEY, "false")
             .build();
 
     Attributes expectedAttributesCreateSessionFailed =
-        expectedBaseAttributes
+        expectedCommonBaseAttributes
             .toBuilder()
             .put(BuiltInMetricsConstant.STATUS_KEY, "UNAVAILABLE")
             .put(BuiltInMetricsConstant.METHOD_KEY, "Spanner.CreateSession")
             // Include the additional attributes that are added by the HeaderInterceptor in the
             // filter. Note that the DIRECT_PATH_USED attribute is not added, as the request never
             // leaves the client.
-            .put(BuiltInMetricsConstant.INSTANCE_ID_KEY, instance)
-            .put(BuiltInMetricsConstant.DATABASE_KEY, "d")
-            .put(BuiltInMetricsConstant.DIRECT_PATH_ENABLED_KEY, "false")
             .build();
 
     MetricData attemptCountMetricData =