From 6d5a042f0a113f2fdeff17bd535c1fa19ddf3010 Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Mon, 8 Dec 2025 15:05:58 -0500 Subject: [PATCH 1/3] Add deprecation warning for otel --- .../Telemetry/Providers/OpenTelemetry/OTelProvider.swift | 3 +++ .../Telemetry/Providers/OpenTelemetry/OTelTracing.swift | 6 ++++++ .../Telemetry/Providers/OpenTelemetry/OTelUtils.swift | 1 + 3 files changed, 10 insertions(+) diff --git a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelProvider.swift b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelProvider.swift index e930728f2..6fb581818 100644 --- a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelProvider.swift +++ b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelProvider.swift @@ -13,6 +13,7 @@ import SmithyTelemetryAPI @preconcurrency import protocol OpenTelemetrySdk.SpanExporter /// Namespace for the SDK Telemetry implementation. +@available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") public enum OpenTelemetrySwift { /// The SDK TelemetryProviderOTel Implementation. /// @@ -20,10 +21,12 @@ public enum OpenTelemetrySwift { /// - loggerProvider: provides SwiftLoggers /// - meterProvider: no-op /// - tracerProvider: provides OTelTracerProvider with InMemoryExporter + @available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") public static func provider(spanExporter: any SpanExporter) -> TelemetryProvider { return OpenTelemetrySwiftProvider(spanExporter: spanExporter) } + @available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") public final class OpenTelemetrySwiftProvider: TelemetryProvider { public let contextManager: TelemetryContextManager public let loggerProvider: LoggerProvider diff --git a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelTracing.swift b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelTracing.swift index cd068bb11..2db2a8061 100644 --- a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelTracing.swift +++ b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelTracing.swift @@ -24,12 +24,17 @@ import struct Smithy.AttributeKey import struct Smithy.Attributes +@available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") public typealias OpenTelemetryTracer = OpenTelemetryApi.Tracer +@available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") public typealias OpenTelemetrySpanKind = OpenTelemetryApi.SpanKind +@available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") public typealias OpenTelemetrySpan = OpenTelemetryApi.Span +@available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") public typealias OpenTelemetryStatus = OpenTelemetryApi.Status // Trace +@available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") public final class OTelTracerProvider: TracerProvider { private let sdkTracerProvider: TracerProviderSdk @@ -46,6 +51,7 @@ public final class OTelTracerProvider: TracerProvider { } } +@available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") public final class OTelTracerImpl: Tracer { private let otelTracer: OpenTelemetryTracer diff --git a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelUtils.swift b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelUtils.swift index d95855e6d..4e12d64a3 100644 --- a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelUtils.swift +++ b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelUtils.swift @@ -15,6 +15,7 @@ import struct Smithy.AttributeKey import struct Smithy.Attributes extension Attributes { + @available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") public func toOtelAttributes() -> [String: AttributeValue] { let keys: [String] = self.getKeys() var otelKeys: [String: AttributeValue] = [:] From 74551f1dc48f3ad530f9d0b9da6aa7ecc536e796 Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Mon, 8 Dec 2025 16:00:32 -0500 Subject: [PATCH 2/3] Shorten message for swiftlint --- .../Providers/OpenTelemetry/OTelProvider.swift | 6 +++--- .../Providers/OpenTelemetry/OTelTracing.swift | 12 ++++++------ .../Providers/OpenTelemetry/OTelUtils.swift | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelProvider.swift b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelProvider.swift index 6fb581818..de925f85c 100644 --- a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelProvider.swift +++ b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelProvider.swift @@ -13,7 +13,7 @@ import SmithyTelemetryAPI @preconcurrency import protocol OpenTelemetrySdk.SpanExporter /// Namespace for the SDK Telemetry implementation. -@available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") +@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") public enum OpenTelemetrySwift { /// The SDK TelemetryProviderOTel Implementation. /// @@ -21,12 +21,12 @@ public enum OpenTelemetrySwift { /// - loggerProvider: provides SwiftLoggers /// - meterProvider: no-op /// - tracerProvider: provides OTelTracerProvider with InMemoryExporter - @available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") + @available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") public static func provider(spanExporter: any SpanExporter) -> TelemetryProvider { return OpenTelemetrySwiftProvider(spanExporter: spanExporter) } - @available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") + @available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") public final class OpenTelemetrySwiftProvider: TelemetryProvider { public let contextManager: TelemetryContextManager public let loggerProvider: LoggerProvider diff --git a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelTracing.swift b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelTracing.swift index 2db2a8061..0d06f030a 100644 --- a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelTracing.swift +++ b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelTracing.swift @@ -24,17 +24,17 @@ import struct Smithy.AttributeKey import struct Smithy.Attributes -@available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") +@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") public typealias OpenTelemetryTracer = OpenTelemetryApi.Tracer -@available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") +@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") public typealias OpenTelemetrySpanKind = OpenTelemetryApi.SpanKind -@available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") +@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") public typealias OpenTelemetrySpan = OpenTelemetryApi.Span -@available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") +@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") public typealias OpenTelemetryStatus = OpenTelemetryApi.Status // Trace -@available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") +@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") public final class OTelTracerProvider: TracerProvider { private let sdkTracerProvider: TracerProviderSdk @@ -51,7 +51,7 @@ public final class OTelTracerProvider: TracerProvider { } } -@available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") +@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") public final class OTelTracerImpl: Tracer { private let otelTracer: OpenTelemetryTracer diff --git a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelUtils.swift b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelUtils.swift index 4e12d64a3..fb344e3dd 100644 --- a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelUtils.swift +++ b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelUtils.swift @@ -15,7 +15,7 @@ import struct Smithy.AttributeKey import struct Smithy.Attributes extension Attributes { - @available(*, deprecated, message: "OpenTelemetry support has been moved to smithy-swift-opentelemetry package. This will be removed after March 8, 2026.") + @available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") public func toOtelAttributes() -> [String: AttributeValue] { let keys: [String] = self.getKeys() var otelKeys: [String: AttributeValue] = [:] From e70bce4c1c4b4a8de8597b18daa8edc3ccbedca2 Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Tue, 9 Dec 2025 13:29:42 -0500 Subject: [PATCH 3/3] Change date from Sunday to Tuesday --- .../Providers/OpenTelemetry/OTelProvider.swift | 6 +++--- .../Providers/OpenTelemetry/OTelTracing.swift | 12 ++++++------ .../Providers/OpenTelemetry/OTelUtils.swift | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelProvider.swift b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelProvider.swift index de925f85c..232cd7682 100644 --- a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelProvider.swift +++ b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelProvider.swift @@ -13,7 +13,7 @@ import SmithyTelemetryAPI @preconcurrency import protocol OpenTelemetrySdk.SpanExporter /// Namespace for the SDK Telemetry implementation. -@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") +@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 10, 2026.") public enum OpenTelemetrySwift { /// The SDK TelemetryProviderOTel Implementation. /// @@ -21,12 +21,12 @@ public enum OpenTelemetrySwift { /// - loggerProvider: provides SwiftLoggers /// - meterProvider: no-op /// - tracerProvider: provides OTelTracerProvider with InMemoryExporter - @available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") + @available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 10, 2026.") public static func provider(spanExporter: any SpanExporter) -> TelemetryProvider { return OpenTelemetrySwiftProvider(spanExporter: spanExporter) } - @available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") + @available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 10, 2026.") public final class OpenTelemetrySwiftProvider: TelemetryProvider { public let contextManager: TelemetryContextManager public let loggerProvider: LoggerProvider diff --git a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelTracing.swift b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelTracing.swift index 0d06f030a..b6d584bee 100644 --- a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelTracing.swift +++ b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelTracing.swift @@ -24,17 +24,17 @@ import struct Smithy.AttributeKey import struct Smithy.Attributes -@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") +@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 10, 2026.") public typealias OpenTelemetryTracer = OpenTelemetryApi.Tracer -@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") +@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 10, 2026.") public typealias OpenTelemetrySpanKind = OpenTelemetryApi.SpanKind -@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") +@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 10, 2026.") public typealias OpenTelemetrySpan = OpenTelemetryApi.Span -@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") +@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 10, 2026.") public typealias OpenTelemetryStatus = OpenTelemetryApi.Status // Trace -@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") +@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 10, 2026.") public final class OTelTracerProvider: TracerProvider { private let sdkTracerProvider: TracerProviderSdk @@ -51,7 +51,7 @@ public final class OTelTracerProvider: TracerProvider { } } -@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") +@available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 10, 2026.") public final class OTelTracerImpl: Tracer { private let otelTracer: OpenTelemetryTracer diff --git a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelUtils.swift b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelUtils.swift index fb344e3dd..fdd20a9ec 100644 --- a/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelUtils.swift +++ b/Sources/ClientRuntime/Telemetry/Providers/OpenTelemetry/OTelUtils.swift @@ -15,7 +15,7 @@ import struct Smithy.AttributeKey import struct Smithy.Attributes extension Attributes { - @available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 8, 2026.") + @available(*, deprecated, message: "Moved to smithy-swift-opentelemetry package. Removal after March 10, 2026.") public func toOtelAttributes() -> [String: AttributeValue] { let keys: [String] = self.getKeys() var otelKeys: [String: AttributeValue] = [:]