Skip to content

Commit 0529194

Browse files
armcknightarmcknight
authored
test: standardize scoping of launch arg and env var names for easier scanning (#5621)
1 parent 6279992 commit 0529194

File tree

16 files changed

+198
-187
lines changed

16 files changed

+198
-187
lines changed

‎Samples/SentrySampleShared/SentrySampleShared/SentrySDKOverrides.swift‎

Lines changed: 77 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -46,96 +46,101 @@ public enum SentrySDKOverrides: String, CaseIterable {
4646
}
4747

4848
public enum Special: String, SentrySDKOverride {
49-
case wipeDataOnLaunch = "--io.sentry.wipe-data"
49+
case wipeDataOnLaunch = "--io.sentry.wipe-data"
5050
case disableEverything = "--io.sentry.disable-everything"
51-
case skipSDKInit = "--skip-sentry-init"
52-
case disableDebugMode = "--io.sentry.disable-debug-mode"
51+
case skipSDKInit = "--io.sentry.skip-sentry-init"
52+
case disableDebugMode = "--io.sentry.disable-debug-mode"
53+
case dsn = "--io.sentry.dsn"
5354
}
5455
case special = "Special"
5556

5657
public enum Feedback: String, SentrySDKOverride {
57-
case allDefaults = "--io.sentry.feedback.all-defaults"
58-
case disableAutoInject = "--io.sentry.feedback.no-auto-inject-widget"
59-
case noWidgetText = "--io.sentry.feedback.no-widget-text"
60-
case noWidgetIcon = "--io.sentry.feedback.no-widget-icon"
61-
case noUserInjection = "--io.sentry.feedback.dont-use-sentry-user"
62-
case requireEmail = "--io.sentry.feedback.require-email"
63-
case requireName = "--io.sentry.feedback.require-name"
64-
case noAnimations = "--io.sentry.feedback.no-animations"
65-
case injectScreenshot = "--io.sentry.feedback.inject-screenshot"
66-
case useCustomFeedbackButton = "--io.sentry.feedback.use-custom-feedback-button"
67-
case noScreenshots = "--io.sentry.feedback.no-screenshots"
68-
case noShakeGesture = "--io.sentry.feedback.no-shake-gesture"
58+
case allDefaults = "--io.sentry.feedback.all-defaults"
59+
case disableAutoInject = "--io.sentry.feedback.no-auto-inject-widget"
60+
case noWidgetText = "--io.sentry.feedback.no-widget-text"
61+
case noWidgetIcon = "--io.sentry.feedback.no-widget-icon"
62+
case noUserInjection = "--io.sentry.feedback.dont-use-sentry-user"
63+
case requireEmail = "--io.sentry.feedback.require-email"
64+
case requireName = "--io.sentry.feedback.require-name"
65+
case noAnimations = "--io.sentry.feedback.no-animations"
66+
case injectScreenshot = "--io.sentry.feedback.inject-screenshot"
67+
case useCustomFeedbackButton = "--io.sentry.feedback.use-custom-feedback-button"
68+
case noScreenshots = "--io.sentry.feedback.no-screenshots"
69+
case noShakeGesture = "--io.sentry.feedback.no-shake-gesture"
6970
}
7071
case feedback = "Feedback"
7172

7273
public enum Performance: String, SentrySDKOverride {
73-
case disableTimeToFullDisplayTracing = "--disable-time-to-full-display-tracing"
74-
case disablePerformanceV2 = "--disable-performance-v2"
75-
case disableAppHangTrackingV2 = "--disable-app-hang-tracking-v2"
76-
case disableSessionTracking = "--disable-automatic-session-tracking"
77-
case disableFileIOTracing = "--disable-file-io-tracing"
78-
case disableUIVCTracing = "--disable-uiviewcontroller-tracing"
79-
case disableNetworkTracing = "--disable-network-tracking"
80-
case disableCoreDataTracing = "--disable-core-data-tracing"
81-
case disableANRTracking = "--disable-anr-tracking"
82-
case disableWatchdogTracking = "--disable-watchdog-tracking"
83-
case disableUITracing = "--disable-ui-tracing"
84-
case disablePrewarmedAppStartTracing = "--disable-prewarmed-app-start-tracing"
85-
case disablePerformanceTracing = "--disable-auto-performance-tracing"
86-
case sessionTrackingIntervalMillis = "--io.sentry.sessionTrackingIntervalMillis"
74+
case disableTimeToFullDisplayTracing = "--io.sentry.performance.disable-time-to-full-display-tracing"
75+
case disablePerformanceV2 = "--io.sentry.performance.disable-performance-v2"
76+
case disableAppHangTrackingV2 = "--io.sentry.performance.disable-app-hang-tracking-v2"
77+
case disableSessionTracking = "--io.sentry.performance.disable-automatic-session-tracking"
78+
case disableFileIOTracing = "--io.sentry.performance.disable-file-io-tracing"
79+
case disableUIVCTracing = "--io.sentry.performance.disable-uiviewcontroller-tracing"
80+
case disableNetworkTracing = "--io.sentry.performance.disable-network-tracking"
81+
case disableCoreDataTracing = "--io.sentry.performance.disable-core-data-tracing"
82+
case disableANRTracking = "--io.sentry.performance.disable-anr-tracking"
83+
case disableWatchdogTracking = "--io.sentry.performance.disable-watchdog-tracking"
84+
case disableUITracing = "--io.sentry.performance.disable-ui-tracing"
85+
case disablePrewarmedAppStartTracing = "--io.sentry.performance.disable-prewarmed-app-start-tracing"
86+
case disablePerformanceTracing = "--io.sentry.performance.disable-auto-performance-tracing"
87+
case sessionTrackingIntervalMillis = "--io.sentry.performance.sessionTrackingIntervalMillis"
8788
}
8889
case performance = "Performance"
8990

9091
public enum SessionReplay: String, SentrySDKOverride {
91-
case disableSessionReplay = "--disable-session-replay"
92-
case disableViewRendererV2 = "--io.sentry.session-replay.disableViewRendereV2"
93-
case enableFastViewRendering = "--io.sentry.session-replay.enableFastViewRendering"
94-
case sampleRate = "--io.sentry.sessionReplaySampleRate"
95-
case onErrorSampleRate = "--io.sentry.sessionReplayOnErrorSampleRate"
96-
case quality = "--io.sentry.sessionReplayQuality"
97-
case disableMaskAllText = "--io.sentry.session-replay.disable-mask-all-text"
98-
case disableMaskAllImages = "--io.sentry.session-replay.disable-mask-all-images"
92+
case disableSessionReplay = "--io.sentry.session-replay.disable-session-replay"
93+
case disableViewRendererV2 = "--io.sentry.session-replay.disableViewRendereV2"
94+
case enableFastViewRendering = "--io.sentry.session-replay.enableFastViewRendering"
95+
case sampleRate = "--io.sentry.session-replay.sessionReplaySampleRate"
96+
case onErrorSampleRate = "--io.sentry.session-replay.sessionReplayOnErrorSampleRate"
97+
case quality = "--io.sentry.session-replay.sessionReplayQuality"
98+
case disableMaskAllText = "--io.sentry.session-replay.disable-mask-all-text"
99+
case disableMaskAllImages = "--io.sentry.session-replay.disable-mask-all-images"
99100
}
100101
case sessionReplay = "Session Replay"
101102

102103
public enum Other: String, SentrySDKOverride {
103-
case disableAttachScreenshot = "--disable-attach-screenshot"
104-
case disableAttachViewHierarchy = "--disable-attach-view-hierarchy"
105-
case rejectAllEvents = "--reject-all-events"
106-
case rejectAllSpans = "--reject-all-spans"
107-
case rejectScreenshots = "--reject-screenshots-in-before-capture-screenshot"
108-
case rejectViewHierarchy = "--reject-view-hierarchy-in-before-capture-view-hierarchy"
109-
case disableMetricKit = "--disable-metrickit-integration"
110-
case disableMetricKitRawPayloads = "--disable-metrickit-raw-payloads"
111-
case disableBreadcrumbs = "--disable-automatic-breadcrumbs"
112-
case disableNetworkBreadcrumbs = "--disable-network-breadcrumbs"
113-
case disableSwizzling = "--disable-swizzling"
114-
case disableCrashHandling = "--disable-crash-handler"
115-
case disableSpotlight = "--disable-spotlight"
116-
case disableFileManagerSwizzling = "--disable-filemanager-swizzling"
117-
case username = "--io.sentry.user.username"
118-
case userFullName = "--io.sentry.user.name"
119-
case userEmail = "--io.sentry.user.email"
120-
case userID = "--io.sentry.user.id"
121-
case environment = "--io.sentry.sdk-environment"
104+
case disableAttachScreenshot = "--io.sentry.other.disable-attach-screenshot"
105+
case disableAttachViewHierarchy = "--io.sentry.other.disable-attach-view-hierarchy"
106+
case rejectAllEvents = "--io.sentry.other.reject-all-events"
107+
case rejectAllSpans = "--io.sentry.other.reject-all-spans"
108+
case rejectScreenshots = "--io.sentry.other.reject-screenshots-in-before-capture-screenshot"
109+
case rejectViewHierarchy = "--io.sentry.other.reject-view-hierarchy-in-before-capture-view-hierarchy"
110+
case disableMetricKit = "--io.sentry.other.disable-metrickit-integration"
111+
case disableMetricKitRawPayloads = "--io.sentry.other.disable-metrickit-raw-payloads"
112+
case disableBreadcrumbs = "--io.sentry.other.disable-automatic-breadcrumbs"
113+
case disableNetworkBreadcrumbs = "--io.sentry.other.disable-network-breadcrumbs"
114+
case disableSwizzling = "--io.sentry.other.disable-swizzling"
115+
case disableCrashHandling = "--io.sentry.other.disable-crash-handler"
116+
case disableSpotlight = "--io.sentry.other.disable-spotlight"
117+
case disableFileManagerSwizzling = "--io.sentry.other.disable-filemanager-swizzling"
118+
case base64AttachmentData = "--io.sentry.other.base64-attachment-data"
119+
case disableHttpTransport = "--io.sentry.other.disable-http-transport"
120+
case username = "--io.sentry.scope.user.username"
121+
case userFullName = "--io.sentry.scope.user.name"
122+
case userEmail = "--io.sentry.scope.user.email"
123+
case userID = "--io.sentry.scope.user.id"
124+
case environment = "--io.sentry.scope.sdk-environment"
122125
}
123126
case other = "Other"
124127

125128
public enum Tracing: String, SentrySDKOverride {
126-
case sampleRate = "--io.sentry.tracesSampleRate"
127-
case samplerValue = "--io.sentry.tracesSamplerValue"
128-
case disableTracing = "--io.sentry.disable-tracing"
129+
case sampleRate = "--io.sentry.tracing.tracesSampleRate"
130+
case samplerValue = "--io.sentry.tracing.tracesSamplerValue"
131+
case disableTracing = "--io.sentry.tracing.disable-tracing"
129132
}
130133
case tracing = "Tracing"
131134

132135
public enum Profiling: String, SentrySDKOverride {
133-
case sampleRate = "--io.sentry.profilesSampleRate"
134-
case samplerValue = "--io.sentry.profilesSamplerValue"
135-
case disableAppStartProfiling = "--io.sentry.disable-app-start-profiling"
136-
case manualLifecycle = "--io.sentry.profile-lifecycle-manual"
137-
case sessionSampleRate = "--io.sentry.profile-session-sample-rate"
138-
case disableUIProfiling = "--io.sentry.disable-ui-profiling"
136+
case sampleRate = "--io.sentry.profiling.profilesSampleRate"
137+
case samplerValue = "--io.sentry.profiling.profilesSamplerValue"
138+
case disableAppStartProfiling = "--io.sentry.profiling.disable-app-start-profiling"
139+
case manualLifecycle = "--io.sentry.profiling.profile-lifecycle-manual"
140+
case sessionSampleRate = "--io.sentry.profiling.profile-session-sample-rate"
141+
case disableUIProfiling = "--io.sentry.profiling.disable-ui-profiling"
142+
case slowLoadMethod = "--io.sentry.profiling.slow-load-method"
143+
case immediateStop = "--io.sentry.profiling.continuous-profiler-immediate-stop"
139144
}
140145
case profiling = "Profiling"
141146
}
@@ -234,7 +239,7 @@ extension SentrySDKOverrides.Profiling {
234239
public var overrideType: OverrideType {
235240
switch self {
236241
case .sampleRate, .samplerValue, .sessionSampleRate: return .float
237-
case .disableAppStartProfiling, .manualLifecycle, .disableUIProfiling: return .boolean
242+
case .disableAppStartProfiling, .manualLifecycle, .disableUIProfiling, .slowLoadMethod, .immediateStop: return .boolean
238243
}
239244
}
240245
}
@@ -251,7 +256,7 @@ extension SentrySDKOverrides.Tracing {
251256
extension SentrySDKOverrides.Other {
252257
public var overrideType: OverrideType {
253258
switch self {
254-
case .disableAttachScreenshot, .disableAttachViewHierarchy, .rejectScreenshots, .rejectViewHierarchy, .disableMetricKit, .disableMetricKitRawPayloads, .disableBreadcrumbs, .disableNetworkBreadcrumbs, .disableSwizzling, .disableCrashHandling, .disableSpotlight, .disableFileManagerSwizzling, .rejectAllSpans, .rejectAllEvents: return .boolean
259+
case .disableAttachScreenshot, .disableAttachViewHierarchy, .rejectScreenshots, .rejectViewHierarchy, .disableMetricKit, .disableMetricKitRawPayloads, .disableBreadcrumbs, .disableNetworkBreadcrumbs, .disableSwizzling, .disableCrashHandling, .disableSpotlight, .disableFileManagerSwizzling, .rejectAllSpans, .rejectAllEvents, .base64AttachmentData, .disableHttpTransport: return .boolean
255260
case .username, .userFullName, .userEmail, .userID, .environment: return .string
256261
}
257262
}
@@ -288,6 +293,7 @@ extension SentrySDKOverrides.Special {
288293
public var overrideType: OverrideType {
289294
switch self {
290295
case .wipeDataOnLaunch, .disableEverything, .skipSDKInit, .disableDebugMode: return .boolean
296+
case .dsn: return .string
291297
}
292298
}
293299
}
@@ -299,7 +305,7 @@ extension SentrySDKOverrides.Special {
299305
extension SentrySDKOverrides.Profiling {
300306
public var ignoresDisableEverything: Bool {
301307
switch self {
302-
case .sampleRate, .samplerValue, .sessionSampleRate, .manualLifecycle: return true
308+
case .sampleRate, .samplerValue, .sessionSampleRate, .manualLifecycle, .slowLoadMethod, .immediateStop: return true
303309
case .disableAppStartProfiling, .disableUIProfiling: return false
304310
}
305311
}
@@ -317,8 +323,8 @@ extension SentrySDKOverrides.Tracing {
317323
extension SentrySDKOverrides.Other {
318324
public var ignoresDisableEverything: Bool {
319325
switch self {
320-
case .rejectScreenshots, .rejectViewHierarchy, .rejectAllSpans, .rejectAllEvents, .username, .userFullName, .userEmail, .userID, .environment: return true
321-
case .disableAttachScreenshot, .disableAttachViewHierarchy, .disableMetricKit, .disableMetricKitRawPayloads, .disableBreadcrumbs, .disableNetworkBreadcrumbs, .disableSwizzling, .disableCrashHandling, .disableSpotlight, .disableFileManagerSwizzling: return false
326+
case .rejectScreenshots, .rejectViewHierarchy, .rejectAllSpans, .rejectAllEvents, .username, .userFullName, .userEmail, .userID, .environment, .base64AttachmentData: return true
327+
case .disableAttachScreenshot, .disableAttachViewHierarchy, .disableMetricKit, .disableMetricKitRawPayloads, .disableBreadcrumbs, .disableNetworkBreadcrumbs, .disableSwizzling, .disableCrashHandling, .disableSpotlight, .disableFileManagerSwizzling, .disableHttpTransport: return false
322328
}
323329
}
324330
}
@@ -352,7 +358,7 @@ extension SentrySDKOverrides.Feedback {
352358
extension SentrySDKOverrides.Special {
353359
public var ignoresDisableEverything: Bool {
354360
switch self {
355-
case .wipeDataOnLaunch, .disableEverything, .skipSDKInit, .disableDebugMode: return true
361+
case .wipeDataOnLaunch, .disableEverything, .skipSDKInit, .disableDebugMode, .dsn: return true
356362
}
357363
}
358364
}

‎Samples/SentrySampleShared/SentrySampleShared/SentrySDKWrapper.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ extension SentrySDKWrapper {
416416

417417
/// Whether or not profiling benchmarks are being run; this requires disabling certain other features for proper functionality.
418418
var isBenchmarking: Bool { args.contains("--io.sentry.test.benchmarking") }
419-
var isUITest: Bool { env["--io.sentry.sdk-environment"] == "ui-tests" }
419+
var isUITest: Bool { env["--io.sentry.scope.sdk-environment"] == "ui-tests" }
420420
}
421421

422422
// MARK: Profiling configuration

0 commit comments

Comments
 (0)