Add otel current context detection

googleapis · May 5, 2024 · 4ff6738 · 4ff6738
1 parent e59fd6b
commit 4ff6738
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 23 deletions.
diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml
@@ -21,10 +21,10 @@
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-api</artifactId>
     </dependency>
-<!--    <dependency>-->
-<!--      <groupId>io.opentelemetry</groupId>-->
-<!--      <artifactId>opentelemetry-context</artifactId>-->
-<!--    </dependency>-->
+    <dependency>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-context</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>

diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Context.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/Context.java
@@ -23,6 +23,7 @@
 import com.google.common.collect.Iterables;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanContext;
 import java.util.List;
 import java.util.Objects;
 import java.util.regex.Matcher;
@@ -204,10 +205,12 @@ public Builder loadW3CTraceParentContext(String traceParent) {
      */
     @CanIgnoreReturnValue
     public Builder loadOpenTelemetryContext() {
-      if (Span.current().getSpanContext() != null && Span.current().getSpanContext().isValid()) {
-        setTraceId(Span.current().getSpanContext().getTraceId());
-        setSpanId(Span.current().getSpanContext().getSpanId());
-        setTraceSampled(Span.current().getSpanContext().isSampled());
+      io.opentelemetry.context.Context currentContext =  io.opentelemetry.context.Context.current();
+      SpanContext spanContext = Span.fromContext(currentContext).getSpanContext();
+      if (spanContext != null && spanContext.isValid()) {
+        setTraceId(spanContext.getTraceId());
+        setSpanId(spanContext.getSpanId());
+        setTraceSampled(spanContext.isSampled());
       }
       return this;
     }

diff --git a/pom.xml b/pom.xml
@@ -65,12 +65,11 @@
         <artifactId>opentelemetry-api</artifactId>
         <version>${opentelemetry.version}</version>
       </dependency>
-<!--      <dependency>-->
-<!--        <groupId>io.opentelemetry</groupId>-->
-<!--        <artifactId>opentelemetry-context</artifactId>-->
-<!--        <version>${opentelemetry.version}</version>-->
-<!--        <optional>false</optional>-->
-<!--      </dependency>-->
+      <dependency>
+        <groupId>io.opentelemetry</groupId>
+        <artifactId>opentelemetry-context</artifactId>
+        <version>${opentelemetry.version}</version>
+      </dependency>
       <!-- END OpenTelemetry -->
       <dependency>
         <groupId>com.google.api.grpc</groupId>
@@ -179,15 +178,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
           <configuration>
-            <ignoredUnusedDeclaredDependencies>
-              <ignoredUnusedDeclaredDependency>org.objenesis:objenesis</ignoredUnusedDeclaredDependency>
-<!--              <ignoredUnusedDeclaredDependency>io.opentelemetry:opentelemetry-context</ignoredUnusedDeclaredDependency>-->
-            </ignoredUnusedDeclaredDependencies>
-<!--            <ignoredUnusedDeclaredDependencies>io.opentelemetry:opentelemetry-context</ignoredUnusedDeclaredDependencies>-->
-            <!-- ignore annotations for "non-test scoped" warnings -->
-<!--            <ignoredNonTestScopedDependencies>-->
-<!--              <ignoredNonTestScopedDependency>io.opentelemetry:opentelemetry-context</ignoredNonTestScopedDependency>-->
-<!--            </ignoredNonTestScopedDependencies>-->
+            <ignoredUnusedDeclaredDependencies>org.objenesis:objenesis</ignoredUnusedDeclaredDependencies>
           </configuration>
         </plugin>
       </plugins>