Remove TextMapPropagator in TracerSdk

danielqsj · danielqsj · commit 42ed730ebad5 · 2021-10-28T12:24:42.000+08:00
diff --git a/Sources/Instrumentation/URLSession/URLSessionLogger.swift b/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 }
         }
diff --git a/Sources/OpenTelemetrySdk/Trace/TracerSdk.swift b/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
 
diff --git a/Tests/OpenTelemetrySdkTests/Trace/TracerSdkTests.swift b/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.

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ class URLSessionLogger {`
`147`	`147`	`instrumentation.configuration.injectCustomHeaders?(&request, span)`
`148`	`148`	`var instrumentedRequest = request`
`149`	`149`	`objc_setAssociatedObject(instrumentedRequest, &URLSessionInstrumentation.instrumentedKey, true, .OBJC_ASSOCIATION_COPY_NONATOMIC)`
`150`		`- var traceHeaders = tracePropagationHTTPHeaders(span: span, textMapPropagator: instrumentation.tracer.textFormat)`
	`150`	`+ var traceHeaders = tracePropagationHTTPHeaders(span: span, textMapPropagator: OpenTelemetry.instance.propagators.textMapPropagator)`
`151`	`151`	`if let originalHeaders = request.allHTTPHeaderFields {`
`152`	`152`	`traceHeaders.merge(originalHeaders) { _, new in new }`
`153`	`153`	`}`