changed

Author: surbhigarg92

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

@@ -45,6 +45,7 @@ class BuiltInMetricsTracer extends MetricsTracer implements ApiTracer {
   private final TraceWrapper traceWrapper;
   private long gfeHeaderMissingCount = 0;
   private long afeHeaderMissingCount = 0;
+  private ISpan currentSpan;
 
   BuiltInMetricsTracer(
       MethodName methodName,
@@ -61,25 +62,37 @@ class BuiltInMetricsTracer extends MetricsTracer implements ApiTracer {
     this.traceWrapper = traceWrapper;
   }
 
+  BuiltInMetricsTracer(
+      MethodName methodName,
+      BuiltInMetricsRecorder builtInOpenTelemetryMetricsRecorder,
+      TraceWrapper traceWrapper,
+      ISpan currentSpan) {
+    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("request_id", "test");
+    this.traceWrapper = traceWrapper;
+    this.currentSpan = currentSpan;
+  }
+
   /**
    * Adds an annotation that the attempt succeeded. Successful attempt add "OK" value to the status
    * attribute key.
    */
   @Override
   public void attemptSucceeded() {
-    // For exemplars to worj metrics should be recorded with the span context.
-    // Creating a new span to verify this.
-    ISpan currentSpan = this.traceWrapper.getCurrentSpan();
     AttributesBuilder builder = Attributes.builder();
     builder.put("test1", "abc");
-    ISpan span = this.traceWrapper.spanBuilder("attempt succeeded", builder.build());
-    try (IScope s = this.traceWrapper.withSpan(span)) {
+    try (IScope s = this.traceWrapper.withSpan(this.currentSpan)) {
       super.attemptSucceeded();
       attributes.put(STATUS_ATTRIBUTE, StatusCode.Code.OK.toString());
       builtInOpenTelemetryMetricsRecorder.recordServerTimingHeaderMetrics(
           gfeLatency, afeLatency, gfeHeaderMissingCount, afeHeaderMissingCount, attributes);
     }
-    span.end();
   }
 
   /**

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

@@ -56,11 +56,13 @@ public BuiltInMetricsTracerFactory(
 
   @Override
   public ApiTracer newTracer(ApiTracer parent, SpanName spanName, OperationType operationType) {
+    ISpan currentSpan = this.traceWrapper.getCurrentSpan();
     BuiltInMetricsTracer metricsTracer =
         new BuiltInMetricsTracer(
             MethodName.of(spanName.getClientName(), spanName.getMethodName()),
             builtInMetricsRecorder,
-            this.traceWrapper);
+            this.traceWrapper, 
+            currentSpan);
     metricsTracer.addAttributes(attributes);
     return metricsTracer;
   }

google-cloud-spanner/src/main/java/com/google/cloud/spanner/testing/RemoteSpannerHelper.java

@@ -35,6 +35,8 @@
 import com.google.common.collect.Iterables;
 import com.google.spanner.admin.database.v1.CreateDatabaseMetadata;
 import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
+import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
@@ -274,7 +276,8 @@ public static OpenTelemetry createTraceExporter() {
 
     // Export to a collector that is expecting OTLP using gRPC.
     OpenTelemetry openTelemetry =
-        OpenTelemetrySdk.builder().setTracerProvider(sdkTracerProvider).build();
+        OpenTelemetrySdk.builder().setTracerProvider(sdkTracerProvider).setPropagators(
+            ContextPropagators.create(W3CTraceContextPropagator.getInstance())).build();
 
     return openTelemetry;
   }

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

@@ -91,6 +91,8 @@ public GceTestEnvConfig() {
           interceptorProvider.with(new DirectPathAddressCheckInterceptor(directPathTestScenario));
     }
     builder.setInterceptorProvider(interceptorProvider);
+    builder.setEnableEndToEndTracing(true);
+    builder.setEnableApiTracing(true);
     builder.setOpenTelemetry(RemoteSpannerHelper.createTraceExporter());
     // DirectPath tests need to set a custom endpoint to the ChannelProvider
     InstantiatingGrpcChannelProvider.Builder customChannelProviderBuilder =