diff --git a/ElementX/Sources/Other/Logging/MXLog.swift b/ElementX/Sources/Other/Logging/MXLog.swift index 6b0e236d5..e89b01c09 100644 --- a/ElementX/Sources/Other/Logging/MXLog.swift +++ b/ElementX/Sources/Other/Logging/MXLog.swift @@ -59,7 +59,7 @@ enum MXLog { return } - setupTracing(configuration: .init(logLevel: logLevel), otlpConfiguration: otlpConfiguration) + RustTracing.setup(configuration: .init(logLevel: logLevel), otlpConfiguration: otlpConfiguration) if let target { self.target = target diff --git a/ElementX/Sources/Other/Logging/RustTracing.swift b/ElementX/Sources/Other/Logging/RustTracing.swift index 7774ffc08..d62b00aea 100644 --- a/ElementX/Sources/Other/Logging/RustTracing.swift +++ b/ElementX/Sources/Other/Logging/RustTracing.swift @@ -133,18 +133,24 @@ struct TracingConfiguration { } } -func setupTracing(configuration: TracingConfiguration, otlpConfiguration: OTLPConfiguration?) { - if let otlpConfiguration { - setupOtlpTracing(config: .init(clientName: "ElementX-iOS", - user: otlpConfiguration.username, - password: otlpConfiguration.password, - otlpEndpoint: otlpConfiguration.url, - filter: configuration.filter, +enum RustTracing { + private(set) static var currentTracingConfiguration: TracingConfiguration? + + static func setup(configuration: TracingConfiguration, otlpConfiguration: OTLPConfiguration?) { + currentTracingConfiguration = configuration + + if let otlpConfiguration { + setupOtlpTracing(config: .init(clientName: "ElementX-iOS", + user: otlpConfiguration.username, + password: otlpConfiguration.password, + otlpEndpoint: otlpConfiguration.url, + filter: configuration.filter, + writeToStdoutOrSystem: true, + writeToFiles: nil)) + } else { + setupTracing(config: .init(filter: configuration.filter, writeToStdoutOrSystem: true, writeToFiles: nil)) - } else { - setupTracing(config: .init(filter: configuration.filter, - writeToStdoutOrSystem: true, - writeToFiles: nil)) + } } } diff --git a/ElementX/Sources/Services/BugReport/BugReportService.swift b/ElementX/Sources/Services/BugReport/BugReportService.swift index c08122c37..f5fab48b6 100644 --- a/ElementX/Sources/Services/BugReport/BugReportService.swift +++ b/ElementX/Sources/Services/BugReport/BugReportService.swift @@ -218,7 +218,8 @@ class BugReportService: NSObject, BugReportServiceProtocol { MultipartFormData(key: "fallback_language", type: .text(value: Bundle.app.developmentLocalization ?? "null")), MultipartFormData(key: "local_time", type: .text(value: localTime)), MultipartFormData(key: "utc_time", type: .text(value: utcTime)), - MultipartFormData(key: "base_bundle_identifier", type: .text(value: InfoPlistReader.main.baseBundleIdentifier)) + MultipartFormData(key: "base_bundle_identifier", type: .text(value: InfoPlistReader.main.baseBundleIdentifier)), + MultipartFormData(key: "rust_tracing_filter", type: .text(value: RustTracing.currentTracingConfiguration?.filter ?? "null")) ] } diff --git a/changelog.d/1861.feature b/changelog.d/1861.feature new file mode 100644 index 000000000..0ea27fd2a --- /dev/null +++ b/changelog.d/1861.feature @@ -0,0 +1 @@ +Report rust tracing configuration filter in rageshakes \ No newline at end of file