changes

Author: surbhigarg92

google-cloud-spanner/pom.xml

@@ -267,11 +267,6 @@
       <artifactId>detector-resources-support</artifactId>
       <version>0.33.0</version>
     </dependency>
-    <dependency>
-      <groupId>com.google.cloud.opentelemetry</groupId>
-      <artifactId>exporter-trace</artifactId>
-      <version>0.33.0</version>
-    </dependency>
     <dependency>
       <groupId>com.google.cloud.opentelemetry</groupId>
       <artifactId>exporter-metrics</artifactId>
@@ -466,7 +461,6 @@
       <groupId>com.google.cloud.opentelemetry</groupId>
       <artifactId>exporter-trace</artifactId>
       <version>0.33.0</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>

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

@@ -168,6 +168,14 @@ 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");
     defineGRPCView(views);
     return views.build();
   }

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

@@ -17,15 +17,15 @@
 package com.google.cloud.spanner;
 
 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_UID_KEY;
-import static com.google.cloud.spanner.BuiltInMetricsConstant.SPANNER_RESOURCE_TYPE;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.INSTANCE_CONFIG_ID_KEY;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.INSTANCE_ID_KEY;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.LOCATION_ID_KEY;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.PROJECT_ID_KEY;
+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;
@@ -34,8 +34,6 @@
 import com.google.cloud.opentelemetry.metric.GoogleCloudMetricExporter;
 import com.google.cloud.opentelemetry.metric.MetricConfiguration;
 import com.google.cloud.opentelemetry.metric.MonitoredResourceDescription;
-import com.google.cloud.opentelemetry.trace.TraceConfiguration;
-import com.google.cloud.opentelemetry.trace.TraceExporter;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
@@ -47,11 +45,8 @@
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
-import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.metrics.export.MetricExporter;
-import io.opentelemetry.sdk.trace.SdkTracerProvider;
-import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
-import io.opentelemetry.sdk.trace.samplers.Sampler;
+import io.opentelemetry.sdk.resources.Resource;
 import java.lang.management.ManagementFactory;
 import java.lang.reflect.Method;
 import java.net.InetAddress;
@@ -101,39 +96,11 @@ OpenTelemetry getOrCreateOpenTelemetry(
                     .setPrefix("spanner.googleapis.com/internal/client")
                     .setUseServiceTimeSeries(true)
                     .build());
-        AttributesBuilder attributesBuilder =
-            Attributes.builder()
-                .put("gcp.resource_type", SPANNER_RESOURCE_TYPE)
-                .put("project_id", projectId)
-                .put("instance_id", "spanner-testing-east2")
-                .put("instance_config", "unknown")
-                .put("location", detectClientLocation())
-                .put("client_hash", generateClientHash(getDefaultTaskValue()));
         BuiltInMetricsView.registerBuiltinMetrics(metricExporter, sdkMeterProviderBuilder);
         sdkMeterProviderBuilder.setResource(Resource.create(createResourceAttributes(projectId)));
-        SdkMeterProvider sdkMeterProvider =
-            sdkMeterProviderBuilder.setResource(Resource.create(attributesBuilder.build())).build();
-
-        // Registering the trace provider with the same OpenTelemetry object used for metrics.
-        Resource resource =
-            Resource.getDefault().merge(Resource.builder().put("service.name", "surbhi").build());
-
-        io.opentelemetry.sdk.trace.export.SpanExporter traceExporter =
-            TraceExporter.createWithConfiguration(TraceConfiguration.builder().build());
-        BatchSpanProcessor otlpGrpcSpanProcessor =
-            BatchSpanProcessor.builder(traceExporter).build();
-        SdkTracerProvider sdkTracerProvider =
-            SdkTracerProvider.builder()
-                .addSpanProcessor(otlpGrpcSpanProcessor)
-                .setResource(resource)
-                .setSampler(Sampler.traceIdRatioBased(1))
-                .build();
+        SdkMeterProvider sdkMeterProvider = sdkMeterProviderBuilder.build();
 
-        this.openTelemetry =
-            OpenTelemetrySdk.builder()
-                .setMeterProvider(sdkMeterProvider)
-                // .setTracerProvider(sdkTracerProvider)
-                .build();
+        this.openTelemetry = OpenTelemetrySdk.builder().setMeterProvider(sdkMeterProvider).build();
         Runtime.getRuntime().addShutdownHook(new Thread(sdkMeterProvider::close));
       }
       return this.openTelemetry;
@@ -178,20 +145,16 @@ Attributes createResourceAttributes(String projectId) {
             .put(INSTANCE_CONFIG_ID_KEY.getKey(), "unknown")
             .put(CLIENT_HASH_KEY.getKey(), generateClientHash(getDefaultTaskValue()))
             .put(INSTANCE_ID_KEY.getKey(), "unknown")
-            .put(LOCATION_ID_KEY.getKey(), detectClientLocation());
+            .put(LOCATION_ID_KEY.getKey(), detectClientLocation())
+            .put("gcp.resource_type", SPANNER_RESOURCE_TYPE);
 
     return attributesBuilder.build();
   }
 
   Map<String, String> createClientAttributes() {
     Map<String, String> clientAttributes = new HashMap<>();
-    // clientAttributes.put(LOCATION_ID_KEY.getKey(), detectClientLocation());
-    // clientAttributes.put(PROJECT_ID_KEY.getKey(), projectId);
-    // clientAttributes.put(INSTANCE_CONFIG_ID_KEY.getKey(), "unknown");
-    // clientAttributes.put(CLIENT_NAME_KEY.getKey(), client_name);
     String clientUid = getDefaultTaskValue();
     clientAttributes.put(CLIENT_UID_KEY.getKey(), clientUid);
-    // clientAttributes.put(CLIENT_HASH_KEY.getKey(), generateClientHash(clientUid));
     return clientAttributes;
   }
 

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

@@ -105,7 +105,7 @@ void recordServerTimingHeaderMetrics(
       Map<String, String> attributes) {
     io.opentelemetry.api.common.Attributes otelAttributes = toOtelAttributes(attributes);
     if (gfeLatency != null) {
-      gfeLatencyRecorder.record(gfeLatency, otelAttributes);
+      gfeLatencyRecorder.record(gfeLatency, otelAttributes, Context.current());
     }
     if (gfeHeaderMissingCount > 0) {
       gfeHeaderMissingCountRecorder.add(gfeHeaderMissingCount, otelAttributes);

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

@@ -77,7 +77,7 @@ public void attemptSucceeded() {
       super.attemptSucceeded();
       attributes.put(STATUS_ATTRIBUTE, StatusCode.Code.OK.toString());
       builtInOpenTelemetryMetricsRecorder.recordServerTimingHeaderMetrics(
-        gfeLatency, afeLatency, gfeHeaderMissingCount, afeHeaderMissingCount, attributes);
+          gfeLatency, afeLatency, gfeHeaderMissingCount, afeHeaderMissingCount, attributes);
     }
     span.end();
   }
@@ -161,7 +161,6 @@ public void addAttributes(Map<String, String> attributes) {
     super.addAttributes(attributes);
     this.attributes.putAll(attributes);
   }
-  ;
 
   @Override
   public void addAttributes(String key, String value) {

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

@@ -2012,9 +2012,6 @@ public OpenTelemetry getOpenTelemetry() {
       return this.openTelemetry;
     } else {
       return GlobalOpenTelemetry.get();
-      // this.openTelemetry = this.builtInMetricsProvider.getOrCreateOpenTelemetry(
-      //     this.getProjectId(), getCredentials(), this.monitoringHost);
-      // return this.openTelemetry;
     }
   }
 
@@ -2074,17 +2071,17 @@ private ApiTracerFactory createMetricsApiTracerFactory() {
         this.builtInMetricsProvider.getOrCreateOpenTelemetry(
             this.getProjectId(), getCredentials(), this.monitoringHost);
 
-    // this.openTelemetry = openTelemetry;
-
     return openTelemetry != null
         ? new BuiltInMetricsTracerFactory(
             new BuiltInMetricsRecorder(openTelemetry, BuiltInMetricsConstant.METER_NAME),
             new HashMap<>(),
             new TraceWrapper(
                 Tracing.getTracer(),
-                openTelemetry.getTracer(
-                    MetricRegistryConstants.INSTRUMENTATION_SCOPE,
-                    GaxProperties.getLibraryVersion(getClass())),
+                // Using the OpenTelemetry object set in Spanner Options, will be NoOp if not set
+                this.getOpenTelemetry()
+                    .getTracer(
+                        MetricRegistryConstants.INSTRUMENTATION_SCOPE,
+                        GaxProperties.getLibraryVersion(getClass())),
                 true))
         : null;
   }

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

@@ -26,6 +26,7 @@
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeFalse;
 
+import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.longrunning.OperationTimedPollAlgorithm;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.api.gax.tracing.ApiTracerFactory;
@@ -97,7 +98,14 @@ public ApiTracerFactory createMetricsTracerFactory() {
         OpenTelemetrySdk.builder().setMeterProvider(meterProvider.build()).build();
 
     return new BuiltInMetricsTracerFactory(
-        new BuiltInMetricsRecorder(openTelemetry, BuiltInMetricsConstant.METER_NAME), attributes);
+        new BuiltInMetricsRecorder(openTelemetry, BuiltInMetricsConstant.METER_NAME),
+        attributes,
+        new TraceWrapper(
+            Tracing.getTracer(),
+            openTelemetry.getTracer(
+                MetricRegistryConstants.INSTRUMENTATION_SCOPE,
+                GaxProperties.getLibraryVersion(getClass())),
+            true));
   }
 
   @BeforeClass
@@ -119,7 +127,7 @@ public void createSpannerInstance() {
 
     ApiTracerFactory metricsTracerFactory =
         new BuiltInMetricsTracerFactory(
-            new BuiltInMetricsRecorder(openTelemetry, BuiltInMetricsConstant.METER_NAME),
+            new BuiltInMetricsRecorder(OpenTelemetry.noop(), BuiltInMetricsConstant.METER_NAME),
             attributes,
             new TraceWrapper(Tracing.getTracer(), OpenTelemetry.noop().getTracer(""), true));
     // Set a quick polling algorithm to prevent this from slowing down the test unnecessarily.