swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 21:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1861 - Report rust tracing configuration filter in rageshakes

Browse Source
This commit is contained in:
Stefan Ceriu 2023-10-06 12:33:13 +03:00
parent 1f12a7cb2f
commit 855b08144c
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ElementX/Sources/Other/Logging/MXLog.swift
View File

@ -59,7 +59,7 @@ enum MXLog {
return return
} }
setupTracing(configuration: .init(logLevel: logLevel), otlpConfiguration: otlpConfiguration) RustTracing.setup(configuration: .init(logLevel: logLevel), otlpConfiguration: otlpConfiguration)
if let target { if let target {
self.target = target self.target = target

28
ElementX/Sources/Other/Logging/RustTracing.swift
View File

@ -133,18 +133,24 @@ struct TracingConfiguration {
} }
} }
func setupTracing(configuration: TracingConfiguration, otlpConfiguration: OTLPConfiguration?) { enum RustTracing {
if let otlpConfiguration { private(set) static var currentTracingConfiguration: TracingConfiguration?
setupOtlpTracing(config: .init(clientName: "ElementX-iOS",
user: otlpConfiguration.username, static func setup(configuration: TracingConfiguration, otlpConfiguration: OTLPConfiguration?) {
password: otlpConfiguration.password, currentTracingConfiguration = configuration
otlpEndpoint: otlpConfiguration.url,
filter: configuration.filter, 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, writeToStdoutOrSystem: true,
writeToFiles: nil)) writeToFiles: nil))
} else { }
setupTracing(config: .init(filter: configuration.filter,
writeToStdoutOrSystem: true,
writeToFiles: nil))
} }
} }

3
ElementX/Sources/Services/BugReport/BugReportService.swift
View File

@ -218,7 +218,8 @@ class BugReportService: NSObject, BugReportServiceProtocol {
MultipartFormData(key: "fallback_language", type: .text(value: Bundle.app.developmentLocalization ?? "null")), MultipartFormData(key: "fallback_language", type: .text(value: Bundle.app.developmentLocalization ?? "null")),
MultipartFormData(key: "local_time", type: .text(value: localTime)), MultipartFormData(key: "local_time", type: .text(value: localTime)),
MultipartFormData(key: "utc_time", type: .text(value: utcTime)), 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"))
] ]
} }

1
changelog.d/1861.feature Normal file
View File

@ -0,0 +1 @@
Report rust tracing configuration filter in rageshakes