Merge branch 'main' into clarify-experimental-statuses

Author: Ignacio Bonafonte

Examples/Datadog Sample/main.swift

@@ -71,7 +71,7 @@ func simpleSpan() {
 func childSpan() {
     let span = tracer.spanBuilder(spanName: "parentSpan").setSpanKind(spanKind: .client).startSpan()
     span.setAttribute(key: sampleKey, value: sampleValue)
-    OpenTelemetryContext.setActiveSpan(span)
+    OpenTelemetry.instance.contextProvider.setActiveSpan(span)
     let childSpan = tracer.spanBuilder(spanName: "childSpan").setSpanKind(spanKind: .client).startSpan()
     childSpan.setAttribute(key: sampleKey, value: sampleValue)
     childSpan.end()

Examples/Logging Tracer/LoggingSpan.swift

@@ -22,7 +22,6 @@ class LoggingSpan: Span {
     var context: SpanContext
     var isRecording: Bool = true
     var status: Status = .unset
-    var scope: Scope?
 
     public init(name: String, kind: SpanKind) {
         self.name = name

Examples/Logging Tracer/LoggingTracer.swift

@@ -18,9 +18,6 @@ import OpenTelemetryApi
 
 class LoggingTracer: Tracer {
     let tracerName = "LoggingTracer"
-    public var activeSpan: Span? {
-        return OpenTelemetryContext.activeSpan
-    }
 
     var binaryFormat: BinaryFormattable = LoggingBinaryFormat()
     var textFormat: TextMapPropagator = W3CTraceContextPropagator()
@@ -42,7 +39,7 @@ class LoggingTracer: Tracer {
 
         func startSpan() -> Span {
             if spanContext == nil, !isRootSpan {
-                spanContext = OpenTelemetryContext.activeSpan?.context
+                spanContext = OpenTelemetry.instance.contextProvider.activeSpan?.context
             }
             if spanContext != nil {
                 return LoggingSpan(name: name, kind: .client)

Examples/Logging Tracer/main.swift

@@ -22,14 +22,18 @@ OpenTelemetry.registerTracerProvider(tracerProvider: LoggingTracerProvider())
 
 var tracer = OpenTelemetry.instance.tracerProvider.get(instrumentationName: "ConsoleApp", instrumentationVersion: "semver:1.0.0")
 
-let scope = OpenTelemetryContext.setActiveSpan(tracer.spanBuilder(spanName: "Main (span1)").startSpan())
+
+let span1 = tracer.spanBuilder(spanName: "Main (span1)").startSpan()
+OpenTelemetry.instance.contextProvider.setActiveSpan(span1)
 let semaphore = DispatchSemaphore(value: 0)
 DispatchQueue.global().async {
-    var scope2 = OpenTelemetryContext.setActiveSpan(tracer.spanBuilder(spanName: "Main (span2)").startSpan())
-    OpenTelemetryContext.activeSpan?.setAttribute(key: "myAttribute", value: "myValue")
+    let span2 = tracer.spanBuilder(spanName: "Main (span2)").startSpan()
+    OpenTelemetry.instance.contextProvider.setActiveSpan(span2)
+    OpenTelemetry.instance.contextProvider.activeSpan?.setAttribute(key: "myAttribute", value: "myValue")
     sleep(1)
     semaphore.signal()
-    scope2.close()
+    span2.end()
 }
+span1.end()
 
 semaphore.wait()

Examples/Simple Exporter/main.swift

@@ -39,7 +39,7 @@ func simpleSpan() {
 func childSpan() {
     let span = tracer.spanBuilder(spanName: "parentSpan").setSpanKind(spanKind: .client).startSpan()
     span.setAttribute(key: sampleKey, value: sampleValue)
-    OpenTelemetryContext.setActiveSpan(span)
+    OpenTelemetry.instance.contextProvider.setActiveSpan(span)
     let childSpan = tracer.spanBuilder(spanName: "childSpan").setSpanKind(spanKind: .client).startSpan()
     childSpan.setAttribute(key: sampleKey, value: sampleValue)
     childSpan.end()

Sources/Importers/OpenTracingShim/Propagation.swift

@@ -30,7 +30,7 @@ public class Propagation: BaseShimProtocol {
     }
 
     public func extractTextFormat(carrier: [String: String]) -> SpanContextShim? {
-        guard let currentBaggage = OpenTelemetryContext.activeBaggage else { return nil }
+        guard let currentBaggage = OpenTelemetry.instance.contextProvider.activeBaggage else { return nil }
         let context = propagators.textMapPropagator.extract(carrier: carrier, getter: TextMapGetter())
         if !(context?.isValid ?? false) {
             return nil

Sources/Importers/OpenTracingShim/SpanContextShim.swift

@@ -20,9 +20,9 @@ import Opentracing
 public class SpanContextShim: OTSpanContext, BaseShimProtocol {
     var telemetryInfo: TelemetryInfo
     public private(set) var context: SpanContext
-    public private(set) var baggage: Baggage
+    public private(set) var baggage: Baggage?
 
-    init(telemetryInfo: TelemetryInfo, context: SpanContext, baggage: Baggage) {
+    init(telemetryInfo: TelemetryInfo, context: SpanContext, baggage: Baggage?) {
         self.telemetryInfo = telemetryInfo
         self.context = context
         self.baggage = baggage
@@ -37,21 +37,22 @@ public class SpanContextShim: OTSpanContext, BaseShimProtocol {
     }
 
     func newWith(key: String, value: String) -> SpanContextShim {
-        let baggageBuilder = baggageManager.baggageBuilder().setParent(baggage)
+        let baggageBuilder = baggageManager.baggageBuilder()
+        baggageBuilder.setParent(baggage)
         baggageBuilder.put(key: EntryKey(name: key)!, value: EntryValue(string: value)!, metadata: nil)
 
         return SpanContextShim(telemetryInfo: telemetryInfo, context: context, baggage: baggageBuilder.build())
     }
 
     func getBaggageItem(key: String) -> String? {
         guard let key = EntryKey(name: key) else { return nil }
-        let value = baggage.getEntryValue(key: key)
+        let value = baggage?.getEntryValue(key: key)
         return value?.string
     }
 
     public func forEachBaggageItem(_ callback: @escaping (String, String) -> Bool) {
-        let entries = baggage.getEntries()
-        entries.forEach {
+        let entries = baggage?.getEntries()
+        entries?.forEach {
             if !callback($0.key.name, $0.value.string) {
                 return
             }
@@ -61,6 +62,11 @@ public class SpanContextShim: OTSpanContext, BaseShimProtocol {
 
 extension SpanContextShim: Equatable {
     public static func == (lhs: SpanContextShim, rhs: SpanContextShim) -> Bool {
-        return lhs.context == rhs.context && lhs.baggage == rhs.baggage
+        if let lbaggage = lhs.baggage, let rbaggage = rhs.baggage {
+            return lbaggage == rbaggage && lhs.context == rhs.context
+        }
+        else {
+            return lhs.baggage == nil && rhs.baggage == nil && lhs.context == rhs.context
+        }
     }
 }

Sources/Importers/OpenTracingShim/SpanContextShimTable.swift

@@ -49,7 +49,7 @@ public class SpanContextShimTable {
         return create(spanShim: spanShim, distContext: spanShim.telemetryInfo.emptyBaggage)
     }
 
-    @discardableResult public func create(spanShim: SpanShim, distContext: Baggage) -> SpanContextShim {
+    @discardableResult public func create(spanShim: SpanShim, distContext: Baggage?) -> SpanContextShim {
         lock.withWriterLock {
             var contextShim = shimsMap[spanShim.span.context]
             if contextShim != nil {

Sources/Importers/OpenTracingShim/TelemetryInfo.swift

@@ -20,7 +20,7 @@ struct TelemetryInfo {
     var tracer: Tracer
     var baggageManager: BaggageManager
     var propagators: ContextPropagators
-    var emptyBaggage: Baggage
+    var emptyBaggage: Baggage?
     var spanContextTable: SpanContextShimTable
 
     init(tracer: Tracer, baggageManager: BaggageManager, propagators: ContextPropagators) {

Sources/Importers/OpenTracingShim/TracerShim.swift

@@ -70,10 +70,10 @@ public class TracerShim: OTTracer, BaseShimProtocol {
         }
 
         let span = builder.startSpan()
-        OpenTelemetryContext.setActiveSpan(span)
+        OpenTelemetry.instance.contextProvider.setActiveSpan(span)
         let spanShim = SpanShim(telemetryInfo: telemetryInfo, span: span)
-        if baggage != nil, !(baggage! == telemetryInfo.emptyBaggage) {
-            spanContextTable.create(spanShim: spanShim, distContext: baggage!)
+        if let baggage = baggage {
+            spanContextTable.create(spanShim: spanShim, distContext: baggage)
         }
         return spanShim
     }