fix: cleaning up startSpan(spanName, parentContext) variant

googleapis · Sep 18, 2024 · 451aeab · 451aeab
1 parent 900cdef
commit 451aeab
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 24 deletions.
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java
@@ -714,8 +714,7 @@ com.google.datastore.v1.BeginTransactionResponse beginTransaction(
       final com.google.datastore.v1.BeginTransactionRequest requestPb) {
     com.google.cloud.datastore.telemetry.TraceUtil.Span span =
         otelTraceUtil.startSpan(
-            com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_BEGIN_TRANSACTION,
-            otelTraceUtil.getCurrentContext());
+            com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_BEGIN_TRANSACTION);
     try (com.google.cloud.datastore.telemetry.TraceUtil.Scope scope = span.makeCurrent()) {
       return RetryHelper.runWithRetries(
           () -> datastoreRpc.beginTransaction(requestPb),

diff --git a/...cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DisabledTraceUtil.java b/...cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DisabledTraceUtil.java
@@ -102,11 +102,6 @@ public Span startSpan(String spanName) {
     return new Span();
   }
 
-  @Override
-  public TraceUtil.Span startSpan(String spanName, TraceUtil.Context parentContext) {
-    return new Span();
-  }
-
   @Override
   public TraceUtil.Span startSpan(String spanName, TraceUtil.Span parentSpan) {
     return new Span();

diff --git a/...-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java b/...-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java
@@ -298,16 +298,6 @@ public Span startSpan(String spanName) {
     return new Span(span, spanName);
   }
 
-  @Override
-  public TraceUtil.Span startSpan(String spanName, TraceUtil.Context parentContext) {
-    SpanBuilder spanBuilder =
-        tracer
-            .spanBuilder(spanName)
-            .setSpanKind(SpanKind.PRODUCER)
-            .setParent(((EnabledTraceUtil.Context) parentContext).context);
-    return new Span(addSettingsAttributesToCurrentSpan(spanBuilder).startSpan(), spanName);
-  }
-
   @Override
   public TraceUtil.Span startSpan(String spanName, TraceUtil.Span parentSpan) {
     SpanBuilder spanBuilder =

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/TraceUtil.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/TraceUtil.java
@@ -148,11 +148,9 @@ interface Scope extends AutoCloseable {
   Span startSpan(String spanName);
 
   /**
-   * Starts a new span with the given name and the span represented by the parentSpanContext as its
-   * parents, sets it as the current span and returns it.
+   * Starts a new span with the given name and the span represented by the parentSpan as its parent,
+   * sets it as the current span and returns it.
    */
-  Span startSpan(String spanName, Context parentContext);
-
   Span startSpan(String spanName, Span parentSpan);
 
   /**

diff --git a/...d-datastore/src/test/java/com/google/cloud/datastore/telemetry/DisabledTraceUtilTest.java b/...d-datastore/src/test/java/com/google/cloud/datastore/telemetry/DisabledTraceUtilTest.java
@@ -38,7 +38,7 @@ public void usesDisabledSpan() {
     assertThat(traceUtil.getCurrentSpan() instanceof DisabledTraceUtil.Span).isTrue();
     assertThat(traceUtil.startSpan("foo") instanceof DisabledTraceUtil.Span).isTrue();
     assertThat(
-            traceUtil.startSpan("foo", traceUtil.getCurrentContext())
+            traceUtil.startSpan("foo", traceUtil.getCurrentSpan())
                 instanceof DisabledTraceUtil.Span)
         .isTrue();
   }

diff --git a/...ud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java b/...ud-datastore/src/test/java/com/google/cloud/datastore/telemetry/EnabledTraceUtilTest.java
@@ -92,8 +92,7 @@ public void usesEnabledSpan() {
     assertThat(traceUtil.getCurrentSpan() instanceof EnabledTraceUtil.Span).isTrue();
     assertThat(traceUtil.startSpan("foo") != null).isTrue();
     assertThat(
-            traceUtil.startSpan("foo", traceUtil.getCurrentContext())
-                instanceof EnabledTraceUtil.Span)
+            traceUtil.startSpan("foo", traceUtil.getCurrentSpan()) instanceof EnabledTraceUtil.Span)
         .isTrue();
   }