Skip to content

Commit 030ebac

Browse files
author
Nacho Bonafonte
committed
Fix Metric ambiguity with Apple's swift-metrics version >= 2.4.0
1 parent 5352d75 commit 030ebac

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Sources/Importers/SwiftMetricsShim/MetricHandlers.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class SwiftCounterMetric: CounterHandler, SwiftMetric {
1313
let counter: AnyCounterMetric<Int>
1414
let labels: [String: String]
1515

16-
required init(name: String, labels: [String: String], meter: Meter) {
16+
required init(name: String, labels: [String: String], meter: OpenTelemetryApi.Meter) {
1717
metricName = name
1818
counter = meter.createIntCounter(name: name, monotonic: true)
1919
self.labels = labels
@@ -36,7 +36,7 @@ class SwiftGaugeMetric: RecorderHandler, SwiftMetric {
3636
let counter: AnyCounterMetric<Double>
3737
let labels: [String: String]
3838

39-
required init(name: String, labels: [String: String], meter: Meter) {
39+
required init(name: String, labels: [String: String], meter: OpenTelemetryApi.Meter) {
4040
metricName = name
4141
counter = meter.createDoubleCounter(name: name, monotonic: false)
4242
self.labels = labels
@@ -59,7 +59,7 @@ class SwiftHistogramMetric: RecorderHandler, SwiftMetric {
5959
let measure: AnyMeasureMetric<Double>
6060
let labels: [String: String]
6161

62-
required init(name: String, labels: [String: String], meter: Meter) {
62+
required init(name: String, labels: [String: String], meter: OpenTelemetryApi.Meter) {
6363
metricName = name
6464
measure = meter.createDoubleMeasure(name: name)
6565
self.labels = labels
@@ -82,7 +82,7 @@ class SwiftSummaryMetric: TimerHandler, SwiftMetric {
8282
let measure: AnyMeasureMetric<Double>
8383
let labels: [String: String]
8484

85-
required init(name: String, labels: [String: String], meter: Meter) {
85+
required init(name: String, labels: [String: String], meter: OpenTelemetryApi.Meter) {
8686
metricName = name
8787
measure = meter.createDoubleMeasure(name: name)
8888
self.labels = labels
@@ -97,7 +97,7 @@ class SwiftSummaryMetric: TimerHandler, SwiftMetric {
9797
protocol SwiftMetric {
9898
var metricName: String { get }
9999
var metricType: MetricType { get }
100-
init(name: String, labels: [String: String], meter: Meter)
100+
init(name: String, labels: [String: String], meter: OpenTelemetryApi.Meter)
101101
}
102102

103103
enum MetricType: String {

Sources/Importers/SwiftMetricsShim/SwiftMetricsShim.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import OpenTelemetryApi
88

99
public class OpenTelemetrySwiftMetrics: MetricsFactory {
1010

11-
internal let meter: Meter
11+
internal let meter: OpenTelemetryApi.Meter
1212
internal var metrics = [MetricKey: SwiftMetric]()
1313
internal let lock = Lock()
1414

15-
public init(meter: Meter) {
15+
public init(meter: OpenTelemetryApi.Meter) {
1616
self.meter = meter
1717
}
1818

0 commit comments

Comments
 (0)