Build in release build on CI

.github/workflows/ci.yaml

@@ -8,15 +8,34 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        images:
-        - swift:5.7
-        - swift:5.8
-        - swiftlang/swift:nightly-main-focal
-    container: ${{ matrix.images }}
+        image:
+        - swift:5.3
+        - swift:5.4
+        - swiftlang/swift:nightly-main
+    container: ${{ matrix.image }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Resolve Swift dependencies
         run: swift package resolve
       - name: Build & Test
-        run: swift test --parallel
+        run: swift test --enable-test-discovery --parallel
+
+  release-build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        image:
+        - swift:5.3
+        - swift:5.4
+        - swift:5.5
+        - swiftlang/swift:nightly-main
+    container: ${{ matrix.image }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Resolve Swift dependencies
+        run: swift package resolve
+      - name: Build in release mode
+        run: swift build --enable-test-discovery -c release

.github/workflows/documentation.yaml

@@ -0,0 +1,31 @@
+name: Documentation
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Generate Documentation
+        uses: SwiftDocOrg/swift-doc@master
+        with:
+          format: html
+          base-url: /opentelemetry-swift-xray/
+          module-name: "OpenTelemetry Swift X-Ray"
+          output: Documentation
+
+      - name: Update Permissions
+        run: 'sudo chown -R $USER Documentation'
+
+      - name: Deploy to GitHub Pages
+        uses: JamesIves/github-pages-deploy-action@4.1.0
+        with:
+          branch: gh-pages
+          folder: Documentation

.spi.yml

@@ -1,4 +0,0 @@
-version: 1
-builder:
-  configs:
-    - documentation_targets: [OpenTelemetryXRay]

Package.swift

@@ -1,18 +1,17 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.3
 import PackageDescription
 
 let package = Package(
-    name: "swift-otel-xray",
-    platforms: [.macOS(.v13)],
+    name: "opentelemetry-swift-xray",
     products: [
         .library(name: "OpenTelemetryXRay", targets: ["OpenTelemetryXRay"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/slashmo/swift-otel.git", .upToNextMinor(from: "0.8.0")),
+        .package(url: "https://github.com/slashmo/opentelemetry-swift.git", .branch("automatic-context-propagation")),
     ],
     targets: [
         .target(name: "OpenTelemetryXRay", dependencies: [
-            .product(name: "OpenTelemetry", package: "swift-otel"),
+            .product(name: "OpenTelemetry", package: "opentelemetry-swift"),
         ]),
         .testTarget(name: "OpenTelemetryXRayTests", dependencies: [
             .target(name: "OpenTelemetryXRay"),

README.md

@@ -1,8 +1,8 @@
 # X-Ray Support for OpenTelemetry Swift
 
-[![CI](https://github.com/slashmo/opentelemetry-swift-xray/actions/workflows/ci.yaml/badge.svg)](https://github.com/slashmo/opentelemetry-swift-xray/actions/workflows/ci.yaml)
-[![Swift support](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Fslashmo%2Fswift-otel%2Fbadge%3Ftype%3Dswift-versions)](https://swiftpackageindex.com/slashmo/swift-otel)
+[![Swift 5.3](https://img.shields.io/badge/Swift-5.3-%23f05137)](https://swift.org)
 [![Made for Swift Distributed Tracing](https://img.shields.io/badge/Made%20for-Swift%20Distributed%20Tracing-%23f05137)](https://github.com/apple/swift-distributed-tracing)
+[![CI](https://github.com/slashmo/opentelemetry-swift-xray/actions/workflows/ci.yaml/badge.svg)](https://github.com/slashmo/opentelemetry-swift-xray/actions/workflows/ci.yaml)
 
 This library adds support for [AWS X-Ray](https://aws.amazon.com/xray/) to [OpenTelemetry Swift](https://github.com/slashmo/opentelemetry-swift).
 

Sources/OpenTelemetryXRay/Propagator.swift

@@ -73,11 +73,14 @@ public struct XRayPropagator: OTelPropagator {
         guard let traceID = extractedTraceID else {
             throw TraceHeaderParsingError(value: tracingHeader, reason: .missingTraceID)
         }
+        guard let traceFlags = extractedTraceFlags else {
+            throw TraceHeaderParsingError(value: tracingHeader, reason: .missingSampleDecision)
+        }
 
         return OTel.SpanContext(
             traceID: traceID,
             spanID: spanID ?? OTel.SpanID(bytes: (0, 0, 0, 0, 0, 0, 0, 0)),
-            traceFlags: extractedTraceFlags ?? [],
+            traceFlags: traceFlags,
             isRemote: true
         )
     }
@@ -145,5 +148,7 @@ extension XRayPropagator.TraceHeaderParsingError {
         case invalidTraceIDDelimiters
 
         case invalidSpanIDLength(Int)
+
+        case missingSampleDecision
     }
 }

Tests/OpenTelemetryXRayTests/PropagatorTests.swift

@@ -125,16 +125,14 @@ final class XRayPropagatorTests: XCTestCase {
         )
     }
 
-    func test_extractsTracingHeader_missingSampleDecision() throws {
+    func test_extractFails_missingSampleDecision() throws {
         let tracingHeader = "Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8"
         let headers = ["X-Amzn-Trace-Id": tracingHeader]
 
-        let spanContext = try XCTUnwrap(propagator.extractSpanContext(from: headers, using: extractor))
-
-        XCTAssertEqual(spanContext.traceID.description, "5759e988bd862e3fe1be46a994272793")
-        XCTAssertEqual(spanContext.spanID.description, "53995c3f42cd8ad8")
-        XCTAssertTrue(spanContext.traceFlags.isEmpty)
-        XCTAssertNil(spanContext.traceState)
+        XCTAssertThrowsError(
+            try propagator.extractSpanContext(from: headers, using: extractor),
+            XRayPropagator.TraceHeaderParsingError(value: tracingHeader, reason: .missingSampleDecision)
+        )
     }
 
     func test_extractFails_invalidTraceIDLength() throws {