Skip to content

Commit

Permalink
Merge pull request #228 from TelemetryDeck/feature/default-param-fix
Browse files Browse the repository at this point in the history
Prevent adding default parameter prefix to TelemetryDeck-internal params
  • Loading branch information
Jeehut authored Jan 31, 2025
2 parents b24e4ec + f7cea9d commit 8ec0286
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions Sources/TelemetryDeck/TelemetryDeck.swift
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ public enum TelemetryDeck {
guard !configuration.swiftUIPreviewMode, !configuration.analyticsDisabled else { return }

let combinedSignalName = (configuration.defaultSignalPrefix ?? "") + signalName
let prefixedParameters = parameters.mapKeys { (configuration.defaultParameterPrefix ?? "") + $0 }
let prefixedParameters = parameters.mapKeys { parameter in
guard !parameter.hasPrefix("TelemetryDeck.") else { return parameter }
return (configuration.defaultParameterPrefix ?? "") + parameter
}

if configuration.reservedParameterWarningsEnabled {
// warn users about reserved keys to avoid unexpected behavior
Expand Down Expand Up @@ -137,7 +140,10 @@ public enum TelemetryDeck {
// make sure to not send any signals when run by Xcode via SwiftUI previews
guard !configuration.swiftUIPreviewMode, !configuration.analyticsDisabled else { return }

let prefixedDefaultParameters = configuration.defaultParameters().mapKeys { (configuration.defaultParameterPrefix ?? "") + $0 }
let prefixedDefaultParameters = configuration.defaultParameters().mapKeys { parameter in
guard !parameter.hasPrefix("TelemetryDeck.") else { return parameter }
return (configuration.defaultParameterPrefix ?? "") + parameter
}
let combinedParameters = prefixedDefaultParameters.merging(parameters) { $1 }

// check only default parameters
Expand Down

0 comments on commit 8ec0286

Please sign in to comment.