Merge branch 'main' into fix-network-instrumentation-interlock

Author: Ignacio Bonafonte

Sources/Exporters/Zipkin/Implementation/ZipkinConversionExtension.swift

@@ -21,6 +21,8 @@ struct ZipkinConversionExtension {
     static var localEndpointCache = [String: ZipkinEndpoint]()
     static var remoteEndpointCache = [String: ZipkinEndpoint]()
 
+    static let defaultServiceName = "unknown_service:" + ProcessInfo.processInfo.processName
+
     struct AttributeEnumerationState {
         var tags = [String: String]()
         var RemoteEndpointServiceName: String?
@@ -44,11 +46,11 @@ struct ZipkinConversionExtension {
 
         var localEndpoint = defaultLocalEndpoint
 
-        if let serviceName = attributeEnumerationState.serviceName, !serviceName.isEmpty {
+        if let serviceName = attributeEnumerationState.serviceName, !serviceName.isEmpty, defaultServiceName != serviceName {
             if localEndpointCache[serviceName] == nil {
-                localEndpoint = defaultLocalEndpoint.clone(serviceName: serviceName)
-                localEndpointCache[serviceName] = localEndpoint
+                localEndpointCache[serviceName] = defaultLocalEndpoint.clone(serviceName: serviceName)
             }
+            localEndpoint = localEndpointCache[serviceName] ?? localEndpoint
         }
 
         if let serviceNamespace = attributeEnumerationState.serviceNamespace, !serviceNamespace.isEmpty {

Sources/Instrumentation/URLSession/URLSessionLogger.swift

@@ -147,7 +147,7 @@ class URLSessionLogger {
         instrumentation.configuration.injectCustomHeaders?(&request, span)
         var instrumentedRequest = request
         objc_setAssociatedObject(instrumentedRequest, &URLSessionInstrumentation.instrumentedKey, true, .OBJC_ASSOCIATION_COPY_NONATOMIC)
-        var traceHeaders = tracePropagationHTTPHeaders(span: span, textMapPropagator: instrumentation.tracer.textFormat)
+        var traceHeaders = tracePropagationHTTPHeaders(span: span, textMapPropagator: OpenTelemetry.instance.propagators.textMapPropagator)
         if let originalHeaders = request.allHTTPHeaderFields {
             traceHeaders.merge(originalHeaders) { _, new in new }
         }

Sources/OpenTelemetryApi/OpenTelemetry.swift

@@ -45,6 +45,10 @@ public struct OpenTelemetry {
         instance.baggageManager = baggageManager
     }
 
+    public static func registerPropagators(textPropagators: [TextMapPropagator], baggagePropagator: TextMapBaggagePropagator) {
+        instance.propagators = DefaultContextPropagators(textPropagators: textPropagators, baggagePropagator: baggagePropagator)
+    }
+
     public static func registerContextManager(contextManager: ContextManager) {
         instance.contextProvider.contextManager = contextManager
     }

Sources/OpenTelemetrySdk/Trace/TracerSdk.swift

@@ -8,7 +8,6 @@ import OpenTelemetryApi
 
 /// TracerSdk is SDK implementation of Tracer.
 public class TracerSdk: Tracer {
-    public let textFormat: TextMapPropagator = W3CTraceContextPropagator()
     public let instrumentationLibraryInfo: InstrumentationLibraryInfo
     var sharedState: TracerSharedState
 

Tests/OpenTelemetrySdkTests/Trace/TracerSdkTests.swift

@@ -30,10 +30,6 @@ class TracerSdkTests: XCTestCase {
         XCTAssertTrue(tracer.spanBuilder(spanName: spanName) is SpanBuilderSdk)
     }
 
-    func testDefaultTextMapPropagator() {
-        XCTAssertTrue(tracer.textFormat is W3CTraceContextPropagator)
-    }
-
     func testGetCurrentSpan() {
         XCTAssertNil(OpenTelemetry.instance.contextProvider.activeSpan)
         // Make sure context is detached even if test fails.