Skip to content

Commit 816c73e

Browse files
authored
deprecated root interfaces for old metrics (#619)
* deprecated root interfaces for old metrics * added deprecation messages to exporters as well.
1 parent 06423d5 commit 816c73e

File tree

7 files changed

+9
-2
lines changed

7 files changed

+9
-2
lines changed

Sources/Exporters/OpenTelemetryProtocolGrpc/metric/OtlpMetricExporter.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import OpenTelemetryApi
1212
import OpenTelemetryProtocolExporterCommon
1313
import OpenTelemetrySdk
1414

15+
@available(*, deprecated, renamed: "StableOtlpMetricExporter")
1516
public class OtlpMetricExporter: MetricExporter {
1617
let channel: GRPCChannel
1718
var metricClient: Opentelemetry_Proto_Collector_Metrics_V1_MetricsServiceNIOClient

Sources/Exporters/OpenTelemetryProtocolHttp/metric/OltpHTTPMetricExporter.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public func defaultOltpHTTPMetricsEndpoint() -> URL {
1414
URL(string: "http://localhost:4318/v1/metrics")!
1515
}
1616

17+
@available(*, deprecated, renamed: "StableOtlpHTTPMetricExporter")
1718
public class OtlpHttpMetricExporter: OtlpHttpExporterBase, MetricExporter {
1819
var pendingMetrics: [Metric] = []
1920
private let exporterLock = Lock()

Sources/OpenTelemetryApi/Metrics/MeterProvider.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Foundation
88
/// Creates Meters for an instrumentation library.
99
/// Libraries should use this class as follows to obtain Meter instance.
1010
// Phase 2
11-
//@available(*, deprecated, renamed: "StableMeterProvider")
11+
@available(*, deprecated, renamed: "StableMeterProvider")
1212
public protocol MeterProvider: AnyObject {
1313
/// Returns a Meter for a given name and version.
1414
/// - Parameters:

Sources/OpenTelemetryApi/OpenTelemetry.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public struct OpenTelemetry {
7070
instance.tracerProvider = tracerProvider
7171
}
7272

73+
@available(*, deprecated, message: "Use registerStableMeterProvider instead.")
7374
public static func registerMeterProvider(meterProvider: MeterProvider) {
7475
instance.meterProvider = meterProvider
7576
}

Sources/OpenTelemetrySdk/Metrics/MeterProviderBuilder.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ import Foundation
66

77
import OpenTelemetryApi
88

9+
10+
11+
@available(*, deprecated, renamed: "StableMeterProviderBuilder")
912
public class MeterProviderBuilder {
1013
public private(set) var resource : Resource = Resource()
1114
public private(set) var metricExporter : MetricExporter = NoopMetricExporter()

Sources/OpenTelemetrySdk/Metrics/MeterProviderSdk.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import Foundation
77
import OpenTelemetryApi
88

99
// Phase 2
10-
//@available(*, deprecated, renamed: "StableMeterProviderSdk")
10+
@available(*, deprecated, renamed: "StableMeterProviderSdk")
1111
public class MeterProviderSdk: MeterProvider {
1212
private let lock = Lock()
1313
public static let defaultPushInterval: TimeInterval = 60

Sources/OpenTelemetrySdk/Metrics/MeterSdk.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public extension Meter {
1212
}
1313
}
1414

15+
@available(*, deprecated, renamed: "StableMeterSdk")
1516
class MeterSdk: Meter {
1617
fileprivate let collectLock = Lock()
1718
fileprivate let rawMetricLock = Lock()

0 commit comments

Comments
 (0)