changes

Author: surbhigarg92

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

@@ -176,6 +176,14 @@ static Map<InstrumentSelector, View> getAllViews() {
         BuiltInMetricsConstant.AGGREGATION_WITH_MILLIS_HISTOGRAM,
         InstrumentType.HISTOGRAM,
         "ms");
+    defineView(
+        views,
+        BuiltInMetricsConstant.SPANNER_METER_NAME,
+        BuiltInMetricsConstant.AFE_LATENCIES_NAME,
+        BuiltInMetricsConstant.AFE_LATENCIES_NAME,
+        BuiltInMetricsConstant.AGGREGATION_WITH_MILLIS_HISTOGRAM,
+        InstrumentType.HISTOGRAM,
+        "ms");
     defineGRPCView(views);
     return views.build();
   }

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

@@ -18,6 +18,7 @@
 
 import static com.google.cloud.opentelemetry.detection.GCPPlatformDetector.SupportedPlatform.GOOGLE_KUBERNETES_ENGINE;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.CLIENT_HASH_KEY;
+import static com.google.cloud.spanner.BuiltInMetricsConstant.CLIENT_NAME_KEY;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.CLIENT_UID_KEY;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.INSTANCE_CONFIG_ID_KEY;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.INSTANCE_ID_KEY;
@@ -26,6 +27,7 @@
 import static com.google.cloud.spanner.BuiltInMetricsConstant.SPANNER_RESOURCE_TYPE;
 
 import com.google.api.core.ApiFunction;
+import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
 import com.google.auth.Credentials;
 import com.google.cloud.opentelemetry.detection.AttributeKeys;
@@ -75,6 +77,9 @@ OpenTelemetry getOrCreateOpenTelemetry(
     try {
       if (this.openTelemetry == null) {
         SdkMeterProviderBuilder sdkMeterProviderBuilder = SdkMeterProvider.builder();
+        // BuiltInMetricsView.registerBuiltinMetrics(
+        //     SpannerCloudMonitoringExporter.create(projectId, credentials, monitoringHost),
+        //     sdkMeterProviderBuilder);
 
         // Use GoogleCloudMetricExporter with service time series as the current custom exporter
         // does not export exemplars
@@ -153,8 +158,9 @@ Attributes createResourceAttributes(String projectId) {
 
   Map<String, String> createClientAttributes() {
     Map<String, String> clientAttributes = new HashMap<>();
-    String clientUid = getDefaultTaskValue();
-    clientAttributes.put(CLIENT_UID_KEY.getKey(), clientUid);
+    clientAttributes.put(
+        CLIENT_NAME_KEY.getKey(), "spanner-java/" + GaxProperties.getLibraryVersion(getClass()));
+    clientAttributes.put(CLIENT_UID_KEY.getKey(), getDefaultTaskValue());
     return clientAttributes;
   }
 

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

@@ -42,24 +42,17 @@ class BuiltInMetricsTracer extends MetricsTracer implements ApiTracer {
   private Float gfeLatency = null;
   private Float afeLatency = null;
 
-  private final TraceWrapper traceWrapper;
+  private TraceWrapper traceWrapper;
   private long gfeHeaderMissingCount = 0;
   private long afeHeaderMissingCount = 0;
   private ISpan currentSpan;
 
   BuiltInMetricsTracer(
       MethodName methodName,
-      BuiltInMetricsRecorder builtInOpenTelemetryMetricsRecorder,
-      TraceWrapper traceWrapper) {
+      BuiltInMetricsRecorder builtInOpenTelemetryMetricsRecorder) {
     super(methodName, builtInOpenTelemetryMetricsRecorder);
     this.builtInOpenTelemetryMetricsRecorder = builtInOpenTelemetryMetricsRecorder;
     this.attributes.put(METHOD_ATTRIBUTE, methodName.toString());
-    // Metrics attributes which are filtered from metrics views are sent to exemplars as
-    // filtered_attributes.
-    // Below testmetric attribute will be available in exemplar as we have added a attributefilter
-    // for our metric views.
-    this.attributes.put("testmetric", "testm");
-    this.traceWrapper = traceWrapper;
   }
 
   BuiltInMetricsTracer(
@@ -85,8 +78,6 @@ class BuiltInMetricsTracer extends MetricsTracer implements ApiTracer {
    */
   @Override
   public void attemptSucceeded() {
-    AttributesBuilder builder = Attributes.builder();
-    builder.put("test1", "abc");
     try (IScope s = this.traceWrapper.withSpan(this.currentSpan)) {
       super.attemptSucceeded();
       attributes.put(STATUS_ATTRIBUTE, StatusCode.Code.OK.toString());