Merge aea3d34 into 9299104

Author: noahsmartin

SentryTestUtils/ClearTestState.swift

@@ -1,5 +1,5 @@
 import Foundation
-@testable import Sentry
+@_spi(Private) @testable import Sentry
 
 public func clearTestState() {
     TestCleanup.clearTestState()

SentryTestUtils/SentryLogExtensions.swift

@@ -1,5 +1,5 @@
 import Foundation
-@testable import Sentry
+@_spi(Private) @testable import Sentry
 
 extension SentryLog {
     public static func setTestDefaultLogLevel() {

SentryTestUtils/TestHub.swift

@@ -1,6 +1,6 @@
 import _SentryPrivate
 import Foundation
-@testable import Sentry
+@_spi(Private) @testable import Sentry
 
 public class TestHub: SentryHub {
 
@@ -51,8 +51,8 @@ public class TestHub: SentryHub {
     }
 
     public var onReplayCapture: (() -> Void)?
-    public var capturedReplayRecordingVideo = Invocations<(replay: SentryReplayEvent, recording: SentryReplayRecording, video: URL)>()
-    public override func capture(_ replayEvent: SentryReplayEvent, replayRecording: SentryReplayRecording, video videoURL: URL) {
+    @_spi(Private) public var capturedReplayRecordingVideo = Invocations<(replay: SentryReplayEvent, recording: SentryReplayRecording, video: URL)>()
+    @_spi(Private) public override func capture(_ replayEvent: SentryReplayEvent, replayRecording: SentryReplayRecording, video videoURL: URL) {
         capturedReplayRecordingVideo.record((replayEvent, replayRecording, videoURL))
         onReplayCapture?()
     }

Sources/Swift/Core/Helper/Log/SentryLevel.swift

@@ -36,12 +36,12 @@ extension SentryLevel: CustomStringConvertible {
 }
 
 @objcMembers
-class SentryLevelHelper: NSObject {
-    static func nameForLevel(_  level: SentryLevel) -> String {
+@_spi(Private) public class SentryLevelHelper: NSObject {
+    public static func nameForLevel(_  level: SentryLevel) -> String {
         return level.description
     }
 
-    static func levelForName(_ name: String) -> SentryLevel {
+    public static func levelForName(_ name: String) -> SentryLevel {
         .fromName(name)
     }
 }

Sources/Swift/Core/Helper/SentryCurrentDateProvider.swift

@@ -13,28 +13,28 @@ protocol SentryCurrentDateProvider {
 }
 
 @objcMembers
-class SentryDefaultCurrentDateProvider: NSObject, SentryCurrentDateProvider {
-    func date() -> Date {
+@_spi(Private) public class SentryDefaultCurrentDateProvider: NSObject, SentryCurrentDateProvider {
+    public func date() -> Date {
         return Date()
     }
 
-    func timezoneOffset() -> Int {
+    public func timezoneOffset() -> Int {
         return TimeZone.current.secondsFromGMT()
     }
 
     /**
      * Returns the absolute timestamp, which has no defined reference point or unit
      * as it is platform dependent.
      */
-    func systemTime() -> UInt64 {
+    public func systemTime() -> UInt64 {
         Self.getAbsoluteTime()
     }
 
     func systemUptime() -> TimeInterval {
         ProcessInfo.processInfo.systemUptime
     }
 
-    static func getAbsoluteTime() -> UInt64 {
+    public static func getAbsoluteTime() -> UInt64 {
         clock_gettime_nsec_np(CLOCK_UPTIME_RAW)
     }
 }

Sources/Swift/Core/Helper/SentryFileContents.swift

@@ -1,12 +1,12 @@
 import Foundation
 
 @objcMembers
-class SentryFileContents: NSObject {
+@_spi(Private) public class SentryFileContents: NSObject {
 
-    let path: String
-    let contents: Data
+    public let path: String
+    public let contents: Data
 
-    init(path: String, contents: Data) {
+    public init(path: String, contents: Data) {
         self.path = path
         self.contents = contents
     }

Sources/Swift/Core/MetricKit/SentryMXCallStackTree.swift

@@ -5,10 +5,10 @@ import Foundation
  * JSON specification of MXCallStackTree can be found here https://developer.apple.com/documentation/metrickit/mxcallstacktree/3552293-jsonrepresentation
  */
 @objcMembers
-class SentryMXCallStackTree: NSObject, Codable {
+@_spi(Private) public class SentryMXCallStackTree: NSObject, Codable {
 
-    let callStacks: [SentryMXCallStack]
-    let callStackPerThread: Bool
+    public let callStacks: [SentryMXCallStack]
+    public let callStackPerThread: Bool
 
     init(callStacks: [SentryMXCallStack], callStackPerThread: Bool) {
         self.callStacks = callStacks
@@ -21,11 +21,11 @@ class SentryMXCallStackTree: NSObject, Codable {
 }
 
 @objcMembers
-class SentryMXCallStack: NSObject, Codable {
-    var threadAttributed: Bool?
-    var callStackRootFrames: [SentryMXFrame]
+@_spi(Private) public class SentryMXCallStack: NSObject, Codable {
+    public var threadAttributed: Bool?
+    public var callStackRootFrames: [SentryMXFrame]
 
-    var flattenedRootFrames: [SentryMXFrame] {
+    public var flattenedRootFrames: [SentryMXFrame] {
         return callStackRootFrames.flatMap { [$0] + $0.frames }
     }
 
@@ -36,14 +36,14 @@ class SentryMXCallStack: NSObject, Codable {
 }
 
 @objcMembers
-class SentryMXFrame: NSObject, Codable {
-    var binaryUUID: UUID
-    var offsetIntoBinaryTextSegment: Int
-    var binaryName: String?
-    var address: UInt64
-    var subFrames: [SentryMXFrame]?
+@_spi(Private) public class SentryMXFrame: NSObject, Codable {
+    public var binaryUUID: UUID
+    public var offsetIntoBinaryTextSegment: Int
+    public var binaryName: String?
+    public var address: UInt64
+    public var subFrames: [SentryMXFrame]?
 
-    var sampleCount: Int?
+    public var sampleCount: Int?
 
     init(binaryUUID: UUID, offsetIntoBinaryTextSegment: Int, sampleCount: Int? = nil, binaryName: String? = nil, address: UInt64, subFrames: [SentryMXFrame]?) {
         self.binaryUUID = binaryUUID

Sources/Swift/Core/MetricKit/SentryMXManager.swift

@@ -12,7 +12,7 @@ import MetricKit
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, *)
 @available(tvOS, unavailable)
 @available(watchOS, unavailable)
-@objc protocol SentryMXManagerDelegate {
+@objc @_spi(Private) public protocol SentryMXManagerDelegate {
 
     func didReceiveCrashDiagnostic(_ diagnostic: MXCrashDiagnostic, callStackTree: SentryMXCallStackTree, timeStampBegin: Date, timeStampEnd: Date)
 
@@ -26,7 +26,7 @@ import MetricKit
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, *)
 @available(tvOS, unavailable)
 @available(watchOS, unavailable)
-@objcMembers class SentryMXManager: NSObject, MXMetricManagerSubscriber {
+@objcMembers @_spi(Private) public class SentryMXManager: NSObject, MXMetricManagerSubscriber {
 
     let disableCrashDiagnostics: Bool
 
@@ -36,17 +36,17 @@ import MetricKit
 
     weak var delegate: SentryMXManagerDelegate?
 
-    func receiveReports() {
+    public func receiveReports() {
         let shared = MXMetricManager.shared
         shared.add(self)
     }
 
-    func pauseReports() {
+    public func pauseReports() {
         let shared = MXMetricManager.shared
         shared.remove(self)
     }
 
-    func didReceive(_ payloads: [MXDiagnosticPayload]) {
+    public func didReceive(_ payloads: [MXDiagnosticPayload]) {
         func actOn(callStackTree: MXCallStackTree, action: (SentryMXCallStackTree) -> Void) {
             guard let callStackTree = try? SentryMXCallStackTree.from(data: callStackTree.jsonRepresentation()) else {
                 return

Sources/Swift/Core/SwiftDescriptor.swift

@@ -5,17 +5,17 @@ import UIKit
 #endif
 
 @objc
-class SwiftDescriptor: NSObject {
+@_spi(Private) public class SwiftDescriptor: NSObject {
 
     @objc
-    static func getObjectClassName(_ object: AnyObject) -> String { 
+    public static func getObjectClassName(_ object: AnyObject) -> String {
         return String(describing: type(of: object))
     }
 
     /// UIViewControllers aren't available on watchOS
 #if canImport(UIKit) && !os(watchOS) && !SENTRY_NO_UIKIT
     @objc
-    static func getViewControllerClassName(_ object: UIViewController) -> String {
+    public static func getViewControllerClassName(_ object: UIViewController) -> String {
         if let object = object as? SentryUIViewControllerDescriptor {
             return object.sentryName
         }
@@ -24,7 +24,7 @@ class SwiftDescriptor: NSObject {
 #endif
 
     @objc
-    static func getSwiftErrorDescription(_ error: Error) -> String? {
+    public static func getSwiftErrorDescription(_ error: Error) -> String? {
         return String(describing: error)
     }
 }

Sources/Swift/Core/Tools/HTTPHeaderSanitizer.swift

@@ -1,8 +1,8 @@
 import Foundation
 
 @objcMembers
-class HTTPHeaderSanitizer: NSObject {
-    static func sanitizeHeaders(_ headers: [String: String]) -> [String: String] {
+@_spi(Private) public class HTTPHeaderSanitizer: NSObject {
+    public static func sanitizeHeaders(_ headers: [String: String]) -> [String: String] {
         let _securityHeaders = Set([
             "X-FORWARDED-FOR", "AUTHORIZATION", "COOKIE", "SET-COOKIE", "X-API-KEY", "X-REAL-IP",
             "REMOTE-ADDR", "FORWARDED", "PROXY-AUTHORIZATION", "X-CSRF-TOKEN", "X-CSRFTOKEN",