Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.

Remove malformed error pixel #3612

Merged
merged 3 commits into from
Nov 30, 2024
Merged

Remove malformed error pixel #3612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a82044
Remove malformed error pixel.
samsymons Nov 29, 2024
e19bb2d
Merge branch 'main' into sam/remove-malformed-error-pixel
samsymons Nov 30, 2024
d2c78cd
Update BSK tag.
samsymons Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15347,7 +15347,7 @@
repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 215.0.1;
version = 216.0.0;
};
};
9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/BrowserServicesKit",
"state" : {
"revision" : "837dfbfe7a1b2a5e0ec2fb24a47a53dec53444b0",
"version" : "215.0.1"
"revision" : "1f1a9f979671e886699ef9b5edd572bc6b490875",
"version" : "216.0.0"
}
},
{
Expand Down
11 changes: 2 additions & 9 deletions ...DuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
case networkProtectionConfigurationErrorLoadingCachedConfig(_ error: Error)
case networkProtectionConfigurationFailedToParse(_ error: Error)

case networkProtectionMalformedErrorDetected(_ error: Error)

case networkProtectionUnhandledError(function: String, line: Int, error: Error)

/// Name of the pixel event
Expand Down Expand Up @@ -330,9 +328,6 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
case .networkProtectionConfigurationFailedToParse:
return "netp_ev_configuration_failed_to_parse"

case .networkProtectionMalformedErrorDetected:
return "netp_malformed_error_detected"

case .networkProtectionUnhandledError:
return "netp_unhandled_error"
}
Expand Down Expand Up @@ -445,8 +440,7 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
.networkProtectionServerMigrationSuccess,
.networkProtectionDNSUpdateCustom,
.networkProtectionDNSUpdateDefault,
.networkProtectionConfigurationInvalidPayload,
.networkProtectionMalformedErrorDetected:
.networkProtectionConfigurationInvalidPayload:
return nil
}
}
Expand All @@ -473,8 +467,7 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
.networkProtectionSystemExtensionActivationFailure(let error),
.networkProtectionServerMigrationFailure(let error),
.networkProtectionConfigurationErrorLoadingCachedConfig(let error),
.networkProtectionConfigurationFailedToParse(let error),
.networkProtectionMalformedErrorDetected(let error):
.networkProtectionConfigurationFailedToParse(let error):
return error
case .networkProtectionActiveUser,
.networkProtectionNewUser,
Expand Down
5 changes: 0 additions & 5 deletions ...kProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@

// MARK: - PacketTunnelProvider.Event reporting

private static var vpnLogger = VPNLogger()

Check warning on line 135 in DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift

View workflow job for this annotation

GitHub Actions / Test (Non-Sandbox) 

'VPNLogger' is deprecated: This goes against Apple logging guidelines and will be removed, please don't use it anymore

private static var packetTunnelProviderEvents: EventMapping<PacketTunnelProvider.Event> = .init { event, _, _, _ in

Expand All @@ -149,7 +149,7 @@
withAdditionalParameters: [PixelKit.Parameters.vpnCohort: PixelKit.cohort(from: defaults.vpnFirstEnabled)],
includeAppVersionParameter: true)
case .connectionTesterStatusChange(let status, let server):
vpnLogger.log(status, server: server)

Check warning on line 152 in DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift

View workflow job for this annotation

GitHub Actions / Test (Non-Sandbox) 

'log(_:server:)' is deprecated: This goes against Apple logging guidelines and will be removed, please don't use it anymore

switch status {
case .failed(let duration):
Expand Down Expand Up @@ -390,11 +390,6 @@
NetworkProtectionPixelEvent.networkProtectionTunnelStartAttemptOnDemandWithoutAccessToken,
frequency: .legacyDailyAndCount,
includeAppVersionParameter: true)
case .malformedErrorDetected(let error):
PixelKit.fire(
NetworkProtectionPixelEvent.networkProtectionMalformedErrorDetected(error),
frequency: .legacyDailyAndCount,
includeAppVersionParameter: true)
}
}

Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/DataBrokerProtection/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ let package = Package(
targets: ["DataBrokerProtection"])
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "215.0.1"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "216.0.0"),
.package(path: "../SwiftUIExtensions"),
.package(path: "../AppKitExtensions"),
.package(path: "../XPCHelper"),
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/FeatureFlags/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ let package = Package(
targets: ["FeatureFlags"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "215.0.1"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "216.0.0"),
],
targets: [
// Targets are the basic building blocks of a package, defining a module or a test suite.
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/NetworkProtectionMac/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ let package = Package(
.library(name: "VPNAppLauncher", targets: ["VPNAppLauncher"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "215.0.1"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "216.0.0"),
.package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.3"),
.package(path: "../AppLauncher"),
.package(path: "../UDSHelper"),
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/SubscriptionUI/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ let package = Package(
targets: ["SubscriptionUI"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "215.0.1"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "216.0.0"),
.package(path: "../SwiftUIExtensions"),
.package(path: "../FeatureFlags")
],
Expand Down
Loading