fix

Author: surbhigarg92

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

@@ -168,22 +168,7 @@ static Map<InstrumentSelector, View> getAllViews() {
         Aggregation.sum(),
         InstrumentType.COUNTER,
         "1");
-    defineView(
-        views,
-        BuiltInMetricsConstant.SPANNER_METER_NAME,
-        BuiltInMetricsConstant.GFE_LATENCIES_NAME,
-        BuiltInMetricsConstant.GFE_LATENCIES_NAME,
-        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");
+    defineSpannerView(views);
     defineGRPCView(views);
     return views.build();
   }
@@ -216,6 +201,19 @@ private static void defineView(
     viewMap.put(selector, view);
   }
 
+  private static void defineSpannerView(ImmutableMap.Builder<InstrumentSelector, View> viewMap) {
+    InstrumentSelector selector =
+        InstrumentSelector.builder()
+            .setMeterName(BuiltInMetricsConstant.SPANNER_METER_NAME)
+            .build();
+    Set<String> attributesFilter =
+        BuiltInMetricsConstant.COMMON_ATTRIBUTES.stream()
+            .map(AttributeKey::getKey)
+            .collect(Collectors.toSet());
+    View view = View.builder().setAttributeFilter(attributesFilter).build();
+    viewMap.put(selector, view);
+  }
+
   private static void defineGRPCView(ImmutableMap.Builder<InstrumentSelector, View> viewMap) {
     for (String metric : BuiltInMetricsConstant.GRPC_METRICS_TO_ENABLE) {
       InstrumentSelector selector =

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

@@ -103,7 +103,8 @@ static List<TimeSeries> convertToSpannerTimeSeries(
       metricData.getData().getPoints().stream()
           .map(
               pointData ->
-                  convertPointToSpannerTimeSeries(metricData, pointData, monitoredResourceBuilder))
+                  convertPointToSpannerTimeSeries(
+                      metricData, pointData, monitoredResourceBuilder, projectId))
           .forEach(allTimeSeries::add);
     }
     return allTimeSeries;
@@ -112,7 +113,8 @@ static List<TimeSeries> convertToSpannerTimeSeries(
   private static TimeSeries convertPointToSpannerTimeSeries(
       MetricData metricData,
       PointData pointData,
-      MonitoredResource.Builder monitoredResourceBuilder) {
+      MonitoredResource.Builder monitoredResourceBuilder,
+      String projectId) {
     TimeSeries.Builder builder =
         TimeSeries.newBuilder()
             .setMetricKind(convertMetricKind(metricData))
@@ -208,7 +210,8 @@ private static Point createPoint(
         return builder
             .setValue(
                 TypedValue.newBuilder()
-                    .setDistributionValue(convertHistogramData((HistogramPointData) pointData))
+                    .setDistributionValue(
+                        convertHistogramData((HistogramPointData) pointData, projectId))
                     .build())
             .build();
       case DOUBLE_GAUGE:
@@ -238,6 +241,49 @@ private static Distribution convertHistogramData(HistogramPointData pointData, S
             BucketOptions.newBuilder()
                 .setExplicitBuckets(Explicit.newBuilder().addAllBounds(pointData.getBoundaries())))
         .addAllBucketCounts(pointData.getCounts())
+        .addAllExemplars(
+            pointData.getExemplars().stream()
+                .map(e -> mapExemplar(e, projectId))
+                .collect(Collectors.toList()))
+        .build();
+  }
+
+  private static Distribution.Exemplar mapExemplar(ExemplarData exemplar, String projectId) {
+    double value = 0;
+    if (exemplar instanceof DoubleExemplarData) {
+      value = ((DoubleExemplarData) exemplar).getValue();
+    } else if (exemplar instanceof LongExemplarData) {
+      value = ((LongExemplarData) exemplar).getValue();
+    }
+
+    Distribution.Exemplar.Builder exemplarBuilder =
+        Distribution.Exemplar.newBuilder()
+            .setValue(value)
+            .setTimestamp(mapTimestamp(exemplar.getEpochNanos()));
+    if (exemplar.getSpanContext().isValid()) {
+      exemplarBuilder.addAttachments(
+          Any.pack(
+              SpanContext.newBuilder()
+                  .setSpanName(
+                      makeSpanName(
+                          projectId,
+                          exemplar.getSpanContext().getTraceId(),
+                          exemplar.getSpanContext().getSpanId()))
+                  .build()));
+    }
+    if (!exemplar.getFilteredAttributes().isEmpty()) {
+      exemplarBuilder.addAttachments(
+          Any.pack(mapFilteredAttributes(exemplar.getFilteredAttributes())));
+    }
+    return exemplarBuilder.build();
+  }
+
+  static final long NANO_PER_SECOND = (long) 1e9;
+
+  private static Timestamp mapTimestamp(long epochNanos) {
+    return Timestamp.newBuilder()
+        .setSeconds(epochNanos / NANO_PER_SECOND)
+        .setNanos((int) (epochNanos % NANO_PER_SECOND))
         .build();
   }
 

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

@@ -284,8 +284,8 @@ private Map<String, String> getBuiltInMetricAttributes(String key, DatabaseName
         () -> {
           Map<String, String> attributes = new HashMap<>();
           attributes.put(BuiltInMetricsConstant.DATABASE_KEY.getKey(), databaseName.getDatabase());
-          // attributes.put(
-          //     BuiltInMetricsConstant.INSTANCE_ID_KEY.getKey(), databaseName.getInstance());
+          attributes.put(
+              BuiltInMetricsConstant.INSTANCE_ID_KEY.getKey(), databaseName.getInstance());
           attributes.put(
               BuiltInMetricsConstant.DIRECT_PATH_ENABLED_KEY.getKey(),
               String.valueOf(GapicSpannerRpc.DIRECTPATH_CHANNEL_CREATED));