test

Author: surbhigarg92

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

@@ -21,7 +21,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.sdk.metrics.Aggregation;
 import io.opentelemetry.sdk.metrics.InstrumentSelector;
@@ -101,9 +100,7 @@ public class BuiltInMetricsConstant {
           DIRECT_PATH_USED_KEY);
 
   public static final Set<String> GRPC_ATTRIBUTES =
-      ImmutableSet.of(
-          "grpc_lb_rls_data_plane_target",
-          "grpc_lb_pick_result");
+      ImmutableSet.of("grpc.lb.rls.data_plane_target", "grpc.lb.pick_result");
 
   static Aggregation AGGREGATION_WITH_MILLIS_HISTOGRAM =
       Aggregation.explicitBucketHistogram(
@@ -204,8 +201,7 @@ private static void defineView(
   }
 
   private static void defineGRPCView(ImmutableMap.Builder<InstrumentSelector, View> viewMap) {
-    for (String metric :
-        ImmutableList.copyOf(Iterables.concat(BuiltInMetricsConstant.GRPC_METRICS_TO_ENABLE, BuiltInMetricsConstant.GRPC_METRICS_ENABLED_BY_DEFAULT))) {
+    for (String metric : BuiltInMetricsConstant.GRPC_METRICS_TO_ENABLE) {
       InstrumentSelector selector =
           InstrumentSelector.builder()
               .setName(metric)
@@ -215,8 +211,8 @@ private static void defineGRPCView(ImmutableMap.Builder<InstrumentSelector, View
           BuiltInMetricsConstant.COMMON_ATTRIBUTES.stream()
               .map(AttributeKey::getKey)
               .collect(Collectors.toSet());
-
       attributesFilter.addAll(BuiltInMetricsConstant.GRPC_ATTRIBUTES);
+
       View view =
           View.builder()
               .setName(BuiltInMetricsConstant.METER_NAME + '/' + metric.replace(".", "/"))

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

@@ -31,8 +31,6 @@
 import com.google.cloud.opentelemetry.detection.AttributeKeys;
 import com.google.cloud.opentelemetry.detection.DetectedPlatform;
 import com.google.cloud.opentelemetry.detection.GCPPlatformDetector;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
 import io.grpc.ManagedChannelBuilder;
@@ -41,10 +39,8 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.metrics.InstrumentSelector;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
-import io.opentelemetry.sdk.metrics.View;
 import io.opentelemetry.sdk.resources.Resource;
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
@@ -79,7 +75,6 @@ OpenTelemetry getOrCreateOpenTelemetry(
             SpannerCloudMonitoringExporter.create(projectId, credentials, monitoringHost),
             sdkMeterProviderBuilder);
 
-
         sdkMeterProviderBuilder.setResource(Resource.create(createResourceAttributes(projectId)));
         SdkMeterProvider sdkMeterProvider = sdkMeterProviderBuilder.build();
         this.openTelemetry = OpenTelemetrySdk.builder().setMeterProvider(sdkMeterProvider).build();
@@ -104,7 +99,7 @@ public void enableGrpcMetrics(
         GrpcOpenTelemetry.newBuilder()
             .sdk(this.getOrCreateOpenTelemetry(projectId, credentials, monitoringHost))
             .enableMetrics(BuiltInMetricsConstant.GRPC_METRICS_TO_ENABLE)
-            // .disableMetrics(BuiltInMetricsConstant.GRPC_METRICS_ENABLED_BY_DEFAULT)
+            .disableMetrics(BuiltInMetricsConstant.GRPC_METRICS_ENABLED_BY_DEFAULT)
             .build();
     ApiFunction<ManagedChannelBuilder, ManagedChannelBuilder> channelConfigurator =
         channelProviderBuilder.getChannelConfigurator();

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

@@ -105,17 +105,24 @@ static SpannerCloudMonitoringExporter create(
 
   @Override
   public CompletableResultCode export(@Nonnull Collection<MetricData> collection) {
-    // Print 
+    // TODO: Remove
     collection.stream()
-        .forEach(md -> {
-          System.out.println("Name: " + md.getName()); // Print the name
-
-          md.getData().getPoints().forEach(point -> {
-            System.out.println("Attributes: " + point.getAttributes()); // Print attributes for each point
-          });
-
-          System.out.println("----------------------"); // Separator for readability
-        });
+        .filter(md -> "grpc-java".equals(md.getInstrumentationScopeInfo().getName()))
+        .forEach(
+            md -> {
+              System.out.println("Name: " + md.getName()); // Print the name
+
+              md.getData()
+                  .getPoints()
+                  .forEach(
+                      point -> {
+                        System.out.println(
+                            "Attributes: "
+                                + point.getAttributes()); // Print attributes for each point
+                      });
+
+              System.out.println("----------------------"); // Separator for readability
+            });
 
     if (client.isShutdown()) {
       logger.log(Level.WARNING, "Exporter is shut down");

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

@@ -122,7 +122,8 @@ private static TimeSeries convertPointToSpannerTimeSeries(
       if (SPANNER_PROMOTED_RESOURCE_LABELS.contains(key)) {
         monitoredResourceBuilder.putLabels(key.getKey(), String.valueOf(attributes.get(key)));
       } else {
-        metricBuilder.putLabels(key.getKey(), String.valueOf(attributes.get(key)));
+        metricBuilder.putLabels(
+            key.getKey().replace(".", "/"), String.valueOf(attributes.get(key)));
       }
     }
 

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBuiltInMetricsTest.java

@@ -36,7 +36,6 @@
 import java.util.concurrent.TimeUnit;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;