feat: create XRayInstrument

Package.swift

@@ -16,6 +16,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.17.0")),
         .package(url: "https://github.com/apple/swift-log.git", .upToNextMajor(from: "1.0.0")),
         .package(url: "https://github.com/Flight-School/AnyCodable.git", .upToNextMajor(from: "0.3.0")),
+        .package(url: "https://github.com/slashmo/gsoc-swift-tracing.git", .branch("main")),
         .package(url: "https://github.com/swift-aws/aws-sdk-swift-core.git", .upToNextMinor(from: "5.0.0-alpha.5")),
         .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", .upToNextMajor(from: "0.2.0")),
     ],
@@ -28,6 +29,21 @@ let package = Package(
                 .product(name: "AnyCodable", package: "AnyCodable"),
             ]
         ),
+        .testTarget(
+            name: "AWSXRayRecorderTests",
+            dependencies: ["AWSXRayRecorder"]
+        ),
+        .target(
+            name: "AWSXRayInstrument",
+            dependencies: [
+                .byName(name: "AWSXRayRecorder"),
+                .product(name: "Instrumentation", package: "gsoc-swift-tracing"),
+            ]
+        ),
+        .testTarget(
+            name: "AWSXRayInstrumentTests",
+            dependencies: ["AWSXRayInstrument"]
+        ),
         .target(
             name: "AWSXRayRecorderLambda",
             dependencies: [
@@ -42,9 +58,5 @@ let package = Package(
                 .product(name: "AWSSDKSwiftCore", package: "aws-sdk-swift-core"),
             ]
         ),
-        .testTarget(
-            name: "AWSXRayRecorderTests",
-            dependencies: ["AWSXRayRecorder"]
-        ),
     ]
 )

Sources/AWSXRayInstrument/Instrument.swift

@@ -0,0 +1,26 @@
+import AWSXRayRecorder
+import Baggage
+import Dispatch
+import Instrumentation
+
+extension XRayRecorder: TracingInstrument {
+    public func extract<Carrier, Extractor>(_ carrier: Carrier, into baggage: inout BaggageContext, using extractor: Extractor) where Carrier == Extractor.Carrier, Extractor: ExtractorProtocol {
+        // TODO: impl
+    }
+
+    public func inject<Carrier, Injector>(_ baggage: BaggageContext, into carrier: inout Carrier, using injector: Injector) where Carrier == Injector.Carrier, Injector: InjectorProtocol {
+        // TODO: impl
+    }
+
+    public func startSpan(
+        named operationName: String,
+        context: BaggageContext,
+        ofKind kind: SpanKind,
+        at timestamp: DispatchTime?
+    ) -> Span {
+        // TODO: parse context, extend existing recorder/segment to use `Baggage`?
+        // TODO: map DispatchTime to Timestamp
+        // TODO: does kind has any meaning?
+        beginSegment(name: operationName)
+    }
+}

Sources/AWSXRayInstrument/Span.swift

@@ -0,0 +1,72 @@
+import AWSXRayRecorder
+import Baggage
+import Dispatch
+import Instrumentation
+
+extension XRayRecorder.Segment: Instrumentation.Span {
+    public var operationName: String {
+        // TODO: impl
+        "test"
+    }
+
+    public var kind: SpanKind {
+        // TODO: impl
+        .internal
+    }
+
+    public var status: SpanStatus? {
+        // TODO: impl
+        get {
+            nil
+        }
+        set(newValue) {}
+    }
+
+    public var startTimestamp: DispatchTime {
+        // TODO: impl
+        DispatchTime.now()
+    }
+
+    public var endTimestamp: DispatchTime? {
+        // TODO: impl
+        nil
+    }
+
+    public func end(at timestamp: DispatchTime) {
+        // TODO: impl
+    }
+
+    public var baggage: BaggageContext {
+        // TODO: impl
+        BaggageContext()
+    }
+
+    public var events: [SpanEvent] {
+        // TODO: impl
+        [SpanEvent]()
+    }
+
+    public func addEvent(_: SpanEvent) {
+        // TODO: impl
+    }
+
+    public var attributes: SpanAttributes {
+        // TODO: impl
+        get {
+            SpanAttributes()
+        }
+        set(newValue) {}
+    }
+
+    public var isRecording: Bool {
+        // TODO: impl
+        true
+    }
+
+    public var links: [SpanLink] {
+        // not supported
+        [SpanLink]()
+    }
+
+    public func addLink(_: SpanLink) {}
+}

Tests/AWSXRayInstrumentTests/InstrumentTests.swift

@@ -0,0 +1,29 @@
+import XCTest
+
+import AWSXRayInstrument
+import AWSXRayRecorder
+import Baggage
+import Dispatch
+import Instrumentation
+
+final class InstrumentTests: XCTestCase {
+    func testRecordingOneSegment() {
+        let emitter = TestEmitter()
+        let instrument: TracingInstrument = XRayRecorder(emitter: emitter)
+
+        XCTAssertEqual(0, emitter.segments.count)
+
+        let name: String = UUID().uuidString
+        let context = BaggageContext()
+        let kind = SpanKind.internal
+        let now = DispatchTime.now()
+
+        var span: Span = instrument.startSpan(named: name, context: context, ofKind: kind, at: now)
+
+        // TODO: test attributes
+
+        span.end()
+
+        XCTAssertEqual(1, emitter.segments.count)
+    }
+}

Tests/AWSXRayInstrumentTests/SpanTests.swift

@@ -0,0 +1,23 @@
+import XCTest
+
+import AWSXRayInstrument
+import AWSXRayRecorder
+import Instrumentation
+
+final class SpanTests: XCTestCase {
+    func testRecordingOneSegment() {
+        let recorder = XRayRecorder(emitter: XRayNoOpEmitter())
+
+        let name: String = UUID().uuidString
+
+        // use existing "segment" API, make sure the segment is a proper span
+        var span: Span = recorder.beginSegment(name: name)
+
+        XCTAssertEqual(name, span.operationName)
+        // TODO: more tests
+
+        span.end()
+
+        // TODO: test end time
+    }
+}

Tests/AWSXRayInstrumentTests/TestEmitter.swift

@@ -0,0 +1,12 @@
+@testable import AWSXRayRecorder
+
+class TestEmitter: XRayEmitter {
+    var segments = [XRayRecorder.Segment]()
+
+    func send(_ segment: XRayRecorder.Segment) {
+        // TODO: flatten, append subsegments separately
+        segments.append(segment)
+    }
+
+    func flush(_: @escaping (Error?) -> Void) {}
+}