feat: refactor instrumentation options

ExampleApp/ExampleApp/Client.swift

@@ -17,7 +17,15 @@ struct Client {
                     tracesApi: .enabled,
                     metricsApi: .enabled,
                     crashReporting: .disabled,
-                    autoInstrumentation: [.urlSession, .userTaps, .memory, .cpu, .memoryWarnings]
+                    autoInstrumentation: [.urlSession, .userTaps, .memory, .cpu, .memoryWarnings],
+                    instrumentation: .init(
+                        urlSession: .enabled,
+                        userTaps: .enabled,
+                        memory: .enabled,
+                        memoryWarnings: .enabled,
+                        cpu: .disabled,
+                        launchTimes: .enabled
+                    )
                 )
             )
         ]

Sources/Observability/Api/Options.swift

@@ -130,6 +130,13 @@ public struct Options {
     public enum FeatureFlag {
         case enabled
         case disabled
+
+        var isEnabled: Bool {
+            switch self {
+            case .enabled: return true
+            case .disabled: return false
+            }
+        }
     }
     public enum TracingOriginsOption {
         case enabled([String])
@@ -144,6 +151,30 @@ public struct Options {
         case cpu
         case launchTimes
     }
+    public struct Instrumentation {
+        let urlSession: FeatureFlag
+        let userTaps: FeatureFlag
+        let memory: FeatureFlag
+        let memoryWarnings: FeatureFlag
+        let cpu: FeatureFlag
+        let launchTimes: FeatureFlag
+
+        public init(
+            urlSession: FeatureFlag = .disabled,
+            userTaps: FeatureFlag = .disabled,
+            memory: FeatureFlag = .disabled,
+            memoryWarnings: FeatureFlag = .disabled,
+            cpu: FeatureFlag = .disabled,
+            launchTimes: FeatureFlag = .disabled
+        ) {
+            self.urlSession = urlSession
+            self.userTaps = userTaps
+            self.memory = memory
+            self.memoryWarnings = memoryWarnings
+            self.cpu = cpu
+            self.launchTimes = launchTimes
+        }
+    }
     public var serviceName: String
     public var serviceVersion: String
     public var otlpEndpoint: String
@@ -161,6 +192,7 @@ public struct Options {
     public var log: OSLog
     public var crashReporting: FeatureFlag
     public var autoInstrumentation: Set<AutoInstrumented>
+    public var instrumentation: Instrumentation
     let launchMeter = LaunchMeter()
 
     public init(
@@ -180,7 +212,8 @@ public struct Options {
         metricsApi: AppMetrics = .enabled,
         log: OSLog = OSLog(subsystem: "com.launchdarkly", category: "LaunchDarklyObservabilityPlugin"),
         crashReporting: FeatureFlag = .enabled,
-        autoInstrumentation: Set<AutoInstrumented> = [.urlSession]
+        autoInstrumentation: Set<AutoInstrumented> = [.urlSession],
+        instrumentation: Instrumentation = .init()
     ) {
         self.serviceName = serviceName
         self.serviceVersion = serviceVersion
@@ -199,5 +232,6 @@ public struct Options {
         self.log = log
         self.crashReporting = crashReporting
         self.autoInstrumentation = autoInstrumentation
+        self.instrumentation = instrumentation
     }
 }

Sources/Observability/Client/ObservabilityClientFactory.swift

@@ -48,7 +48,7 @@ public struct ObservabilityClientFactory {
         Task {
             await batchWorker.addExporter(logExporter)
         }
-        if options.autoInstrumentation.contains(.memoryWarnings) {
+        if options.instrumentation.memoryWarnings.isEnabled {
             let memoryWarningMonitor = MemoryPressureMonitor(options: options, appLogBuilder: appLogBuilder) { log in
                 await eventQueue.send(LogItem(log: log))
             }
@@ -88,7 +88,7 @@ public struct ObservabilityClientFactory {
             options: options.tracesApi,
             tracingApiClient: traceClient
         )
-        if options.autoInstrumentation.contains(.urlSession) {
+        if options.instrumentation.urlSession.isEnabled {
             autoInstrumentation.append(
                 NetworkInstrumentationManager(
                     options: options,
@@ -97,7 +97,7 @@ public struct ObservabilityClientFactory {
                 )
             )
         }
-        if options.autoInstrumentation.contains(.launchTimes) {
+        if options.instrumentation.launchTimes.isEnabled {
             options.launchMeter.subscribe { statistics in
                 for element in statistics {
                     let span = traceClient.startSpan(
@@ -141,7 +141,7 @@ public struct ObservabilityClientFactory {
             metricsApiClient: metricsClient
         )
 
-        if options.autoInstrumentation.contains(.memory) {
+        if options.instrumentation.memory.isEnabled {
             autoInstrumentation.append(
                 MeasurementTask(metricsApi: metricsClient, samplingInterval: autoInstrumentationSamplingInterval) { api in
                     guard let report = MemoryUseManager.memoryReport(log: options.log) else { return }
@@ -155,7 +155,7 @@ public struct ObservabilityClientFactory {
             )
         }
 
-        if options.autoInstrumentation.contains(.cpu) {
+        if options.instrumentation.cpu.isEnabled {
             autoInstrumentation.append(
                 MeasurementTask(metricsApi: metricsClient, samplingInterval: autoInstrumentationSamplingInterval) { api in
                     guard let value = CpuUtilizationManager.currentCPUUsage() else { return }