CORE-19093: Ensure propagation of Tracing Data from E2E test call

libs/tracing-impl/build.gradle

@@ -10,6 +10,7 @@ dependencies {
 
     implementation platform("net.corda:corda-api:$cordaApiVersion")
     implementation project(':libs:tracing')
+    implementation project(':libs:utilities')
 
     implementation("io.zipkin.reporter2:zipkin-sender-urlconnection:$zipkinVersion")
     implementation("io.zipkin.brave:brave-context-slf4j:$braveVersion")

libs/tracing-impl/src/main/kotlin/net/corda/tracing/brave/BraveRecordTracing.kt

@@ -10,18 +10,18 @@ class BraveRecordTracing(private val tracing: Tracing) {
     private val tracer = tracing.tracer()
     private val recordExtractor = BraveRecordExtractor(tracing)
 
-    fun getTraceContext(headers: List<Pair<String, String>>): brave.propagation.TraceContext {
+    fun getTraceContext(headers: List<Pair<String, String>>): brave.propagation.TraceContext? {
         val extracted = recordExtractor.extract(headers)
         return getTraceContext(extracted)
     }
 
-    fun getTraceContext(headers: Map<String, Any>): brave.propagation.TraceContext {
+    fun getTraceContext(headers: Map<String, Any>): brave.propagation.TraceContext? {
         val extracted = recordExtractor.extract(headers)
         return getTraceContext(extracted)
     }
 
-    private fun getTraceContext(extracted: TraceContextOrSamplingFlags?): brave.propagation.TraceContext {
-        return extracted?.context() ?: tracing.currentTraceContext().get()
+    private fun getTraceContext(extracted: TraceContextOrSamplingFlags?): brave.propagation.TraceContext? {
+        return extracted?.context() ?: tracing.currentTraceContext()?.get()
     }
 
     fun nextSpan(record: Record<*, *>): Span {

libs/tracing-impl/src/main/kotlin/net/corda/tracing/brave/BraveTraceContext.kt

@@ -39,4 +39,7 @@ internal class BraveTraceContext(
     override fun finish() {
         span.finish()
     }
+
+    override val traceIdString: String
+        get() = span.context().traceIdString()
 }

libs/tracing-impl/src/main/kotlin/net/corda/tracing/brave/BraveTracingService.kt

@@ -26,6 +26,7 @@ import net.corda.tracing.BatchPublishTracing
 import net.corda.tracing.BatchRecordTracer
 import net.corda.tracing.TraceContext
 import net.corda.tracing.TracingService
+import net.corda.utilities.debug
 import org.eclipse.jetty.servlet.FilterHolder
 import org.slf4j.LoggerFactory
 import zipkin2.Span
@@ -116,7 +117,7 @@ internal class BraveTracingService(serviceName: String, zipkinHost: String?, sam
         HttpTracing.newBuilder(tracing)
             .serverRequestParser(
                 object : HttpRequestParser.Default() {
-                    override fun spanName(req: HttpRequest?, context: brave.propagation.TraceContext?): String? {
+                    override fun spanName(req: HttpRequest?, context: brave.propagation.TraceContext?): String {
                         return "http server - ${req?.method()} - ${req?.path()}"
                     }
                 }
@@ -153,23 +154,38 @@ internal class BraveTracingService(serviceName: String, zipkinHost: String?, sam
         traceHeadersToOverrideContext: List<Pair<String, String>>
     ): List<Pair<String, String>> {
         val ctx = recordTracing.getTraceContext(traceHeadersToOverrideContext)
-        return recordInjector.inject(ctx, headers)
+        return if (ctx == null) {
+            logger.debug { "Tracing context is not set" }
+            headers
+        } else {
+            recordInjector.inject(ctx, headers)
+        }
     }
 
     override fun addTraceHeaders(
         headers: List<Pair<String, String>>,
         traceHeadersToOverrideContext: Map<String, Any>
     ): List<Pair<String, String>> {
         val ctx = recordTracing.getTraceContext(traceHeadersToOverrideContext)
-        return recordInjector.inject(ctx, headers)
+        return if (ctx == null) {
+            logger.debug { "Tracing context is not set" }
+            headers
+        } else {
+            recordInjector.inject(ctx, headers)
+        }
     }
 
     override fun addTraceHeaders(
         headers: Map<String, Any>,
         traceHeadersToOverrideContext: Map<String, Any>
     ): Map<String, Any> {
         val ctx = recordTracing.getTraceContext(traceHeadersToOverrideContext)
-        return recordInjector.inject(ctx, headers)
+        return if (ctx == null) {
+            logger.debug { "Tracing context is not set" }
+            headers
+        } else {
+            return recordInjector.inject(ctx, headers)
+        }
     }
 
     override fun traceBatch(operationName: String): BatchRecordTracer {

libs/tracing/src/main/kotlin/net/corda/tracing/TraceContext.kt

@@ -14,4 +14,6 @@ interface TraceContext {
     fun errorAndFinish(e: Exception)
 
     fun finish()
+
+    val traceIdString: String
 }

libs/tracing/src/main/kotlin/net/corda/tracing/impl/NoopTracingService.kt

@@ -11,6 +11,9 @@ import java.util.concurrent.ExecutorService
 class NoopTracingService : TracingService {
 
     class NoopTraceContext : TraceContext {
+
+        override val traceIdString = "Noop traceId"
+
         override fun traceTag(key: String, value: String) {
         }
 

testing/e2e-test-utilities/build.gradle

@@ -30,4 +30,7 @@ dependencies {
     implementation project(':tools:plugins:package')
     implementation project(":testing:packaging-test-utilities")
     implementation project(':testing:test-utilities')
+
+    implementation project(':libs:tracing')
+    runtimeOnly project(':libs:tracing-impl')
 }