renames, cleanups, preparing for api review

Author: ktoso

Package.swift

@@ -6,11 +6,10 @@ let package = Package(
     products: [
         .library(name: "Instrumentation", targets: ["Instrumentation"]),
         .library(name: "Tracing", targets: ["Tracing"]),
-        .library(name: "OpenTelemetryInstrumentationSupport", targets: ["OpenTelemetryInstrumentationSupport"]),
+        .library(name: "TracingOpenTelemetrySupport", targets: ["TracingOpenTelemetrySupport"]),
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-distributed-tracing-baggage.git", from: "0.0.1"),
-        .package(url: "https://github.com/apple/swift-distributed-tracing-baggage-core.git", from: "0.0.1"),
     ],
     targets: [
         // ==== --------------------------------------------------------------------------------------------------------
@@ -49,30 +48,32 @@ let package = Package(
         // MARK: Support libraries
 
         .target(
-            name: "OpenTelemetryInstrumentationSupport",
+            name: "TracingOpenTelemetrySupport",
             dependencies: [
                 "Tracing"
             ]
         ),
         .testTarget(
-            name: "OpenTelemetryInstrumentationSupportTests",
+            name: "TracingOpenTelemetrySupportTests",
             dependencies: [
-                "OpenTelemetryInstrumentationSupport",
+                "TracingOpenTelemetrySupport",
             ]
         ),
 
         // ==== --------------------------------------------------------------------------------------------------------
         // MARK: Performance / Benchmarks
 
         .target(
-            name: "TracingBenchmarks",
+            name: "_TracingBenchmarks",
             dependencies: [
                 "Baggage",
-                "TracingBenchmarkTools",
+                "Tracing",
+                "TracingOpenTelemetrySupport",
+                "_TracingBenchmarkTools",
             ]
         ),
         .target(
-            name: "TracingBenchmarkTools",
+            name: "_TracingBenchmarkTools",
             dependencies: []
         ),
     ]

README.md

@@ -218,7 +218,7 @@ func get(url: String, context: BaggageContextCarrier) {
 > Make sure that error cases also set the error attribute and end the span.
 
 > In the above example we used the semantic `http.method` attribute that gets exposed via the
-`OpenTelemetryInstrumentationSupport` library.
+`TracingOpenTelemetrySupport` library.
 
 ## Instrument developers: Creating an instrument
 

Sources/Instrumentation/Instrument.swift

@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Baggage
+import CoreBaggage
 
 /// Conforming types are used to extract values from a specific `Carrier`.
 public protocol ExtractorProtocol {

Sources/Tracing/InstrumentationSystem+Tracing.swift

@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Instrumentation
+@_exported import Instrumentation
 
 extension InstrumentationSystem {
     /// Get a `Tracer` instance of the given type.

Sources/Tracing/NoOpTracer.swift

@@ -11,13 +11,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Baggage
-import Instrumentation
+@_exported import Baggage
+@_exported import Instrumentation
 
 /// No operation Tracer, used when no tracing is required.
 public struct NoOpTracer: Tracer {
     public func startSpan(
-        named operationName: String,
+        _ operationName: String,
         baggage: Baggage,
         ofKind kind: SpanKind,
         at timestamp: Timestamp

Sources/Tracing/Span.swift

@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import BaggageContext
+@_exported import Baggage
 
 /// A `Span` type that follows the OpenTracing/OpenTelemetry spec. The span itself should not be
 /// initializable via its public interface. `Span` creation should instead go through `tracer.startSpan`
@@ -154,7 +154,7 @@ extension SpanAttributeNamespace {
 
     public subscript<Namespace>(dynamicMember dynamicMember: KeyPath<SpanAttribute, Namespace>) -> Namespace
         where Namespace: SpanAttributeNamespace {
-        SpanAttribute.__namespace[keyPath: dynamicMember]
+        SpanAttribute.int(0)[keyPath: dynamicMember]
     }
 }
 #endif

Sources/Tracing/Tracer.swift

@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Baggage
-import Instrumentation
+@_exported import Baggage
+@_exported import Instrumentation
 
 /// An `Instrument` with added functionality for distributed tracing. Is uses the span-based tracing model and is
 /// based on the OpenTracing/OpenTelemetry spec.
@@ -25,7 +25,7 @@ public protocol Tracer: Instrument {
     ///   - kind: The `SpanKind` of the new `Span`.
     ///   - timestamp: The `DispatchTime` at which to start the new `Span`.
     func startSpan(
-        named operationName: String,
+        _ operationName: String,
         baggage: Baggage,
         ofKind kind: SpanKind,
         at timestamp: Timestamp
@@ -45,13 +45,30 @@ extension Tracer {
     ///
     /// - Parameters:
     ///   - operationName: The name of the operation being traced. This may be a handler function, database call, ...
-    ///   - context: The carrier of a `BaggageContext` within to start the new `Span`.
+    ///   - baggage: Baggage potentially containing trace identifiers of a parent `Span`.
     ///   - kind: The `SpanKind` of the `Span` to be created. Defaults to `.internal`.
     public func startSpan(
-        named operationName: String,
+        _ operationName: String,
         baggage: Baggage,
         ofKind kind: SpanKind = .internal
     ) -> Span {
-        return self.startSpan(named: operationName, baggage: baggage, ofKind: kind, at: .now())
+        return self.startSpan(operationName, baggage: baggage, ofKind: kind, at: .now())
+    }
+
+    // ==== --------------------------------------------------------------------
+    // MARK: LoggingContext accepting
+
+    /// Start a new `Span` with the given `Baggage` starting at `Timestamp.now()`.
+    ///
+    /// - Parameters:
+    ///   - operationName: The name of the operation being traced. This may be a handler function, database call, ...
+    ///   - context: Logging context containing a `Baggage` whichi may contain trace identifiers of a parent `Span`.
+    ///   - kind: The `SpanKind` of the `Span` to be created. Defaults to `.internal`.
+    public func startSpan(
+        _ operationName: String,
+        context: LoggingContext,
+        ofKind kind: SpanKind = .internal
+    ) -> Span {
+        return self.startSpan(operationName, baggage: context.baggage, ofKind: kind, at: .now())
     }
 }