Merge pull request #419 from nachoBonafonte/main

Fix Metric ambiguity with Apple's swift-metrics version >= 2.4.0
open-telemetry · Jun 1, 2023 · 37b52e2 · 37b52e2
2 parents 5352d75 + 030ebac
commit 37b52e2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Sources/Importers/SwiftMetricsShim/MetricHandlers.swift b/Sources/Importers/SwiftMetricsShim/MetricHandlers.swift
@@ -13,7 +13,7 @@ class SwiftCounterMetric: CounterHandler, SwiftMetric {
     let counter: AnyCounterMetric<Int>
     let labels: [String: String]
 
-    required init(name: String, labels: [String: String], meter: Meter) {
+    required init(name: String, labels: [String: String], meter: OpenTelemetryApi.Meter) {
         metricName = name
         counter = meter.createIntCounter(name: name, monotonic: true)
         self.labels = labels
@@ -36,7 +36,7 @@ class SwiftGaugeMetric: RecorderHandler, SwiftMetric {
     let counter: AnyCounterMetric<Double>
     let labels: [String: String]
 
-    required init(name: String, labels: [String: String], meter: Meter) {
+    required init(name: String, labels: [String: String], meter: OpenTelemetryApi.Meter) {
         metricName = name
         counter = meter.createDoubleCounter(name: name, monotonic: false)
         self.labels = labels
@@ -59,7 +59,7 @@ class SwiftHistogramMetric: RecorderHandler, SwiftMetric {
     let measure: AnyMeasureMetric<Double>
     let labels: [String: String]
 
-    required init(name: String, labels: [String: String], meter: Meter) {
+    required init(name: String, labels: [String: String], meter: OpenTelemetryApi.Meter) {
         metricName = name
         measure = meter.createDoubleMeasure(name: name)
         self.labels = labels
@@ -82,7 +82,7 @@ class SwiftSummaryMetric: TimerHandler, SwiftMetric {
     let measure: AnyMeasureMetric<Double>
     let labels: [String: String]
 
-    required init(name: String, labels: [String: String], meter: Meter) {
+    required init(name: String, labels: [String: String], meter: OpenTelemetryApi.Meter) {
         metricName = name
         measure = meter.createDoubleMeasure(name: name)
         self.labels = labels
@@ -97,7 +97,7 @@ class SwiftSummaryMetric: TimerHandler, SwiftMetric {
 protocol SwiftMetric {
     var metricName: String { get }
     var metricType: MetricType { get }
-    init(name: String, labels: [String: String], meter: Meter)
+    init(name: String, labels: [String: String], meter: OpenTelemetryApi.Meter)
 }
 
 enum MetricType: String {

diff --git a/Sources/Importers/SwiftMetricsShim/SwiftMetricsShim.swift b/Sources/Importers/SwiftMetricsShim/SwiftMetricsShim.swift
@@ -8,11 +8,11 @@ import OpenTelemetryApi
 
 public class OpenTelemetrySwiftMetrics: MetricsFactory {
 
-    internal let meter: Meter
+    internal let meter: OpenTelemetryApi.Meter
     internal var metrics = [MetricKey: SwiftMetric]()
     internal let lock = Lock()
 
-    public init(meter: Meter) {
+    public init(meter: OpenTelemetryApi.Meter) {
         self.meter = meter
     }