Merge branch 'main' into resource-extension

Author: Ignacio Bonafonte

Examples/Datadog Sample/main.swift

@@ -71,7 +71,7 @@ func simpleSpan() {
 func childSpan() {
     let span = tracer.spanBuilder(spanName: "parentSpan").setSpanKind(spanKind: .client).startSpan()
     span.setAttribute(key: sampleKey, value: sampleValue)
-    OpenTelemetryContext.setActiveSpan(span)
+    OpenTelemetry.instance.contextProvider.setActiveSpan(span)
     let childSpan = tracer.spanBuilder(spanName: "childSpan").setSpanKind(spanKind: .client).startSpan()
     childSpan.setAttribute(key: sampleKey, value: sampleValue)
     childSpan.end()

Examples/Logging Tracer/LoggingSpan.swift

@@ -22,7 +22,6 @@ class LoggingSpan: Span {
     var context: SpanContext
     var isRecording: Bool = true
     var status: Status = .unset
-    var scope: Scope?
 
     public init(name: String, kind: SpanKind) {
         self.name = name

Examples/Logging Tracer/LoggingTracer.swift

@@ -18,9 +18,6 @@ import OpenTelemetryApi
 
 class LoggingTracer: Tracer {
     let tracerName = "LoggingTracer"
-    public var activeSpan: Span? {
-        return OpenTelemetryContext.activeSpan
-    }
 
     var binaryFormat: BinaryFormattable = LoggingBinaryFormat()
     var textFormat: TextMapPropagator = W3CTraceContextPropagator()
@@ -42,7 +39,7 @@ class LoggingTracer: Tracer {
 
         func startSpan() -> Span {
             if spanContext == nil, !isRootSpan {
-                spanContext = OpenTelemetryContext.activeSpan?.context
+                spanContext = OpenTelemetry.instance.contextProvider.activeSpan?.context
             }
             if spanContext != nil {
                 return LoggingSpan(name: name, kind: .client)

Examples/Logging Tracer/main.swift

@@ -22,14 +22,18 @@ OpenTelemetry.registerTracerProvider(tracerProvider: LoggingTracerProvider())
 
 var tracer = OpenTelemetry.instance.tracerProvider.get(instrumentationName: "ConsoleApp", instrumentationVersion: "semver:1.0.0")
 
-let scope = OpenTelemetryContext.setActiveSpan(tracer.spanBuilder(spanName: "Main (span1)").startSpan())
+
+let span1 = tracer.spanBuilder(spanName: "Main (span1)").startSpan()
+OpenTelemetry.instance.contextProvider.setActiveSpan(span1)
 let semaphore = DispatchSemaphore(value: 0)
 DispatchQueue.global().async {
-    var scope2 = OpenTelemetryContext.setActiveSpan(tracer.spanBuilder(spanName: "Main (span2)").startSpan())
-    OpenTelemetryContext.activeSpan?.setAttribute(key: "myAttribute", value: "myValue")
+    let span2 = tracer.spanBuilder(spanName: "Main (span2)").startSpan()
+    OpenTelemetry.instance.contextProvider.setActiveSpan(span2)
+    OpenTelemetry.instance.contextProvider.activeSpan?.setAttribute(key: "myAttribute", value: "myValue")
     sleep(1)
     semaphore.signal()
-    scope2.close()
+    span2.end()
 }
+span1.end()
 
 semaphore.wait()

Examples/Simple Exporter/main.swift

@@ -42,7 +42,7 @@ func simpleSpan() {
 func childSpan() {
     let span = tracer.spanBuilder(spanName: "parentSpan").setSpanKind(spanKind: .client).startSpan()
     span.setAttribute(key: sampleKey, value: sampleValue)
-    OpenTelemetryContext.setActiveSpan(span)
+    OpenTelemetry.instance.contextProvider.setActiveSpan(span)
     let childSpan = tracer.spanBuilder(spanName: "childSpan").setSpanKind(spanKind: .client).startSpan()
     childSpan.setAttribute(key: sampleKey, value: sampleValue)
     childSpan.end()

Package.swift

@@ -16,18 +16,18 @@ let package = Package(
         .library(name: "libOpenTelemetrySdk", type: .static, targets: ["OpenTelemetrySdk"]),
         .library(name: "ResourceExtension", type: .dynamic, targets: ["ResourceExtension"]),
         .library(name: "libResourceExtension", type: .static, targets: ["ResourceExtension"]),
-        .library(name: "OpenTracingShim", type: .dynamic, targets: ["OpenTracingShim"]),
-        .library(name: "libOpenTracingShim", type: .static, targets: ["OpenTracingShim"]),
-        .library(name: "SwiftMetricsShim", type: .dynamic, targets: ["SwiftMetricsShim"]),
-        .library(name: "libSwiftMetricsShim", type: .static, targets: ["SwiftMetricsShim"]),
+        .library(name: "OpenTracingShim-experimental", type: .dynamic, targets: ["OpenTracingShim"]),
+        .library(name: "libOpenTracingShim-experimental", type: .static, targets: ["OpenTracingShim"]),
+        .library(name: "SwiftMetricsShim-experimental", type: .dynamic, targets: ["SwiftMetricsShim"]),
+        .library(name: "libSwiftMetricsShim-experimental", type: .static, targets: ["SwiftMetricsShim"]),
         .library(name: "JaegerExporter", type: .dynamic, targets: ["JaegerExporter"]),
         .library(name: "libJaegerExporter", type: .static, targets: ["JaegerExporter"]),
         .library(name: "ZipkinExporter", type: .dynamic, targets: ["ZipkinExporter"]),
         .library(name: "libZipkinExporter", type: .static, targets: ["ZipkinExporter"]),
         .library(name: "StdoutExporter", type: .dynamic, targets: ["StdoutExporter"]),
         .library(name: "libStdoutExporter", type: .static, targets: ["StdoutExporter"]),
-        .library(name: "PrometheusExporter", type: .dynamic, targets: ["PrometheusExporter"]),
-        .library(name: "libPrometheusExporter", type: .static, targets: ["PrometheusExporter"]),
+        .library(name: "PrometheusExporter-experimental", type: .dynamic, targets: ["PrometheusExporter"]),
+        .library(name: "libPrometheusExporter-experimental", type: .static, targets: ["PrometheusExporter"]),
         .library(name: "OpenTelemetryProtocolExporter", type: .dynamic, targets: ["OpenTelemetryProtocolExporter"]),
         .library(name: "libOpenTelemetryProtocolExporter", type: .static, targets: ["OpenTelemetryProtocolExporter"]),
         .library(name: "InMemoryExporter", type: .dynamic, targets: ["InMemoryExporter"]),
@@ -58,11 +58,16 @@ let package = Package(
                 exclude: ["README.md"]),
         .target(name: "OpenTracingShim",
                 dependencies: ["OpenTelemetrySdk",
-                               "Opentracing"]),
+                               "Opentracing"],
+                path: "Sources/Importers/OpenTracingShim"
+        ),
         .target(name: "SwiftMetricsShim",
                 dependencies: ["OpenTelemetrySdk",
                                .product(name: "NIO", package: "swift-nio"),
-                               .product(name: "CoreMetrics", package: "swift-metrics")]),
+                               .product(name: "CoreMetrics", package: "swift-metrics")],
+                path: "Sources/Importers/SwiftMetricsShim"
+
+        ),
         .target(name: "JaegerExporter",
                 dependencies: ["OpenTelemetrySdk",
                                .product(name: "Thrift", package: "Thrift")],
@@ -98,11 +103,13 @@ let package = Package(
         .testTarget(name: "OpenTracingShimTests",
                     dependencies: ["OpenTracingShim",
                                    "OpenTelemetrySdk"],
-                    path: "Tests/OpenTracingShim"),
+                    path: "Tests/ImportersTests/OpenTracingShim"
+        ),
         .testTarget(name: "SwiftMetricsShimTests",
                     dependencies: ["SwiftMetricsShim",
                                    "OpenTelemetrySdk"],
-                    path: "Tests/SwiftMetricsShim"),
+                    path: "Tests/ImportersTests/SwiftMetricsShim"
+        ),
         .testTarget(name: "OpenTelemetrySdkTests",
                     dependencies: ["OpenTelemetryApi",
                                    "OpenTelemetrySdk"],

README.md

@@ -32,9 +32,14 @@ or
 ```
 
 ## Current status
-**Please note** Tracing spec follows version 1.0.1 and should be considered almost stable now. Metrics support is experimental, and the spec is still under development
-
-Currently Tracing, Metrics and Baggage API's and SDK are implemented, also OpenTracing shims, for compatibility with existing Opentracing code.
+<!--Please note: 
+Tracing spec follows version 1.0.1 and should be considered almost stable now.
+Metrics support is experimental, and the spec is still under development.
+Semantic Conventions AND OpenTracing shim are also experimental.
+Libraries only dependant on these experimental status include the experimental postfix
+--> 
+
+Currently Tracing, Metrics and Baggage API's and SDK are implemented, also OpenTracing shim, for compatibility with existing Opentracing code.
 
 Implemented traces exporters: Stdout, Jaeger, Zipkin, Datadog and OpenTelemetry collector
 

Sources/OpenTracingShim/BaseShimProtocol.swift renamed to Sources/Importers/OpenTracingShim/BaseShimProtocol.swift

@@ -30,7 +30,7 @@ public class Propagation: BaseShimProtocol {
     }
 
     public func extractTextFormat(carrier: [String: String]) -> SpanContextShim? {
-        guard let currentBaggage = OpenTelemetryContext.activeBaggage else { return nil }
+        guard let currentBaggage = OpenTelemetry.instance.contextProvider.activeBaggage else { return nil }
         let context = propagators.textMapPropagator.extract(carrier: carrier, getter: TextMapGetter())
         if !(context?.isValid ?? false) {
             return nil