Rename EventsListenerTarget to avoid dupe symbols in iOS18 (#573)

Reflejo · web-flow · commit ee9ffc39c3d8 · 2025-08-15T01:03:32.000Z
diff --git a/.github/workflows/ios.yaml b/.github/workflows/ios.yaml
@@ -79,7 +79,7 @@ jobs:
       - run: ./bazelw run --config ci //examples/swift/hello_world:ios_app &> /tmp/envoy.log &
         name: "Run app"
   macos_tsan:
-    runs-on: macos-15
+    runs-on: macos-14
     needs: "pre_check"
     if: needs.pre_check.outputs.should_run == 'true'
     steps:
diff --git a/platform/jvm/capture/consumer-rules.pro b/platform/jvm/capture/consumer-rules.pro
@@ -52,7 +52,7 @@
    public <methods>;
 }
 
--keep, includedescriptorclasses class io.bitdrift.capture.IEventsListenerTarget {
+-keep, includedescriptorclasses class io.bitdrift.capture.IEventSubscriber {
    public <methods>;
 }
 
diff --git a/platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/CaptureJniLibrary.kt b/platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/CaptureJniLibrary.kt
@@ -42,7 +42,7 @@ internal object CaptureJniLibrary : IBridge {
      * @param metadataProvider used to provide metadata for emitted logs.
      * @param resourceUtilizationTarget used to inform platform layer about a need to emit a resource log.
      * @param sessionReplayTarget used to inform platform layer about a need to emit session replay logs.
-     * @param eventsListenerTarget responsible for listening to platform events and emitting logs in response to them.
+     * @param eventSubscriber responsible for listening to platform events and emitting logs in response to them.
      * @param applicationId the application ID of the current app, used to identify with the backend
      * @param applicationVersion the version of the current app, used to identify with the backend
      * @param model the host device model, used to identify with the backend
@@ -58,7 +58,7 @@ internal object CaptureJniLibrary : IBridge {
         metadataProvider: IMetadataProvider,
         resourceUtilizationTarget: IResourceUtilizationTarget,
         sessionReplayTarget: ISessionReplayTarget,
-        eventsListenerTarget: IEventsListenerTarget,
+        eventSubscriber: IEventSubscriber,
         applicationId: String,
         applicationVersion: String,
         model: String,
diff --git a/platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/IBridge.kt b/platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/IBridge.kt
@@ -19,7 +19,7 @@ internal interface IBridge {
         metadataProvider: IMetadataProvider,
         resourceUtilizationTarget: IResourceUtilizationTarget,
         sessionReplayTarget: ISessionReplayTarget,
-        eventsListenerTarget: IEventsListenerTarget,
+        eventSubscriber: IEventSubscriber,
         applicationId: String,
         applicationVersion: String,
         model: String,
diff --git a/platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/IEventSubscriber.kt b/platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/IEventSubscriber.kt
@@ -11,7 +11,7 @@ package io.bitdrift.capture
  * Responsible for managing event listeners that emit out-of-the-box logs in response
  * to various system notifications and events.
  */
-interface IEventsListenerTarget {
+interface IEventSubscriber {
     /**
      * Starts the event listener, giving it an opportunity to subscribe to notifications
      * and system events.
diff --git a/platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/LoggerImpl.kt b/platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/LoggerImpl.kt
@@ -28,7 +28,7 @@ import io.bitdrift.capture.events.common.PowerMonitor
 import io.bitdrift.capture.events.device.DeviceStateListenerLogger
 import io.bitdrift.capture.events.lifecycle.AppExitLogger
 import io.bitdrift.capture.events.lifecycle.AppLifecycleListenerLogger
-import io.bitdrift.capture.events.lifecycle.EventsListenerTarget
+import io.bitdrift.capture.events.lifecycle.EventSubscriber
 import io.bitdrift.capture.events.performance.BatteryMonitor
 import io.bitdrift.capture.events.performance.DiskUsageMonitor
 import io.bitdrift.capture.events.performance.JankStatsMonitor
@@ -106,7 +106,7 @@ internal class LoggerImpl(
     private val sessionUrlBase: HttpUrl
 
     private val resourceUtilizationTarget: ResourceUtilizationTarget
-    private val eventsListenerTarget = EventsListenerTarget()
+    private val eventSubscriber = EventSubscriber()
 
     private val sessionReplayTarget: SessionReplayTarget?
 
@@ -189,14 +189,14 @@ internal class LoggerImpl(
                 sessionStrategy.createSessionStrategyConfiguration { appExitSaveCurrentSessionId(it) },
                 metadataProvider,
                 // TODO(Augustyniak): Pass `resourceUtilizationTarget`, `sessionReplayTarget`,
-                //  and `eventsListenerTarget` as part of `startLogger` method call instead.
+                //  and `eventSubscriber` as part of `startLogger` method call instead.
                 // Pass the event listener target here and finish setting up
                 // before the logger is actually started.
                 resourceUtilizationTarget,
                 sessionReplayTarget,
                 // Pass the event listener target here and finish setting up
                 // before the logger is actually started.
-                eventsListenerTarget,
+                eventSubscriber,
                 clientAttributes.appId,
                 clientAttributes.appVersion,
                 deviceAttributes.model(),
@@ -215,7 +215,7 @@ internal class LoggerImpl(
         diskUsageMonitor.runtime = runtime
         memoryMetricsProvider.runtime = runtime
 
-        eventsListenerTarget.add(
+        eventSubscriber.add(
             AppLifecycleListenerLogger(
                 this,
                 ProcessLifecycleOwner.get(),
@@ -225,7 +225,7 @@ internal class LoggerImpl(
             ),
         )
 
-        eventsListenerTarget.add(
+        eventSubscriber.add(
             DeviceStateListenerLogger(
                 this,
                 context,
@@ -236,7 +236,7 @@ internal class LoggerImpl(
             ),
         )
 
-        eventsListenerTarget.add(
+        eventSubscriber.add(
             AppUpdateListenerLogger(
                 this,
                 clientAttributes,
@@ -603,7 +603,7 @@ internal class LoggerImpl(
                     errorHandler,
                 )
             jankStatsMonitor?.let {
-                eventsListenerTarget.add(it)
+                eventSubscriber.add(it)
             }
         } else {
             errorHandler.handleError("Couldn't start JankStatsMonitor. Invalid application provided")
diff --git a/platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/events/lifecycle/EventSubscriber.kt b/platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/events/lifecycle/EventSubscriber.kt
@@ -7,15 +7,15 @@
 
 package io.bitdrift.capture.events.lifecycle
 
-import io.bitdrift.capture.IEventsListenerTarget
+import io.bitdrift.capture.IEventSubscriber
 import io.bitdrift.capture.events.IEventListenerLogger
 import io.bitdrift.capture.events.SafeEventListenerLogger
 
 /**
  * A wrapper around platform event listeners that subscribe to various system notifications
  * and emit Capture out-of-the-box in response to them.
  */
-internal class EventsListenerTarget : IEventsListenerTarget {
+internal class EventSubscriber : IEventSubscriber {
     private var listeners: MutableList<IEventListenerLogger> = mutableListOf()
 
     fun add(eventListener: IEventListenerLogger) {
diff --git a/platform/jvm/capture/src/test/kotlin/io/bitdrift/capture/CaptureTestJniLibrary.kt b/platform/jvm/capture/src/test/kotlin/io/bitdrift/capture/CaptureTestJniLibrary.kt
@@ -89,7 +89,7 @@ object CaptureTestJniLibrary {
     external fun runSessionReplayTargetTest(target: Any)
 
     // Runs events listener target test.
-    external fun runEventsListenerTargetTest(target: Any)
+    external fun runEventSubscriberTest(target: Any)
 
     // Issues a runtime update causing the specified feature to be marked as disabled.
     external fun disableRuntimeFeature(
diff --git a/platform/jvm/capture/src/test/kotlin/io/bitdrift/capture/events/lifecycle/EventSubscriberTest.kt b/platform/jvm/capture/src/test/kotlin/io/bitdrift/capture/events/lifecycle/EventSubscriberTest.kt
@@ -11,15 +11,15 @@ import io.bitdrift.capture.CaptureJniLibrary
 import io.bitdrift.capture.CaptureTestJniLibrary
 import org.junit.Test
 
-class EventsListenerTargetTest {
-    private val listener = EventsListenerTarget()
+class EventSubscriberTest {
+    private val listener = EventSubscriber()
 
     init {
         CaptureJniLibrary.load()
     }
 
     @Test
-    fun eventsListenerTargetDoesNotCrash() {
-        CaptureTestJniLibrary.runEventsListenerTargetTest(listener)
+    fun eventSubscriberDoesNotCrash() {
+        CaptureTestJniLibrary.runEventSubscriberTest(listener)
     }
 }
diff --git a/platform/jvm/src/events.rs b/platform/jvm/src/events.rs
@@ -17,8 +17,7 @@ static TARGET_START: OnceLock<CachedMethod> = OnceLock::new();
 static TARGET_STOP: OnceLock<CachedMethod> = OnceLock::new();
 
 pub(crate) fn initialize(env: &mut JNIEnv<'_>) {
-  let events_listener_target =
-    initialize_class(env, "io/bitdrift/capture/IEventsListenerTarget", None);
+  let events_listener_target = initialize_class(env, "io/bitdrift/capture/IEventSubscriber", None);
   initialize_method_handle(
     env,
     &events_listener_target.class,
diff --git a/platform/swift/source/CaptureRustBridge.h b/platform/swift/source/CaptureRustBridge.h
@@ -42,7 +42,7 @@ logger_id capture_create_logger(
     id<MetadataProvider> metadata_provider,
     id<ResourceUtilizationTarget> resource_utilization_target,
     id<SessionReplayTarget> session_replay_target,
-    id<EventsListenerTarget> events_listener_target,
+    id<EventSubscriber> events_listener_target,
     const char *app_id,
     const char *app_version,
     const char *model,
diff --git a/platform/swift/source/Logger.swift b/platform/swift/source/Logger.swift
@@ -31,7 +31,7 @@ public final class Logger {
     private(set) var sessionReplayTarget: SessionReplayTarget
     private(set) var dispatchSourceMemoryMonitor: DispatchSourceMemoryMonitor?
     private(set) var resourceUtilizationTarget: ResourceUtilizationTarget
-    private(set) var eventsListenerTarget: EventsListenerTarget
+    private(set) var eventSubscriber: EventSubscriber
 
     private let sessionURLBase: URL
 
@@ -165,7 +165,7 @@ public final class Logger {
             storageProvider: storageProvider,
             timeProvider: timeProvider
         )
-        self.eventsListenerTarget = EventsListenerTarget()
+        self.eventSubscriber = EventSubscriber()
 
         let sessionReplayTarget = SessionReplayTarget(configuration: configuration.sessionReplayConfiguration)
         self.sessionReplayTarget = sessionReplayTarget
@@ -176,14 +176,14 @@ public final class Logger {
             sessionStrategy: sessionStrategy,
             metadataProvider: metadataProvider,
             // TODO(Augustyniak): Pass `resourceUtilizationTarget`, `sessionReplayTarget`,
-            // and `eventsListenerTarget` as part of the `self.underlyingLogger.start()` method call instead.
+            // and `eventSubscriber` as part of the `self.underlyingLogger.start()` method call instead.
             // Pass the event listener target here and finish setting up
             // before the logger is actually started.
             resourceUtilizationTarget: self.resourceUtilizationTarget,
             sessionReplayTarget: self.sessionReplayTarget,
             // Pass the event listener target here and finish setting up
             // before the logger is actually started.
-            eventsListenerTarget: self.eventsListenerTarget,
+            eventSubscriber: self.eventSubscriber,
             appID: clientAttributes.appID,
             releaseVersion: clientAttributes.appVersion,
             model: deviceAttributes.hardwareVersion,
@@ -205,7 +205,7 @@ public final class Logger {
             self.underlyingLogger.logSDKStart(fields: fields, duration: duration)
         }
 
-        self.eventsListenerTarget.setUp(
+        self.eventSubscriber.setUp(
             logger: self.underlyingLogger,
             appStateAttributes: appStateAttributes,
             clientAttributes: clientAttributes,
diff --git a/platform/swift/source/LoggerBridge.swift b/platform/swift/source/LoggerBridge.swift
@@ -68,7 +68,7 @@ final class LoggerBridge: LoggerBridging {
         metadataProvider: CaptureLoggerBridge.MetadataProvider,
         resourceUtilizationTarget: CaptureLoggerBridge.ResourceUtilizationTarget,
         sessionReplayTarget: CaptureLoggerBridge.SessionReplayTarget,
-        eventsListenerTarget: CaptureLoggerBridge.EventsListenerTarget,
+        eventSubscriber: CaptureLoggerBridge.EventSubscriber,
         appID: String,
         releaseVersion: String,
         model: String,
@@ -91,7 +91,7 @@ final class LoggerBridge: LoggerBridging {
             metadataProvider,
             resourceUtilizationTarget,
             sessionReplayTarget,
-            eventsListenerTarget,
+            eventSubscriber,
             appID,
             releaseVersion,
             model,
@@ -122,7 +122,7 @@ final class LoggerBridge: LoggerBridging {
         metadataProvider: CaptureLoggerBridge.MetadataProvider,
         resourceUtilizationTarget: CaptureLoggerBridge.ResourceUtilizationTarget,
         sessionReplayTarget: CaptureLoggerBridge.SessionReplayTarget,
-        eventsListenerTarget: CaptureLoggerBridge.EventsListenerTarget,
+        eventSubscriber: CaptureLoggerBridge.EventSubscriber,
         appID: String,
         releaseVersion: String,
         model: String,
@@ -137,7 +137,7 @@ final class LoggerBridge: LoggerBridging {
             metadataProvider: metadataProvider,
             resourceUtilizationTarget: resourceUtilizationTarget,
             sessionReplayTarget: sessionReplayTarget,
-            eventsListenerTarget: eventsListenerTarget,
+            eventSubscriber: eventSubscriber,
             appID: appID,
             releaseVersion: releaseVersion,
             model: model,
diff --git a/platform/swift/source/LoggerBridgingFactory.swift b/platform/swift/source/LoggerBridgingFactory.swift
@@ -15,7 +15,7 @@ final class LoggerBridgingFactory: LoggerBridgingFactoryProvider {
         metadataProvider: CaptureLoggerBridge.MetadataProvider,
         resourceUtilizationTarget: CaptureLoggerBridge.ResourceUtilizationTarget,
         sessionReplayTarget: CaptureLoggerBridge.SessionReplayTarget,
-        eventsListenerTarget: CaptureLoggerBridge.EventsListenerTarget,
+        eventSubscriber: CaptureLoggerBridge.EventSubscriber,
         appID: String,
         releaseVersion: String,
         model: String,
@@ -30,7 +30,7 @@ final class LoggerBridgingFactory: LoggerBridgingFactoryProvider {
             metadataProvider: metadataProvider,
             resourceUtilizationTarget: resourceUtilizationTarget,
             sessionReplayTarget: sessionReplayTarget,
-            eventsListenerTarget: eventsListenerTarget,
+            eventSubscriber: eventSubscriber,
             appID: appID,
             releaseVersion: releaseVersion,
             model: model,
diff --git a/platform/swift/source/LoggerBridgingFactoryProvider.swift b/platform/swift/source/LoggerBridgingFactoryProvider.swift
@@ -17,7 +17,7 @@ protocol LoggerBridgingFactoryProvider {
     /// - parameter metadataProvider:          The metadata provider to use.
     /// - parameter resourceUtilizationTarget: The resource utilization target to use.
     /// - parameter sessionReplayTarget:       The session replay target to use.
-    /// - parameter eventsListenerTarget:      The events listener target to use.
+    /// - parameter eventSubscriber:           The events listener target to use.
     /// - parameter appID:                     The host application application identifier.
     /// - parameter releaseVersion:            The host application release version.
     /// - parameter model:                     The host device model.
@@ -33,7 +33,7 @@ protocol LoggerBridgingFactoryProvider {
         metadataProvider: CaptureLoggerBridge.MetadataProvider,
         resourceUtilizationTarget: CaptureLoggerBridge.ResourceUtilizationTarget,
         sessionReplayTarget: CaptureLoggerBridge.SessionReplayTarget,
-        eventsListenerTarget: CaptureLoggerBridge.EventsListenerTarget,
+        eventSubscriber: CaptureLoggerBridge.EventSubscriber,
         appID: String,
         releaseVersion: String,
         model: String,
diff --git a/platform/swift/source/bridging/EventSubscriber.swift b/platform/swift/source/bridging/EventSubscriber.swift
@@ -10,7 +10,7 @@ import Foundation
 /// Responsible for managing event listeners that emit out-of-the-box logs in response to
 /// various system notifications and events.
 @objc
-public protocol EventsListenerTarget {
+public protocol EventSubscriber {
     /// Starts the event listener, giving it an opportunity to subscribe to notifications
     /// and system events.
     func start()
diff --git a/platform/swift/source/default/events/EventSubscriber.swift b/platform/swift/source/default/events/EventSubscriber.swift
@@ -10,7 +10,7 @@ import Foundation
 
 /// A wrapper around platform event listeners that subscribe to various system notifications
 /// and emit Capture out-of-the-box in response to them.
-final class EventsListenerTarget {
+final class EventSubscriber {
     private let listeners = Atomic([EventListener]())
 
     func setUp(
@@ -39,7 +39,7 @@ final class EventsListenerTarget {
     }
 }
 
-extension EventsListenerTarget: CaptureLoggerBridge.EventsListenerTarget {
+extension EventSubscriber: CaptureLoggerBridge.EventSubscriber {
     func start() {
         self.listeners.update { $0.forEach { $0.start() } }
     }
diff --git a/test/platform/jvm/src/lib.rs b/test/platform/jvm/src/lib.rs
@@ -361,7 +361,7 @@ pub extern "C" fn Java_io_bitdrift_capture_CaptureTestJniLibrary_runSessionRepla
 }
 
 #[no_mangle]
-pub extern "C" fn Java_io_bitdrift_capture_CaptureTestJniLibrary_runEventsListenerTargetTest(
+pub extern "C" fn Java_io_bitdrift_capture_CaptureTestJniLibrary_runEventSubscriberTest(
   mut env: JNIEnv<'_>,
   _class: JClass<'_>,
   target: JObject<'_>,
diff --git a/test/platform/swift/bridging/CaptureTestBridge.h b/test/platform/swift/bridging/CaptureTestBridge.h
@@ -58,4 +58,4 @@ void run_resource_utilization_target_test(id<ResourceUtilizationTarget>);
 
 void run_session_replay_target_test(id<SessionReplayTarget>);
 
-void run_events_listener_target_test(id<EventsListenerTarget>);
+void run_events_listener_target_test(id<EventSubscriber>);
diff --git a/test/platform/swift/unit_integration/core/bridge/EventSubscriberTests.swift b/test/platform/swift/unit_integration/core/bridge/EventSubscriberTests.swift
@@ -10,9 +10,9 @@ import CaptureMocks
 @testable import CaptureTestBridge
 import XCTest
 
-final class EventsListenerTargetTests: XCTestCase {
-    func testEventsListenerTargetDoesNotCrash() {
-        let listener = EventsListenerTarget()
+final class EventSubscriberTests: XCTestCase {
+    func testEventSubscriberDoesNotCrash() {
+        let listener = EventSubscriber()
         listener.setUp(
             logger: MockCoreLogging(),
             appStateAttributes: AppStateAttributes(),
diff --git a/test/platform/swift/unit_integration/core/network/helper/BaseNetworkingTestCase.swift b/test/platform/swift/unit_integration/core/network/helper/BaseNetworkingTestCase.swift
@@ -82,7 +82,7 @@ open class BaseNetworkingTestCase: XCTestCase {
                 metadataProvider: MockMetadataProvider(),
                 resourceUtilizationTarget: MockResourceUtilizationTarget(),
                 sessionReplayTarget: MockSessionReplayTarget(),
-                eventsListenerTarget: MockEventsListenerTarget(),
+                eventSubscriber: MockEventSubscriber(),
                 appID: "io.bitdrift.capture.test",
                 releaseVersion: "",
                 model: "",
diff --git a/test/platform/swift/unit_integration/mocks/MockEventSubscriber.swift b/test/platform/swift/unit_integration/mocks/MockEventSubscriber.swift
@@ -7,7 +7,7 @@
 
 @testable import CaptureLoggerBridge
 
-public final class MockEventsListenerTarget: CaptureLoggerBridge.EventsListenerTarget {
+public final class MockEventSubscriber: CaptureLoggerBridge.EventSubscriber {
     public init() {}
 
     public func start() {}
diff --git a/test/platform/swift/unit_integration/mocks/MockLoggerBridgingFactory.swift b/test/platform/swift/unit_integration/mocks/MockLoggerBridgingFactory.swift
@@ -24,7 +24,7 @@ public final class MockLoggerBridgingFactory: LoggerBridgingFactoryProvider {
         metadataProvider _: CaptureLoggerBridge.MetadataProvider,
         resourceUtilizationTarget _: CaptureLoggerBridge.ResourceUtilizationTarget,
         sessionReplayTarget _: CaptureLoggerBridge.SessionReplayTarget,
-        eventsListenerTarget _: CaptureLoggerBridge.EventsListenerTarget,
+        eventSubscriber _: CaptureLoggerBridge.EventSubscriber,
         appID _: String,
         releaseVersion _: String,
         model _: String,

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`public <methods>;`
`53`	`53`	`}`
`54`	`54`
`55`		`--keep, includedescriptorclasses class io.bitdrift.capture.IEventsListenerTarget {`
	`55`	`+-keep, includedescriptorclasses class io.bitdrift.capture.IEventSubscriber {`
`56`	`56`	`public <methods>;`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,15 @@ import io.bitdrift.capture.CaptureJniLibrary`
`11`	`11`	`import io.bitdrift.capture.CaptureTestJniLibrary`
`12`	`12`	`import org.junit.Test`
`13`	`13`
`14`		`-class EventsListenerTargetTest {`
`15`		`- private val listener = EventsListenerTarget()`
	`14`	`+class EventSubscriberTest {`
	`15`	`+ private val listener = EventSubscriber()`
`16`	`16`
`17`	`17`	`init {`
`18`	`18`	`CaptureJniLibrary.load()`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Test`
`22`		`- fun eventsListenerTargetDoesNotCrash() {`
`23`		`- CaptureTestJniLibrary.runEventsListenerTargetTest(listener)`
	`22`	`+ fun eventSubscriberDoesNotCrash() {`
	`23`	`+ CaptureTestJniLibrary.runEventSubscriberTest(listener)`
`24`	`24`	`}`
`25`	`25`	`}`