feat!: Upgrade to OpenTelemetry-Swift 2.x and use core package instead (#6)

Author: dayaffe

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
           - macos-14
           - macos-26
         xcode:
-          - Xcode_15.2
+          - Xcode_15.4
           - Xcode_26.0
         destination:
           - 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
@@ -30,17 +30,17 @@ jobs:
             xcode: Xcode_26.0
           # Don't run new macOS with old Xcode
           - runner: macos-26
-            xcode: Xcode_15.2
+            xcode: Xcode_15.4
           # Don't run old simulators with new Xcode
           - destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
             xcode: Xcode_26.0
           - destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
             xcode: Xcode_26.0
           # Don't run new simulators with old Xcode
           - destination: 'platform=tvOS Simulator,OS=26.0,name=Apple TV 4K (3rd generation) (at 1080p)'
-            xcode: Xcode_15.2
+            xcode: Xcode_15.4
           - destination: 'platform=iOS Simulator,OS=26.0.1,name=iPhone 17'
-            xcode: Xcode_15.2
+            xcode: Xcode_15.4
 
     steps:
       - name: Configure Xcode

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 5.10
 
 import PackageDescription
 
@@ -14,17 +14,17 @@ let package = Package(
         .library(name: "SmithyOpenTelemetry", targets: ["SmithyOpenTelemetry"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/smithy-lang/smithy-swift", from: "0.153.0"),
-        .package(url: "https://github.com/open-telemetry/opentelemetry-swift", from: "1.13.0"),
+        .package(url: "https://github.com/smithy-lang/smithy-swift", from: "0.191.0"),
+        .package(url: "https://github.com/open-telemetry/opentelemetry-swift-core", from: "2.3.0"),
     ],
     targets: [
         .target(
             name: "SmithyOpenTelemetry",
             dependencies: [
                 .product(name: "Smithy", package: "smithy-swift"),
                 .product(name: "SmithyTelemetryAPI", package: "smithy-swift"),
-                .product(name: "OpenTelemetryApi", package: "opentelemetry-swift"),
-                .product(name: "OpenTelemetrySdk", package: "opentelemetry-swift"),
+                .product(name: "OpenTelemetryApi", package: "opentelemetry-swift-core"),
+                .product(name: "OpenTelemetrySdk", package: "opentelemetry-swift-core"),
             ]
         ),
         .testTarget(
@@ -33,9 +33,8 @@ let package = Package(
                 "SmithyOpenTelemetry",
                 .product(name: "Smithy", package: "smithy-swift"),
                 .product(name: "SmithyTelemetryAPI", package: "smithy-swift"),
-                .product(name: "OpenTelemetryApi", package: "opentelemetry-swift"),
-                .product(name: "OpenTelemetrySdk", package: "opentelemetry-swift"),
-                .product(name: "InMemoryExporter", package: "opentelemetry-swift"),
+                .product(name: "OpenTelemetryApi", package: "opentelemetry-swift-core"),
+                .product(name: "OpenTelemetrySdk", package: "opentelemetry-swift-core"),
             ]
         ),
     ]

README.md

@@ -16,18 +16,19 @@ Add this package as a dependency when you need OpenTelemetry support for your Sm
 ```swift
 dependencies: [
     .package(url: "https://github.com/smithy-lang/smithy-swift-opentelemetry", from: "1.0.0"),
-    .package(url: "https://github.com/open-telemetry/opentelemetry-swift", from: "1.13.0"),
 ]
 ```
 
+This package depends on [opentelemetry-swift-core](https://github.com/open-telemetry/opentelemetry-swift-core) for the `OpenTelemetryApi` and `OpenTelemetrySdk` modules.
+
 ### Usage
 
 ```swift
 import SmithyOpenTelemetry
-import InMemoryExporter  // Add the exporter you need
+import OpenTelemetrySdk
 
-// Create a span exporter
-let spanExporter = InMemoryExporter()
+// Create a span exporter (use any SpanExporter implementation)
+let spanExporter = YourSpanExporter()
 
 // Create the OpenTelemetry telemetry provider
 let telemetryProvider = OpenTelemetrySwift.provider(spanExporter: spanExporter)
@@ -41,10 +42,7 @@ let config = try await YourClient.YourClientConfiguration(
 let client = YourClient(config: config)
 ```
 
-You'll need to add the exporter package to your dependencies:
-```swift
-.product(name: "InMemoryExporter", package: "opentelemetry-swift")
-```
+For span exporters, you can use any `SpanExporter` implementation from the OpenTelemetry ecosystem, such as the OTLP exporters from the [opentelemetry-swift](https://github.com/open-telemetry/opentelemetry-swift) package.
 
 ## Security
 

Tests/SmithyOpenTelemetryTests/InMemoryExporter.swift

@@ -0,0 +1,39 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import Foundation
+import OpenTelemetrySdk
+
+/// A simple in-memory span exporter for testing purposes.
+class InMemoryExporter: SpanExporter {
+    private var finishedSpanItems: [SpanData] = []
+    private var isRunning: Bool = true
+
+    func getFinishedSpanItems() -> [SpanData] {
+        return finishedSpanItems
+    }
+
+    func export(spans: [SpanData], explicitTimeout: TimeInterval? = nil) -> SpanExporterResultCode {
+        guard isRunning else { return .failure }
+        finishedSpanItems.append(contentsOf: spans)
+        return .success
+    }
+
+    func flush(explicitTimeout: TimeInterval? = nil) -> SpanExporterResultCode {
+        guard isRunning else { return .failure }
+        return .success
+    }
+
+    func reset() {
+        finishedSpanItems.removeAll()
+    }
+
+    func shutdown(explicitTimeout: TimeInterval? = nil) {
+        finishedSpanItems.removeAll()
+        isRunning = false
+    }
+}

Tests/SmithyOpenTelemetryTests/OTelTracingTests.swift

@@ -11,7 +11,6 @@ import XCTest
 import OpenTelemetrySdk
 import Smithy
 import SmithyTelemetryAPI
-import InMemoryExporter
 
 final class OTelTracingTests: XCTestCase {