mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 06:55:59 +00:00
Remove OTLP support.
This commit is contained in:
@@ -70,13 +70,7 @@ class AppCoordinator: AppCoordinatorProtocol, AuthenticationFlowCoordinatorDeleg
|
||||
|
||||
let appSettings = AppSettings()
|
||||
|
||||
if appSettings.otlpTracingEnabled {
|
||||
MXLog.configure(logLevel: appSettings.logLevel, otlpConfiguration: .init(url: appSettings.otlpTracingURL,
|
||||
username: appSettings.otlpTracingUsername,
|
||||
password: appSettings.otlpTracingPassword))
|
||||
} else {
|
||||
MXLog.configure(logLevel: appSettings.logLevel)
|
||||
}
|
||||
MXLog.configure(logLevel: appSettings.logLevel)
|
||||
|
||||
let appName = InfoPlistReader.main.bundleDisplayName
|
||||
let appVersion = InfoPlistReader.main.bundleShortVersionString
|
||||
|
||||
@@ -35,7 +35,6 @@ final class AppSettings {
|
||||
case enableInAppNotifications
|
||||
case pusherProfileTag
|
||||
case logLevel
|
||||
case otlpTracingEnabled
|
||||
case viewSourceEnabled
|
||||
case richTextEditorEnabled
|
||||
case appAppearance
|
||||
@@ -255,15 +254,6 @@ final class AppSettings {
|
||||
@UserPreference(key: UserDefaultsKeys.pusherProfileTag, storageType: .userDefaults(store))
|
||||
var pusherProfileTag: String?
|
||||
|
||||
// MARK: - Logging
|
||||
|
||||
@UserPreference(key: UserDefaultsKeys.otlpTracingEnabled, defaultValue: false, storageType: .userDefaults(store))
|
||||
var otlpTracingEnabled
|
||||
|
||||
let otlpTracingURL = InfoPlistReader.main.otlpTracingURL
|
||||
let otlpTracingUsername = InfoPlistReader.main.otlpTracingUsername
|
||||
let otlpTracingPassword = InfoPlistReader.main.otlpTracingPassword
|
||||
|
||||
// MARK: - Maps
|
||||
|
||||
// maptiler base url
|
||||
|
||||
@@ -29,10 +29,6 @@ struct InfoPlistReader {
|
||||
static let utTypeIdentifierKey = "UTTypeIdentifier"
|
||||
static let utDescriptionKey = "UTTypeDescription"
|
||||
|
||||
static let otlpTracingURL = "otlpTracingURL"
|
||||
static let otlpTracingUsername = "otlpTracingUsername"
|
||||
static let otlpTracingPassword = "otlpTracingPassword"
|
||||
|
||||
static let bundleURLTypes = "CFBundleURLTypes"
|
||||
static let bundleURLName = "CFBundleURLName"
|
||||
static let bundleURLSchemes = "CFBundleURLSchemes"
|
||||
@@ -107,20 +103,6 @@ struct InfoPlistReader {
|
||||
infoPlistValue(forKey: Keys.mapLibreAPIKey)
|
||||
}
|
||||
|
||||
// MARK: - OTLP Tracing
|
||||
|
||||
var otlpTracingURL: String {
|
||||
infoPlistValue(forKey: Keys.otlpTracingURL)
|
||||
}
|
||||
|
||||
var otlpTracingUsername: String {
|
||||
infoPlistValue(forKey: Keys.otlpTracingUsername)
|
||||
}
|
||||
|
||||
var otlpTracingPassword: String {
|
||||
infoPlistValue(forKey: Keys.otlpTracingPassword)
|
||||
}
|
||||
|
||||
// MARK: - Custom App Scheme
|
||||
|
||||
var appScheme: String {
|
||||
|
||||
@@ -33,11 +33,10 @@ enum MXLog {
|
||||
private static var target: String!
|
||||
|
||||
static func configure(target: String? = nil,
|
||||
logLevel: TracingConfiguration.LogLevel,
|
||||
otlpConfiguration: OTLPConfiguration? = nil) {
|
||||
logLevel: TracingConfiguration.LogLevel) {
|
||||
guard !didConfigureOnce else { return }
|
||||
|
||||
RustTracing.setup(configuration: .init(logLevel: logLevel, target: target), otlpConfiguration: otlpConfiguration)
|
||||
RustTracing.setup(configuration: .init(logLevel: logLevel, target: target))
|
||||
|
||||
if let target {
|
||||
self.target = target
|
||||
|
||||
@@ -17,12 +17,6 @@
|
||||
import Foundation
|
||||
import MatrixRustSDK
|
||||
|
||||
struct OTLPConfiguration {
|
||||
let url: String
|
||||
let username: String
|
||||
let password: String
|
||||
}
|
||||
|
||||
enum RustTracing {
|
||||
/// The base filename used for log files. This may be suffixed by the target
|
||||
/// name and other log management metadata during rotation.
|
||||
@@ -31,32 +25,19 @@ enum RustTracing {
|
||||
static var logsDirectory: URL { .appGroupContainerDirectory }
|
||||
|
||||
private(set) static var currentTracingConfiguration: TracingConfiguration?
|
||||
static func setup(configuration: TracingConfiguration, otlpConfiguration: OTLPConfiguration?) {
|
||||
static func setup(configuration: TracingConfiguration) {
|
||||
currentTracingConfiguration = configuration
|
||||
|
||||
// Keep a minimum of 1 week of log files. In reality it will be longer
|
||||
// as the app is unlikely to be running continuously.
|
||||
let maxFiles: UInt64 = 24 * 7
|
||||
|
||||
if let otlpConfiguration {
|
||||
setupOtlpTracing(config: .init(clientName: "ElementX-iOS",
|
||||
user: otlpConfiguration.username,
|
||||
password: otlpConfiguration.password,
|
||||
otlpEndpoint: otlpConfiguration.url,
|
||||
filter: configuration.filter,
|
||||
writeToStdoutOrSystem: true,
|
||||
writeToFiles: .init(path: logsDirectory.path(percentEncoded: false),
|
||||
filePrefix: configuration.fileName,
|
||||
fileSuffix: configuration.fileExtension,
|
||||
maxFiles: maxFiles)))
|
||||
} else {
|
||||
setupTracing(config: .init(filter: configuration.filter,
|
||||
writeToStdoutOrSystem: true,
|
||||
writeToFiles: .init(path: logsDirectory.path(percentEncoded: false),
|
||||
filePrefix: configuration.fileName,
|
||||
fileSuffix: configuration.fileExtension,
|
||||
maxFiles: maxFiles)))
|
||||
}
|
||||
setupTracing(config: .init(filter: configuration.filter,
|
||||
writeToStdoutOrSystem: true,
|
||||
writeToFiles: .init(path: logsDirectory.path(percentEncoded: false),
|
||||
filePrefix: configuration.fileName,
|
||||
fileSuffix: configuration.fileExtension,
|
||||
maxFiles: maxFiles)))
|
||||
}
|
||||
|
||||
/// A list of all log file URLs, sorted chronologically. This is only public for testing purposes, within
|
||||
|
||||
-1
@@ -45,7 +45,6 @@ enum DeveloperOptionsScreenViewAction {
|
||||
|
||||
protocol DeveloperOptionsProtocol: AnyObject {
|
||||
var logLevel: TracingConfiguration.LogLevel { get set }
|
||||
var otlpTracingEnabled: Bool { get set }
|
||||
var shouldCollapseRoomStateEvents: Bool { get set }
|
||||
var hideUnreadMessagesBadge: Bool { get set }
|
||||
var elementCallBaseURL: URL { get set }
|
||||
|
||||
-5
@@ -25,11 +25,6 @@ struct DeveloperOptionsScreen: View {
|
||||
Form {
|
||||
Section("Logging") {
|
||||
LogLevelConfigurationView(logLevel: $context.logLevel)
|
||||
|
||||
Toggle(isOn: $context.otlpTracingEnabled) {
|
||||
Text("OTLP tracing")
|
||||
Text("Requires app reboot")
|
||||
}
|
||||
}
|
||||
|
||||
Section("Room List") {
|
||||
|
||||
Reference in New Issue
Block a user