Merge pull request #75 from slashmo/remove-current-span

Remove currentSpan from TracingInstrument API

Author: ktoso

Sources/Instrumentation/Tracing/NoOpTracing.swift

@@ -16,8 +16,6 @@ import Dispatch
 
 /// No operation TracingInstrument, used when no tracing is required.
 public struct NoOpTracingInstrument: TracingInstrument {
-    public var currentSpan: Span? = nil
-
     public func startSpan(
         named operationName: String,
         context: BaggageContext,

Sources/Instrumentation/Tracing/TracingInstrument.swift

@@ -17,9 +17,6 @@ import Dispatch
 /// An `Instrument` with added functionality for distributed tracing. Is uses the span-based tracing model and is
 /// based on the OpenTracing/OpenTelemetry spec.
 public protocol TracingInstrument: Instrument {
-    /// The currently traces `Span`.
-    var currentSpan: Span? { get }
-
     /// Start a new `Span` within the given `BaggageContext` at a given timestamp.
     /// - Parameters:
     ///   - operationName: The name of the operation being traced. This may be a handler function, database call, ...

Tests/InstrumentationTests/Tracing/TracedLockTests.swift

@@ -53,8 +53,6 @@ enum TaskIDKey: BaggageContextKey {
 // MARK: PrintLn Tracer
 
 private final class TracedLockPrintlnTracer: TracingInstrument {
-    var currentSpan: Span? // FIXME: likely not like that
-
     func startSpan(
         named operationName: String,
         context: BaggageContext,

Tests/InstrumentationTests/TracingInstrumentTests.swift

@@ -32,8 +32,6 @@ final class TracingInstrumentTests: XCTestCase {
 // MARK: - JaegerTracer
 
 final class JaegerTracer: TracingInstrument {
-    private(set) var currentSpan: Span?
-
     func startSpan(
         named operationName: String,
         context: BaggageContext,
@@ -49,7 +47,6 @@ final class JaegerTracer: TracingInstrument {
             span.baggage.logger.info(#"Emitting span "\#(span.operationName)" to backend"#)
             span.baggage.logger.info("\(span.attributes)")
         }
-        currentSpan = span
         return span
     }