Skip to content

Commit 25504f3

Browse files
committed
revert imports back
1 parent d404017 commit 25504f3

File tree

1 file changed

+12
-26
lines changed

1 file changed

+12
-26
lines changed

Sources/SmithyOpenTelemetry/OTelTracing.swift

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,26 @@
66
//
77

88
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
9-
@preconcurrency import enum OpenTelemetryApi.AttributeValue
10-
@preconcurrency import protocol OpenTelemetryApi.Span
11-
@preconcurrency import enum OpenTelemetryApi.SpanKind
12-
@preconcurrency import enum OpenTelemetryApi.Status
139
// OpenTelemetryApi specific imports
14-
@preconcurrency import protocol OpenTelemetryApi.Tracer
10+
@preconcurrency import OpenTelemetryApi
1511

16-
@preconcurrency import struct OpenTelemetrySdk.Resource
17-
@preconcurrency import struct OpenTelemetrySdk.SimpleSpanProcessor
18-
@preconcurrency import protocol OpenTelemetrySdk.SpanExporter
19-
@preconcurrency import class OpenTelemetrySdk.TracerProviderBuilder
2012
// OpenTelemetrySdk specific imports
21-
@preconcurrency import class OpenTelemetrySdk.TracerProviderSdk
13+
@preconcurrency import OpenTelemetrySdk
2214

2315
// Smithy specific imports
2416
import struct Smithy.AttributeKey
2517
import struct Smithy.Attributes
2618

2719
// SmithyTelemetryAPI specific imports
28-
import protocol SmithyTelemetryAPI.Tracer
29-
import protocol SmithyTelemetryAPI.TracerProvider
30-
import protocol SmithyTelemetryAPI.TraceSpan
31-
import protocol SmithyTelemetryAPI.TelemetryContext
32-
import protocol SmithyTelemetryAPI.TelemetryScope
33-
import enum SmithyTelemetryAPI.SpanKind
34-
import enum SmithyTelemetryAPI.TraceSpanStatus
20+
import SmithyTelemetryAPI
3521

3622
public typealias OpenTelemetryTracer = OpenTelemetryApi.Tracer
3723
public typealias OpenTelemetrySpanKind = OpenTelemetryApi.SpanKind
3824
public typealias OpenTelemetrySpan = OpenTelemetryApi.Span
3925
public typealias OpenTelemetryStatus = OpenTelemetryApi.Status
4026

4127
// Trace
42-
public final class OTelTracerProvider: TracerProvider {
28+
public final class OTelTracerProvider: SmithyTelemetryAPI.TracerProvider {
4329
private let sdkTracerProvider: TracerProviderSdk
4430

4531
public init(spanExporter: SpanExporter) {
@@ -49,13 +35,13 @@ public final class OTelTracerProvider: TracerProvider {
4935
.build()
5036
}
5137

52-
public func getTracer(scope: String) -> any Tracer {
38+
public func getTracer(scope: String) -> any SmithyTelemetryAPI.Tracer {
5339
let tracer = self.sdkTracerProvider.get(instrumentationName: scope)
5440
return OTelTracerImpl(otelTracer: tracer)
5541
}
5642
}
5743

58-
public final class OTelTracerImpl: Tracer {
44+
public final class OTelTracerImpl: SmithyTelemetryAPI.Tracer {
5945
private let otelTracer: OpenTelemetryTracer
6046

6147
public init(otelTracer: OpenTelemetryTracer) {
@@ -64,8 +50,8 @@ public final class OTelTracerImpl: Tracer {
6450

6551
public func createSpan(
6652
name: String,
67-
initialAttributes: Attributes?, spanKind: SpanKind, parentContext: (any TelemetryContext)?
68-
) -> any TraceSpan {
53+
initialAttributes: Attributes?, spanKind: SmithyTelemetryAPI.SpanKind, parentContext: (any SmithyTelemetryAPI.TelemetryContext)?
54+
) -> any SmithyTelemetryAPI.TraceSpan {
6955
let spanBuilder = self.otelTracer
7056
.spanBuilder(spanName: name)
7157
.setSpanKind(spanKind: spanKind.toOTelSpanKind())
@@ -81,7 +67,7 @@ public final class OTelTracerImpl: Tracer {
8167
}
8268
}
8369

84-
private final class OTelTraceSpanImpl: TraceSpan {
70+
private final class OTelTraceSpanImpl: SmithyTelemetryAPI.TraceSpan {
8571
let name: String
8672
private let otelSpan: OpenTelemetrySpan
8773

@@ -102,7 +88,7 @@ private final class OTelTraceSpanImpl: TraceSpan {
10288
self.otelSpan.setAttribute(key: key.getName(), value: AttributeValue.init(value))
10389
}
10490

105-
func setStatus(status: TraceSpanStatus) {
91+
func setStatus(status: SmithyTelemetryAPI.TraceSpanStatus) {
10692
self.otelSpan.status = status.toOTelStatus()
10793
}
10894

@@ -111,7 +97,7 @@ private final class OTelTraceSpanImpl: TraceSpan {
11197
}
11298
}
11399

114-
extension SpanKind {
100+
extension SmithyTelemetryAPI.SpanKind {
115101
func toOTelSpanKind() -> OpenTelemetrySpanKind {
116102
switch self {
117103
case .client:
@@ -128,7 +114,7 @@ extension SpanKind {
128114
}
129115
}
130116

131-
extension TraceSpanStatus {
117+
extension SmithyTelemetryAPI.TraceSpanStatus {
132118
func toOTelStatus() -> OpenTelemetryStatus {
133119
switch self {
134120
case .error:

0 commit comments

Comments
 (0)