Added tests to uploadTask instrumentation (#889)

* Added tests to uploadTask instrumentation

* Fixing tests

* Modified makefile to use latest os

* Bumped to Xcode 16.4

* Rollback makefile changes - changed version

* Fix visionOS version

* Added suggestions

* Rollback: using visionOS 2.5

Author: ArielDemarco

.github/workflows/BuildAndTest.yml

@@ -29,6 +29,9 @@ jobs:
     runs-on: macos-15
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
+      with:
+        xcode-version: latest-stable
     - name: Build and Test for macOS
       run: swift test --enable-code-coverage
     - name: Upload Code coverage
@@ -41,6 +44,9 @@ jobs:
     runs-on: macos-15
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
+      with:
+        xcode-version: latest-stable
     - name: Install Homebrew kegs
       run: make setup-brew
     - name: Build for iOS
@@ -51,6 +57,9 @@ jobs:
     runs-on: macos-15
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
+      with:
+        xcode-version: latest-stable
     - name: Install Homebrew kegs
       run: make setup-brew
     - name: Build for tvOS
@@ -61,6 +70,9 @@ jobs:
     runs-on: macos-15
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
+      with:
+        xcode-version: latest-stable
     - name: Install Homebrew kegs
       run: make setup-brew
     - name: Build for watchOS
@@ -71,6 +83,9 @@ jobs:
     runs-on: macos-15
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
+      with:
+        xcode-version: latest-stable
     - name: Install Homebrew kegs
       run: make setup-brew
     - name: Build for visionOS

Makefile

@@ -2,31 +2,31 @@ PROJECT_NAME="opentelemetry-swift-Package"
 
 XCODEBUILD_OPTIONS_IOS=\
 	-configuration Debug \
-	-destination platform='iOS Simulator,name=iPhone 16,OS=18.0' \
+	-destination 'platform=iOS Simulator,name=iPhone 16' \
 	-scheme $(PROJECT_NAME) \
 	-test-iterations 5 \
     -retry-tests-on-failure \
 	-workspace .
 
 XCODEBUILD_OPTIONS_TVOS=\
 	-configuration Debug \
-	-destination platform='tvOS Simulator,name=Apple TV 4K (3rd generation),OS=18.0' \
+	-destination 'platform=tvOS Simulator,name=Apple TV 4K (3rd generation)' \
 	-scheme $(PROJECT_NAME) \
 	-test-iterations 5 \
     -retry-tests-on-failure \
 	-workspace .
 
 XCODEBUILD_OPTIONS_WATCHOS=\
 	-configuration Debug \
-	-destination platform='watchOS Simulator,name=Apple Watch Series 10 (46mm),OS=11.0' \
+	-destination 'platform=watchOS Simulator,name=Apple Watch Series 10 (46mm)' \
 	-scheme $(PROJECT_NAME) \
 	-test-iterations 5 \
     -retry-tests-on-failure \
 	-workspace .
 
 XCODEBUILD_OPTIONS_VISIONOS=\
 	-configuration Debug \
-	-destination platform='visionOS Simulator,name=Apple Vision Pro,OS=2.0' \
+	-destination 'platform=visionOS Simulator,name=Apple Vision Pro,OS=2.5' \
 	-scheme $(PROJECT_NAME) \
 	-test-iterations 5 \
     -retry-tests-on-failure \

Tests/InstrumentationTests/URLSessionTests/URLSessionInstrumentationTests.swift

@@ -417,6 +417,41 @@ class URLSessionInstrumentationTests: XCTestCase {
     XCTAssertNotNil(URLSessionInstrumentationTests.requestCopy?.allHTTPHeaderFields?[W3CTraceContextPropagator.traceparent])
   }
 
+  public func testUploadTaskWithUrlBlock() {
+    let url = URL(string: "http://localhost:33333/success")!
+    var request = URLRequest(url: url)
+    request.httpMethod = "POST"
+
+    let session = URLSession(configuration: URLSessionConfiguration.default, delegate: sessionDelegate, delegateQueue: nil)
+    let task = session.uploadTask(
+        with: request,
+        from: "UploadData".data(using: .utf8)!
+    )
+    task.resume()
+    URLSessionInstrumentationTests.semaphore.wait()
+
+    XCTAssertTrue(URLSessionInstrumentationTests.checker.createdRequestCalled)
+    XCTAssertTrue(URLSessionInstrumentationTests.checker.receivedResponseCalled)
+
+    XCTAssertNotNil(URLSessionInstrumentationTests.requestCopy?.allHTTPHeaderFields?[W3CTraceContextPropagator.traceparent])
+  }
+
+  public func testUploadFileTaskWithUrlBlock() {
+    let url = URL(string: "http://localhost:33333/success")!
+    var request = URLRequest(url: url)
+    request.httpMethod = "POST"
+    let session = URLSession(configuration: URLSessionConfiguration.default, delegate: sessionDelegate, delegateQueue: nil)
+
+    let task = session.uploadTask(with: URLRequest(url: url), fromFile: url)
+    task.resume()
+    URLSessionInstrumentationTests.semaphore.wait()
+
+    XCTAssertTrue(URLSessionInstrumentationTests.checker.createdRequestCalled)
+    XCTAssertTrue(URLSessionInstrumentationTests.checker.receivedResponseCalled)
+
+    XCTAssertNotNil(URLSessionInstrumentationTests.requestCopy?.allHTTPHeaderFields?[W3CTraceContextPropagator.traceparent])
+  }
+
   public func testDownloadTaskWithRequestBlock() {
     let url = URL(string: "http://localhost:33333/success")!
     let request = URLRequest(url: url)