From 480be641ed042be1022336c3f3260a5ce508957f Mon Sep 17 00:00:00 2001
From: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
Date: Mon, 14 Aug 2023 17:10:26 +0200
Subject: [PATCH 1/6] RUMM-3374 Rename `samplingRate` to `sampleRate` in
 `HTTPHeadersWriter` APIs

to unify wording in public APIs
---
 .../Tests/DatadogObjc/DDTracerTests.swift      | 18 +++++++++---------
 .../DDHTTPHeadersWriter+apiTests.m             |  2 +-
 .../DDOTelHTTPHeadersWriter+apiTests.m         |  2 +-
 .../DDW3CHTTPHeadersWriter+apiTests.m          |  2 +-
 .../OpenTelemetry/OTelHTTPHeadersWriter.swift  | 18 ++++++++++++++----
 .../OpenTracing/HTTPHeadersWriter.swift        |  9 +++++++--
 .../W3C/W3CHTTPHeadersWriter.swift             |  9 +++++++--
 .../Propagation/HTTPHeadersWriter+objc.swift   | 10 ++++++++--
 .../OTelHTTPHeadersWriter+objc.swift           | 13 +++++++++++--
 .../W3CHTTPHeadersWriter+objc.swift            | 10 ++++++++--
 10 files changed, 67 insertions(+), 26 deletions(-)

diff --git a/DatadogCore/Tests/DatadogObjc/DDTracerTests.swift b/DatadogCore/Tests/DatadogObjc/DDTracerTests.swift
index bf1c0a5b1b..cbf24a0f68 100644
--- a/DatadogCore/Tests/DatadogObjc/DDTracerTests.swift
+++ b/DatadogCore/Tests/DatadogObjc/DDTracerTests.swift
@@ -203,7 +203,7 @@ class DDTracerTests: XCTestCase {
             swiftSpanContext: DDSpanContext.mockWith(traceID: 1, spanID: 2)
         )
 
-        let objcWriter = DDHTTPHeadersWriter(samplingRate: 100)
+        let objcWriter = DDHTTPHeadersWriter(sampleRate: 100)
         try objcTracer.inject(objcSpanContext, format: OT.formatTextMap, carrier: objcWriter)
 
         let expectedHTTPHeaders = [
@@ -221,7 +221,7 @@ class DDTracerTests: XCTestCase {
             swiftSpanContext: DDSpanContext.mockWith(traceID: 1, spanID: 2)
         )
 
-        let objcWriter = DDHTTPHeadersWriter(samplingRate: 0)
+        let objcWriter = DDHTTPHeadersWriter(sampleRate: 0)
         try objcTracer.inject(objcSpanContext, format: OT.formatTextMap, carrier: objcWriter)
 
         let expectedHTTPHeaders = [
@@ -235,7 +235,7 @@ class DDTracerTests: XCTestCase {
         let objcTracer = DDTracer.shared()
         let objcSpanContext = DDSpanContextObjc(swiftSpanContext: DDSpanContext.mockWith(traceID: 1, spanID: 2))
 
-        let objcValidWriter = DDHTTPHeadersWriter(samplingRate: 100)
+        let objcValidWriter = DDHTTPHeadersWriter(sampleRate: 100)
         let objcInvalidFormat = "foo"
         XCTAssertThrowsError(
             try objcTracer.inject(objcSpanContext, format: objcInvalidFormat, carrier: objcValidWriter)
@@ -255,7 +255,7 @@ class DDTracerTests: XCTestCase {
             swiftSpanContext: DDSpanContext.mockWith(traceID: 1, spanID: 2)
         )
 
-        let objcWriter = DDOTelHTTPHeadersWriter(samplingRate: 100)
+        let objcWriter = DDOTelHTTPHeadersWriter(sampleRate: 100)
         try objcTracer.inject(objcSpanContext, format: OT.formatTextMap, carrier: objcWriter)
 
         let expectedHTTPHeaders = [
@@ -271,7 +271,7 @@ class DDTracerTests: XCTestCase {
             swiftSpanContext: DDSpanContext.mockWith(traceID: 1, spanID: 2)
         )
 
-        let objcWriter = DDOTelHTTPHeadersWriter(samplingRate: 0)
+        let objcWriter = DDOTelHTTPHeadersWriter(sampleRate: 0)
         try objcTracer.inject(objcSpanContext, format: OT.formatTextMap, carrier: objcWriter)
 
         let expectedHTTPHeaders = [
@@ -285,7 +285,7 @@ class DDTracerTests: XCTestCase {
         let objcTracer = DDTracer.shared()
         let objcSpanContext = DDSpanContextObjc(swiftSpanContext: DDSpanContext.mockWith(traceID: 1, spanID: 2))
 
-        let objcValidWriter = DDOTelHTTPHeadersWriter(samplingRate: 100)
+        let objcValidWriter = DDOTelHTTPHeadersWriter(sampleRate: 100)
         let objcInvalidFormat = "foo"
         XCTAssertThrowsError(
             try objcTracer.inject(objcSpanContext, format: objcInvalidFormat, carrier: objcValidWriter)
@@ -305,7 +305,7 @@ class DDTracerTests: XCTestCase {
             swiftSpanContext: DDSpanContext.mockWith(traceID: 1, spanID: 2)
         )
 
-        let objcWriter = DDW3CHTTPHeadersWriter(samplingRate: 100)
+        let objcWriter = DDW3CHTTPHeadersWriter(sampleRate: 100)
         try objcTracer.inject(objcSpanContext, format: OT.formatTextMap, carrier: objcWriter)
 
         let expectedHTTPHeaders = [
@@ -321,7 +321,7 @@ class DDTracerTests: XCTestCase {
             swiftSpanContext: DDSpanContext.mockWith(traceID: 1, spanID: 2)
         )
 
-        let objcWriter = DDW3CHTTPHeadersWriter(samplingRate: 0)
+        let objcWriter = DDW3CHTTPHeadersWriter(sampleRate: 0)
         try objcTracer.inject(objcSpanContext, format: OT.formatTextMap, carrier: objcWriter)
 
         let expectedHTTPHeaders = [
@@ -335,7 +335,7 @@ class DDTracerTests: XCTestCase {
         let objcTracer = DDTracer.shared()
         let objcSpanContext = DDSpanContextObjc(swiftSpanContext: DDSpanContext.mockWith(traceID: 1, spanID: 2))
 
-        let objcValidWriter = DDW3CHTTPHeadersWriter(samplingRate: 100)
+        let objcValidWriter = DDW3CHTTPHeadersWriter(sampleRate: 100)
         let objcInvalidFormat = "foo"
         XCTAssertThrowsError(
             try objcTracer.inject(objcSpanContext, format: objcInvalidFormat, carrier: objcValidWriter)
diff --git a/DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDHTTPHeadersWriter+apiTests.m b/DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDHTTPHeadersWriter+apiTests.m
index 4d39edf4b2..cab2afaeb6 100644
--- a/DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDHTTPHeadersWriter+apiTests.m
+++ b/DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDHTTPHeadersWriter+apiTests.m
@@ -19,7 +19,7 @@ @implementation DDHTTPHeadersWriter_apiTests
 #pragma clang diagnostic ignored "-Wunused-value"
 
 - (void)testInitWithSamplingRate {
-    [[DDHTTPHeadersWriter alloc] initWithSamplingRate:50];
+    [[DDHTTPHeadersWriter alloc] initWithSampleRate:50];
 }
 
 #pragma clang diagnostic pop
diff --git a/DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDOTelHTTPHeadersWriter+apiTests.m b/DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDOTelHTTPHeadersWriter+apiTests.m
index a2ec4b62d5..c3d2d5a18a 100644
--- a/DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDOTelHTTPHeadersWriter+apiTests.m
+++ b/DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDOTelHTTPHeadersWriter+apiTests.m
@@ -19,7 +19,7 @@ @implementation DDOTelHTTPHeadersWriter_apiTests
 #pragma clang diagnostic ignored "-Wunused-value"
 
 - (void)testInitWithSamplingRate {
-    [[DDOTelHTTPHeadersWriter alloc] initWithSamplingRate:100 injectEncoding:DDInjectEncodingSingle];
+    [[DDOTelHTTPHeadersWriter alloc] initWithSampleRate:100 injectEncoding:DDInjectEncodingSingle];
 }
 
 #pragma clang diagnostic pop
diff --git a/DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDW3CHTTPHeadersWriter+apiTests.m b/DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDW3CHTTPHeadersWriter+apiTests.m
index 1ad07d22a2..f75ea8ce27 100644
--- a/DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDW3CHTTPHeadersWriter+apiTests.m
+++ b/DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDW3CHTTPHeadersWriter+apiTests.m
@@ -19,7 +19,7 @@ @implementation DDW3CHTTPHeadersWriter_apiTests
 #pragma clang diagnostic ignored "-Wunused-value"
 
 - (void)testInitWithSamplingRate {
-    [[DDW3CHTTPHeadersWriter alloc] initWithSamplingRate:50];
+    [[DDW3CHTTPHeadersWriter alloc] initWithSampleRate:50];
 }
 
 #pragma clang diagnostic pop
diff --git a/DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeadersWriter.swift b/DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeadersWriter.swift
index 886081515d..f13de4c79f 100644
--- a/DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeadersWriter.swift
+++ b/DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeadersWriter.swift
@@ -64,12 +64,22 @@ public class OTelHTTPHeadersWriter: TracePropagationHeadersWriter {
     ///
     /// - Parameter samplingRate: Tracing sampling rate. 20% by default.
     /// - Parameter injectEncoding: Determines the type of telemetry header type used by the writer.
-    public init(
-        samplingRate: Float = 20,
+    @available(*, deprecated, message: "This will be removed in future versions of the SDK. Use `init(sampleRate:injectEncoding:)` instead.")
+    public convenience init(
+        samplingRate: Float,
         injectEncoding: InjectEncoding = .single
     ) {
-        self.sampler = Sampler(samplingRate: samplingRate)
-        self.injectEncoding = injectEncoding
+        self.init(sampleRate: samplingRate, injectEncoding: injectEncoding)
+    }
+
+    public convenience init(
+        sampleRate: Float = 20,
+        injectEncoding: InjectEncoding = .single
+    ) {
+        self.init(
+            sampler: Sampler(samplingRate: sampleRate),
+            injectEncoding: injectEncoding
+        )
     }
 
     /// Creates a `OTelHTTPHeadersWriter` to inject traces propagation headers
diff --git a/DatadogInternal/Sources/NetworkInstrumentation/OpenTracing/HTTPHeadersWriter.swift b/DatadogInternal/Sources/NetworkInstrumentation/OpenTracing/HTTPHeadersWriter.swift
index 3cdd7646cf..9ffef09c0e 100644
--- a/DatadogInternal/Sources/NetworkInstrumentation/OpenTracing/HTTPHeadersWriter.swift
+++ b/DatadogInternal/Sources/NetworkInstrumentation/OpenTracing/HTTPHeadersWriter.swift
@@ -46,8 +46,13 @@ public class HTTPHeadersWriter: TracePropagationHeadersWriter {
     /// to network request.
     ///
     /// - Parameter samplingRate: Tracing sampling rate. 20% by default.
-    public init(samplingRate: Float = 20) {
-        self.sampler = Sampler(samplingRate: samplingRate)
+    @available(*, deprecated, message: "This will be removed in future versions of the SDK. Use `init(sampleRate:)` instead.")
+    public convenience init(samplingRate: Float) {
+        self.init(sampleRate: samplingRate)
+    }
+
+    public convenience init(sampleRate: Float = 20) {
+        self.init(sampler: Sampler(samplingRate: sampleRate))
     }
 
     /// Creates a `HTTPHeadersWriter` to inject traces propagation headers
diff --git a/DatadogInternal/Sources/NetworkInstrumentation/W3C/W3CHTTPHeadersWriter.swift b/DatadogInternal/Sources/NetworkInstrumentation/W3C/W3CHTTPHeadersWriter.swift
index c8b71c50c5..d601a949ed 100644
--- a/DatadogInternal/Sources/NetworkInstrumentation/W3C/W3CHTTPHeadersWriter.swift
+++ b/DatadogInternal/Sources/NetworkInstrumentation/W3C/W3CHTTPHeadersWriter.swift
@@ -47,8 +47,13 @@ public class W3CHTTPHeadersWriter: TracePropagationHeadersWriter {
     /// to network request.
     ///
     /// - Parameter samplingRate: Tracing sampling rate. 20% by default.
-    public init(samplingRate: Float = 20) {
-        self.sampler = Sampler(samplingRate: samplingRate)
+    @available(*, deprecated, message: "This will be removed in future versions of the SDK. Use `init(sampleRate:)` instead.")
+    public convenience init(samplingRate: Float) {
+        self.init(sampleRate: samplingRate)
+    }
+
+    public convenience init(sampleRate: Float = 20) {
+        self.init(sampler: Sampler(samplingRate: sampleRate))
     }
 
     /// Creates a `W3CHTTPHeadersWriter` to inject traces propagation headers
diff --git a/DatadogObjc/Sources/Tracing/Propagation/HTTPHeadersWriter+objc.swift b/DatadogObjc/Sources/Tracing/Propagation/HTTPHeadersWriter+objc.swift
index 15b2bcd0a4..46e4b00ad0 100644
--- a/DatadogObjc/Sources/Tracing/Propagation/HTTPHeadersWriter+objc.swift
+++ b/DatadogObjc/Sources/Tracing/Propagation/HTTPHeadersWriter+objc.swift
@@ -16,7 +16,13 @@ public class DDHTTPHeadersWriter: NSObject {
     }
 
     @objc
-    public init(samplingRate: Float = 20) {
-        swiftHTTPHeadersWriter = HTTPHeadersWriter(samplingRate: samplingRate)
+    @available(*, deprecated, message: "This will be removed in future versions of the SDK. Use `init(sampleRate:)` instead.")
+    public convenience init(samplingRate: Float) {
+        self.init(sampleRate: samplingRate)
+    }
+
+    @objc
+    public init(sampleRate: Float = 20) {
+        swiftHTTPHeadersWriter = HTTPHeadersWriter(sampleRate: sampleRate)
     }
 }
diff --git a/DatadogObjc/Sources/Tracing/Propagation/OTelHTTPHeadersWriter+objc.swift b/DatadogObjc/Sources/Tracing/Propagation/OTelHTTPHeadersWriter+objc.swift
index 6ee9941158..c096da8aa7 100644
--- a/DatadogObjc/Sources/Tracing/Propagation/OTelHTTPHeadersWriter+objc.swift
+++ b/DatadogObjc/Sources/Tracing/Propagation/OTelHTTPHeadersWriter+objc.swift
@@ -32,13 +32,22 @@ public class DDOTelHTTPHeadersWriter: NSObject {
         swiftOTelHTTPHeadersWriter.traceHeaderFields
     }
 
+    @objc
+    @available(*, deprecated, message: "This will be removed in future versions of the SDK. Use `init(sampleRate:injectEncoding:)` instead.")
+    public convenience init(
+        samplingRate: Float,
+        injectEncoding: DDInjectEncoding = .single
+    ) {
+        self.init(sampleRate: samplingRate, injectEncoding: injectEncoding)
+    }
+
     @objc
     public init(
-        samplingRate: Float = 20,
+        sampleRate: Float = 20,
         injectEncoding: DDInjectEncoding = .single
     ) {
         swiftOTelHTTPHeadersWriter = OTelHTTPHeadersWriter(
-            samplingRate: samplingRate,
+            sampleRate: sampleRate,
             injectEncoding: .init(injectEncoding)
         )
     }
diff --git a/DatadogObjc/Sources/Tracing/Propagation/W3CHTTPHeadersWriter+objc.swift b/DatadogObjc/Sources/Tracing/Propagation/W3CHTTPHeadersWriter+objc.swift
index a11b4c0c58..4aa06aa565 100644
--- a/DatadogObjc/Sources/Tracing/Propagation/W3CHTTPHeadersWriter+objc.swift
+++ b/DatadogObjc/Sources/Tracing/Propagation/W3CHTTPHeadersWriter+objc.swift
@@ -16,7 +16,13 @@ public class DDW3CHTTPHeadersWriter: NSObject {
     }
 
     @objc
-    public init(samplingRate: Float = 20) {
-        swiftW3CHTTPHeadersWriter = W3CHTTPHeadersWriter(samplingRate: samplingRate)
+    @available(*, deprecated, message: "This will be removed in future versions of the SDK. Use `init(sampleRate:)` instead.")
+    public convenience init(samplingRate: Float) {
+        self.init(sampleRate: samplingRate)
+    }
+
+    @objc
+    public init(sampleRate: Float = 20) {
+        swiftW3CHTTPHeadersWriter = W3CHTTPHeadersWriter(sampleRate: sampleRate)
     }
 }

From d8c9ea0f8605e4e670de1e1822529554a4fbf6e2 Mon Sep 17 00:00:00 2001
From: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
Date: Mon, 14 Aug 2023 17:20:32 +0200
Subject: [PATCH 2/6] RUMM-3374 Export `HTTPHeaderWriters` to `DatadogTrace`
 public API

---
 Datadog/E2ETests/Tracing/TracerE2ETests.swift              | 1 -
 Datadog/Example/Debugging/DebugWebviewViewController.swift | 1 -
 Datadog/Example/Utils/ConsoleOutputInterceptor.swift       | 1 -
 DatadogTrace/Sources/TraceConfiguration.swift              | 4 ++++
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Datadog/E2ETests/Tracing/TracerE2ETests.swift b/Datadog/E2ETests/Tracing/TracerE2ETests.swift
index 4e272c1350..1e48e276b7 100644
--- a/Datadog/E2ETests/Tracing/TracerE2ETests.swift
+++ b/Datadog/E2ETests/Tracing/TracerE2ETests.swift
@@ -5,7 +5,6 @@
  */
 
 import DatadogCore
-import DatadogInternal
 import DatadogTrace
 
 class TracerE2ETests: E2ETests {
diff --git a/Datadog/Example/Debugging/DebugWebviewViewController.swift b/Datadog/Example/Debugging/DebugWebviewViewController.swift
index 9130c59ec3..507371a16c 100644
--- a/Datadog/Example/Debugging/DebugWebviewViewController.swift
+++ b/Datadog/Example/Debugging/DebugWebviewViewController.swift
@@ -6,7 +6,6 @@
 
 import UIKit
 import WebKit
-import DatadogInternal
 import DatadogRUM
 import DatadogWebViewTracking
 
diff --git a/Datadog/Example/Utils/ConsoleOutputInterceptor.swift b/Datadog/Example/Utils/ConsoleOutputInterceptor.swift
index f38797c4ff..ebf6937311 100644
--- a/Datadog/Example/Utils/ConsoleOutputInterceptor.swift
+++ b/Datadog/Example/Utils/ConsoleOutputInterceptor.swift
@@ -6,7 +6,6 @@
 
 #if DEBUG
 
-import DatadogInternal
 import UIKit
 
 class ConsoleOutputInterceptor {
diff --git a/DatadogTrace/Sources/TraceConfiguration.swift b/DatadogTrace/Sources/TraceConfiguration.swift
index ef94ec2ffd..fe29b2e994 100644
--- a/DatadogTrace/Sources/TraceConfiguration.swift
+++ b/DatadogTrace/Sources/TraceConfiguration.swift
@@ -12,6 +12,10 @@ import DatadogInternal
 @_exported import class DatadogInternal.DatadogURLSessionDelegate
 @_exported import typealias DatadogInternal.DDURLSessionDelegate
 @_exported import protocol DatadogInternal.__URLSessionDelegateProviding
+
+@_exported import class DatadogInternal.HTTPHeadersWriter
+@_exported import class DatadogInternal.OTelHTTPHeadersWriter
+@_exported import class DatadogInternal.W3CHTTPHeadersWriter
 // swiftlint:enable duplicate_imports
 
 extension Trace {

From 46ab87c03ff7e4fd3987c241f602ec7e6e6b6b70 Mon Sep 17 00:00:00 2001
From: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
Date: Wed, 16 Aug 2023 13:47:41 +0200
Subject: [PATCH 3/6] RUMM-3374 Add debug utility for testing manual trace
 injection

---
 Datadog/Datadog.xcodeproj/project.pbxproj     |   4 +
 .../Example/Base.lproj/Main iOS.storyboard    |  54 ++++++-
 ...ugManualTraceInjectionViewController.swift | 153 ++++++++++++++++++
 3 files changed, 208 insertions(+), 3 deletions(-)
 create mode 100644 Datadog/Example/Debugging/DebugManualTraceInjectionViewController.swift

diff --git a/Datadog/Datadog.xcodeproj/project.pbxproj b/Datadog/Datadog.xcodeproj/project.pbxproj
index f609d24fcc..ea77e1ac60 100644
--- a/Datadog/Datadog.xcodeproj/project.pbxproj
+++ b/Datadog/Datadog.xcodeproj/project.pbxproj
@@ -301,6 +301,7 @@
 		6176991C2A86121B0030022B /* HTTPClientMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6176991A2A86121B0030022B /* HTTPClientMock.swift */; };
 		6176991E2A8791880030022B /* Datadog+MultipleInstancesIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6176991D2A8791880030022B /* Datadog+MultipleInstancesIntegrationTests.swift */; };
 		6176991F2A8791880030022B /* Datadog+MultipleInstancesIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6176991D2A8791880030022B /* Datadog+MultipleInstancesIntegrationTests.swift */; };
+		617699212A8A7DF50030022B /* DebugManualTraceInjectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 617699202A8A7DF50030022B /* DebugManualTraceInjectionViewController.swift */; };
 		61776CED273BEA5500F93802 /* DebugRUMSessionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61776CEC273BEA5500F93802 /* DebugRUMSessionViewController.swift */; };
 		61776D4E273E6D9F00F93802 /* SwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61776D4D273E6D9F00F93802 /* SwiftUI.swift */; };
 		6179FFD3254ADB1700556A0B /* ObjcAppLaunchHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6179FFD2254ADB1100556A0B /* ObjcAppLaunchHandler.m */; };
@@ -2154,6 +2155,7 @@
 		617699172A860D9D0030022B /* HTTPClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPClient.swift; sourceTree = "<group>"; };
 		6176991A2A86121B0030022B /* HTTPClientMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPClientMock.swift; sourceTree = "<group>"; };
 		6176991D2A8791880030022B /* Datadog+MultipleInstancesIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Datadog+MultipleInstancesIntegrationTests.swift"; sourceTree = "<group>"; };
+		617699202A8A7DF50030022B /* DebugManualTraceInjectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugManualTraceInjectionViewController.swift; sourceTree = "<group>"; };
 		61776CEC273BEA5500F93802 /* DebugRUMSessionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugRUMSessionViewController.swift; sourceTree = "<group>"; };
 		61776D4D273E6D9F00F93802 /* SwiftUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUI.swift; sourceTree = "<group>"; };
 		61786F7624FCDE04009E6BAB /* RUMDebuggingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RUMDebuggingTests.swift; sourceTree = "<group>"; };
@@ -4214,6 +4216,7 @@
 			children = (
 				61441C942461A649003D8BB8 /* DebugLoggingViewController.swift */,
 				61441C932461A649003D8BB8 /* DebugTracingViewController.swift */,
+				617699202A8A7DF50030022B /* DebugManualTraceInjectionViewController.swift */,
 				61E5333724B84EE2003D6C4E /* DebugRUMViewController.swift */,
 				61F74AF326F20E4600E5F5ED /* DebugCrashReportingWithRUMViewController.swift */,
 				618236882710560900125326 /* DebugWebviewViewController.swift */,
@@ -7631,6 +7634,7 @@
 				61020C2C2758E853005EEAEA /* DebugBackgroundEventsViewController.swift in Sources */,
 				D2F44FC2299BD5600074B0D9 /* UIViewController+KeyboardControlling.swift in Sources */,
 				61441C992461A649003D8BB8 /* DebugLoggingViewController.swift in Sources */,
+				617699212A8A7DF50030022B /* DebugManualTraceInjectionViewController.swift in Sources */,
 				617247AF25DA9BEA007085B3 /* CrashReportingObjcHelpers.m in Sources */,
 				61776CED273BEA5500F93802 /* DebugRUMSessionViewController.swift in Sources */,
 				61776D4E273E6D9F00F93802 /* SwiftUI.swift in Sources */,
diff --git a/Datadog/Example/Base.lproj/Main iOS.storyboard b/Datadog/Example/Base.lproj/Main iOS.storyboard
index d018ef6429..45f77d1e5e 100644
--- a/Datadog/Example/Base.lproj/Main iOS.storyboard	
+++ b/Datadog/Example/Base.lproj/Main iOS.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="gra-d4-cht">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="gra-d4-cht">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -65,8 +65,28 @@
                                             <segue destination="FaI-gu-eql" kind="show" id="ePB-Ph-XzE"/>
                                         </connections>
                                     </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="M3j-VO-N1P" style="IBUITableViewCellStyleDefault" id="F5A-gJ-7Vm">
+                                        <rect key="frame" x="0.0" y="137" width="414" height="43.5"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="F5A-gJ-7Vm" id="Y3A-pt-TCA">
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Trace Injection (manual)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="M3j-VO-N1P">
+                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.5"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <segue destination="1Dj-vX-hFb" kind="show" id="IrQ-UG-cMw"/>
+                                        </connections>
+                                    </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="yCu-pq-IYL" style="IBUITableViewCellStyleDefault" id="3G8-Wa-fSQ">
-                                        <rect key="frame" x="0.0" y="131.5" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="180.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3G8-Wa-fSQ" id="7IJ-XI-RAR">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
@@ -1662,6 +1682,34 @@
             </objects>
             <point key="canvasLocation" x="1419" y="1175"/>
         </scene>
+        <!--Debug Manual Trace Injection View Controller-->
+        <scene sceneID="d34-e7-Qn8">
+            <objects>
+                <viewController id="1Dj-vX-hFb" customClass="DebugManualTraceInjectionViewController" customModule="Example" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="h6o-Ng-hRs">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This screen requires iO14+" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pe0-Ro-rxm">
+                                <rect key="frame" x="105" y="437.5" width="204" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="LmF-Gg-KKf"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="pe0-Ro-rxm" firstAttribute="centerX" secondItem="h6o-Ng-hRs" secondAttribute="centerX" id="WU4-aG-e4N"/>
+                            <constraint firstItem="pe0-Ro-rxm" firstAttribute="centerY" secondItem="h6o-Ng-hRs" secondAttribute="centerY" id="cB7-WP-Qma"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="yjy-W3-IxO"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="R6e-tl-J7Q" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2201" y="1175"/>
+        </scene>
     </scenes>
     <resources>
         <systemColor name="secondaryLabelColor">
diff --git a/Datadog/Example/Debugging/DebugManualTraceInjectionViewController.swift b/Datadog/Example/Debugging/DebugManualTraceInjectionViewController.swift
new file mode 100644
index 0000000000..168f422bb5
--- /dev/null
+++ b/Datadog/Example/Debugging/DebugManualTraceInjectionViewController.swift
@@ -0,0 +1,153 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+import SwiftUI
+import DatadogTrace
+
+@available(iOS 14, *)
+internal class DebugManualTraceInjectionViewController: UIHostingController<DebugManualTraceInjectionView> {
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder, rootView: DebugManualTraceInjectionView())
+    }
+}
+
+private var currentSession: URLSession? = nil
+
+@available(iOS 14.0, *)
+internal struct DebugManualTraceInjectionView: View {
+    enum TraceHeaderType: String, CaseIterable {
+        case datadog = "Datadog"
+        case w3c = "W3C"
+        case b3Single = "B3-Single"
+        case b3Multiple = "B3-Multiple"
+    }
+
+    @State private var spanName = "network request"
+    @State private var requestURL = "http://127.0.0.1:8000"
+    @State private var selectedTraceHeaderType: TraceHeaderType = .datadog
+    @State private var sampleRate: Float = 100.0
+    @State private var isRequestPending = false
+
+    private let session: URLSession = URLSession(
+        configuration: .ephemeral,
+        delegate: DDURLSessionDelegate(),
+        delegateQueue: nil
+    )
+
+    var body: some View {
+        let isButtonDisabled = isRequestPending || spanName.isEmpty || requestURL.isEmpty
+
+        VStack() {
+            VStack(spacing: 8) {
+                Text("Trace injection")
+                    .font(.caption.weight(.bold))
+                    .frame(maxWidth: .infinity, alignment: .leading)
+
+                Text("After tapping \"SEND REQUEST\", a POST request will be sent to the given URL. The request will be traced using the chosen tracing header type and sample rate. A span with specified name will be sent to Datadog.")
+                    .font(.caption.weight(.light))
+                    .frame(maxWidth: .infinity, alignment: .leading)
+            }
+            .padding()
+
+            Form {
+                Section(header: Text("Traced URL:")) {
+                    TextField("", text: $requestURL)
+                }
+                Section(header: Text("Span name:")) {
+                    TextField("", text: $spanName)
+                }
+                Picker("Trace header type:", selection: $selectedTraceHeaderType) {
+                    ForEach(TraceHeaderType.allCases, id: \.self) { headerType in
+                        Text(headerType.rawValue)
+                    }
+                }
+                .pickerStyle(.inline)
+                Section(header: Text("Trace sample Rate")) {
+                    Slider(
+                        value: $sampleRate,
+                        in: 0...100, step: 1,
+                        minimumValueLabel: Text("0"),
+                        maximumValueLabel: Text("100")
+                    ) {
+                        Text("Sample Rate")
+                    }
+                }
+            }
+
+            Spacer()
+
+            Button(action: { prepareAndSendRequest() }) {
+                Text("SEND REQUEST")
+                    .fontWeight(.bold)
+                    .foregroundColor(.white)
+            }
+            .frame(maxWidth: .infinity)
+            .padding()
+            .background(isButtonDisabled ? Color.gray : Color.datadogPurple)
+            .cornerRadius(10)
+            .disabled(isButtonDisabled)
+            .padding(.horizontal, 8)
+            .padding(.bottom, 30)
+        }
+    }
+
+    private func prepareAndSendRequest() {
+        guard let url = URL(string: requestURL) else {
+            print("🔥 POST Request not sent - invalid url: \(requestURL)")
+            return
+        }
+
+        var request = URLRequest(url: url)
+        request.httpMethod = "POST"
+
+        let span = Tracer.shared().startRootSpan(operationName: spanName)
+
+        switch selectedTraceHeaderType {
+        case .datadog:
+            let writer = HTTPHeadersWriter(sampleRate: sampleRate)
+            Tracer.shared().inject(spanContext: span.context, writer: writer)
+            writer.traceHeaderFields.forEach { request.setValue($0.value, forHTTPHeaderField: $0.key) }
+        case .w3c:
+            let writer = W3CHTTPHeadersWriter(sampleRate: sampleRate)
+            Tracer.shared().inject(spanContext: span.context, writer: writer)
+            writer.traceHeaderFields.forEach { request.setValue($0.value, forHTTPHeaderField: $0.key) }
+        case .b3Single:
+            let writer = OTelHTTPHeadersWriter(sampleRate: sampleRate, injectEncoding: .single)
+            Tracer.shared().inject(spanContext: span.context, writer: writer)
+            writer.traceHeaderFields.forEach { request.setValue($0.value, forHTTPHeaderField: $0.key) }
+        case .b3Multiple:
+            let writer = OTelHTTPHeadersWriter(sampleRate: sampleRate, injectEncoding: .multiple)
+            Tracer.shared().inject(spanContext: span.context, writer: writer)
+            writer.traceHeaderFields.forEach { request.setValue($0.value, forHTTPHeaderField: $0.key) }
+        }
+
+        send(request: request) {
+            span.finish()
+            print("✅ Request sent to \(requestURL)")
+        }
+    }
+
+    private func send(request: URLRequest, completion: @escaping () -> Void) {
+        isRequestPending = true
+        let task = session.dataTask(with: request) { _, _, _ in
+            completion()
+            DispatchQueue.main.async { self.isRequestPending = false }
+        }
+        task.resume()
+    }
+}
+
+// MARK - Preview
+
+@available(iOS 14.0, *)
+
+struct DebugTraceInjectionView_Previews: PreviewProvider {
+    static var previews: some View {
+        NavigationView {
+            DebugManualTraceInjectionView()
+        }
+    }
+}

From 1518ece0ad5ec64b8a9ec071d9ceaac69248bf0f Mon Sep 17 00:00:00 2001
From: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
Date: Wed, 16 Aug 2023 16:10:01 +0200
Subject: [PATCH 4/6] RUMM-3374 Improve doc comments for trace propagation APIs

---
 .../OpenTelemetry/OTelHTTPHeadersWriter.swift | 59 +++++++++++--------
 .../OpenTracing/HTTPHeadersWriter.swift       | 30 ++++++----
 .../W3C/W3CHTTPHeadersWriter.swift            | 31 +++++-----
 3 files changed, 69 insertions(+), 51 deletions(-)

diff --git a/DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeadersWriter.swift b/DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeadersWriter.swift
index f13de4c79f..b5753b0b35 100644
--- a/DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeadersWriter.swift
+++ b/DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeadersWriter.swift
@@ -6,17 +6,16 @@
 
 import Foundation
 
-/// The `OTelHTTPHeadersWriter` should be used to inject trace propagation headers to
-/// the network requests send to the backend instrumented with Open Telemetry.
-/// The injected headers conform to [Open Telemetry](https://github.com/openzipkin/b3-propagation) standard.
+/// The `OTelHTTPHeadersWriter` class facilitates the injection of trace propagation headers into network requests
+/// targeted at a backend expecting [B3 propagation format](https://github.com/openzipkin/b3-propagation).
 ///
 /// Usage:
 ///
 ///     var request = URLRequest(...)
 ///
 ///     let writer = OTelHTTPHeadersWriter(injectEncoding: .single)
-///     let span = DatadogTracer.shared().startSpan("network request")
-///     writer.inject(spanContext: span.context)
+///     let span = Tracer.shared().startRootSpan(operationName: "network request")
+///     Tracer.shared().inject(spanContext: span.context, writer: writer)
 ///
 ///     writer.traceHeaderFields.forEach { (field, value) in
 ///         request.setValue(value, forHTTPHeaderField: field)
@@ -24,23 +23,28 @@ import Foundation
 ///
 ///     // call span.finish() when the request completes
 ///
-///
 public class OTelHTTPHeadersWriter: TracePropagationHeadersWriter {
-    /// Open Telemetry header encoding.
+    /// Enumerates Open Telemetry header encoding options.
     ///
-    /// There are two encodings of B3:
+    /// There are two encodings of B3 propagation:
     /// [Single Header](https://github.com/openzipkin/b3-propagation#single-header)
     /// and [Multiple Header](https://github.com/openzipkin/b3-propagation#multiple-headers).
     ///
-    /// Multiple header encoding uses an `X-B3-` prefixed header per item in the trace context.
-    /// Single header delimits the context into into a single entry named b3.
+    /// Multiple header encoding employs an `X-B3-` prefixed header per item in the trace context.
+    /// Single header delimits the context into a single entry named `B3`.
     /// The single-header variant takes precedence over the multiple header one when extracting fields.
     public enum InjectEncoding {
-        case multiple, single
+        /// Encoding that employs `X-B3-*` prefixed headers per item in the trace context.
+        ///
+        /// See: [Multiple Header](https://github.com/openzipkin/b3-propagation#multiple-headers).
+        case multiple
+        /// Encoding that uses a single `B3` header to transport the trace context.
+        ///
+        /// See: [Single Header](https://github.com/openzipkin/b3-propagation#single-header)
+        case single
     }
 
-    /// A dictionary with HTTP Headers required to propagate the trace started in the mobile app
-    /// to the backend instrumented with Open Telemetry.
+    /// A dictionary containing the required HTTP Headers for propagating trace information.
     ///
     /// Usage:
     ///
@@ -52,18 +56,17 @@ public class OTelHTTPHeadersWriter: TracePropagationHeadersWriter {
 
     /// The tracing sampler.
     ///
-    /// This value will decide of the `X-B3-Sampled` header field value
-    /// and if `X-B3-TraceId`, `X-B3-SpanId` and `X-B3-ParentSpanId` are propagated.
+    /// The sample rate determines the `X-B3-Sampled` header field value
+    /// and whether `X-B3-TraceId`, `X-B3-SpanId`, and `X-B3-ParentSpanId` are propagated.
     private let sampler: Sampler
 
-    /// Determines the type of telemetry header type used by the writer.
+    /// The telemetry header encoding used by the writer.
     private let injectEncoding: InjectEncoding
 
-    /// Creates a `OTelHTTPHeadersWriter` to inject traces propagation headers
-    /// to network request.
+    /// Initializes the headers writer.
     ///
-    /// - Parameter samplingRate: Tracing sampling rate. 20% by default.
-    /// - Parameter injectEncoding: Determines the type of telemetry header type used by the writer.
+    /// - Parameter samplingRate: The sampling rate applied for headers injection.
+    /// - Parameter injectEncoding: The OTel header encoding type, with `.single` as the default.
     @available(*, deprecated, message: "This will be removed in future versions of the SDK. Use `init(sampleRate:injectEncoding:)` instead.")
     public convenience init(
         samplingRate: Float,
@@ -72,6 +75,10 @@ public class OTelHTTPHeadersWriter: TracePropagationHeadersWriter {
         self.init(sampleRate: samplingRate, injectEncoding: injectEncoding)
     }
 
+    /// Initializes the headers writer.
+    ///
+    /// - Parameter sampleRate: The sampling rate applied for headers injection, with 20% as the default.
+    /// - Parameter injectEncoding: The OTel header encoding type, with `.single` as the default.
     public convenience init(
         sampleRate: Float = 20,
         injectEncoding: InjectEncoding = .single
@@ -82,11 +89,10 @@ public class OTelHTTPHeadersWriter: TracePropagationHeadersWriter {
         )
     }
 
-    /// Creates a `OTelHTTPHeadersWriter` to inject traces propagation headers
-    /// to network request.
+    /// Initializes the headers writer.
     ///
-    /// - Parameter sampler: Tracing sampler responsible for randomizing the sample.
-    /// - Parameter injectEncoding: Determines the type of telemetry header type used by the writer.
+    /// - Parameter sampler: The sampler used for headers injection.
+    /// - Parameter injectEncoding: The OTel header encoding type, with `.single` as the default.
     public init(
         sampler: Sampler,
         injectEncoding: InjectEncoding = .single
@@ -95,6 +101,11 @@ public class OTelHTTPHeadersWriter: TracePropagationHeadersWriter {
         self.injectEncoding = injectEncoding
     }
 
+    /// Writes the trace ID, span ID, and optional parent span ID into the trace propagation headers.
+    ///
+    /// - Parameter traceID: The trace ID.
+    /// - Parameter spanID: The span ID.
+    /// - Parameter parentSpanID: The parent span ID, if applicable.
     public func write(traceID: TraceID, spanID: SpanID, parentSpanID: SpanID?) {
         let samplingPriority = sampler.sample()
 
diff --git a/DatadogInternal/Sources/NetworkInstrumentation/OpenTracing/HTTPHeadersWriter.swift b/DatadogInternal/Sources/NetworkInstrumentation/OpenTracing/HTTPHeadersWriter.swift
index 9ffef09c0e..6a23257f14 100644
--- a/DatadogInternal/Sources/NetworkInstrumentation/OpenTracing/HTTPHeadersWriter.swift
+++ b/DatadogInternal/Sources/NetworkInstrumentation/OpenTracing/HTTPHeadersWriter.swift
@@ -6,16 +6,16 @@
 
 import Foundation
 
-/// The `HTTPHeadersWriter` should be used to inject trace propagation headers to
-/// the network requests send to the backend instrumented with Datadog APM.
+/// The `HTTPHeadersWriter` class facilitates the injection of trace propagation headers into network requests
+/// targeted at a backend instrumented with Datadog and expecting `x-datadog-*` headers.
 ///
 /// Usage:
 ///
 ///     var request = URLRequest(...)
 ///
 ///     let writer = HTTPHeadersWriter()
-///     let span = DatadogTracer.shared().startSpan("network request")
-///     writer.inject(spanContext: span.context)
+///     let span = Tracer.shared().startRootSpan(operationName: "network request")
+///     Tracer.shared().inject(spanContext: span.context, writer: writer)
 ///
 ///     writer.traceHeaderFields.forEach { (field, value) in
 ///         request.setValue(value, forHTTPHeaderField: field)
@@ -23,10 +23,8 @@ import Foundation
 ///
 ///     // call span.finish() when the request completes
 ///
-///
 public class HTTPHeadersWriter: TracePropagationHeadersWriter {
-    /// A dictionary with HTTP Headers required to propagate the trace started in the mobile app
-    /// to the backend instrumented with Datadog APM.
+    /// A dictionary containing the required HTTP Headers for propagating trace information.
     ///
     /// Usage:
     ///
@@ -42,27 +40,33 @@ public class HTTPHeadersWriter: TracePropagationHeadersWriter {
     /// and if `x-datadog-trace-id` and `x-datadog-parent-id` are propagated.
     private let sampler: Sampler
 
-    /// Creates a `HTTPHeadersWriter` to inject traces propagation headers
-    /// to network request.
+    /// Initializes the headers writer.
     ///
-    /// - Parameter samplingRate: Tracing sampling rate. 20% by default.
+    /// - Parameter samplingRate: The sampling rate applied for headers injection.
     @available(*, deprecated, message: "This will be removed in future versions of the SDK. Use `init(sampleRate:)` instead.")
     public convenience init(samplingRate: Float) {
         self.init(sampleRate: samplingRate)
     }
 
+    /// Initializes the headers writer.
+    ///
+    /// - Parameter sampleRate: The sampling rate applied for headers injection, with 20% as the default.
     public convenience init(sampleRate: Float = 20) {
         self.init(sampler: Sampler(samplingRate: sampleRate))
     }
 
-    /// Creates a `HTTPHeadersWriter` to inject traces propagation headers
-    /// to network request.
+    /// Initializes the headers writer.
     ///
-    /// - Parameter sampler: Tracing sampler responsible for randomizing the sample.
+    /// - Parameter sampler: The sampler used for headers injection.
     public init(sampler: Sampler) {
         self.sampler = sampler
     }
 
+    /// Writes the trace ID, span ID, and optional parent span ID into the trace propagation headers.
+    ///
+    /// - Parameter traceID: The trace ID.
+    /// - Parameter spanID: The span ID.
+    /// - Parameter parentSpanID: The parent span ID, if applicable.
     public func write(traceID: TraceID, spanID: SpanID, parentSpanID: SpanID?) {
         let samplingPriority = sampler.sample()
 
diff --git a/DatadogInternal/Sources/NetworkInstrumentation/W3C/W3CHTTPHeadersWriter.swift b/DatadogInternal/Sources/NetworkInstrumentation/W3C/W3CHTTPHeadersWriter.swift
index d601a949ed..bd97c9136d 100644
--- a/DatadogInternal/Sources/NetworkInstrumentation/W3C/W3CHTTPHeadersWriter.swift
+++ b/DatadogInternal/Sources/NetworkInstrumentation/W3C/W3CHTTPHeadersWriter.swift
@@ -6,17 +6,16 @@
 
 import Foundation
 
-/// The `W3CHTTPHeadersWriter` should be used to inject trace propagation headers to
-/// the network requests send to the backend instrumented with W3C trace context.
-/// The injected headers conform to [W3C](https://www.w3.org/TR/trace-context/) standard.
+/// The `W3CHTTPHeadersWriter` class facilitates the injection of trace propagation headers into network requests
+/// targeted at a backend expecting [W3C propagation format](https://github.com/openzipkin/b3-propagation).
 ///
 /// Usage:
 ///
 ///     var request = URLRequest(...)
 ///
 ///     let writer = W3CHTTPHeadersWriter()
-///     let span = DatadogTracer.shared().startSpan("network request")
-///     writer.inject(spanContext: span.context)
+///     let span = Tracer.shared().startRootSpan(operationName: "network request")
+///     Tracer.shared().inject(spanContext: span.context, writer: writer)
 ///
 ///     writer.traceHeaderFields.forEach { (field, value) in
 ///         request.setValue(value, forHTTPHeaderField: field)
@@ -24,10 +23,8 @@ import Foundation
 ///
 ///     // call span.finish() when the request completes
 ///
-///
 public class W3CHTTPHeadersWriter: TracePropagationHeadersWriter {
-    /// A dictionary with HTTP Headers required to propagate the trace started in the mobile app
-    /// to the backend instrumented with W3C trace context.
+    /// A dictionary containing the required HTTP Headers for propagating trace information.
     ///
     /// Usage:
     ///
@@ -43,27 +40,33 @@ public class W3CHTTPHeadersWriter: TracePropagationHeadersWriter {
     /// and if `trace-id`, `span-id` are propagated.
     private let sampler: Sampler
 
-    /// Creates a `W3CHTTPHeadersWriter` to inject traces propagation headers
-    /// to network request.
+    /// Initializes the headers writer.
     ///
-    /// - Parameter samplingRate: Tracing sampling rate. 20% by default.
+    /// - Parameter samplingRate: The sampling rate applied for headers injection.
     @available(*, deprecated, message: "This will be removed in future versions of the SDK. Use `init(sampleRate:)` instead.")
     public convenience init(samplingRate: Float) {
         self.init(sampleRate: samplingRate)
     }
 
+    /// Initializes the headers writer.
+    ///
+    /// - Parameter sampleRate: The sampling rate applied for headers injection, with 20% as the default.
     public convenience init(sampleRate: Float = 20) {
         self.init(sampler: Sampler(samplingRate: sampleRate))
     }
 
-    /// Creates a `W3CHTTPHeadersWriter` to inject traces propagation headers
-    /// to network request.
+    /// Initializes the headers writer.
     ///
-    /// - Parameter sampler: Tracing sampler responsible for randomizing the sample.
+    /// - Parameter sampler: The sampler used for headers injection.
     public init(sampler: Sampler) {
         self.sampler = sampler
     }
 
+    /// Writes the trace ID, span ID, and optional parent span ID into the trace propagation headers.
+    ///
+    /// - Parameter traceID: The trace ID.
+    /// - Parameter spanID: The span ID.
+    /// - Parameter parentSpanID: The parent span ID, if applicable.
     public func write(traceID: TraceID, spanID: SpanID, parentSpanID: SpanID?) {
         typealias Constants = W3CHTTPHeaders.Constants
 

From 3afe2ea091132c5ddb9d1174c4f4eb6b5a3dde7d Mon Sep 17 00:00:00 2001
From: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
Date: Wed, 16 Aug 2023 16:34:04 +0200
Subject: [PATCH 5/6] RUMM-3374 Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42126127d4..d0e530fbdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- [BUGFIX] Manual trace injection APIs are not available in DatadogTrace. See [#1415][].
 - [BUGFIX] Allow instantiating custom instance of the SDK after default one. See [#1413][].
 - [BUGFIX] Do not propagate attributes from Errors and LongTasks to Views.
 - [IMPROVEMENT] Upgrade to PLCrashReporter 1.11.1.
@@ -495,6 +496,7 @@ Release `2.0` introduces breaking changes. Follow the [Migration Guide](MIGRATIO
 [#1355]: https://github.com/DataDog/dd-sdk-ios/pull/1355
 [#1410]: https://github.com/DataDog/dd-sdk-ios/pull/1410
 [#1413]: https://github.com/DataDog/dd-sdk-ios/pull/1413
+[#1415]: https://github.com/DataDog/dd-sdk-ios/pull/1415
 [@00fa9a]: https://github.com/00FA9A
 [@britton-earnin]: https://github.com/Britton-Earnin
 [@hengyu]: https://github.com/Hengyu

From 4a3819c1f79fcb83f6dbaa12aee1d394906848cb Mon Sep 17 00:00:00 2001
From: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
Date: Fri, 18 Aug 2023 08:59:45 +0200
Subject: [PATCH 6/6] RUMM-3374 Deprecate `OTelHTTPHeaders*` by renaming to
 `B3HTTPHeaders*`

---
 Datadog/Datadog.xcodeproj/project.pbxproj     |  96 +++++++--------
 ...ugManualTraceInjectionViewController.swift |   4 +-
 DatadogCore/Tests/Datadog/TracerTests.swift   |  28 ++---
 .../Tests/DatadogObjc/DDTracerTests.swift     |  12 +-
 ...sts.m => DDB3HTTPHeadersWriter+apiTests.m} |   6 +-
 .../B3HTTPHeaders.swift}                      |   7 +-
 .../B3HTTPHeadersReader.swift}                |  15 ++-
 .../B3HTTPHeadersWriter.swift}                |  31 ++---
 .../HTTPHeadersReader.swift                   |   0
 .../HTTPHeadersWriter.swift                   |   0
 .../TracingHTTPHeaders.swift                  |   0
 .../NetworkInstrumentationFeature.swift       |   2 +-
 ...s.swift => B3HTTPHeadersReaderTests.swift} |  38 +++---
 .../B3HTTPHeadersWriterTests.swift            | 109 ++++++++++++++++++
 .../NetworkInstrumentationFeatureTests.swift  |   4 +-
 .../OTelHTTPHeadersWriterTests.swift          | 109 ------------------
 DatadogObjc/Sources/Trace+objc.swift          |   4 +-
 ...c.swift => B3HTTPHeadersWriter+objc.swift} |  16 ++-
 .../URLSessionRUMResourcesHandler.swift       |   4 +-
 .../URLSessionRUMResourcesHandlerTests.swift  |  20 ++--
 DatadogTrace/Sources/DDFormat.swift           |   4 +-
 .../TracingURLSessionHandler.swift            |   4 +-
 DatadogTrace/Sources/TraceConfiguration.swift |   2 +-
 .../Tests/TracingURLSessionHandlerTests.swift |  20 ++--
 24 files changed, 274 insertions(+), 261 deletions(-)
 rename DatadogCore/Tests/DatadogObjc/ObjcAPITests/{DDOTelHTTPHeadersWriter+apiTests.m => DDB3HTTPHeadersWriter+apiTests.m} (72%)
 rename DatadogInternal/Sources/NetworkInstrumentation/{OpenTelemetry/OTelHTTPHeaders.swift => B3/B3HTTPHeaders.swift} (93%)
 rename DatadogInternal/Sources/NetworkInstrumentation/{OpenTelemetry/OTelHTTPHeadersReader.swift => B3/B3HTTPHeadersReader.swift} (69%)
 rename DatadogInternal/Sources/NetworkInstrumentation/{OpenTelemetry/OTelHTTPHeadersWriter.swift => B3/B3HTTPHeadersWriter.swift} (76%)
 rename DatadogInternal/Sources/NetworkInstrumentation/{OpenTracing => Datadog}/HTTPHeadersReader.swift (100%)
 rename DatadogInternal/Sources/NetworkInstrumentation/{OpenTracing => Datadog}/HTTPHeadersWriter.swift (100%)
 rename DatadogInternal/Sources/NetworkInstrumentation/{OpenTracing => Datadog}/TracingHTTPHeaders.swift (100%)
 rename DatadogInternal/Tests/NetworkInstrumentation/{OTelHTTPHeadersReaderTests.swift => B3HTTPHeadersReaderTests.swift} (52%)
 create mode 100644 DatadogInternal/Tests/NetworkInstrumentation/B3HTTPHeadersWriterTests.swift
 delete mode 100644 DatadogInternal/Tests/NetworkInstrumentation/OTelHTTPHeadersWriterTests.swift
 rename DatadogObjc/Sources/Tracing/Propagation/{OTelHTTPHeadersWriter+objc.swift => B3HTTPHeadersWriter+objc.swift} (72%)

diff --git a/Datadog/Datadog.xcodeproj/project.pbxproj b/Datadog/Datadog.xcodeproj/project.pbxproj
index ea77e1ac60..afceb143da 100644
--- a/Datadog/Datadog.xcodeproj/project.pbxproj
+++ b/Datadog/Datadog.xcodeproj/project.pbxproj
@@ -458,10 +458,10 @@
 		A728ADAC2934EA2100397996 /* W3CHTTPHeadersWriter+objc.swift in Sources */ = {isa = PBXBuildFile; fileRef = A728ADAA2934EA2100397996 /* W3CHTTPHeadersWriter+objc.swift */; };
 		A728ADB02934EB0900397996 /* DDW3CHTTPHeadersWriter+apiTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A728ADAD2934EB0300397996 /* DDW3CHTTPHeadersWriter+apiTests.m */; };
 		A728ADB12934EB0C00397996 /* DDW3CHTTPHeadersWriter+apiTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A728ADAD2934EB0300397996 /* DDW3CHTTPHeadersWriter+apiTests.m */; };
-		A79B0F64292BD074008742B3 /* DDOTelHTTPHeadersWriter+apiTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A79B0F63292BD074008742B3 /* DDOTelHTTPHeadersWriter+apiTests.m */; };
-		A79B0F65292BD074008742B3 /* DDOTelHTTPHeadersWriter+apiTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A79B0F63292BD074008742B3 /* DDOTelHTTPHeadersWriter+apiTests.m */; };
-		A79B0F66292BD7CA008742B3 /* OTelHTTPHeadersWriter+objc.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79B0F5E292BA435008742B3 /* OTelHTTPHeadersWriter+objc.swift */; };
-		A79B0F67292BD7CC008742B3 /* OTelHTTPHeadersWriter+objc.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79B0F5E292BA435008742B3 /* OTelHTTPHeadersWriter+objc.swift */; };
+		A79B0F64292BD074008742B3 /* DDB3HTTPHeadersWriter+apiTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A79B0F63292BD074008742B3 /* DDB3HTTPHeadersWriter+apiTests.m */; };
+		A79B0F65292BD074008742B3 /* DDB3HTTPHeadersWriter+apiTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A79B0F63292BD074008742B3 /* DDB3HTTPHeadersWriter+apiTests.m */; };
+		A79B0F66292BD7CA008742B3 /* B3HTTPHeadersWriter+objc.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79B0F5E292BA435008742B3 /* B3HTTPHeadersWriter+objc.swift */; };
+		A79B0F67292BD7CC008742B3 /* B3HTTPHeadersWriter+objc.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79B0F5E292BA435008742B3 /* B3HTTPHeadersWriter+objc.swift */; };
 		D20605A3287464F40047275C /* ContextValuePublisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20605A2287464F40047275C /* ContextValuePublisher.swift */; };
 		D20605A4287464F40047275C /* ContextValuePublisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20605A2287464F40047275C /* ContextValuePublisher.swift */; };
 		D20605A6287476230047275C /* ServerOffsetPublisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20605A5287476230047275C /* ServerOffsetPublisher.swift */; };
@@ -1335,11 +1335,11 @@
 		D2EBEE2029BA160F00B15732 /* TracePropagationHeadersWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2EBEDCF29B8A02100B15732 /* TracePropagationHeadersWriter.swift */; };
 		D2EBEE2129BA160F00B15732 /* W3CHTTPHeaders.swift in Sources */ = {isa = PBXBuildFile; fileRef = A728AD9C2934CE4400397996 /* W3CHTTPHeaders.swift */; };
 		D2EBEE2229BA160F00B15732 /* TracePropagationHeadersReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2EBEDD229B8A58E00B15732 /* TracePropagationHeadersReader.swift */; };
-		D2EBEE2329BA160F00B15732 /* OTelHTTPHeadersReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F773DC29253F8B00AC1A62 /* OTelHTTPHeadersReader.swift */; };
+		D2EBEE2329BA160F00B15732 /* B3HTTPHeadersReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F773DC29253F8B00AC1A62 /* B3HTTPHeadersReader.swift */; };
 		D2EBEE2429BA160F00B15732 /* W3CHTTPHeadersReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = A728ADA02934CE5D00397996 /* W3CHTTPHeadersReader.swift */; };
 		D2EBEE2529BA160F00B15732 /* TraceID.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2EBEDCC29B893D800B15732 /* TraceID.swift */; };
-		D2EBEE2629BA160F00B15732 /* OTelHTTPHeaders.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F773D32924EA2D00AC1A62 /* OTelHTTPHeaders.swift */; };
-		D2EBEE2729BA160F00B15732 /* OTelHTTPHeadersWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F773DB29253F8B00AC1A62 /* OTelHTTPHeadersWriter.swift */; };
+		D2EBEE2629BA160F00B15732 /* B3HTTPHeaders.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F773D32924EA2D00AC1A62 /* B3HTTPHeaders.swift */; };
+		D2EBEE2729BA160F00B15732 /* B3HTTPHeadersWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F773DB29253F8B00AC1A62 /* B3HTTPHeadersWriter.swift */; };
 		D2EBEE2829BA160F00B15732 /* W3CHTTPHeadersWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A728AD9E2934CE5000397996 /* W3CHTTPHeadersWriter.swift */; };
 		D2EBEE2929BA160F00B15732 /* HTTPHeadersWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C5A88324509A0C00DA608C /* HTTPHeadersWriter.swift */; };
 		D2EBEE2A29BA160F00B15732 /* TracingHTTPHeaders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 618E13B02524B8F80098C6B0 /* TracingHTTPHeaders.swift */; };
@@ -1347,20 +1347,20 @@
 		D2EBEE2E29BA161100B15732 /* TracePropagationHeadersWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2EBEDCF29B8A02100B15732 /* TracePropagationHeadersWriter.swift */; };
 		D2EBEE2F29BA161100B15732 /* W3CHTTPHeaders.swift in Sources */ = {isa = PBXBuildFile; fileRef = A728AD9C2934CE4400397996 /* W3CHTTPHeaders.swift */; };
 		D2EBEE3029BA161100B15732 /* TracePropagationHeadersReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2EBEDD229B8A58E00B15732 /* TracePropagationHeadersReader.swift */; };
-		D2EBEE3129BA161100B15732 /* OTelHTTPHeadersReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F773DC29253F8B00AC1A62 /* OTelHTTPHeadersReader.swift */; };
+		D2EBEE3129BA161100B15732 /* B3HTTPHeadersReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F773DC29253F8B00AC1A62 /* B3HTTPHeadersReader.swift */; };
 		D2EBEE3229BA161100B15732 /* W3CHTTPHeadersReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = A728ADA02934CE5D00397996 /* W3CHTTPHeadersReader.swift */; };
 		D2EBEE3329BA161100B15732 /* TraceID.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2EBEDCC29B893D800B15732 /* TraceID.swift */; };
-		D2EBEE3429BA161100B15732 /* OTelHTTPHeaders.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F773D32924EA2D00AC1A62 /* OTelHTTPHeaders.swift */; };
-		D2EBEE3529BA161100B15732 /* OTelHTTPHeadersWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F773DB29253F8B00AC1A62 /* OTelHTTPHeadersWriter.swift */; };
+		D2EBEE3429BA161100B15732 /* B3HTTPHeaders.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F773D32924EA2D00AC1A62 /* B3HTTPHeaders.swift */; };
+		D2EBEE3529BA161100B15732 /* B3HTTPHeadersWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F773DB29253F8B00AC1A62 /* B3HTTPHeadersWriter.swift */; };
 		D2EBEE3629BA161100B15732 /* W3CHTTPHeadersWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A728AD9E2934CE5000397996 /* W3CHTTPHeadersWriter.swift */; };
 		D2EBEE3729BA161100B15732 /* HTTPHeadersWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C5A88324509A0C00DA608C /* HTTPHeadersWriter.swift */; };
 		D2EBEE3829BA161100B15732 /* TracingHTTPHeaders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 618E13B02524B8F80098C6B0 /* TracingHTTPHeaders.swift */; };
-		D2EBEE3B29BA163E00B15732 /* OTelHTTPHeadersReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79B0F60292BB071008742B3 /* OTelHTTPHeadersReaderTests.swift */; };
-		D2EBEE3C29BA163E00B15732 /* OTelHTTPHeadersWriterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79B0F5A292B7C06008742B3 /* OTelHTTPHeadersWriterTests.swift */; };
+		D2EBEE3B29BA163E00B15732 /* B3HTTPHeadersReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79B0F60292BB071008742B3 /* B3HTTPHeadersReaderTests.swift */; };
+		D2EBEE3C29BA163E00B15732 /* B3HTTPHeadersWriterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79B0F5A292B7C06008742B3 /* B3HTTPHeadersWriterTests.swift */; };
 		D2EBEE3D29BA163E00B15732 /* W3CHTTPHeadersWriterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A728ADA22934DB5000397996 /* W3CHTTPHeadersWriterTests.swift */; };
 		D2EBEE3E29BA163E00B15732 /* W3CHTTPHeadersReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A728ADA52934DF2400397996 /* W3CHTTPHeadersReaderTests.swift */; };
-		D2EBEE3F29BA163F00B15732 /* OTelHTTPHeadersReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79B0F60292BB071008742B3 /* OTelHTTPHeadersReaderTests.swift */; };
-		D2EBEE4029BA163F00B15732 /* OTelHTTPHeadersWriterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79B0F5A292B7C06008742B3 /* OTelHTTPHeadersWriterTests.swift */; };
+		D2EBEE3F29BA163F00B15732 /* B3HTTPHeadersReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79B0F60292BB071008742B3 /* B3HTTPHeadersReaderTests.swift */; };
+		D2EBEE4029BA163F00B15732 /* B3HTTPHeadersWriterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79B0F5A292B7C06008742B3 /* B3HTTPHeadersWriterTests.swift */; };
 		D2EBEE4129BA163F00B15732 /* W3CHTTPHeadersWriterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A728ADA22934DB5000397996 /* W3CHTTPHeadersWriterTests.swift */; };
 		D2EBEE4229BA163F00B15732 /* W3CHTTPHeadersReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A728ADA52934DF2400397996 /* W3CHTTPHeadersReaderTests.swift */; };
 		D2EBEE4329BA168200B15732 /* TraceIDGeneratorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B558D32469CDD8001460D3 /* TraceIDGeneratorTests.swift */; };
@@ -2369,13 +2369,13 @@
 		A728ADA52934DF2400397996 /* W3CHTTPHeadersReaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = W3CHTTPHeadersReaderTests.swift; sourceTree = "<group>"; };
 		A728ADAA2934EA2100397996 /* W3CHTTPHeadersWriter+objc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "W3CHTTPHeadersWriter+objc.swift"; sourceTree = "<group>"; };
 		A728ADAD2934EB0300397996 /* DDW3CHTTPHeadersWriter+apiTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "DDW3CHTTPHeadersWriter+apiTests.m"; sourceTree = "<group>"; };
-		A79B0F5A292B7C06008742B3 /* OTelHTTPHeadersWriterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OTelHTTPHeadersWriterTests.swift; sourceTree = "<group>"; };
-		A79B0F5E292BA435008742B3 /* OTelHTTPHeadersWriter+objc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OTelHTTPHeadersWriter+objc.swift"; sourceTree = "<group>"; };
-		A79B0F60292BB071008742B3 /* OTelHTTPHeadersReaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OTelHTTPHeadersReaderTests.swift; sourceTree = "<group>"; };
-		A79B0F63292BD074008742B3 /* DDOTelHTTPHeadersWriter+apiTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "DDOTelHTTPHeadersWriter+apiTests.m"; sourceTree = "<group>"; };
-		A7F773D32924EA2D00AC1A62 /* OTelHTTPHeaders.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OTelHTTPHeaders.swift; sourceTree = "<group>"; };
-		A7F773DB29253F8B00AC1A62 /* OTelHTTPHeadersWriter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OTelHTTPHeadersWriter.swift; sourceTree = "<group>"; };
-		A7F773DC29253F8B00AC1A62 /* OTelHTTPHeadersReader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OTelHTTPHeadersReader.swift; sourceTree = "<group>"; };
+		A79B0F5A292B7C06008742B3 /* B3HTTPHeadersWriterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = B3HTTPHeadersWriterTests.swift; sourceTree = "<group>"; };
+		A79B0F5E292BA435008742B3 /* B3HTTPHeadersWriter+objc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "B3HTTPHeadersWriter+objc.swift"; sourceTree = "<group>"; };
+		A79B0F60292BB071008742B3 /* B3HTTPHeadersReaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = B3HTTPHeadersReaderTests.swift; sourceTree = "<group>"; };
+		A79B0F63292BD074008742B3 /* DDB3HTTPHeadersWriter+apiTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "DDB3HTTPHeadersWriter+apiTests.m"; sourceTree = "<group>"; };
+		A7F773D32924EA2D00AC1A62 /* B3HTTPHeaders.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = B3HTTPHeaders.swift; sourceTree = "<group>"; };
+		A7F773DB29253F8B00AC1A62 /* B3HTTPHeadersWriter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = B3HTTPHeadersWriter.swift; sourceTree = "<group>"; };
+		A7F773DC29253F8B00AC1A62 /* B3HTTPHeadersReader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = B3HTTPHeadersReader.swift; sourceTree = "<group>"; };
 		B3BBBCB0265E71C600943419 /* VitalMemoryReader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VitalMemoryReader.swift; sourceTree = "<group>"; };
 		B3BBBCBB265E71D100943419 /* VitalMemoryReaderTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VitalMemoryReaderTests.swift; sourceTree = "<group>"; };
 		B3FC3C0626526EFF00DEED9E /* VitalInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VitalInfo.swift; sourceTree = "<group>"; };
@@ -4046,7 +4046,7 @@
 			isa = PBXGroup;
 			children = (
 				6132BF4B24A49C8F00D7BD17 /* HTTPHeadersWriter+objc.swift */,
-				A79B0F5E292BA435008742B3 /* OTelHTTPHeadersWriter+objc.swift */,
+				A79B0F5E292BA435008742B3 /* B3HTTPHeadersWriter+objc.swift */,
 				A728ADAA2934EA2100397996 /* W3CHTTPHeadersWriter+objc.swift */,
 			);
 			path = Propagation;
@@ -4593,7 +4593,7 @@
 				6147989B2A459E2B0095CB02 /* DDTrace+apiTests.m */,
 				61B5E42A26DFC433000B0A5F /* DDNSURLSessionDelegate+apiTests.m */,
 				D2B3F051282E826A00C2B5EE /* DDHTTPHeadersWriter+apiTests.m */,
-				A79B0F63292BD074008742B3 /* DDOTelHTTPHeadersWriter+apiTests.m */,
+				A79B0F63292BD074008742B3 /* DDB3HTTPHeadersWriter+apiTests.m */,
 				A728ADAD2934EB0300397996 /* DDW3CHTTPHeadersWriter+apiTests.m */,
 			);
 			path = ObjcAPITests;
@@ -4974,24 +4974,24 @@
 			path = W3C;
 			sourceTree = "<group>";
 		};
-		A7F773D929253F5900AC1A62 /* OpenTracing */ = {
+		A7F773D929253F5900AC1A62 /* Datadog */ = {
 			isa = PBXGroup;
 			children = (
 				618E13B02524B8F80098C6B0 /* TracingHTTPHeaders.swift */,
 				61C5A88324509A0C00DA608C /* HTTPHeadersWriter.swift */,
 				618E13A92524B8700098C6B0 /* HTTPHeadersReader.swift */,
 			);
-			path = OpenTracing;
+			path = Datadog;
 			sourceTree = "<group>";
 		};
-		A7F773DA29253F6200AC1A62 /* OpenTelemetry */ = {
+		A7F773DA29253F6200AC1A62 /* B3 */ = {
 			isa = PBXGroup;
 			children = (
-				A7F773D32924EA2D00AC1A62 /* OTelHTTPHeaders.swift */,
-				A7F773DB29253F8B00AC1A62 /* OTelHTTPHeadersWriter.swift */,
-				A7F773DC29253F8B00AC1A62 /* OTelHTTPHeadersReader.swift */,
+				A7F773D32924EA2D00AC1A62 /* B3HTTPHeaders.swift */,
+				A7F773DB29253F8B00AC1A62 /* B3HTTPHeadersWriter.swift */,
+				A7F773DC29253F8B00AC1A62 /* B3HTTPHeadersReader.swift */,
 			);
-			path = OpenTelemetry;
+			path = B3;
 			sourceTree = "<group>";
 		};
 		B3FC3C0426526EE900DEED9E /* RUMVitals */ = {
@@ -5651,8 +5651,8 @@
 				D2EBEDD229B8A58E00B15732 /* TracePropagationHeadersReader.swift */,
 				D2160CC029C0DED100FAA9A5 /* URLSession */,
 				A728AD992934CE2800397996 /* W3C */,
-				A7F773DA29253F6200AC1A62 /* OpenTelemetry */,
-				A7F773D929253F5900AC1A62 /* OpenTracing */,
+				A7F773DA29253F6200AC1A62 /* B3 */,
+				A7F773D929253F5900AC1A62 /* Datadog */,
 			);
 			path = NetworkInstrumentation;
 			sourceTree = "<group>";
@@ -5668,8 +5668,8 @@
 				D2160CD229C0DF6700FAA9A5 /* URLSessionTaskInterceptionTests.swift */,
 				61E45BCE2450A6EC00F2C652 /* TraceIDTests.swift */,
 				61B558D32469CDD8001460D3 /* TraceIDGeneratorTests.swift */,
-				A79B0F5A292B7C06008742B3 /* OTelHTTPHeadersWriterTests.swift */,
-				A79B0F60292BB071008742B3 /* OTelHTTPHeadersReaderTests.swift */,
+				A79B0F5A292B7C06008742B3 /* B3HTTPHeadersWriterTests.swift */,
+				A79B0F60292BB071008742B3 /* B3HTTPHeadersReaderTests.swift */,
 				A728ADA22934DB5000397996 /* W3CHTTPHeadersWriterTests.swift */,
 				A728ADA52934DF2400397996 /* W3CHTTPHeadersReaderTests.swift */,
 			);
@@ -7406,7 +7406,7 @@
 				D2DA23CD298D5EDD00C6C7E6 /* _InternalProxyTests.swift in Sources */,
 				61133C5B2423990D00786299 /* DirectoryTests.swift in Sources */,
 				610ABD4C2A6930CA00AFEA34 /* TelemetryCoreIntegrationTests.swift in Sources */,
-				A79B0F64292BD074008742B3 /* DDOTelHTTPHeadersWriter+apiTests.m in Sources */,
+				A79B0F64292BD074008742B3 /* DDB3HTTPHeadersWriter+apiTests.m in Sources */,
 				D2B3F052282E827700C2B5EE /* DDHTTPHeadersWriter+apiTests.m in Sources */,
 				D20605B92875729E0047275C /* ContextValuePublisherMock.swift in Sources */,
 				D24C9C4D29A7BA3F002057CF /* LogsMocks.swift in Sources */,
@@ -7459,7 +7459,7 @@
 				6132BF4924A49B6800D7BD17 /* DDSpanContext+objc.swift in Sources */,
 				6132BF4224A38D2400D7BD17 /* OTTracer+objc.swift in Sources */,
 				A728ADAB2934EA2100397996 /* W3CHTTPHeadersWriter+objc.swift in Sources */,
-				A79B0F66292BD7CA008742B3 /* OTelHTTPHeadersWriter+objc.swift in Sources */,
+				A79B0F66292BD7CA008742B3 /* B3HTTPHeadersWriter+objc.swift in Sources */,
 				61133C0E2423983800786299 /* Datadog+objc.swift in Sources */,
 				61133C102423983800786299 /* DDLogs+objc.swift in Sources */,
 				615A4A8324A3431600233986 /* Trace+objc.swift in Sources */,
@@ -7810,7 +7810,7 @@
 				D263BCAF29DAFFEB00FA0E21 /* PerformancePresetOverride.swift in Sources */,
 				D23039E7298D5236001A1FA3 /* NetworkConnectionInfo.swift in Sources */,
 				D23039E9298D5236001A1FA3 /* TrackingConsent.swift in Sources */,
-				D2EBEE2629BA160F00B15732 /* OTelHTTPHeaders.swift in Sources */,
+				D2EBEE2629BA160F00B15732 /* B3HTTPHeaders.swift in Sources */,
 				D23354FC2A42E32000AFCAE2 /* InternalExtended.swift in Sources */,
 				D23039F3298D5236001A1FA3 /* DynamicCodingKey.swift in Sources */,
 				D23039FE298D5236001A1FA3 /* FeatureRequestBuilder.swift in Sources */,
@@ -7844,7 +7844,7 @@
 				D2DE63532A30A7CA00441A54 /* CoreRegistry.swift in Sources */,
 				D2EBEE2829BA160F00B15732 /* W3CHTTPHeadersWriter.swift in Sources */,
 				D23039EA298D5236001A1FA3 /* DeviceInfo.swift in Sources */,
-				D2EBEE2329BA160F00B15732 /* OTelHTTPHeadersReader.swift in Sources */,
+				D2EBEE2329BA160F00B15732 /* B3HTTPHeadersReader.swift in Sources */,
 				D23039F8298D5236001A1FA3 /* InternalLogger.swift in Sources */,
 				D2303A01298D5236001A1FA3 /* DateFormatting.swift in Sources */,
 				D23039F1298D5236001A1FA3 /* AnyDecodable.swift in Sources */,
@@ -7858,7 +7858,7 @@
 				D23039FF298D5236001A1FA3 /* Foundation+Datadog.swift in Sources */,
 				D2F8235329915E12003C7E99 /* DatadogSite.swift in Sources */,
 				D2D3199A29E98D970004F169 /* DefaultJSONEncoder.swift in Sources */,
-				D2EBEE2729BA160F00B15732 /* OTelHTTPHeadersWriter.swift in Sources */,
+				D2EBEE2729BA160F00B15732 /* B3HTTPHeadersWriter.swift in Sources */,
 				D23039E2298D5236001A1FA3 /* UserInfo.swift in Sources */,
 				D23039FB298D5236001A1FA3 /* URLRequestBuilder.swift in Sources */,
 				D23039F6298D5236001A1FA3 /* Attributes.swift in Sources */,
@@ -8466,7 +8466,7 @@
 				61A2CC222A443D330000FF25 /* DDRUMConfigurationTests.swift in Sources */,
 				6176991C2A86121B0030022B /* HTTPClientMock.swift in Sources */,
 				D29294E4291D652D00F8EFF9 /* ApplicationVersionPublisherTests.swift in Sources */,
-				A79B0F65292BD074008742B3 /* DDOTelHTTPHeadersWriter+apiTests.m in Sources */,
+				A79B0F65292BD074008742B3 /* DDB3HTTPHeadersWriter+apiTests.m in Sources */,
 				D2CB6F4327C520D400A62B57 /* DDLogsTests.swift in Sources */,
 				D2CB6F4527C520D400A62B57 /* TracerTests.swift in Sources */,
 				D2CB6F4627C520D400A62B57 /* CoreMocks.swift in Sources */,
@@ -8530,7 +8530,7 @@
 				D2CB6F9B27C5217A00A62B57 /* DDSpanContext+objc.swift in Sources */,
 				D2CB6F9C27C5217A00A62B57 /* OTTracer+objc.swift in Sources */,
 				A728ADAC2934EA2100397996 /* W3CHTTPHeadersWriter+objc.swift in Sources */,
-				A79B0F67292BD7CC008742B3 /* OTelHTTPHeadersWriter+objc.swift in Sources */,
+				A79B0F67292BD7CC008742B3 /* B3HTTPHeadersWriter+objc.swift in Sources */,
 				D2CB6F9E27C5217A00A62B57 /* Datadog+objc.swift in Sources */,
 				D2CB6F9F27C5217A00A62B57 /* DDLogs+objc.swift in Sources */,
 				D2CB6FA027C5217A00A62B57 /* Trace+objc.swift in Sources */,
@@ -8590,7 +8590,7 @@
 				D263BCB029DAFFEB00FA0E21 /* PerformancePresetOverride.swift in Sources */,
 				D2DA2359298D57AA00C6C7E6 /* NetworkConnectionInfo.swift in Sources */,
 				D2DA235A298D57AA00C6C7E6 /* TrackingConsent.swift in Sources */,
-				D2EBEE3429BA161100B15732 /* OTelHTTPHeaders.swift in Sources */,
+				D2EBEE3429BA161100B15732 /* B3HTTPHeaders.swift in Sources */,
 				D23354FD2A42E32000AFCAE2 /* InternalExtended.swift in Sources */,
 				D2DA235B298D57AA00C6C7E6 /* DynamicCodingKey.swift in Sources */,
 				D2DA235C298D57AA00C6C7E6 /* FeatureRequestBuilder.swift in Sources */,
@@ -8624,7 +8624,7 @@
 				D2DE63542A30A7CA00441A54 /* CoreRegistry.swift in Sources */,
 				D2EBEE3629BA161100B15732 /* W3CHTTPHeadersWriter.swift in Sources */,
 				D2DA236D298D57AA00C6C7E6 /* DeviceInfo.swift in Sources */,
-				D2EBEE3129BA161100B15732 /* OTelHTTPHeadersReader.swift in Sources */,
+				D2EBEE3129BA161100B15732 /* B3HTTPHeadersReader.swift in Sources */,
 				D2DA236E298D57AA00C6C7E6 /* InternalLogger.swift in Sources */,
 				D2DA236F298D57AA00C6C7E6 /* DateFormatting.swift in Sources */,
 				D2DA2370298D57AA00C6C7E6 /* AnyDecodable.swift in Sources */,
@@ -8638,7 +8638,7 @@
 				D2DA2375298D57AA00C6C7E6 /* Foundation+Datadog.swift in Sources */,
 				D2F8235429915E12003C7E99 /* DatadogSite.swift in Sources */,
 				D2D3199B29E98D970004F169 /* DefaultJSONEncoder.swift in Sources */,
-				D2EBEE3529BA161100B15732 /* OTelHTTPHeadersWriter.swift in Sources */,
+				D2EBEE3529BA161100B15732 /* B3HTTPHeadersWriter.swift in Sources */,
 				D2DA2376298D57AA00C6C7E6 /* UserInfo.swift in Sources */,
 				D2DA2377298D57AA00C6C7E6 /* URLRequestBuilder.swift in Sources */,
 				D2DA2378298D57AA00C6C7E6 /* Attributes.swift in Sources */,
@@ -8666,7 +8666,7 @@
 			files = (
 				D2160CD629C0DF6700FAA9A5 /* URLSessionSwizzlerTests.swift in Sources */,
 				D26416B62A30E84F00BCD9F7 /* CoreRegistryTest.swift in Sources */,
-				D2EBEE3C29BA163E00B15732 /* OTelHTTPHeadersWriterTests.swift in Sources */,
+				D2EBEE3C29BA163E00B15732 /* B3HTTPHeadersWriterTests.swift in Sources */,
 				D21AE6BC29E5EDAF0064BF29 /* TelemetryTests.swift in Sources */,
 				D2DA23A3298D58F400C6C7E6 /* AnyEncodableTests.swift in Sources */,
 				D263BCB429DB014900FA0E21 /* FixedWidthInteger+ConvenienceTests.swift in Sources */,
@@ -8687,7 +8687,7 @@
 				D2160CDC29C0DF6700FAA9A5 /* HostsSanitizerTests.swift in Sources */,
 				D2F44FB8299AA1DA0074B0D9 /* DataCompressionTests.swift in Sources */,
 				D2160CE029C0DF6700FAA9A5 /* URLSessionDelegateAsSuperclassTests.swift in Sources */,
-				D2EBEE3B29BA163E00B15732 /* OTelHTTPHeadersReaderTests.swift in Sources */,
+				D2EBEE3B29BA163E00B15732 /* B3HTTPHeadersReaderTests.swift in Sources */,
 				D2DA23A9298D58F400C6C7E6 /* FeatureBaggageTests.swift in Sources */,
 				D2A783DA29A530EF003B03BB /* SwiftExtensionsTests.swift in Sources */,
 				D2160CD429C0DF6700FAA9A5 /* NetworkInstrumentationFeatureTests.swift in Sources */,
@@ -8703,7 +8703,7 @@
 			files = (
 				D2160CD729C0DF6700FAA9A5 /* URLSessionSwizzlerTests.swift in Sources */,
 				D26416B72A30E84F00BCD9F7 /* CoreRegistryTest.swift in Sources */,
-				D2EBEE4029BA163F00B15732 /* OTelHTTPHeadersWriterTests.swift in Sources */,
+				D2EBEE4029BA163F00B15732 /* B3HTTPHeadersWriterTests.swift in Sources */,
 				D21AE6BD29E5EDAF0064BF29 /* TelemetryTests.swift in Sources */,
 				D2DA23B1298D59DC00C6C7E6 /* AnyEncodableTests.swift in Sources */,
 				D263BCB529DB014900FA0E21 /* FixedWidthInteger+ConvenienceTests.swift in Sources */,
@@ -8724,7 +8724,7 @@
 				D2160CDD29C0DF6700FAA9A5 /* HostsSanitizerTests.swift in Sources */,
 				D2F44FB9299AA1DB0074B0D9 /* DataCompressionTests.swift in Sources */,
 				D2160CE129C0DF6700FAA9A5 /* URLSessionDelegateAsSuperclassTests.swift in Sources */,
-				D2EBEE3F29BA163F00B15732 /* OTelHTTPHeadersReaderTests.swift in Sources */,
+				D2EBEE3F29BA163F00B15732 /* B3HTTPHeadersReaderTests.swift in Sources */,
 				D2DA23B7298D59DC00C6C7E6 /* FeatureBaggageTests.swift in Sources */,
 				D2A783D929A530EF003B03BB /* SwiftExtensionsTests.swift in Sources */,
 				D2160CD529C0DF6700FAA9A5 /* NetworkInstrumentationFeatureTests.swift in Sources */,
diff --git a/Datadog/Example/Debugging/DebugManualTraceInjectionViewController.swift b/Datadog/Example/Debugging/DebugManualTraceInjectionViewController.swift
index 168f422bb5..2d56e0d42f 100644
--- a/Datadog/Example/Debugging/DebugManualTraceInjectionViewController.swift
+++ b/Datadog/Example/Debugging/DebugManualTraceInjectionViewController.swift
@@ -115,11 +115,11 @@ internal struct DebugManualTraceInjectionView: View {
             Tracer.shared().inject(spanContext: span.context, writer: writer)
             writer.traceHeaderFields.forEach { request.setValue($0.value, forHTTPHeaderField: $0.key) }
         case .b3Single:
-            let writer = OTelHTTPHeadersWriter(sampleRate: sampleRate, injectEncoding: .single)
+            let writer = B3HTTPHeadersWriter(sampleRate: sampleRate, injectEncoding: .single)
             Tracer.shared().inject(spanContext: span.context, writer: writer)
             writer.traceHeaderFields.forEach { request.setValue($0.value, forHTTPHeaderField: $0.key) }
         case .b3Multiple:
-            let writer = OTelHTTPHeadersWriter(sampleRate: sampleRate, injectEncoding: .multiple)
+            let writer = B3HTTPHeadersWriter(sampleRate: sampleRate, injectEncoding: .multiple)
             Tracer.shared().inject(spanContext: span.context, writer: writer)
             writer.traceHeaderFields.forEach { request.setValue($0.value, forHTTPHeaderField: $0.key) }
         }
diff --git a/DatadogCore/Tests/Datadog/TracerTests.swift b/DatadogCore/Tests/Datadog/TracerTests.swift
index 997441a563..d56f931d0f 100644
--- a/DatadogCore/Tests/Datadog/TracerTests.swift
+++ b/DatadogCore/Tests/Datadog/TracerTests.swift
@@ -744,14 +744,14 @@ class TracerTests: XCTestCase {
         XCTAssertEqual(httpHeadersWriter.traceHeaderFields, expectedHTTPHeaders2)
     }
 
-    func testItInjectsSpanContextWithOTelHTTPHeadersWriter_usingMultipleHeaders() {
+    func testItInjectsSpanContextWithB3HTTPHeadersWriter_usingMultipleHeaders() {
         Trace.enable(with: config, in: core)
         let tracer = Tracer.shared(in: core)
         let spanContext1 = DDSpanContext(traceID: 1, spanID: 2, parentSpanID: 3, baggageItems: .mockAny())
         let spanContext2 = DDSpanContext(traceID: 4, spanID: 5, parentSpanID: 6, baggageItems: .mockAny())
         let spanContext3 = DDSpanContext(traceID: 77, spanID: 88, parentSpanID: nil, baggageItems: .mockAny())
 
-        let httpHeadersWriter = OTelHTTPHeadersWriter(sampler: .mockKeepAll(), injectEncoding: .multiple)
+        let httpHeadersWriter = B3HTTPHeadersWriter(sampler: .mockKeepAll(), injectEncoding: .multiple)
         XCTAssertEqual(httpHeadersWriter.traceHeaderFields, [:])
 
         // When
@@ -790,14 +790,14 @@ class TracerTests: XCTestCase {
         XCTAssertEqual(httpHeadersWriter.traceHeaderFields, expectedHTTPHeaders3)
     }
 
-    func testItInjectsSpanContextWithOTelHTTPHeadersWriter_usingSingleHeader() {
+    func testItInjectsSpanContextWithB3HTTPHeadersWriter_usingSingleHeader() {
         Trace.enable(with: config, in: core)
         let tracer = Tracer.shared(in: core)
         let spanContext1 = DDSpanContext(traceID: 1, spanID: 2, parentSpanID: 3, baggageItems: .mockAny())
         let spanContext2 = DDSpanContext(traceID: 4, spanID: 5, parentSpanID: 6, baggageItems: .mockAny())
         let spanContext3 = DDSpanContext(traceID: 77, spanID: 88, parentSpanID: nil, baggageItems: .mockAny())
 
-        let httpHeadersWriter = OTelHTTPHeadersWriter(sampler: .mockKeepAll(), injectEncoding: .single)
+        let httpHeadersWriter = B3HTTPHeadersWriter(sampler: .mockKeepAll(), injectEncoding: .single)
         XCTAssertEqual(httpHeadersWriter.traceHeaderFields, [:])
 
         // When
@@ -828,12 +828,12 @@ class TracerTests: XCTestCase {
         XCTAssertEqual(httpHeadersWriter.traceHeaderFields, expectedHTTPHeaders3)
     }
 
-    func testItInjectsRejectedSpanContextWithOTelHTTPHeadersWriter_usingSingleHeader() {
+    func testItInjectsRejectedSpanContextWithB3HTTPHeadersWriter_usingSingleHeader() {
         Trace.enable(with: config, in: core)
         let tracer = Tracer.shared(in: core)
         let spanContext = DDSpanContext(traceID: 1, spanID: 2, parentSpanID: .mockAny(), baggageItems: .mockAny())
 
-        let httpHeadersWriter = OTelHTTPHeadersWriter(sampler: .mockRejectAll())
+        let httpHeadersWriter = B3HTTPHeadersWriter(sampler: .mockRejectAll())
         XCTAssertEqual(httpHeadersWriter.traceHeaderFields, [:])
 
         // When
@@ -846,12 +846,12 @@ class TracerTests: XCTestCase {
         XCTAssertEqual(httpHeadersWriter.traceHeaderFields, expectedHTTPHeaders)
     }
 
-    func testItInjectsRejectedSpanContextWithOTelHTTPHeadersWriter_usingMultipleHeader() {
+    func testItInjectsRejectedSpanContextWithB3HTTPHeadersWriter_usingMultipleHeader() {
         Trace.enable(with: config, in: core)
         let tracer = Tracer.shared(in: core)
         let spanContext = DDSpanContext(traceID: 1, spanID: 2, parentSpanID: .mockAny(), baggageItems: .mockAny())
 
-        let httpHeadersWriter = OTelHTTPHeadersWriter(sampler: .mockRejectAll(), injectEncoding: .multiple)
+        let httpHeadersWriter = B3HTTPHeadersWriter(sampler: .mockRejectAll(), injectEncoding: .multiple)
         XCTAssertEqual(httpHeadersWriter.traceHeaderFields, [:])
 
         // When
@@ -956,15 +956,15 @@ class TracerTests: XCTestCase {
         XCTAssertNil(extractedSpanContext?.dd.parentSpanID)
     }
 
-    func testItExtractsSpanContextWithOTelHTTPHeadersReader_forMultipleHeaders() {
+    func testItExtractsSpanContextWithB3HTTPHeadersReader_forMultipleHeaders() {
         Trace.enable(with: config, in: core)
         let tracer = Tracer.shared(in: core)
         let injectedSpanContext = DDSpanContext(traceID: 1, spanID: 2, parentSpanID: 3, baggageItems: .mockAny())
 
-        let httpHeadersWriter = OTelHTTPHeadersWriter(sampler: .mockKeepAll(), injectEncoding: .multiple)
+        let httpHeadersWriter = B3HTTPHeadersWriter(sampler: .mockKeepAll(), injectEncoding: .multiple)
         tracer.inject(spanContext: injectedSpanContext, writer: httpHeadersWriter)
 
-        let httpHeadersReader = OTelHTTPHeadersReader(
+        let httpHeadersReader = B3HTTPHeadersReader(
             httpHeaderFields: httpHeadersWriter.traceHeaderFields
         )
         let extractedSpanContext = tracer.extract(reader: httpHeadersReader)
@@ -974,15 +974,15 @@ class TracerTests: XCTestCase {
         XCTAssertEqual(extractedSpanContext?.dd.parentSpanID, injectedSpanContext.dd.parentSpanID)
     }
 
-    func testItExtractsSpanContextWithOTelHTTPHeadersReader_forSingleHeader() {
+    func testItExtractsSpanContextWithB3HTTPHeadersReader_forSingleHeader() {
         Trace.enable(with: config, in: core)
         let tracer = Tracer.shared(in: core)
         let injectedSpanContext = DDSpanContext(traceID: 1, spanID: 2, parentSpanID: 3, baggageItems: .mockAny())
 
-        let httpHeadersWriter = OTelHTTPHeadersWriter(sampler: .mockKeepAll(), injectEncoding: .single)
+        let httpHeadersWriter = B3HTTPHeadersWriter(sampler: .mockKeepAll(), injectEncoding: .single)
         tracer.inject(spanContext: injectedSpanContext, writer: httpHeadersWriter)
 
-        let httpHeadersReader = OTelHTTPHeadersReader(
+        let httpHeadersReader = B3HTTPHeadersReader(
             httpHeaderFields: httpHeadersWriter.traceHeaderFields
         )
         let extractedSpanContext = tracer.extract(reader: httpHeadersReader)
diff --git a/DatadogCore/Tests/DatadogObjc/DDTracerTests.swift b/DatadogCore/Tests/DatadogObjc/DDTracerTests.swift
index cbf24a0f68..b633963c90 100644
--- a/DatadogCore/Tests/DatadogObjc/DDTracerTests.swift
+++ b/DatadogCore/Tests/DatadogObjc/DDTracerTests.swift
@@ -248,14 +248,14 @@ class DDTracerTests: XCTestCase {
         )
     }
 
-    func testInjectingSpanContextToValidCarrierAndFormatForOTel() throws {
+    func testInjectingSpanContextToValidCarrierAndFormatForB3() throws {
         Trace.enable(with: config)
         let objcTracer = DDTracer.shared()
         let objcSpanContext = DDSpanContextObjc(
             swiftSpanContext: DDSpanContext.mockWith(traceID: 1, spanID: 2)
         )
 
-        let objcWriter = DDOTelHTTPHeadersWriter(sampleRate: 100)
+        let objcWriter = DDB3HTTPHeadersWriter(sampleRate: 100)
         try objcTracer.inject(objcSpanContext, format: OT.formatTextMap, carrier: objcWriter)
 
         let expectedHTTPHeaders = [
@@ -264,14 +264,14 @@ class DDTracerTests: XCTestCase {
         XCTAssertEqual(objcWriter.traceHeaderFields, expectedHTTPHeaders)
     }
 
-    func testInjectingRejectedSpanContextToValidCarrierAndFormatForOTel() throws {
+    func testInjectingRejectedSpanContextToValidCarrierAndFormatForB3() throws {
         Trace.enable(with: config)
         let objcTracer = DDTracer.shared()
         let objcSpanContext = DDSpanContextObjc(
             swiftSpanContext: DDSpanContext.mockWith(traceID: 1, spanID: 2)
         )
 
-        let objcWriter = DDOTelHTTPHeadersWriter(sampleRate: 0)
+        let objcWriter = DDB3HTTPHeadersWriter(sampleRate: 0)
         try objcTracer.inject(objcSpanContext, format: OT.formatTextMap, carrier: objcWriter)
 
         let expectedHTTPHeaders = [
@@ -280,12 +280,12 @@ class DDTracerTests: XCTestCase {
         XCTAssertEqual(objcWriter.traceHeaderFields, expectedHTTPHeaders)
     }
 
-    func testInjectingSpanContextToInvalidCarrierOrFormatForOTel() throws {
+    func testInjectingSpanContextToInvalidCarrierOrFormatForB3() throws {
         Trace.enable(with: config)
         let objcTracer = DDTracer.shared()
         let objcSpanContext = DDSpanContextObjc(swiftSpanContext: DDSpanContext.mockWith(traceID: 1, spanID: 2))
 
-        let objcValidWriter = DDOTelHTTPHeadersWriter(sampleRate: 100)
+        let objcValidWriter = DDB3HTTPHeadersWriter(sampleRate: 100)
         let objcInvalidFormat = "foo"
         XCTAssertThrowsError(
             try objcTracer.inject(objcSpanContext, format: objcInvalidFormat, carrier: objcValidWriter)
diff --git a/DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDOTelHTTPHeadersWriter+apiTests.m b/DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDB3HTTPHeadersWriter+apiTests.m
similarity index 72%
rename from DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDOTelHTTPHeadersWriter+apiTests.m
rename to DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDB3HTTPHeadersWriter+apiTests.m
index c3d2d5a18a..57beff0c08 100644
--- a/DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDOTelHTTPHeadersWriter+apiTests.m
+++ b/DatadogCore/Tests/DatadogObjc/ObjcAPITests/DDB3HTTPHeadersWriter+apiTests.m
@@ -7,19 +7,19 @@
 #import <XCTest/XCTest.h>
 @import DatadogObjc;
 
-@interface DDOTelHTTPHeadersWriter_apiTests : XCTestCase
+@interface DDB3HTTPHeadersWriter_apiTests : XCTestCase
 @end
 
 /*
  * `DatadogObjc` APIs smoke tests - only check if the interface is available to Objc.
  */
-@implementation DDOTelHTTPHeadersWriter_apiTests
+@implementation DDB3HTTPHeadersWriter_apiTests
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-value"
 
 - (void)testInitWithSamplingRate {
-    [[DDOTelHTTPHeadersWriter alloc] initWithSampleRate:100 injectEncoding:DDInjectEncodingSingle];
+    [[DDB3HTTPHeadersWriter alloc] initWithSampleRate:100 injectEncoding:DDInjectEncodingSingle];
 }
 
 #pragma clang diagnostic pop
diff --git a/DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeaders.swift b/DatadogInternal/Sources/NetworkInstrumentation/B3/B3HTTPHeaders.swift
similarity index 93%
rename from DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeaders.swift
rename to DatadogInternal/Sources/NetworkInstrumentation/B3/B3HTTPHeaders.swift
index fbc628e038..0d2886a2ab 100644
--- a/DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeaders.swift
+++ b/DatadogInternal/Sources/NetworkInstrumentation/B3/B3HTTPHeaders.swift
@@ -6,9 +6,12 @@
 
 import Foundation
 
-/// Open Telemetry propagation headers as explained in
+@available(*, deprecated, renamed: "B3HTTPHeaders")
+public typealias OTelHTTPHeaders = B3HTTPHeaders
+
+/// B3 propagation headers as explained in
 /// https://github.com/openzipkin/b3-propagation/blob/master/RATIONALE.md
-public enum OTelHTTPHeaders {
+public enum B3HTTPHeaders {
     public enum Multiple {
         /// The `X-B3-TraceId` header is encoded as 32 or 16 lower-hex characters.
         /// For example, a 128-bit TraceId header might look like: `X-B3-TraceId: 463ac35c9f6413ad48485a3953bb6124`.
diff --git a/DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeadersReader.swift b/DatadogInternal/Sources/NetworkInstrumentation/B3/B3HTTPHeadersReader.swift
similarity index 69%
rename from DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeadersReader.swift
rename to DatadogInternal/Sources/NetworkInstrumentation/B3/B3HTTPHeadersReader.swift
index 3ca0604b48..528943d0a7 100644
--- a/DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeadersReader.swift
+++ b/DatadogInternal/Sources/NetworkInstrumentation/B3/B3HTTPHeadersReader.swift
@@ -6,7 +6,10 @@
 
 import Foundation
 
-public class OTelHTTPHeadersReader: TracePropagationHeadersReader {
+@available(*, deprecated, renamed: "B3HTTPHeadersReader")
+public typealias OTelHTTPHeadersReader = B3HTTPHeadersReader
+
+public class B3HTTPHeadersReader: TracePropagationHeadersReader {
     private let httpHeaderFields: [String: String]
 
     public init(httpHeaderFields: [String: String]) {
@@ -14,20 +17,20 @@ public class OTelHTTPHeadersReader: TracePropagationHeadersReader {
     }
 
     public func read() -> (traceID: TraceID, spanID: SpanID, parentSpanID: SpanID?)? {
-        if let traceIDValue = httpHeaderFields[OTelHTTPHeaders.Multiple.traceIDField],
-           let spanIDValue = httpHeaderFields[OTelHTTPHeaders.Multiple.spanIDField],
+        if let traceIDValue = httpHeaderFields[B3HTTPHeaders.Multiple.traceIDField],
+           let spanIDValue = httpHeaderFields[B3HTTPHeaders.Multiple.spanIDField],
            let traceID = TraceID(traceIDValue, representation: .hexadecimal),
            let spanID = TraceID(spanIDValue, representation: .hexadecimal) {
             return (
                 traceID: traceID,
                 spanID: spanID,
-                parentSpanID: httpHeaderFields[OTelHTTPHeaders.Multiple.parentSpanIDField]
+                parentSpanID: httpHeaderFields[B3HTTPHeaders.Multiple.parentSpanIDField]
                     .flatMap { TraceID($0, representation: .hexadecimal) }
             )
         }
 
-        let b3Value = httpHeaderFields[OTelHTTPHeaders.Single.b3Field]?
-            .components(separatedBy: OTelHTTPHeaders.Constants.b3Separator)
+        let b3Value = httpHeaderFields[B3HTTPHeaders.Single.b3Field]?
+            .components(separatedBy: B3HTTPHeaders.Constants.b3Separator)
 
         if let traceIDValue = b3Value?[safe: 0],
            let spanIDValue = b3Value?[safe: 1],
diff --git a/DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeadersWriter.swift b/DatadogInternal/Sources/NetworkInstrumentation/B3/B3HTTPHeadersWriter.swift
similarity index 76%
rename from DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeadersWriter.swift
rename to DatadogInternal/Sources/NetworkInstrumentation/B3/B3HTTPHeadersWriter.swift
index b5753b0b35..b6b219d9e6 100644
--- a/DatadogInternal/Sources/NetworkInstrumentation/OpenTelemetry/OTelHTTPHeadersWriter.swift
+++ b/DatadogInternal/Sources/NetworkInstrumentation/B3/B3HTTPHeadersWriter.swift
@@ -6,14 +6,17 @@
 
 import Foundation
 
-/// The `OTelHTTPHeadersWriter` class facilitates the injection of trace propagation headers into network requests
+@available(*, deprecated, renamed: "B3HTTPHeadersWriter")
+public typealias OTelHTTPHeadersWriter = B3HTTPHeadersWriter
+
+/// The `B3HTTPHeadersWriter` class facilitates the injection of trace propagation headers into network requests
 /// targeted at a backend expecting [B3 propagation format](https://github.com/openzipkin/b3-propagation).
 ///
 /// Usage:
 ///
 ///     var request = URLRequest(...)
 ///
-///     let writer = OTelHTTPHeadersWriter(injectEncoding: .single)
+///     let writer = B3HTTPHeadersWriter(injectEncoding: .single)
 ///     let span = Tracer.shared().startRootSpan(operationName: "network request")
 ///     Tracer.shared().inject(spanContext: span.context, writer: writer)
 ///
@@ -23,8 +26,8 @@ import Foundation
 ///
 ///     // call span.finish() when the request completes
 ///
-public class OTelHTTPHeadersWriter: TracePropagationHeadersWriter {
-    /// Enumerates Open Telemetry header encoding options.
+public class B3HTTPHeadersWriter: TracePropagationHeadersWriter {
+    /// Enumerates B3 header encoding options.
     ///
     /// There are two encodings of B3 propagation:
     /// [Single Header](https://github.com/openzipkin/b3-propagation#single-header)
@@ -66,7 +69,7 @@ public class OTelHTTPHeadersWriter: TracePropagationHeadersWriter {
     /// Initializes the headers writer.
     ///
     /// - Parameter samplingRate: The sampling rate applied for headers injection.
-    /// - Parameter injectEncoding: The OTel header encoding type, with `.single` as the default.
+    /// - Parameter injectEncoding: The B3 header encoding type, with `.single` as the default.
     @available(*, deprecated, message: "This will be removed in future versions of the SDK. Use `init(sampleRate:injectEncoding:)` instead.")
     public convenience init(
         samplingRate: Float,
@@ -78,7 +81,7 @@ public class OTelHTTPHeadersWriter: TracePropagationHeadersWriter {
     /// Initializes the headers writer.
     ///
     /// - Parameter sampleRate: The sampling rate applied for headers injection, with 20% as the default.
-    /// - Parameter injectEncoding: The OTel header encoding type, with `.single` as the default.
+    /// - Parameter injectEncoding: The B3 header encoding type, with `.single` as the default.
     public convenience init(
         sampleRate: Float = 20,
         injectEncoding: InjectEncoding = .single
@@ -92,7 +95,7 @@ public class OTelHTTPHeadersWriter: TracePropagationHeadersWriter {
     /// Initializes the headers writer.
     ///
     /// - Parameter sampler: The sampler used for headers injection.
-    /// - Parameter injectEncoding: The OTel header encoding type, with `.single` as the default.
+    /// - Parameter injectEncoding: The B3 header encoding type, with `.single` as the default.
     public init(
         sampler: Sampler,
         injectEncoding: InjectEncoding = .single
@@ -109,22 +112,22 @@ public class OTelHTTPHeadersWriter: TracePropagationHeadersWriter {
     public func write(traceID: TraceID, spanID: SpanID, parentSpanID: SpanID?) {
         let samplingPriority = sampler.sample()
 
-        typealias Constants = OTelHTTPHeaders.Constants
+        typealias Constants = B3HTTPHeaders.Constants
 
         switch injectEncoding {
         case .multiple:
             traceHeaderFields = [
-                OTelHTTPHeaders.Multiple.sampledField: samplingPriority ? Constants.sampledValue : Constants.unsampledValue
+                B3HTTPHeaders.Multiple.sampledField: samplingPriority ? Constants.sampledValue : Constants.unsampledValue
             ]
 
             if samplingPriority {
-                traceHeaderFields[OTelHTTPHeaders.Multiple.traceIDField] = String(traceID, representation: .hexadecimal32Chars)
-                traceHeaderFields[OTelHTTPHeaders.Multiple.spanIDField] = String(spanID, representation: .hexadecimal16Chars)
-                traceHeaderFields[OTelHTTPHeaders.Multiple.parentSpanIDField] = parentSpanID.map { String($0, representation: .hexadecimal16Chars) }
+                traceHeaderFields[B3HTTPHeaders.Multiple.traceIDField] = String(traceID, representation: .hexadecimal32Chars)
+                traceHeaderFields[B3HTTPHeaders.Multiple.spanIDField] = String(spanID, representation: .hexadecimal16Chars)
+                traceHeaderFields[B3HTTPHeaders.Multiple.parentSpanIDField] = parentSpanID.map { String($0, representation: .hexadecimal16Chars) }
             }
         case .single:
             if samplingPriority {
-                traceHeaderFields[OTelHTTPHeaders.Single.b3Field] = [
+                traceHeaderFields[B3HTTPHeaders.Single.b3Field] = [
                     String(traceID, representation: .hexadecimal32Chars),
                     String(spanID, representation: .hexadecimal16Chars),
                     samplingPriority ? Constants.sampledValue : Constants.unsampledValue,
@@ -133,7 +136,7 @@ public class OTelHTTPHeadersWriter: TracePropagationHeadersWriter {
                 .compactMap { $0 }
                 .joined(separator: Constants.b3Separator)
             } else {
-                traceHeaderFields[OTelHTTPHeaders.Single.b3Field] = Constants.unsampledValue
+                traceHeaderFields[B3HTTPHeaders.Single.b3Field] = Constants.unsampledValue
             }
         }
     }
diff --git a/DatadogInternal/Sources/NetworkInstrumentation/OpenTracing/HTTPHeadersReader.swift b/DatadogInternal/Sources/NetworkInstrumentation/Datadog/HTTPHeadersReader.swift
similarity index 100%
rename from DatadogInternal/Sources/NetworkInstrumentation/OpenTracing/HTTPHeadersReader.swift
rename to DatadogInternal/Sources/NetworkInstrumentation/Datadog/HTTPHeadersReader.swift
diff --git a/DatadogInternal/Sources/NetworkInstrumentation/OpenTracing/HTTPHeadersWriter.swift b/DatadogInternal/Sources/NetworkInstrumentation/Datadog/HTTPHeadersWriter.swift
similarity index 100%
rename from DatadogInternal/Sources/NetworkInstrumentation/OpenTracing/HTTPHeadersWriter.swift
rename to DatadogInternal/Sources/NetworkInstrumentation/Datadog/HTTPHeadersWriter.swift
diff --git a/DatadogInternal/Sources/NetworkInstrumentation/OpenTracing/TracingHTTPHeaders.swift b/DatadogInternal/Sources/NetworkInstrumentation/Datadog/TracingHTTPHeaders.swift
similarity index 100%
rename from DatadogInternal/Sources/NetworkInstrumentation/OpenTracing/TracingHTTPHeaders.swift
rename to DatadogInternal/Sources/NetworkInstrumentation/Datadog/TracingHTTPHeaders.swift
diff --git a/DatadogInternal/Sources/NetworkInstrumentation/NetworkInstrumentationFeature.swift b/DatadogInternal/Sources/NetworkInstrumentation/NetworkInstrumentationFeature.swift
index 722f886db8..5309d351fc 100644
--- a/DatadogInternal/Sources/NetworkInstrumentation/NetworkInstrumentationFeature.swift
+++ b/DatadogInternal/Sources/NetworkInstrumentation/NetworkInstrumentationFeature.swift
@@ -175,7 +175,7 @@ extension NetworkInstrumentationFeature {
         if tracingHeaderTypes.contains(.datadog) {
             reader = HTTPHeadersReader(httpHeaderFields: headers)
         } else if tracingHeaderTypes.contains(.b3) || tracingHeaderTypes.contains(.b3multi) {
-            reader = OTelHTTPHeadersReader(httpHeaderFields: headers)
+            reader = B3HTTPHeadersReader(httpHeaderFields: headers)
         } else {
             reader = W3CHTTPHeadersReader(httpHeaderFields: headers)
         }
diff --git a/DatadogInternal/Tests/NetworkInstrumentation/OTelHTTPHeadersReaderTests.swift b/DatadogInternal/Tests/NetworkInstrumentation/B3HTTPHeadersReaderTests.swift
similarity index 52%
rename from DatadogInternal/Tests/NetworkInstrumentation/OTelHTTPHeadersReaderTests.swift
rename to DatadogInternal/Tests/NetworkInstrumentation/B3HTTPHeadersReaderTests.swift
index 93774b0e7d..7c4b5331ee 100644
--- a/DatadogInternal/Tests/NetworkInstrumentation/OTelHTTPHeadersReaderTests.swift
+++ b/DatadogInternal/Tests/NetworkInstrumentation/B3HTTPHeadersReaderTests.swift
@@ -7,71 +7,71 @@
 import XCTest
 import DatadogInternal
 
-class OTelHTTPHeadersReaderTests: XCTestCase {
-    func testOTelHTTPHeadersReaderreadsSingleHeader() {
-        let oTelHTTPHeadersReader = OTelHTTPHeadersReader(httpHeaderFields: ["b3": "4d2-929-1-162e"])
+class B3HTTPHeadersReaderTests: XCTestCase {
+    func testItReadsSingleHeader() {
+        let reader = B3HTTPHeadersReader(httpHeaderFields: ["b3": "4d2-929-1-162e"])
 
-        let ids = oTelHTTPHeadersReader.read()
+        let ids = reader.read()
 
         XCTAssertEqual(ids?.traceID, 1_234)
         XCTAssertEqual(ids?.spanID, 2_345)
         XCTAssertEqual(ids?.parentSpanID, 5_678)
     }
 
-    func testOTelHTTPHeadersReaderreadsSingleHeaderWithSampling() {
-        let oTelHTTPHeadersReader = OTelHTTPHeadersReader(httpHeaderFields: ["b3": "0"])
+    func testItReadsSingleHeaderWithSampling() {
+        let reader = B3HTTPHeadersReader(httpHeaderFields: ["b3": "0"])
 
-        let ids = oTelHTTPHeadersReader.read()
+        let ids = reader.read()
 
         XCTAssertNil(ids?.traceID)
         XCTAssertNil(ids?.spanID)
         XCTAssertNil(ids?.parentSpanID)
     }
 
-    func testOTelHTTPHeadersReaderreadsSingleHeaderWithoutOptionalValues() {
-        let oTelHTTPHeadersReader = OTelHTTPHeadersReader(httpHeaderFields: ["b3": "4d2-929"])
+    func testItReadsSingleHeaderWithoutOptionalValues() {
+        let reader = B3HTTPHeadersReader(httpHeaderFields: ["b3": "4d2-929"])
 
-        let ids = oTelHTTPHeadersReader.read()
+        let ids = reader.read()
 
         XCTAssertEqual(ids?.traceID, 1_234)
         XCTAssertEqual(ids?.spanID, 2_345)
         XCTAssertNil(ids?.parentSpanID)
     }
 
-    func testOTelHTTPHeadersReaderreadsMultipleHeader() {
-        let oTelHTTPHeadersReader = OTelHTTPHeadersReader(httpHeaderFields: [
+    func testItReadsMultipleHeader() {
+        let reader = B3HTTPHeadersReader(httpHeaderFields: [
             "X-B3-TraceId": "4d2",
             "X-B3-SpanId": "929",
             "X-B3-Sampled": "1",
             "X-B3-ParentSpanId": "162e"
         ])
 
-        let ids = oTelHTTPHeadersReader.read()
+        let ids = reader.read()
 
         XCTAssertEqual(ids?.traceID, 1_234)
         XCTAssertEqual(ids?.spanID, 2_345)
         XCTAssertEqual(ids?.parentSpanID, 5_678)
     }
 
-    func testOTelHTTPHeadersReaderreadsMultipleHeaderWithSampling() {
-        let oTelHTTPHeadersReader = OTelHTTPHeadersReader(httpHeaderFields: [
+    func testItReadsMultipleHeaderWithSampling() {
+        let reader = B3HTTPHeadersReader(httpHeaderFields: [
             "X-B3-Sampled": "0"
         ])
 
-        let ids = oTelHTTPHeadersReader.read()
+        let ids = reader.read()
 
         XCTAssertNil(ids?.traceID)
         XCTAssertNil(ids?.spanID)
         XCTAssertNil(ids?.parentSpanID)
     }
 
-    func testOTelHTTPHeadersReaderreadsMultipleHeaderWithoutOptionalValues() {
-        let oTelHTTPHeadersReader = OTelHTTPHeadersReader(httpHeaderFields: [
+    func testItReadsMultipleHeaderWithoutOptionalValues() {
+        let reader = B3HTTPHeadersReader(httpHeaderFields: [
             "X-B3-TraceId": "4d2",
             "X-B3-SpanId": "929"
         ])
 
-        let ids = oTelHTTPHeadersReader.read()
+        let ids = reader.read()
 
         XCTAssertEqual(ids?.traceID, 1_234)
         XCTAssertEqual(ids?.spanID, 2_345)
diff --git a/DatadogInternal/Tests/NetworkInstrumentation/B3HTTPHeadersWriterTests.swift b/DatadogInternal/Tests/NetworkInstrumentation/B3HTTPHeadersWriterTests.swift
new file mode 100644
index 0000000000..40a3a02ac9
--- /dev/null
+++ b/DatadogInternal/Tests/NetworkInstrumentation/B3HTTPHeadersWriterTests.swift
@@ -0,0 +1,109 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+import XCTest
+@testable import DatadogInternal
+
+class B3HTTPHeadersWriterTests: XCTestCase {
+    func testItWritesSingleHeader() {
+        let sampler: Sampler = .mockKeepAll()
+        let writer = B3HTTPHeadersWriter(
+            sampler: sampler,
+            injectEncoding: .single
+        )
+
+        writer.write(
+            traceID: 1_234,
+            spanID: 2_345,
+            parentSpanID: 5_678
+        )
+
+        let headers = writer.traceHeaderFields
+        XCTAssertEqual(headers[B3HTTPHeaders.Single.b3Field], "000000000000000000000000000004d2-0000000000000929-1-000000000000162e")
+    }
+
+    func testItWritesSingleHeaderWithSampling() {
+        let sampler: Sampler = .mockRejectAll()
+        let writer = B3HTTPHeadersWriter(
+            sampler: sampler,
+            injectEncoding: .single
+        )
+
+        writer.write(
+            traceID: 1_234,
+            spanID: 2_345,
+            parentSpanID: 5_678
+        )
+
+        let headers = writer.traceHeaderFields
+        XCTAssertEqual(headers[B3HTTPHeaders.Single.b3Field], "0")
+    }
+
+    func testItWritesSingleHeaderWithoutOptionalValues() {
+        let sampler: Sampler = .mockKeepAll()
+        let writer = B3HTTPHeadersWriter(
+            sampler: sampler,
+            injectEncoding: .single
+        )
+        writer.write(traceID: 1_234, spanID: 2_345)
+
+        let headers = writer.traceHeaderFields
+        XCTAssertEqual(headers[B3HTTPHeaders.Single.b3Field], "000000000000000000000000000004d2-0000000000000929-1")
+    }
+
+    func testItWritesMultipleHeader() {
+        let sampler: Sampler = .mockKeepAll()
+        let writer = B3HTTPHeadersWriter(
+            sampler: sampler,
+            injectEncoding: .multiple
+        )
+        writer.write(
+            traceID: 1_234,
+            spanID: 2_345,
+            parentSpanID: 5_678
+        )
+
+        let headers = writer.traceHeaderFields
+        XCTAssertEqual(headers[B3HTTPHeaders.Multiple.traceIDField], "000000000000000000000000000004d2")
+        XCTAssertEqual(headers[B3HTTPHeaders.Multiple.spanIDField], "0000000000000929")
+        XCTAssertEqual(headers[B3HTTPHeaders.Multiple.sampledField], "1")
+        XCTAssertEqual(headers[B3HTTPHeaders.Multiple.parentSpanIDField], "000000000000162e")
+    }
+
+    func testItWritesMultipleHeaderWithSampling() {
+        let sampler: Sampler = .mockRejectAll()
+        let writer = B3HTTPHeadersWriter(
+            sampler: sampler,
+            injectEncoding: .multiple
+        )
+        writer.write(
+            traceID: 1_234,
+            spanID: 2_345,
+            parentSpanID: 5_678
+        )
+
+        let headers = writer.traceHeaderFields
+        XCTAssertNil(headers[B3HTTPHeaders.Multiple.traceIDField])
+        XCTAssertNil(headers[B3HTTPHeaders.Multiple.spanIDField])
+        XCTAssertEqual(headers[B3HTTPHeaders.Multiple.sampledField], "0")
+        XCTAssertNil(headers[B3HTTPHeaders.Multiple.parentSpanIDField])
+    }
+
+    func testItWritesMultipleHeaderWithoutOptionalValues() {
+        let sampler: Sampler = .mockKeepAll()
+        let writer = B3HTTPHeadersWriter(
+            sampler: sampler,
+            injectEncoding: .multiple
+        )
+        writer.write(traceID: 1_234, spanID: 2_345)
+
+        let headers = writer.traceHeaderFields
+        XCTAssertEqual(headers[B3HTTPHeaders.Multiple.traceIDField], "000000000000000000000000000004d2")
+        XCTAssertEqual(headers[B3HTTPHeaders.Multiple.spanIDField], "0000000000000929")
+        XCTAssertEqual(headers[B3HTTPHeaders.Multiple.sampledField], "1")
+        XCTAssertNil(headers[B3HTTPHeaders.Multiple.parentSpanIDField])
+    }
+}
diff --git a/DatadogInternal/Tests/NetworkInstrumentation/NetworkInstrumentationFeatureTests.swift b/DatadogInternal/Tests/NetworkInstrumentation/NetworkInstrumentationFeatureTests.swift
index 20861aea5c..24684b92d0 100644
--- a/DatadogInternal/Tests/NetworkInstrumentation/NetworkInstrumentationFeatureTests.swift
+++ b/DatadogInternal/Tests/NetworkInstrumentation/NetworkInstrumentationFeatureTests.swift
@@ -263,7 +263,7 @@ class NetworkInstrumentationFeatureTests: XCTestCase {
     func testGivenOpenTelemetry_b3single_whenInterceptingRequests_itInjectsTrace() throws {
         // Given
         var request: URLRequest = .mockWith(url: "https://test.com")
-        let writer = OTelHTTPHeadersWriter(sampler: .mockKeepAll(), injectEncoding: .single)
+        let writer = B3HTTPHeadersWriter(sampler: .mockKeepAll(), injectEncoding: .single)
         handler.firstPartyHosts = .init(["test.com": [.b3]])
 
         // When
@@ -285,7 +285,7 @@ class NetworkInstrumentationFeatureTests: XCTestCase {
     func testGivenOpenTelemetry_b3multi_whenInterceptingRequests_itInjectsTrace() throws {
         // Given
         var request: URLRequest = .mockWith(url: "https://test.com")
-        let writer = OTelHTTPHeadersWriter(sampler: .mockKeepAll(), injectEncoding: .multiple)
+        let writer = B3HTTPHeadersWriter(sampler: .mockKeepAll(), injectEncoding: .multiple)
         handler.firstPartyHosts = .init(["test.com": [.b3multi]])
 
         // When
diff --git a/DatadogInternal/Tests/NetworkInstrumentation/OTelHTTPHeadersWriterTests.swift b/DatadogInternal/Tests/NetworkInstrumentation/OTelHTTPHeadersWriterTests.swift
deleted file mode 100644
index d57334cda4..0000000000
--- a/DatadogInternal/Tests/NetworkInstrumentation/OTelHTTPHeadersWriterTests.swift
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
- * This product includes software developed at Datadog (https://www.datadoghq.com/).
- * Copyright 2019-Present Datadog, Inc.
- */
-
-import XCTest
-@testable import DatadogInternal
-
-class OTelHTTPHeadersWriterTests: XCTestCase {
-    func testOTelHTTPHeadersWriterwritesSingleHeader() {
-        let sampler: Sampler = .mockKeepAll()
-        let oTelHTTPHeadersWriter = OTelHTTPHeadersWriter(
-            sampler: sampler,
-            injectEncoding: .single
-        )
-
-        oTelHTTPHeadersWriter.write(
-            traceID: 1_234,
-            spanID: 2_345,
-            parentSpanID: 5_678
-        )
-
-        let headers = oTelHTTPHeadersWriter.traceHeaderFields
-        XCTAssertEqual(headers[OTelHTTPHeaders.Single.b3Field], "000000000000000000000000000004d2-0000000000000929-1-000000000000162e")
-    }
-
-    func testOTelHTTPHeadersWriterwritesSingleHeaderWithSampling() {
-        let sampler: Sampler = .mockRejectAll()
-        let oTelHTTPHeadersWriter = OTelHTTPHeadersWriter(
-            sampler: sampler,
-            injectEncoding: .single
-        )
-
-        oTelHTTPHeadersWriter.write(
-            traceID: 1_234,
-            spanID: 2_345,
-            parentSpanID: 5_678
-        )
-
-        let headers = oTelHTTPHeadersWriter.traceHeaderFields
-        XCTAssertEqual(headers[OTelHTTPHeaders.Single.b3Field], "0")
-    }
-
-    func testOTelHTTPHeadersWriterwritesSingleHeaderWithoutOptionalValues() {
-        let sampler: Sampler = .mockKeepAll()
-        let oTelHTTPHeadersWriter = OTelHTTPHeadersWriter(
-            sampler: sampler,
-            injectEncoding: .single
-        )
-        oTelHTTPHeadersWriter.write(traceID: 1_234, spanID: 2_345)
-
-        let headers = oTelHTTPHeadersWriter.traceHeaderFields
-        XCTAssertEqual(headers[OTelHTTPHeaders.Single.b3Field], "000000000000000000000000000004d2-0000000000000929-1")
-    }
-
-    func testOTelHTTPHeadersWriterwritesMultipleHeader() {
-        let sampler: Sampler = .mockKeepAll()
-        let oTelHTTPHeadersWriter = OTelHTTPHeadersWriter(
-            sampler: sampler,
-            injectEncoding: .multiple
-        )
-        oTelHTTPHeadersWriter.write(
-            traceID: 1_234,
-            spanID: 2_345,
-            parentSpanID: 5_678
-        )
-
-        let headers = oTelHTTPHeadersWriter.traceHeaderFields
-        XCTAssertEqual(headers[OTelHTTPHeaders.Multiple.traceIDField], "000000000000000000000000000004d2")
-        XCTAssertEqual(headers[OTelHTTPHeaders.Multiple.spanIDField], "0000000000000929")
-        XCTAssertEqual(headers[OTelHTTPHeaders.Multiple.sampledField], "1")
-        XCTAssertEqual(headers[OTelHTTPHeaders.Multiple.parentSpanIDField], "000000000000162e")
-    }
-
-    func testOTelHTTPHeadersWriterwritesMultipleHeaderWithSampling() {
-        let sampler: Sampler = .mockRejectAll()
-        let oTelHTTPHeadersWriter = OTelHTTPHeadersWriter(
-            sampler: sampler,
-            injectEncoding: .multiple
-        )
-        oTelHTTPHeadersWriter.write(
-            traceID: 1_234,
-            spanID: 2_345,
-            parentSpanID: 5_678
-        )
-
-        let headers = oTelHTTPHeadersWriter.traceHeaderFields
-        XCTAssertNil(headers[OTelHTTPHeaders.Multiple.traceIDField])
-        XCTAssertNil(headers[OTelHTTPHeaders.Multiple.spanIDField])
-        XCTAssertEqual(headers[OTelHTTPHeaders.Multiple.sampledField], "0")
-        XCTAssertNil(headers[OTelHTTPHeaders.Multiple.parentSpanIDField])
-    }
-
-    func testOTelHTTPHeadersWriterwritesMultipleHeaderWithoutOptionalValues() {
-        let sampler: Sampler = .mockKeepAll()
-        let oTelHTTPHeadersWriter = OTelHTTPHeadersWriter(
-            sampler: sampler,
-            injectEncoding: .multiple
-        )
-        oTelHTTPHeadersWriter.write(traceID: 1_234, spanID: 2_345)
-
-        let headers = oTelHTTPHeadersWriter.traceHeaderFields
-        XCTAssertEqual(headers[OTelHTTPHeaders.Multiple.traceIDField], "000000000000000000000000000004d2")
-        XCTAssertEqual(headers[OTelHTTPHeaders.Multiple.spanIDField], "0000000000000929")
-        XCTAssertEqual(headers[OTelHTTPHeaders.Multiple.sampledField], "1")
-        XCTAssertNil(headers[OTelHTTPHeaders.Multiple.parentSpanIDField])
-    }
-}
diff --git a/DatadogObjc/Sources/Trace+objc.swift b/DatadogObjc/Sources/Trace+objc.swift
index 88d96e7101..df3922f091 100644
--- a/DatadogObjc/Sources/Trace+objc.swift
+++ b/DatadogObjc/Sources/Trace+objc.swift
@@ -197,13 +197,13 @@ public class DDTracer: NSObject, DatadogObjc.OTTracer {
                 spanContext: ddspanContext.swiftSpanContext,
                 writer: objcWriter.swiftHTTPHeadersWriter
             )
-        } else if let objcWriter = carrier as? DDOTelHTTPHeadersWriter, format == OT.formatTextMap {
+        } else if let objcWriter = carrier as? DDB3HTTPHeadersWriter, format == OT.formatTextMap {
             guard let ddspanContext = spanContext.dd else {
                 return
             }
             swiftTracer.inject(
                 spanContext: ddspanContext.swiftSpanContext,
-                writer: objcWriter.swiftOTelHTTPHeadersWriter
+                writer: objcWriter.swiftB3HTTPHeadersWriter
             )
         } else if let objcWriter = carrier as? DDW3CHTTPHeadersWriter, format == OT.formatTextMap {
             guard let ddspanContext = spanContext.dd else {
diff --git a/DatadogObjc/Sources/Tracing/Propagation/OTelHTTPHeadersWriter+objc.swift b/DatadogObjc/Sources/Tracing/Propagation/B3HTTPHeadersWriter+objc.swift
similarity index 72%
rename from DatadogObjc/Sources/Tracing/Propagation/OTelHTTPHeadersWriter+objc.swift
rename to DatadogObjc/Sources/Tracing/Propagation/B3HTTPHeadersWriter+objc.swift
index c096da8aa7..2bb596ecf3 100644
--- a/DatadogObjc/Sources/Tracing/Propagation/OTelHTTPHeadersWriter+objc.swift
+++ b/DatadogObjc/Sources/Tracing/Propagation/B3HTTPHeadersWriter+objc.swift
@@ -5,7 +5,7 @@
  */
 
 import Foundation
-import class DatadogInternal.OTelHTTPHeadersWriter
+import class DatadogInternal.B3HTTPHeadersWriter
 
 @objc
 public enum DDInjectEncoding: Int {
@@ -13,7 +13,7 @@ public enum DDInjectEncoding: Int {
     case single = 1
 }
 
-private extension OTelHTTPHeadersWriter.InjectEncoding {
+private extension B3HTTPHeadersWriter.InjectEncoding {
     init(_ value: DDInjectEncoding) {
         switch value {
         case .single:
@@ -25,11 +25,15 @@ private extension OTelHTTPHeadersWriter.InjectEncoding {
 }
 
 @objc
-public class DDOTelHTTPHeadersWriter: NSObject {
-    let swiftOTelHTTPHeadersWriter: OTelHTTPHeadersWriter
+@available(*, deprecated, renamed: "DDB3HTTPHeadersWriter")
+public class DDOTelHTTPHeadersWriter: DDB3HTTPHeadersWriter {}
+
+@objc
+public class DDB3HTTPHeadersWriter: NSObject {
+    let swiftB3HTTPHeadersWriter: B3HTTPHeadersWriter
 
     @objc public var traceHeaderFields: [String: String] {
-        swiftOTelHTTPHeadersWriter.traceHeaderFields
+        swiftB3HTTPHeadersWriter.traceHeaderFields
     }
 
     @objc
@@ -46,7 +50,7 @@ public class DDOTelHTTPHeadersWriter: NSObject {
         sampleRate: Float = 20,
         injectEncoding: DDInjectEncoding = .single
     ) {
-        swiftOTelHTTPHeadersWriter = OTelHTTPHeadersWriter(
+        swiftB3HTTPHeadersWriter = B3HTTPHeadersWriter(
             sampleRate: sampleRate,
             injectEncoding: .init(injectEncoding)
         )
diff --git a/DatadogRUM/Sources/Instrumentation/Resources/URLSessionRUMResourcesHandler.swift b/DatadogRUM/Sources/Instrumentation/Resources/URLSessionRUMResourcesHandler.swift
index 0e4f78761c..10a92419a5 100644
--- a/DatadogRUM/Sources/Instrumentation/Resources/URLSessionRUMResourcesHandler.swift
+++ b/DatadogRUM/Sources/Instrumentation/Resources/URLSessionRUMResourcesHandler.swift
@@ -154,12 +154,12 @@ extension DistributedTracing {
                 // To make sure the generated traces from RUM don’t affect APM Index Spans counts.
                 request.setValue("rum", forHTTPHeaderField: TracingHTTPHeaders.originField)
             case .b3:
-                writer = OTelHTTPHeadersWriter(
+                writer = B3HTTPHeadersWriter(
                     sampler: sampler,
                     injectEncoding: .single
                 )
             case .b3multi:
-                writer = OTelHTTPHeadersWriter(
+                writer = B3HTTPHeadersWriter(
                     sampler: sampler,
                     injectEncoding: .multiple
                 )
diff --git a/DatadogRUM/Tests/Instrumentation/Resources/URLSessionRUMResourcesHandlerTests.swift b/DatadogRUM/Tests/Instrumentation/Resources/URLSessionRUMResourcesHandlerTests.swift
index f7d1686a08..c6e967cdd5 100644
--- a/DatadogRUM/Tests/Instrumentation/Resources/URLSessionRUMResourcesHandlerTests.swift
+++ b/DatadogRUM/Tests/Instrumentation/Resources/URLSessionRUMResourcesHandlerTests.swift
@@ -67,7 +67,7 @@ class URLSessionRUMResourcesHandlerTests: XCTestCase {
         )
 
         XCTAssertNil(request.value(forHTTPHeaderField: TracingHTTPHeaders.originField))
-        XCTAssertEqual(request.value(forHTTPHeaderField: OTelHTTPHeaders.Single.b3Field), "00000000000000000000000000000001-0000000000000001-1")
+        XCTAssertEqual(request.value(forHTTPHeaderField: B3HTTPHeaders.Single.b3Field), "00000000000000000000000000000001-0000000000000001-1")
     }
 
     func testGivenFirstPartyInterception_withSampledTrace_itInjectB3MultiTraceHeaders() throws {
@@ -87,10 +87,10 @@ class URLSessionRUMResourcesHandlerTests: XCTestCase {
         )
 
         XCTAssertNil(request.value(forHTTPHeaderField: TracingHTTPHeaders.originField))
-        XCTAssertEqual(request.value(forHTTPHeaderField: OTelHTTPHeaders.Multiple.traceIDField), "00000000000000000000000000000001")
-        XCTAssertEqual(request.value(forHTTPHeaderField: OTelHTTPHeaders.Multiple.spanIDField), "0000000000000001")
-        XCTAssertNil(request.value(forHTTPHeaderField: OTelHTTPHeaders.Multiple.parentSpanIDField))
-        XCTAssertEqual(request.value(forHTTPHeaderField: OTelHTTPHeaders.Multiple.sampledField), "1")
+        XCTAssertEqual(request.value(forHTTPHeaderField: B3HTTPHeaders.Multiple.traceIDField), "00000000000000000000000000000001")
+        XCTAssertEqual(request.value(forHTTPHeaderField: B3HTTPHeaders.Multiple.spanIDField), "0000000000000001")
+        XCTAssertNil(request.value(forHTTPHeaderField: B3HTTPHeaders.Multiple.parentSpanIDField))
+        XCTAssertEqual(request.value(forHTTPHeaderField: B3HTTPHeaders.Multiple.sampledField), "1")
     }
 
     func testGivenFirstPartyInterception_withSampledTrace_itInjectW3CTraceHeaders() throws {
@@ -152,7 +152,7 @@ class URLSessionRUMResourcesHandlerTests: XCTestCase {
         )
 
         XCTAssertNil(request.value(forHTTPHeaderField: TracingHTTPHeaders.originField))
-        XCTAssertEqual(request.value(forHTTPHeaderField: OTelHTTPHeaders.Single.b3Field), "0")
+        XCTAssertEqual(request.value(forHTTPHeaderField: B3HTTPHeaders.Single.b3Field), "0")
     }
 
     func testGivenFirstPartyInterception_withRejectedTrace_itDoesNotInjectB3MultiTraceHeaders() throws {
@@ -172,10 +172,10 @@ class URLSessionRUMResourcesHandlerTests: XCTestCase {
         )
 
         XCTAssertNil(request.value(forHTTPHeaderField: TracingHTTPHeaders.originField))
-        XCTAssertNil(request.value(forHTTPHeaderField: OTelHTTPHeaders.Multiple.traceIDField))
-        XCTAssertNil(request.value(forHTTPHeaderField: OTelHTTPHeaders.Multiple.spanIDField))
-        XCTAssertNil(request.value(forHTTPHeaderField: OTelHTTPHeaders.Multiple.parentSpanIDField))
-        XCTAssertEqual(request.value(forHTTPHeaderField: OTelHTTPHeaders.Multiple.sampledField), "0")
+        XCTAssertNil(request.value(forHTTPHeaderField: B3HTTPHeaders.Multiple.traceIDField))
+        XCTAssertNil(request.value(forHTTPHeaderField: B3HTTPHeaders.Multiple.spanIDField))
+        XCTAssertNil(request.value(forHTTPHeaderField: B3HTTPHeaders.Multiple.parentSpanIDField))
+        XCTAssertEqual(request.value(forHTTPHeaderField: B3HTTPHeaders.Multiple.sampledField), "0")
     }
 
     func testGivenFirstPartyInterception_withRejectedTrace_itDoesNotInjectW3CTraceHeaders() throws {
diff --git a/DatadogTrace/Sources/DDFormat.swift b/DatadogTrace/Sources/DDFormat.swift
index 785db3de65..01d52cb045 100644
--- a/DatadogTrace/Sources/DDFormat.swift
+++ b/DatadogTrace/Sources/DDFormat.swift
@@ -9,11 +9,11 @@ import DatadogInternal
 
 extension HTTPHeadersReader: OTFormatReader {}
 extension W3CHTTPHeadersReader: OTFormatReader {}
-extension OTelHTTPHeadersReader: OTFormatReader {}
+extension B3HTTPHeadersReader: OTFormatReader {}
 
 extension HTTPHeadersWriter: OTFormatWriter {}
 extension W3CHTTPHeadersWriter: OTFormatWriter {}
-extension OTelHTTPHeadersWriter: OTFormatWriter {}
+extension B3HTTPHeadersWriter: OTFormatWriter {}
 
 extension TracePropagationHeadersWriter where Self: OTFormatWriter {
     public func inject(spanContext: OTSpanContext) {
diff --git a/DatadogTrace/Sources/Integrations/TracingURLSessionHandler.swift b/DatadogTrace/Sources/Integrations/TracingURLSessionHandler.swift
index 989e7ee184..f6f53b139d 100644
--- a/DatadogTrace/Sources/Integrations/TracingURLSessionHandler.swift
+++ b/DatadogTrace/Sources/Integrations/TracingURLSessionHandler.swift
@@ -43,12 +43,12 @@ internal struct TracingURLSessionHandler: DatadogURLSessionHandler {
             case .datadog:
                 writer = HTTPHeadersWriter(sampler: tracingSampler)
             case .b3:
-                writer = OTelHTTPHeadersWriter(
+                writer = B3HTTPHeadersWriter(
                     sampler: tracingSampler,
                     injectEncoding: .single
                 )
             case .b3multi:
-                writer = OTelHTTPHeadersWriter(
+                writer = B3HTTPHeadersWriter(
                     sampler: tracingSampler,
                     injectEncoding: .multiple
                 )
diff --git a/DatadogTrace/Sources/TraceConfiguration.swift b/DatadogTrace/Sources/TraceConfiguration.swift
index fe29b2e994..21c7d58414 100644
--- a/DatadogTrace/Sources/TraceConfiguration.swift
+++ b/DatadogTrace/Sources/TraceConfiguration.swift
@@ -14,7 +14,7 @@ import DatadogInternal
 @_exported import protocol DatadogInternal.__URLSessionDelegateProviding
 
 @_exported import class DatadogInternal.HTTPHeadersWriter
-@_exported import class DatadogInternal.OTelHTTPHeadersWriter
+@_exported import class DatadogInternal.B3HTTPHeadersWriter
 @_exported import class DatadogInternal.W3CHTTPHeadersWriter
 // swiftlint:enable duplicate_imports
 
diff --git a/DatadogTrace/Tests/TracingURLSessionHandlerTests.swift b/DatadogTrace/Tests/TracingURLSessionHandlerTests.swift
index 42ad94f7a2..38439854bb 100644
--- a/DatadogTrace/Tests/TracingURLSessionHandlerTests.swift
+++ b/DatadogTrace/Tests/TracingURLSessionHandlerTests.swift
@@ -65,11 +65,11 @@ class TracingURLSessionHandlerTests: XCTestCase {
         XCTAssertEqual(request.value(forHTTPHeaderField: TracingHTTPHeaders.traceIDField), "1")
         XCTAssertEqual(request.value(forHTTPHeaderField: TracingHTTPHeaders.parentSpanIDField), "1")
         XCTAssertEqual(request.value(forHTTPHeaderField: TracingHTTPHeaders.samplingPriorityField), "1")
-        XCTAssertEqual(request.value(forHTTPHeaderField: OTelHTTPHeaders.Multiple.traceIDField), "00000000000000000000000000000001")
-        XCTAssertEqual(request.value(forHTTPHeaderField: OTelHTTPHeaders.Multiple.spanIDField), "0000000000000001")
-        XCTAssertNil(request.value(forHTTPHeaderField: OTelHTTPHeaders.Multiple.parentSpanIDField))
-        XCTAssertEqual(request.value(forHTTPHeaderField: OTelHTTPHeaders.Multiple.sampledField), "1")
-        XCTAssertEqual(request.value(forHTTPHeaderField: OTelHTTPHeaders.Single.b3Field), "00000000000000000000000000000001-0000000000000001-1")
+        XCTAssertEqual(request.value(forHTTPHeaderField: B3HTTPHeaders.Multiple.traceIDField), "00000000000000000000000000000001")
+        XCTAssertEqual(request.value(forHTTPHeaderField: B3HTTPHeaders.Multiple.spanIDField), "0000000000000001")
+        XCTAssertNil(request.value(forHTTPHeaderField: B3HTTPHeaders.Multiple.parentSpanIDField))
+        XCTAssertEqual(request.value(forHTTPHeaderField: B3HTTPHeaders.Multiple.sampledField), "1")
+        XCTAssertEqual(request.value(forHTTPHeaderField: B3HTTPHeaders.Single.b3Field), "00000000000000000000000000000001-0000000000000001-1")
         XCTAssertEqual(request.value(forHTTPHeaderField: W3CHTTPHeaders.traceparent), "00-00000000000000000000000000000001-0000000000000001-01")
     }
 
@@ -96,11 +96,11 @@ class TracingURLSessionHandlerTests: XCTestCase {
         XCTAssertNil(request.value(forHTTPHeaderField: TracingHTTPHeaders.traceIDField))
         XCTAssertNil(request.value(forHTTPHeaderField: TracingHTTPHeaders.parentSpanIDField))
         XCTAssertEqual(request.value(forHTTPHeaderField: TracingHTTPHeaders.samplingPriorityField), "0")
-        XCTAssertNil(request.value(forHTTPHeaderField: OTelHTTPHeaders.Multiple.traceIDField))
-        XCTAssertNil(request.value(forHTTPHeaderField: OTelHTTPHeaders.Multiple.spanIDField))
-        XCTAssertNil(request.value(forHTTPHeaderField: OTelHTTPHeaders.Multiple.parentSpanIDField))
-        XCTAssertEqual(request.value(forHTTPHeaderField: OTelHTTPHeaders.Multiple.sampledField), "0")
-        XCTAssertEqual(request.value(forHTTPHeaderField: OTelHTTPHeaders.Single.b3Field), "0")
+        XCTAssertNil(request.value(forHTTPHeaderField: B3HTTPHeaders.Multiple.traceIDField))
+        XCTAssertNil(request.value(forHTTPHeaderField: B3HTTPHeaders.Multiple.spanIDField))
+        XCTAssertNil(request.value(forHTTPHeaderField: B3HTTPHeaders.Multiple.parentSpanIDField))
+        XCTAssertEqual(request.value(forHTTPHeaderField: B3HTTPHeaders.Multiple.sampledField), "0")
+        XCTAssertEqual(request.value(forHTTPHeaderField: B3HTTPHeaders.Single.b3Field), "0")
         XCTAssertEqual(request.value(forHTTPHeaderField: W3CHTTPHeaders.traceparent), "00-00000000000000000000000000000001-0000000000000001-00")
     }