use own instrumentation name

honeycombio · Nov 20, 2024 · ef672fe · ef672fe
1 parent 6967340
commit ef672fe
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/Sources/Honeycomb/UIKit/NavigationInstrumentation.swift b/Sources/Honeycomb/UIKit/NavigationInstrumentation.swift
@@ -1,9 +1,18 @@
 #if canImport(UIKit)
-    import Foundation
-    import OpenTelemetryApi
-    import UIKit
+import Foundation
+import OpenTelemetryApi
+import UIKit
 
-    public func installUINavigationInstrumentation() {
-        UIViewController.swizzle()
-    }
+private let honeycombUIKitInstrumentationName = "@honeycombio/instrumentation-uikit"
+
+internal func getUIKitViewTracer() -> Tracer {
+    return OpenTelemetry.instance.tracerProvider.get(
+        instrumentationName: honeycombUIKitInstrumentationName,
+        instrumentationVersion: honeycombLibraryVersion
+    )
+}
+
+public func installUINavigationInstrumentation() {
+    UIViewController.swizzle()
+}
 #endif
diff --git a/Sources/Honeycomb/UIKit/UIViewController.swift b/Sources/Honeycomb/UIKit/UIViewController.swift
@@ -9,7 +9,7 @@
 
             // Internal classes from SwiftUI will likely begin with an underscore
             if !className.hasPrefix("_") {
-                let span = getViewTracer().spanBuilder(spanName: "viewDidAppear").startSpan()
+                let span = getUIKitViewTracer().spanBuilder(spanName: "viewDidAppear").startSpan()
                 if self.title != nil {
                     span.setAttribute(key: "title", value: self.title!)
                 }
@@ -27,7 +27,7 @@
 
             // Internal classes from SwiftUI will likely begin with an underscore
             if !className.hasPrefix("_") {
-                let span = getViewTracer().spanBuilder(spanName: "viewDidDisappear").startSpan()
+                let span = getUIKitViewTracer().spanBuilder(spanName: "viewDidDisappear").startSpan()
                 if self.title != nil {
                     span.setAttribute(key: "title", value: self.title!)
                 }

diff --git a/smoke-tests/smoke-e2e.bats b/smoke-tests/smoke-e2e.bats
@@ -185,12 +185,12 @@ mk_diag_attr() {
 }
 
 @test "UIViewController attributes are correct" {
-    result=$(attributes_from_span_named "@honeycombio/instrumentation-view" viewDidAppear | \
+    result=$(attributes_from_span_named "@honeycombio/instrumentation-uikit" viewDidAppear | \
          jq "select (.key == \"className\")" | \
          jq "select (.value.stringValue == \"UIViewController\").value.stringValue")
     assert_equal "$result" '"UIViewController"'
 
-        result=$(attributes_from_span_named "@honeycombio/instrumentation-view" viewDidDisappear | \
+        result=$(attributes_from_span_named "@honeycombio/instrumentation-uikit" viewDidDisappear | \
          jq "select (.key == \"className\")" | \
          jq "select (.value.stringValue == \"UIViewController\").value.stringValue")
     assert_equal "$result" '"UIViewController"'