1 files changed, 13 insertions, 0 deletions
diff --git a/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala b/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala
index 76f5a0d..d2e4bc3 100644
--- a/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala
+++ b/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala
@@ -6,7 +6,11 @@ import xyz.driver.core.auth.{AuthToken, PermissionsToken, User}
 import xyz.driver.core.generators
 import scalaz.Scalaz.{mapEqual, stringInstance}
 import scalaz.syntax.equal._
+import xyz.driver.core.reporting.SpanContext
 import xyz.driver.core.rest.auth.AuthProvider
+import xyz.driver.core.rest.headers.Traceparent
+
+import scala.util.Try
 
 class ServiceRequestContext(
     val trackingId: String = generators.nextUuid().toString,
@@ -45,6 +49,15 @@ class ServiceRequestContext(
     case _ => false
   }
 
+  def spanContext: SpanContext = {
+    val validHeader = Try {
+      contextHeaders(Traceparent.name)
+    }.flatMap { value =>
+      Traceparent.parse(value)
+    }
+    validHeader.map(_.spanContext).getOrElse(SpanContext.fresh())
+  }
+
   override def toString: String = s"ServiceRequestContext($trackingId, $contextHeaders)"
 }