Skip to content

Commit 0f45f30

Browse files
committed
Adapt to new SmithyTelemetryAPI module
1 parent f7deeb8 commit 0f45f30

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ let package = Package(
2222
name: "SmithyOpenTelemetry",
2323
dependencies: [
2424
.product(name: "Smithy", package: "smithy-swift"),
25-
.product(name: "ClientRuntime", package: "smithy-swift"),
25+
.product(name: "SmithyTelemetryAPI", package: "smithy-swift"),
2626
.product(name: "OpenTelemetrySdk", package: "opentelemetry-swift"),
2727
]
2828
),

Sources/SmithyOpenTelemetry/OTelProvider.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
99
import Foundation
10-
import protocol ClientRuntime.TelemetryProvider
11-
import protocol ClientRuntime.TelemetryContextManager
12-
import protocol ClientRuntime.LoggerProvider
13-
import protocol ClientRuntime.MeterProvider
14-
import protocol ClientRuntime.TracerProvider
15-
import enum ClientRuntime.DefaultTelemetry
10+
import protocol SmithyTelemetryAPI.TelemetryProvider
11+
import protocol SmithyTelemetryAPI.TelemetryContextManager
12+
import protocol SmithyTelemetryAPI.LoggerProvider
13+
import protocol SmithyTelemetryAPI.MeterProvider
14+
import protocol SmithyTelemetryAPI.TracerProvider
15+
import enum SmithyTelemetryAPI.DefaultTelemetry
1616

1717
// OpenTelemetrySdk specific imports
1818
@preconcurrency import protocol OpenTelemetrySdk.SpanExporter

Sources/SmithyOpenTelemetry/OTelTracing.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@
2323
// Smithy specific imports
2424
import struct Smithy.AttributeKey
2525
import struct Smithy.Attributes
26-
import enum ClientRuntime.SpanKind
27-
import protocol ClientRuntime.TelemetryContext
28-
import protocol ClientRuntime.TracerProvider
29-
import protocol ClientRuntime.TraceSpan
30-
import protocol ClientRuntime.Tracer
31-
import enum ClientRuntime.TraceSpanStatus
26+
import enum SmithyTelemetryAPI.SpanKind
27+
import protocol SmithyTelemetryAPI.TelemetryContext
28+
import protocol SmithyTelemetryAPI.TracerProvider
29+
import protocol SmithyTelemetryAPI.TraceSpan
30+
import protocol SmithyTelemetryAPI.Tracer
31+
import enum SmithyTelemetryAPI.TraceSpanStatus
3232

3333
public typealias OpenTelemetryTracer = OpenTelemetryApi.Tracer
3434
public typealias OpenTelemetrySpanKind = OpenTelemetryApi.SpanKind
3535
public typealias OpenTelemetrySpan = OpenTelemetryApi.Span
3636
public typealias OpenTelemetryStatus = OpenTelemetryApi.Status
3737

3838
// Trace
39-
public final class OTelTracerProvider: ClientRuntime.TracerProvider {
39+
public final class OTelTracerProvider: SmithyTelemetryAPI.TracerProvider {
4040
private let sdkTracerProvider: TracerProviderSdk
4141

4242
public init(spanExporter: SpanExporter) {
@@ -46,13 +46,13 @@ public final class OTelTracerProvider: ClientRuntime.TracerProvider {
4646
.build()
4747
}
4848

49-
public func getTracer(scope: String) -> any ClientRuntime.Tracer {
49+
public func getTracer(scope: String) -> any SmithyTelemetryAPI.Tracer {
5050
let tracer = self.sdkTracerProvider.get(instrumentationName: scope)
5151
return OTelTracerImpl(otelTracer: tracer)
5252
}
5353
}
5454

55-
public final class OTelTracerImpl: ClientRuntime.Tracer {
55+
public final class OTelTracerImpl: SmithyTelemetryAPI.Tracer {
5656
private let otelTracer: OpenTelemetryTracer
5757

5858
public init(otelTracer: OpenTelemetryTracer) {
@@ -61,7 +61,7 @@ public final class OTelTracerImpl: ClientRuntime.Tracer {
6161

6262
public func createSpan(
6363
name: String,
64-
initialAttributes: Attributes?, spanKind: ClientRuntime.SpanKind, parentContext: (any TelemetryContext)?
64+
initialAttributes: Attributes?, spanKind: SmithyTelemetryAPI.SpanKind, parentContext: (any TelemetryContext)?
6565
) -> any TraceSpan {
6666
let spanBuilder = self.otelTracer
6767
.spanBuilder(spanName: name)
@@ -108,7 +108,7 @@ private final class OTelTraceSpanImpl: TraceSpan {
108108
}
109109
}
110110

111-
extension ClientRuntime.SpanKind {
111+
extension SmithyTelemetryAPI.SpanKind {
112112
func toOTelSpanKind() -> OpenTelemetrySpanKind {
113113
switch self {
114114
case .client:

0 commit comments

Comments
 (0)