diff --git a/.github/file-filters.yml b/.github/file-filters.yml index 8632331b16d..7fb42accc12 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -428,7 +428,6 @@ run_version_bump_util_for_prs: &run_version_bump_util_for_prs - "Sources/Configuration/SDK.xcconfig" - "Sources/Configuration/Versioning.xcconfig" - "Sources/Configuration/SentrySwiftUI.xcconfig" - - "Sources/Configuration/SentrySwiftLog.xcconfig" run_ui_tests_for_prs: &run_ui_tests_for_prs - "Sources/**" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6f4f7bc4814..f42fb4311ab 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -355,16 +355,6 @@ jobs: device: "iPhone 15 Pro" scheme: "SentrySwiftUI" - # iOS 17 - Use pre-installed iOS 17.5 runtime on macOS-14 with Xcode 15.4 - - name: iOS 17 SentrySwiftLog - runs-on: macos-14 - xcode: "15.4" - test-destination-os: "17.5" - platform: "iOS" - create_device: true - device: "iPhone 15 Pro" - scheme: "SentrySwiftLog" - # tvOS 18 - name: tvOS 18 Sentry runs-on: macos-15 diff --git a/CHANGELOG.md b/CHANGELOG.md index 712d3511842..0f9ed768b58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,7 +63,6 @@ This option is still disabled by default and will be enabled in a future major release. - Move `enableDataSwizzling` from experimental options to top-level options (#6592). This option remains enabled by default. - Add `sentry.replay_id` attribute to logs ([#6515](https://github.com/getsentry/sentry-cocoa/pull/6515)) -- Structured Logs: Add `SentrySwiftLog` Integration (#6286) ## 9.0.0-alpha.0 @@ -127,7 +126,6 @@ This option is still disabled by default and will be enabled in a future major release. - Move `enableDataSwizzling` from experimental options to top-level options (#6592). This option remains enabled by default. - Add `sentry.replay_id` attribute to logs ([#6515](https://github.com/getsentry/sentry-cocoa/pull/6515)) -- Structured Logs: Add `SentrySwiftLog` Integration (#6286) ## 8.57.2 diff --git a/Package.swift b/Package.swift index 7af7e3bcdbb..3c20caa0b01 100644 --- a/Package.swift +++ b/Package.swift @@ -16,8 +16,7 @@ var products: [Product] = [ .library(name: "Sentry-WithoutUIKitOrAppKit", targets: ["Sentry-WithoutUIKitOrAppKit", "SentryCppHelper"]), .library(name: "Sentry-WithoutUIKitOrAppKit-WithARM64e", targets: ["Sentry-WithoutUIKitOrAppKit-WithARM64e", "SentryCppHelper"]), .library(name: "SentrySwiftUI", targets: ["Sentry", "SentrySwiftUI", "SentryCppHelper"]), - .library(name: "SentryDistribution", targets: ["SentryDistribution"]), - .library(name: "SentrySwiftLog", targets: ["Sentry", "SentrySwiftLog"]) + .library(name: "SentryDistribution", targets: ["SentryDistribution"]) ] var targets: [Target] = [ @@ -55,14 +54,6 @@ var targets: [Target] = [ .linkedFramework("Sentry") ] ), - .target( - name: "SentrySwiftLog", - dependencies: ["Sentry", .product(name: "Logging", package: "swift-log")], - path: "Sources/SentrySwiftLog", - linkerSettings: [ - .linkedFramework("Sentry") - ] - ), .target( name: "SentryInternal", path: "Sources/SentrySwiftUI", @@ -112,7 +103,7 @@ if let env = env, String(cString: env, encoding: .utf8) == "1" { name: "SentryObjc", dependencies: ["SentrySwift"], path: "Sources", - exclude: ["Sentry/SentryDummyPublicEmptyClass.m", "Sentry/SentryDummyPrivateEmptyClass.m", "Swift", "SentrySwiftUI", "SentrySwiftLog", "Resources", "Configuration", "SentryCppHelper", "SentryDistribution", "SentryDistributionTests"], + exclude: ["Sentry/SentryDummyPublicEmptyClass.m", "Sentry/SentryDummyPrivateEmptyClass.m", "Swift", "SentrySwiftUI", "Resources", "Configuration", "SentryCppHelper", "SentryDistribution", "SentryDistributionTests"], cSettings: [ .headerSearchPath("Sentry/include/HybridPublic"), .headerSearchPath("Sentry"), @@ -129,12 +120,6 @@ let package = Package( name: "Sentry", platforms: [.iOS(.v15), .macOS(.v12), .tvOS(.v15), .watchOS(.v8)], products: products, - dependencies: [ - // SPM doesn't support peer-dependencies, so users are locked into our declared version. - // Using `from: "1.6.0"` covers 1.6.0 < 2.0.0, resolving minor versions automatically. - // See develop-docs/DECISIONS.md for discussion. - .package(url: "https://github.com/apple/swift-log", from: "1.6.0") - ], targets: targets, cxxLanguageStandard: .cxx14 ) diff --git a/Plans/SentrySwiftLog_Base.xctestplan b/Plans/SentrySwiftLog_Base.xctestplan deleted file mode 100644 index a012f4b55e6..00000000000 --- a/Plans/SentrySwiftLog_Base.xctestplan +++ /dev/null @@ -1,24 +0,0 @@ -{ - "configurations" : [ - { - "id" : "EBB4F92C-3CA9-47E0-8589-7934881F1E4B", - "name" : "Configuration 1", - "options" : { - - } - } - ], - "defaultOptions" : { - "codeCoverage" : true - }, - "testTargets" : [ - { - "target" : { - "containerPath" : "container:Sentry.xcodeproj", - "identifier" : "9241AC1A2EBA38CC00E611ED", - "name" : "SentrySwiftLogTests" - } - } - ], - "version" : 1 -} diff --git a/Samples/iOS-Swift/iOS-Swift.yml b/Samples/iOS-Swift/iOS-Swift.yml index e7c777921fe..3c021922eba 100644 --- a/Samples/iOS-Swift/iOS-Swift.yml +++ b/Samples/iOS-Swift/iOS-Swift.yml @@ -34,7 +34,6 @@ targets: - target: iOS-SwiftClip - target: SentrySampleShared/SentrySampleShared - target: iOS-Swift-ShareExtension - - target: Sentry/SentrySwiftLog configFiles: Debug: iOS-Swift.xcconfig Release: iOS-Swift.xcconfig diff --git a/Samples/iOS-Swift/iOS-Swift/AppDelegate.swift b/Samples/iOS-Swift/iOS-Swift/AppDelegate.swift index 0ce237f3355..b64f5c7a966 100644 --- a/Samples/iOS-Swift/iOS-Swift/AppDelegate.swift +++ b/Samples/iOS-Swift/iOS-Swift/AppDelegate.swift @@ -1,9 +1,6 @@ import SentrySampleShared import UIKit -import Logging -import SentrySwiftLog - @UIApplicationMain class AppDelegate: UIResponder, UIApplicationDelegate { private var randomDistributionTimer: Timer? @@ -32,17 +29,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate { metricKit.receiveReports() } - // Use structured logs with swift-log - LoggingSystem.bootstrap { _ in - return SentryLogHandler(logLevel: .trace) - } - let logger = Logger(label: "io.sentry.iOS-Swift") - logger.trace( - "[iOS-Swift] didFinishLaunchingWithOptions", - metadata: ["foo": "bar"], - source: "iOS" - ) - return true } diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj index 088e91002b9..64e2f6af2b0 100644 --- a/Sentry.xcodeproj/project.pbxproj +++ b/Sentry.xcodeproj/project.pbxproj @@ -713,13 +713,6 @@ 92235CAC2E15369900865983 /* SentryLogBatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92235CAB2E15369900865983 /* SentryLogBatcher.swift */; }; 92235CAE2E15549C00865983 /* SentryLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92235CAD2E15549C00865983 /* SentryLogger.swift */; }; 92235CB02E155B2600865983 /* SentryLoggerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92235CAF2E155B2600865983 /* SentryLoggerTests.swift */; }; - 92275AAA2EBA402D00F31AB9 /* Logging in Frameworks */ = {isa = PBXBuildFile; productRef = 92275AA92EBA402D00F31AB9 /* Logging */; }; - 92275AAB2EBA417700F31AB9 /* SentryLogHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9241AC4A2EBA39EE00E611ED /* SentryLogHandler.swift */; }; - 9241AC1C2EBA38CC00E611ED /* SentrySwiftLog.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9241AC132EBA38CB00E611ED /* SentrySwiftLog.framework */; }; - 9241AC3C2EBA399100E611ED /* libSentryTestUtils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8431F00A29B284F200D8DC56 /* libSentryTestUtils.a */; }; - 9241AC3F2EBA399500E611ED /* SentryTestUtilsDynamic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D84DAD4D2B17428D003CF120 /* SentryTestUtilsDynamic.framework */; }; - 9241AC442EBA39A500E611ED /* SentrySwiftLog.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9241AC132EBA38CB00E611ED /* SentrySwiftLog.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 9241AC4F2EBA3A0C00E611ED /* SentryLogHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9241AC4D2EBA3A0C00E611ED /* SentryLogHandlerTests.swift */; }; 925824C22CB5897700C9B20B /* SentrySessionReplayIntegration-Hybrid.h in Headers */ = {isa = PBXBuildFile; fileRef = D80382BE2C09C6FD0090E048 /* SentrySessionReplayIntegration-Hybrid.h */; settings = {ATTRIBUTES = (Private, ); }; }; 9264E1EB2E2E385E00B077CF /* SentryLogMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9264E1EA2E2E385B00B077CF /* SentryLogMessage.swift */; }; 9264E1ED2E2E397C00B077CF /* SentryLogMessageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9264E1EC2E2E397400B077CF /* SentryLogMessageTests.swift */; }; @@ -1214,34 +1207,6 @@ remoteGlobalIDString = 63AA759A1EB8AEF500D153DE; remoteInfo = Sentry; }; - 9241AC1D2EBA38CC00E611ED /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6327C5CA1EB8A783004E799B /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9241AC122EBA38CB00E611ED; - remoteInfo = SentrySwiftLog; - }; - 9241AC3D2EBA399100E611ED /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6327C5CA1EB8A783004E799B /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8431F00929B284F200D8DC56; - remoteInfo = SentryTestUtils; - }; - 9241AC412EBA399500E611ED /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6327C5CA1EB8A783004E799B /* Project object */; - proxyType = 1; - remoteGlobalIDString = D84DAD4C2B17428D003CF120; - remoteInfo = SentryTestUtilsDynamic; - }; - 9241AC482EBA39D600E611ED /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6327C5CA1EB8A783004E799B /* Project object */; - proxyType = 1; - remoteGlobalIDString = 63AA759A1EB8AEF500D153DE; - remoteInfo = Sentry; - }; D4B339FB2EA7823000359F3A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 6327C5CA1EB8A783004E799B /* Project object */; @@ -1280,17 +1245,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - 9241AC432EBA399500E611ED /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 9241AC442EBA39A500E611ED /* SentrySwiftLog.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; D4B339FD2EA7823000359F3A /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -2123,10 +2077,6 @@ 92235CAB2E15369900865983 /* SentryLogBatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryLogBatcher.swift; sourceTree = ""; }; 92235CAD2E15549C00865983 /* SentryLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryLogger.swift; sourceTree = ""; }; 92235CAF2E155B2600865983 /* SentryLoggerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryLoggerTests.swift; sourceTree = ""; }; - 9241AC132EBA38CB00E611ED /* SentrySwiftLog.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SentrySwiftLog.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 9241AC1B2EBA38CC00E611ED /* SentrySwiftLogTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SentrySwiftLogTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 9241AC4A2EBA39EE00E611ED /* SentryLogHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryLogHandler.swift; sourceTree = ""; }; - 9241AC4D2EBA3A0C00E611ED /* SentryLogHandlerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryLogHandlerTests.swift; sourceTree = ""; }; 9264E1EA2E2E385B00B077CF /* SentryLogMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryLogMessage.swift; sourceTree = ""; }; 9264E1EC2E2E397400B077CF /* SentryLogMessageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryLogMessageTests.swift; sourceTree = ""; }; 92672BB529C9A2A9006B021C /* SentryBreadcrumb+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SentryBreadcrumb+Private.h"; path = "include/HybridPublic/SentryBreadcrumb+Private.h"; sourceTree = ""; }; @@ -2407,7 +2357,6 @@ D8F8F5562B835BC600AC5465 /* SentryMsgPackSerializerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryMsgPackSerializerTests.m; sourceTree = ""; }; D8FC98AA2CD0DAAC0009824C /* BreadcrumbExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BreadcrumbExtension.swift; sourceTree = ""; }; D8FFE50B2703DAAE00607131 /* SwizzlingCallTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwizzlingCallTests.swift; sourceTree = ""; }; - D92A1BCF2EBA3A0000E611ED /* SentrySwiftLog.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SentrySwiftLog.xcconfig; sourceTree = ""; }; F40E42342EA1887000E53876 /* SentryFramesTracker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryFramesTracker.swift; sourceTree = ""; }; F40E423B2EA18E8000E53876 /* SentryDelayedFramesTrackerWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryDelayedFramesTrackerWrapper.swift; sourceTree = ""; }; F40E42FA2EAAAD4500E53876 /* PrivateSentrySDKOnlyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivateSentrySDKOnlyTests.swift; sourceTree = ""; }; @@ -2626,24 +2575,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9241AC102EBA38CB00E611ED /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 92275AAA2EBA402D00F31AB9 /* Logging in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 9241AC182EBA38CC00E611ED /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 9241AC3C2EBA399100E611ED /* libSentryTestUtils.a in Frameworks */, - 9241AC3F2EBA399500E611ED /* SentryTestUtilsDynamic.framework in Frameworks */, - 9241AC1C2EBA38CC00E611ED /* SentrySwiftLog.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; D4CBA2402DE06D0200581618 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -2941,8 +2872,6 @@ D84DAD4D2B17428D003CF120 /* SentryTestUtilsDynamic.framework */, D833D7342D1321C100961E7A /* SentrySwiftUITests.xctest */, D4CBA2432DE06D0200581618 /* SentryTestUtilsTests.xctest */, - 9241AC132EBA38CB00E611ED /* SentrySwiftLog.framework */, - 9241AC1B2EBA38CC00E611ED /* SentrySwiftLogTests.xctest */, ); name = Products; sourceTree = ""; @@ -3074,7 +3003,6 @@ D800942328F82E8D005D3943 /* Swift */, 63FE6FB920DA4C1000CDBAE8 /* SentryCrash */, D8199DB329376ECC0074249E /* SentrySwiftUI */, - 9241AC4B2EBA39EE00E611ED /* SentrySwiftLog */, 63AA75A31EB8AFDF00D153DE /* Configuration */, D8B0542F2A7D35F10056BAF6 /* Resources */, ); @@ -3090,7 +3018,6 @@ 846D3F122E286ECF00D4E7E3 /* DuplicatedSDKTest */, 63AA75931EB8AEDB00D153DE /* SentryTests */, 8431EFDB29B27B3D00D8DC56 /* SentryProfilerTests */, - 9241AC4E2EBA3A0C00E611ED /* SentrySwiftLogTests */, D8F01DE32A125D7B008F4996 /* HybridSDKTest */, D833D60F2D1320DF00961E7A /* SentrySwiftUITests */, ); @@ -3162,7 +3089,6 @@ 84EACEDF2C3DCAE2009B8753 /* DeploymentTargets.xcconfig */, 63AA75C51EB8B00100D153DE /* Sentry.xcconfig */, D8199DCF29376FF40074249E /* SentrySwiftUI.xcconfig */, - D92A1BCF2EBA3A0000E611ED /* SentrySwiftLog.xcconfig */, ); path = Configuration; sourceTree = ""; @@ -4272,22 +4198,6 @@ name = Transaction; sourceTree = ""; }; - 9241AC4B2EBA39EE00E611ED /* SentrySwiftLog */ = { - isa = PBXGroup; - children = ( - 9241AC4A2EBA39EE00E611ED /* SentryLogHandler.swift */, - ); - path = SentrySwiftLog; - sourceTree = ""; - }; - 9241AC4E2EBA3A0C00E611ED /* SentrySwiftLogTests */ = { - isa = PBXGroup; - children = ( - 9241AC4D2EBA3A0C00E611ED /* SentryLogHandlerTests.swift */, - ); - path = SentrySwiftLogTests; - sourceTree = ""; - }; D4009EA02D77196F0007AF30 /* ViewCapture */ = { isa = PBXGroup; children = ( @@ -5482,13 +5392,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9241AC0E2EBA38CB00E611ED /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; D8199DA529376E9B0074249E /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -5589,51 +5492,6 @@ productReference = 8431F00A29B284F200D8DC56 /* libSentryTestUtils.a */; productType = "com.apple.product-type.library.static"; }; - 9241AC122EBA38CB00E611ED /* SentrySwiftLog */ = { - isa = PBXNativeTarget; - buildConfigurationList = 9241AC332EBA38CC00E611ED /* Build configuration list for PBXNativeTarget "SentrySwiftLog" */; - buildPhases = ( - 9241AC0E2EBA38CB00E611ED /* Headers */, - 9241AC0F2EBA38CB00E611ED /* Sources */, - 9241AC102EBA38CB00E611ED /* Frameworks */, - 9241AC112EBA38CB00E611ED /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 9241AC492EBA39D600E611ED /* PBXTargetDependency */, - ); - name = SentrySwiftLog; - packageProductDependencies = ( - 92275AA92EBA402D00F31AB9 /* Logging */, - ); - productName = SentrySwiftLog; - productReference = 9241AC132EBA38CB00E611ED /* SentrySwiftLog.framework */; - productType = "com.apple.product-type.framework"; - }; - 9241AC1A2EBA38CC00E611ED /* SentrySwiftLogTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 9241AC342EBA38CC00E611ED /* Build configuration list for PBXNativeTarget "SentrySwiftLogTests" */; - buildPhases = ( - 9241AC172EBA38CC00E611ED /* Sources */, - 9241AC182EBA38CC00E611ED /* Frameworks */, - 9241AC192EBA38CC00E611ED /* Resources */, - 9241AC432EBA399500E611ED /* Embed Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 9241AC1E2EBA38CC00E611ED /* PBXTargetDependency */, - 9241AC3E2EBA399100E611ED /* PBXTargetDependency */, - 9241AC422EBA399500E611ED /* PBXTargetDependency */, - ); - name = SentrySwiftLogTests; - packageProductDependencies = ( - ); - productName = SentrySwiftLogTests; - productReference = 9241AC1B2EBA38CC00E611ED /* SentrySwiftLogTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; D4CBA2422DE06D0200581618 /* SentryTestUtilsTests */ = { isa = PBXNativeTarget; buildConfigurationList = D4CBA2502DE06D0200581618 /* Build configuration list for PBXNativeTarget "SentryTestUtilsTests" */; @@ -5740,12 +5598,6 @@ DevelopmentTeam = 97JCY7859U; ProvisioningStyle = Manual; }; - 9241AC122EBA38CB00E611ED = { - CreatedOnToolsVersion = 26.1; - }; - 9241AC1A2EBA38CC00E611ED = { - CreatedOnToolsVersion = 26.1; - }; D4CBA2422DE06D0200581618 = { CreatedOnToolsVersion = 16.3; }; @@ -5767,7 +5619,6 @@ ); mainGroup = 6327C5C91EB8A783004E799B; packageReferences = ( - 9241AC452EBA39C700E611ED /* XCRemoteSwiftPackageReference "swift-log" */, ); productRefGroup = 6327C5D41EB8A783004E799B /* Products */; projectDirPath = ""; @@ -5787,8 +5638,6 @@ D84DAD4C2B17428D003CF120 /* SentryTestUtilsDynamic */, D833D61E2D1321C100961E7A /* SentrySwiftUITests */, D4CBA2422DE06D0200581618 /* SentryTestUtilsTests */, - 9241AC122EBA38CB00E611ED /* SentrySwiftLog */, - 9241AC1A2EBA38CC00E611ED /* SentrySwiftLogTests */, ); }; /* End PBXProject section */ @@ -5857,20 +5706,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9241AC112EBA38CB00E611ED /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 9241AC192EBA38CC00E611ED /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; D4CBA2412DE06D0200581618 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -6739,22 +6574,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9241AC0F2EBA38CB00E611ED /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 92275AAB2EBA417700F31AB9 /* SentryLogHandler.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 9241AC172EBA38CC00E611ED /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 9241AC4F2EBA3A0C00E611ED /* SentryLogHandlerTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; D4CBA23F2DE06D0200581618 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -6823,26 +6642,6 @@ target = 63AA759A1EB8AEF500D153DE /* Sentry */; targetProxy = 84B7FA3729B2860500AD93B1 /* PBXContainerItemProxy */; }; - 9241AC1E2EBA38CC00E611ED /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9241AC122EBA38CB00E611ED /* SentrySwiftLog */; - targetProxy = 9241AC1D2EBA38CC00E611ED /* PBXContainerItemProxy */; - }; - 9241AC3E2EBA399100E611ED /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8431F00929B284F200D8DC56 /* SentryTestUtils */; - targetProxy = 9241AC3D2EBA399100E611ED /* PBXContainerItemProxy */; - }; - 9241AC422EBA399500E611ED /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = D84DAD4C2B17428D003CF120 /* SentryTestUtilsDynamic */; - targetProxy = 9241AC412EBA399500E611ED /* PBXContainerItemProxy */; - }; - 9241AC492EBA39D600E611ED /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 63AA759A1EB8AEF500D153DE /* Sentry */; - targetProxy = 9241AC482EBA39D600E611ED /* PBXContainerItemProxy */; - }; D4B339FC2EA7823000359F3A /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = D84DAD4C2B17428D003CF120 /* SentryTestUtilsDynamic */; @@ -7624,606 +7423,6 @@ }; name = ReleaseWithoutUIKit; }; - 9241AC222EBA38CC00E611ED /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D92A1BCF2EBA3A0000E611ED /* SentrySwiftLog.xcconfig */; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - GCC_C_LANGUAGE_STANDARD = gnu17; - INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Sentry. All rights reserved."; - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; - SWIFT_APPROACHABLE_CONCURRENCY = YES; - SWIFT_INSTALL_OBJC_HEADER = NO; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; - SWIFT_VERSION = 5.0; - }; - name = Debug; - }; - 9241AC232EBA38CC00E611ED /* DebugWithoutUIKit */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D92A1BCF2EBA3A0000E611ED /* SentrySwiftLog.xcconfig */; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - GCC_C_LANGUAGE_STANDARD = gnu17; - INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Sentry. All rights reserved."; - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; - SWIFT_APPROACHABLE_CONCURRENCY = YES; - SWIFT_INSTALL_OBJC_HEADER = NO; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; - SWIFT_VERSION = 5.0; - }; - name = DebugWithoutUIKit; - }; - 9241AC242EBA38CC00E611ED /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D92A1BCF2EBA3A0000E611ED /* SentrySwiftLog.xcconfig */; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - GCC_C_LANGUAGE_STANDARD = gnu17; - INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Sentry. All rights reserved."; - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; - SWIFT_APPROACHABLE_CONCURRENCY = YES; - SWIFT_INSTALL_OBJC_HEADER = NO; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; - SWIFT_VERSION = 5.0; - }; - name = Test; - }; - 9241AC252EBA38CC00E611ED /* TestCI */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D92A1BCF2EBA3A0000E611ED /* SentrySwiftLog.xcconfig */; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - GCC_C_LANGUAGE_STANDARD = gnu17; - INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Sentry. All rights reserved."; - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; - SWIFT_APPROACHABLE_CONCURRENCY = YES; - SWIFT_INSTALL_OBJC_HEADER = NO; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; - SWIFT_VERSION = 5.0; - }; - name = TestCI; - }; - 9241AC262EBA38CC00E611ED /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D92A1BCF2EBA3A0000E611ED /* SentrySwiftLog.xcconfig */; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - GCC_C_LANGUAGE_STANDARD = gnu17; - INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Sentry. All rights reserved."; - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; - SWIFT_APPROACHABLE_CONCURRENCY = YES; - SWIFT_INSTALL_OBJC_HEADER = NO; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; - SWIFT_VERSION = 5.0; - }; - name = Release; - }; - 9241AC272EBA38CC00E611ED /* ReleaseWithoutUIKit */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D92A1BCF2EBA3A0000E611ED /* SentrySwiftLog.xcconfig */; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - GCC_C_LANGUAGE_STANDARD = gnu17; - INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Sentry. All rights reserved."; - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; - SWIFT_APPROACHABLE_CONCURRENCY = YES; - SWIFT_INSTALL_OBJC_HEADER = NO; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; - SWIFT_VERSION = 5.0; - }; - name = ReleaseWithoutUIKit; - }; - 9241AC282EBA38CC00E611ED /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGNING_ALLOWED = NO; - CODE_SIGNING_REQUIRED = NO; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = ""; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 12; - MARKETING_VERSION = 1.0; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - OTHER_SWIFT_FLAGS = "-enable-experimental-feature AccessLevelOnImport"; - PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentrySwiftLogTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = auto; - STRING_CATALOG_GENERATE_SYMBOLS = NO; - SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator"; - SUPPORTS_MACCATALYST = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG SENTRY_TEST $(inherited)"; - SWIFT_APPROACHABLE_CONCURRENCY = YES; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2,3,4,7"; - XROS_DEPLOYMENT_TARGET = 1.0; - }; - name = Debug; - }; - 9241AC292EBA38CC00E611ED /* DebugWithoutUIKit */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGNING_ALLOWED = NO; - CODE_SIGNING_REQUIRED = NO; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = ""; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 12; - MARKETING_VERSION = 1.0; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - OTHER_SWIFT_FLAGS = "-enable-experimental-feature AccessLevelOnImport"; - PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentrySwiftLogTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = auto; - STRING_CATALOG_GENERATE_SYMBOLS = NO; - SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator"; - SUPPORTS_MACCATALYST = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG SENTRY_TEST $(inherited)"; - SWIFT_APPROACHABLE_CONCURRENCY = YES; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2,3,4,7"; - XROS_DEPLOYMENT_TARGET = 1.0; - }; - name = DebugWithoutUIKit; - }; - 9241AC2A2EBA38CC00E611ED /* Test */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGNING_ALLOWED = NO; - CODE_SIGNING_REQUIRED = NO; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = ""; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 12; - MARKETING_VERSION = 1.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - OTHER_SWIFT_FLAGS = "-enable-experimental-feature AccessLevelOnImport"; - PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentrySwiftLogTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = auto; - STRING_CATALOG_GENERATE_SYMBOLS = NO; - SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator"; - SUPPORTS_MACCATALYST = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SENTRY_TEST"; - SWIFT_APPROACHABLE_CONCURRENCY = YES; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2,3,4,7"; - XROS_DEPLOYMENT_TARGET = 1.0; - }; - name = Test; - }; - 9241AC2B2EBA38CC00E611ED /* TestCI */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGNING_ALLOWED = NO; - CODE_SIGNING_REQUIRED = NO; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = ""; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 12; - MARKETING_VERSION = 1.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - OTHER_SWIFT_FLAGS = "-enable-experimental-feature AccessLevelOnImport"; - PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentrySwiftLogTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = auto; - STRING_CATALOG_GENERATE_SYMBOLS = NO; - SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator"; - SUPPORTS_MACCATALYST = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SENTRY_TEST_CI"; - SWIFT_APPROACHABLE_CONCURRENCY = YES; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2,3,4,7"; - XROS_DEPLOYMENT_TARGET = 1.0; - }; - name = TestCI; - }; - 9241AC2C2EBA38CC00E611ED /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGNING_ALLOWED = NO; - CODE_SIGNING_REQUIRED = NO; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = ""; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 12; - MARKETING_VERSION = 1.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - OTHER_SWIFT_FLAGS = "-enable-experimental-feature AccessLevelOnImport"; - PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentrySwiftLogTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = auto; - STRING_CATALOG_GENERATE_SYMBOLS = NO; - SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator"; - SUPPORTS_MACCATALYST = YES; - SWIFT_APPROACHABLE_CONCURRENCY = YES; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2,3,4,7"; - XROS_DEPLOYMENT_TARGET = 1.0; - }; - name = Release; - }; - 9241AC2D2EBA38CC00E611ED /* ReleaseWithoutUIKit */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGNING_ALLOWED = NO; - CODE_SIGNING_REQUIRED = NO; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = ""; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 12; - MARKETING_VERSION = 1.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - OTHER_SWIFT_FLAGS = "-enable-experimental-feature AccessLevelOnImport"; - PRODUCT_BUNDLE_IDENTIFIER = io.sentry.SentrySwiftLogTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = auto; - STRING_CATALOG_GENERATE_SYMBOLS = NO; - SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator"; - SUPPORTS_MACCATALYST = YES; - SWIFT_APPROACHABLE_CONCURRENCY = YES; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2,3,4,7"; - XROS_DEPLOYMENT_TARGET = 1.0; - }; - name = ReleaseWithoutUIKit; - }; D4CBA24A2DE06D0200581618 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -9187,32 +8386,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9241AC332EBA38CC00E611ED /* Build configuration list for PBXNativeTarget "SentrySwiftLog" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 9241AC222EBA38CC00E611ED /* Debug */, - 9241AC232EBA38CC00E611ED /* DebugWithoutUIKit */, - 9241AC242EBA38CC00E611ED /* Test */, - 9241AC252EBA38CC00E611ED /* TestCI */, - 9241AC262EBA38CC00E611ED /* Release */, - 9241AC272EBA38CC00E611ED /* ReleaseWithoutUIKit */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 9241AC342EBA38CC00E611ED /* Build configuration list for PBXNativeTarget "SentrySwiftLogTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 9241AC282EBA38CC00E611ED /* Debug */, - 9241AC292EBA38CC00E611ED /* DebugWithoutUIKit */, - 9241AC2A2EBA38CC00E611ED /* Test */, - 9241AC2B2EBA38CC00E611ED /* TestCI */, - 9241AC2C2EBA38CC00E611ED /* Release */, - 9241AC2D2EBA38CC00E611ED /* ReleaseWithoutUIKit */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; D4CBA2502DE06D0200581618 /* Build configuration list for PBXNativeTarget "SentryTestUtilsTests" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -9266,25 +8439,6 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ - -/* Begin XCRemoteSwiftPackageReference section */ - 9241AC452EBA39C700E611ED /* XCRemoteSwiftPackageReference "swift-log" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/apple/swift-log"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 1.6.0; - }; - }; -/* End XCRemoteSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - 92275AA92EBA402D00F31AB9 /* Logging */ = { - isa = XCSwiftPackageProductDependency; - package = 9241AC452EBA39C700E611ED /* XCRemoteSwiftPackageReference "swift-log" */; - productName = Logging; - }; -/* End XCSwiftPackageProductDependency section */ }; rootObject = 6327C5CA1EB8A783004E799B /* Project object */; } diff --git a/Sentry.xcodeproj/xcshareddata/xcschemes/SentrySwiftLog.xcscheme b/Sentry.xcodeproj/xcshareddata/xcschemes/SentrySwiftLog.xcscheme deleted file mode 100644 index 6b6fac2bdd2..00000000000 --- a/Sentry.xcodeproj/xcshareddata/xcschemes/SentrySwiftLog.xcscheme +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Sources/Configuration/SentrySwiftLog.xcconfig b/Sources/Configuration/SentrySwiftLog.xcconfig deleted file mode 100644 index d7b5baa6ed9..00000000000 --- a/Sources/Configuration/SentrySwiftLog.xcconfig +++ /dev/null @@ -1,27 +0,0 @@ -PRODUCT_NAME = SentrySwiftLog -CURRENT_PROJECT_VERSION = 9.0.0 -MARKETING_VERSION = 9.0.0 - -GENERATE_INFOPLIST_FILE = YES -PRODUCT_BUNDLE_IDENTIFIER = io.sentry.$(PRODUCT_NAME) - -MACOSX_DEPLOYMENT_TARGET = 12 -IPHONEOS_DEPLOYMENT_TARGET = 15.0 -WATCHOS_DEPLOYMENT_TARGET = 8.0 -TVOS_DEPLOYMENT_TARGET = 15.0 -MACH_O_TYPE = mh_dylib - -OTHER_LDFLAGS_DebugWithoutUIKit = -framework SentryWithoutUIKit -OTHER_LDFLAGS_ReleaseWithoutUIKit = -framework SentryWithoutUIKit -OTHER_LDFLAGS_Debug = -framework Sentry -OTHER_LDFLAGS_Test = -framework Sentry -OTHER_LDFLAGS_TestCI = -framework Sentry -OTHER_LDFLAGS_Release = -framework Sentry -OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(CONFIGURATION)) -ARCHS = $(ARCHS_STANDARD) -ARCHS[sdk=*simulator] = $(ARCHS_STANDARD) - -CODE_SIGN_STYLE = Manual -DEVELOPMENT_TEAM = -CODE_SIGN_IDENTITY = -PROVISIONING_PROFILE_SPECIFIER = diff --git a/Sources/SentrySwiftLog/SentryLogHandler.swift b/Sources/SentrySwiftLog/SentryLogHandler.swift deleted file mode 100644 index ed0f587dbf4..00000000000 --- a/Sources/SentrySwiftLog/SentryLogHandler.swift +++ /dev/null @@ -1,131 +0,0 @@ -import Logging -import Sentry - -/// A `swift-log` handler that forwards log entries to Sentry's structured logging system. -/// -/// `SentryLogHandler` implements the `swift-log` `LogHandler` protocol, allowing you to integrate -/// Sentry's structured logging capabilities with Swift's standard logging framework. This enables -/// you to capture application logs and send them to Sentry for analysis and monitoring. -/// -/// ## Level Mapping -/// `swift-log` levels are mapped to Sentry log levels: -/// - `.trace` → `.trace` -/// - `.debug` → `.debug` -/// - `.info` → `.info` -/// - `.notice` → `.info` (notice maps to info as SentryLog doesn't have notice) -/// - `.warning` → `.warn` -/// - `.error` → `.error` -/// - `.critical` → `.fatal` -/// -/// ## Usage -/// ```swift -/// import Logging -/// import Sentry -/// -/// // Initialize Sentry SDK -/// SentrySDK.start { options in -/// options.dsn = "YOUR_DSN" -/// } -/// -/// // Register SentryLogHandler -/// LoggingSystem.bootstrap { _ in -/// return SentryLogHandler(logLevel: .trace) -/// } -/// -/// // Create & use the logger -/// let logger = Logger(label: "com.example.app") -/// logger.info("User logged in", metadata: ["userId": "12345"]) -/// logger.error("Payment failed", metadata: ["errorCode": 500]) -/// ``` -/// -/// - Note: Sentry Logs is currently in Beta. See the [Sentry Logs Documentation](https://docs.sentry.io/platforms/apple/logs/). -/// - Warning: This handler requires Sentry SDK to be initialized before use. -public struct SentryLogHandler: LogHandler { - - /// Logger metadata that will be included with all log entries. - /// - /// This metadata is merged with any metadata provided at the call site, - /// with call-site metadata taking precedence over handler metadata. - public var metadata = Logger.Metadata() - - /// The minimum log level for messages to be sent to Sentry. - /// - /// Messages below this level will be filtered out and not sent to Sentry. - /// Defaults to `.info`. - public var logLevel: Logger.Level - - private let sentryLogger: SentryLogger - - /// Creates a new SentryLogHandler with the specified log level. - /// - /// - Parameter logLevel: The minimum log level for messages to be sent to Sentry. - /// Defaults to `.info`. - public init(logLevel: Logger.Level = .info) { - self.init(logLevel: logLevel, sentryLogger: SentrySDK.logger) - } - - init(logLevel: Logger.Level, sentryLogger: SentryLogger) { - self.logLevel = logLevel - self.sentryLogger = sentryLogger - } - - public func log( - level: Logger.Level, - message: Logger.Message, - metadata: Logger.Metadata?, - source: String, - file: String, - function: String, - line: UInt - ) { - // Filter out messages below the configured log level threshold - guard level >= self.logLevel else { - return - } - - var attributes: [String: Any] = [:] - attributes["sentry.origin"] = "auto.logging.swift-log" - attributes["swift-log.level"] = level.rawValue - attributes["swift-log.source"] = source - attributes["swift-log.file"] = file - attributes["swift-log.function"] = function - attributes["swift-log.line"] = line - - let allMetadata = self.metadata.merging(metadata ?? [:]) { _, new in - new - } - for (key, value) in allMetadata { - attributes["swift-log.\(key)"] = "\(value)" - } - - // Call the appropriate SentryLog method based on level - let messageString = String(describing: message) - - switch level { - case .trace: - sentryLogger.trace(messageString, attributes: attributes) - case .debug: - sentryLogger.debug(messageString, attributes: attributes) - case .info: - sentryLogger.info(messageString, attributes: attributes) - case .notice: - // Map notice to info as SentryLog doesn't have notice - sentryLogger.info(messageString, attributes: attributes) - case .warning: - sentryLogger.warn(messageString, attributes: attributes) - case .error: - sentryLogger.error(messageString, attributes: attributes) - case .critical: - sentryLogger.fatal(messageString, attributes: attributes) - } - } - - public subscript(metadataKey metadataKey: String) -> Logger.Metadata.Value? { - get { - metadata[metadataKey] - } - set(newValue) { - metadata[metadataKey] = newValue - } - } -} diff --git a/Tests/SentrySwiftLogTests/SentryLogHandlerTests.swift b/Tests/SentrySwiftLogTests/SentryLogHandlerTests.swift deleted file mode 100644 index 06217668f22..00000000000 --- a/Tests/SentrySwiftLogTests/SentryLogHandlerTests.swift +++ /dev/null @@ -1,609 +0,0 @@ -internal import _SentryPrivate -import Logging -@_spi(Private) @testable import Sentry -@_spi(Private) @testable import SentrySwiftLog -@_spi(Private) import SentryTestUtils -import XCTest - -// swiftlint:disable cyclomatic_complexity - -final class SentryLogHandlerTests: XCTestCase { - - private class Fixture { - let hub: TestHub - let client: TestClient - let dateProvider: TestCurrentDateProvider - let options: Options - let scope: Scope - let batcher: TestLogBatcher - let sentryLogger: SentryLogger - - init() { - options = Options() - options.dsn = TestConstants.dsnAsString(username: "SentryLogHandlerTests") - - client = TestClient(options: options)! - scope = Scope() - hub = TestHub(client: client, andScope: scope) - dateProvider = TestCurrentDateProvider() - batcher = TestLogBatcher(client: client, dispatchQueue: TestSentryDispatchQueueWrapper()) - - dateProvider.setDate(date: Date(timeIntervalSince1970: 1_627_846_800.123456)) - sentryLogger = SentryLogger(hub: hub, dateProvider: dateProvider, batcher: batcher) - } - - func getSut() -> SentryLogHandler { - return SentryLogHandler(logLevel: .info, sentryLogger: sentryLogger) - } - } - - private class TestLogBatcher: SentryLogBatcher { - var addInvocations = Invocations() - - override func add(_ log: SentryLog) { - addInvocations.record(log) - } - } - - private var fixture: Fixture! - private var sut: SentryLogHandler! - - override func setUp() { - super.setUp() - fixture = Fixture() - sut = fixture.getSut() - } - - override func tearDown() { - super.tearDown() - clearTestState() - } - - // MARK: - Basic Logging Tests - - func testDefaultInit_UsesSDKLogger() throws { - let options = Options() - options.dsn = TestConstants.dsnAsString(username: "SentryLogHandlerTests") - options.enableLogs = true - let testClient = TestClient(options: options)! - let testHub = TestHub(client: testClient, andScope: Scope()) - - SentrySDKInternal.setStart(with: options) - SentrySDKInternal.setCurrentHub(testHub) - - // Create handler with default init (uses SentrySDK.logger) - let sut = SentryLogHandler(logLevel: .info) - XCTAssertNotNil(sut) - - sut.log(level: .info, message: "Test message from default init", metadata: nil, source: "test", file: "TestFile.swift", function: "testDefaultInit", line: 1) - SentrySDK.flush(timeout: 0.25) - - let invocation = try XCTUnwrap(testClient.captureLogsDataInvocations.invocations.first) - let jsonObject = try XCTUnwrap(JSONSerialization.jsonObject(with: invocation.data) as? [String: Any]) - let items = try XCTUnwrap(jsonObject["items"] as? [[String: Any]]) - let item = try XCTUnwrap(items.first) - XCTAssertEqual(1, items.count) - XCTAssertEqual("Test message from default init", item["body"] as? String) - - SentrySDKInternal.close() - } - - func testLog_WithInfoLevel() { - sut.log(level: .info, message: "Test info message", metadata: nil, source: "test", file: "TestFile.swift", function: "testFunction", line: 42) - - assertLogCaptured( - .info, - "Test info message", - [ - "sentry.origin": SentryLog.Attribute(string: "auto.logging.swift-log"), - "swift-log.level": SentryLog.Attribute(string: "info"), - "swift-log.source": SentryLog.Attribute(string: "test"), - "swift-log.file": SentryLog.Attribute(string: "TestFile.swift"), - "swift-log.function": SentryLog.Attribute(string: "testFunction"), - "swift-log.line": SentryLog.Attribute(string: "42") - ] - ) - } - - func testLog_WithErrorLevel() { - sut.log(level: .error, message: "Test error message", metadata: nil, source: "test", file: "TestFile.swift", function: "testFunction", line: 100) - - assertLogCaptured( - .error, - "Test error message", - [ - "sentry.origin": SentryLog.Attribute(string: "auto.logging.swift-log"), - "swift-log.level": SentryLog.Attribute(string: "error"), - "swift-log.source": SentryLog.Attribute(string: "test"), - "swift-log.file": SentryLog.Attribute(string: "TestFile.swift"), - "swift-log.function": SentryLog.Attribute(string: "testFunction"), - "swift-log.line": SentryLog.Attribute(string: "100") - ] - ) - } - - func testLog_WithTraceLevel() { - // Set log level to trace to allow trace messages through - sut.logLevel = .trace - sut.log(level: .trace, message: "Test trace message", metadata: nil, source: "test", file: "TestFile.swift", function: "testFunction", line: 1) - - assertLogCaptured( - .trace, - "Test trace message", - [ - "sentry.origin": SentryLog.Attribute(string: "auto.logging.swift-log"), - "swift-log.level": SentryLog.Attribute(string: "trace"), - "swift-log.source": SentryLog.Attribute(string: "test"), - "swift-log.file": SentryLog.Attribute(string: "TestFile.swift"), - "swift-log.function": SentryLog.Attribute(string: "testFunction"), - "swift-log.line": SentryLog.Attribute(string: "1") - ] - ) - } - - func testLog_WithDebugLevel() { - // Set log level to debug to allow debug messages through - sut.logLevel = .debug - sut.log(level: .debug, message: "Test debug message", metadata: nil, source: "test", file: "TestFile.swift", function: "testFunction", line: 50) - - assertLogCaptured( - .debug, - "Test debug message", - [ - "sentry.origin": SentryLog.Attribute(string: "auto.logging.swift-log"), - "swift-log.level": SentryLog.Attribute(string: "debug"), - "swift-log.source": SentryLog.Attribute(string: "test"), - "swift-log.file": SentryLog.Attribute(string: "TestFile.swift"), - "swift-log.function": SentryLog.Attribute(string: "testFunction"), - "swift-log.line": SentryLog.Attribute(string: "50") - ] - ) - } - - func testLog_WithWarningLevel() { - sut.log(level: .warning, message: "Test warning message", metadata: nil, source: "test", file: "TestFile.swift", function: "testFunction", line: 75) - - assertLogCaptured( - .warn, - "Test warning message", - [ - "sentry.origin": SentryLog.Attribute(string: "auto.logging.swift-log"), - "swift-log.level": SentryLog.Attribute(string: "warning"), - "swift-log.source": SentryLog.Attribute(string: "test"), - "swift-log.file": SentryLog.Attribute(string: "TestFile.swift"), - "swift-log.function": SentryLog.Attribute(string: "testFunction"), - "swift-log.line": SentryLog.Attribute(string: "75") - ] - ) - } - - func testLog_WithCriticalLevel() { - sut.log(level: .critical, message: "Test critical message", metadata: nil, source: "test", file: "TestFile.swift", function: "testFunction", line: 200) - - assertLogCaptured( - .fatal, - "Test critical message", - [ - "sentry.origin": SentryLog.Attribute(string: "auto.logging.swift-log"), - "swift-log.level": SentryLog.Attribute(string: "critical"), - "swift-log.source": SentryLog.Attribute(string: "test"), - "swift-log.file": SentryLog.Attribute(string: "TestFile.swift"), - "swift-log.function": SentryLog.Attribute(string: "testFunction"), - "swift-log.line": SentryLog.Attribute(string: "200") - ] - ) - } - - func testLog_WithNoticeLevel() { - sut.log(level: .notice, message: "Test notice message", metadata: nil, source: "test", file: "TestFile.swift", function: "testFunction", line: 150) - - assertLogCaptured( - .info, - "Test notice message", - [ - "sentry.origin": SentryLog.Attribute(string: "auto.logging.swift-log"), - "swift-log.level": SentryLog.Attribute(string: "notice"), - "swift-log.source": SentryLog.Attribute(string: "test"), - "swift-log.file": SentryLog.Attribute(string: "TestFile.swift"), - "swift-log.function": SentryLog.Attribute(string: "testFunction"), - "swift-log.line": SentryLog.Attribute(string: "150") - ] - ) - } - - // MARK: - Metadata Tests - - func testLog_WithStringMetadata() { - let metadata: Logger.Metadata = [ - "user_id": "12345", - "session_id": "abc-def-ghi" - ] - - sut.log(level: .info, message: "Test with metadata", metadata: metadata, source: "test", file: "TestFile.swift", function: "testFunction", line: 10) - - assertLogCaptured( - .info, - "Test with metadata", - [ - "sentry.origin": SentryLog.Attribute(string: "auto.logging.swift-log"), - "swift-log.level": SentryLog.Attribute(string: "info"), - "swift-log.source": SentryLog.Attribute(string: "test"), - "swift-log.file": SentryLog.Attribute(string: "TestFile.swift"), - "swift-log.function": SentryLog.Attribute(string: "testFunction"), - "swift-log.line": SentryLog.Attribute(string: "10"), - "swift-log.user_id": SentryLog.Attribute(string: "12345"), - "swift-log.session_id": SentryLog.Attribute(string: "abc-def-ghi") - ] - ) - } - - func testLog_WithHandlerMetadata() { - sut.metadata["app_version"] = "1.0.0" - sut.metadata["environment"] = "test" - - sut.log(level: .info, message: "Test with handler metadata", metadata: nil, source: "test", file: "TestFile.swift", function: "testFunction", line: 20) - - assertLogCaptured( - .info, - "Test with handler metadata", - [ - "sentry.origin": SentryLog.Attribute(string: "auto.logging.swift-log"), - "swift-log.level": SentryLog.Attribute(string: "info"), - "swift-log.source": SentryLog.Attribute(string: "test"), - "swift-log.file": SentryLog.Attribute(string: "TestFile.swift"), - "swift-log.function": SentryLog.Attribute(string: "testFunction"), - "swift-log.line": SentryLog.Attribute(string: "20"), - "swift-log.app_version": SentryLog.Attribute(string: "1.0.0"), - "swift-log.environment": SentryLog.Attribute(string: "test") - ] - ) - } - - func testLog_WithMergedMetadata() { - sut.metadata["app_version"] = "1.0.0" - - let logMetadata: Logger.Metadata = [ - "user_id": "12345", - "app_version": "2.0.0" // This should override handler metadata - ] - - sut.log(level: .info, message: "Test with merged metadata", metadata: logMetadata, source: "test", file: "TestFile.swift", function: "testFunction", line: 30) - - assertLogCaptured( - .info, - "Test with merged metadata", - [ - "sentry.origin": SentryLog.Attribute(string: "auto.logging.swift-log"), - "swift-log.level": SentryLog.Attribute(string: "info"), - "swift-log.source": SentryLog.Attribute(string: "test"), - "swift-log.file": SentryLog.Attribute(string: "TestFile.swift"), - "swift-log.function": SentryLog.Attribute(string: "testFunction"), - "swift-log.line": SentryLog.Attribute(string: "30"), - "swift-log.user_id": SentryLog.Attribute(string: "12345"), - "swift-log.app_version": SentryLog.Attribute(string: "2.0.0") - ] - ) - } - - // MARK: - Metadata Value Conversion Tests - - func testLog_WithStringConvertibleMetadata() { - let metadata: Logger.Metadata = [ - "count": Logger.MetadataValue.stringConvertible(42), - "enabled": Logger.MetadataValue.stringConvertible(true), - "score": Logger.MetadataValue.stringConvertible(3.14159) - ] - - sut.log(level: .info, message: "Test with string convertible metadata", metadata: metadata, source: "test", file: "TestFile.swift", function: "testFunction", line: 40) - - assertLogCaptured( - .info, - "Test with string convertible metadata", - [ - "sentry.origin": SentryLog.Attribute(string: "auto.logging.swift-log"), - "swift-log.level": SentryLog.Attribute(string: "info"), - "swift-log.source": SentryLog.Attribute(string: "test"), - "swift-log.file": SentryLog.Attribute(string: "TestFile.swift"), - "swift-log.function": SentryLog.Attribute(string: "testFunction"), - "swift-log.line": SentryLog.Attribute(string: "40"), - "swift-log.count": SentryLog.Attribute(string: "42"), - "swift-log.enabled": SentryLog.Attribute(string: "true"), - "swift-log.score": SentryLog.Attribute(string: "3.14159") - ] - ) - } - - func testLog_WithDictionaryMetadata() { - let metadata: Logger.Metadata = [ - "user": Logger.MetadataValue.dictionary([ - "id": "12345", - "name": "John Doe" - ]) - ] - - sut.log(level: .info, message: "Test with dictionary metadata", metadata: metadata, source: "test", file: "TestFile.swift", function: "testFunction", line: 50) - - // Verify the log was captured - let logs = fixture.batcher.addInvocations.invocations - XCTAssertEqual(logs.count, 1, "Expected exactly one log to be captured") - - guard let capturedLog = logs.first else { - XCTFail("No log captured") - return - } - - // Verify basic log properties - XCTAssertEqual(capturedLog.level, .info) - XCTAssertEqual(capturedLog.body, "Test with dictionary metadata") - - // Verify the user attribute exists and contains the expected keys - guard let userAttribute = capturedLog.attributes["swift-log.user"] else { - XCTFail("Missing swift-log.user attribute") - return - } - - XCTAssertEqual(userAttribute.type, "string") - let userString = userAttribute.value as! String - - // Check that the string contains both expected key-value pairs (order doesn't matter) - XCTAssertTrue(userString.contains("\"id\": \"12345\""), "User string should contain id") - XCTAssertTrue(userString.contains("\"name\": \"John Doe\""), "User string should contain name") - XCTAssertTrue(userString.hasPrefix("["), "User string should start with [") - XCTAssertTrue(userString.hasSuffix("]"), "User string should end with ]") - } - - func testLog_WithArrayMetadata() { - let metadata: Logger.Metadata = [ - "tags": Logger.MetadataValue.array([ - Logger.MetadataValue.string("production"), - Logger.MetadataValue.string("api"), - Logger.MetadataValue.stringConvertible(42) - ]) - ] - - sut.log(level: .info, message: "Test with array metadata", metadata: metadata, source: "test", file: "TestFile.swift", function: "testFunction", line: 60) - - // Verify the log was captured - let logs = fixture.batcher.addInvocations.invocations - XCTAssertEqual(logs.count, 1, "Expected exactly one log to be captured") - - guard let capturedLog = logs.first else { - XCTFail("No log captured") - return - } - - // Verify basic log properties - XCTAssertEqual(capturedLog.level, .info) - XCTAssertEqual(capturedLog.body, "Test with array metadata") - - // Verify the tags attribute exists and contains the expected values - guard let tagsAttribute = capturedLog.attributes["swift-log.tags"] else { - XCTFail("Missing swift-log.tags attribute") - return - } - - XCTAssertEqual(tagsAttribute.type, "string") - let tagsString = tagsAttribute.value as! String - - // Check that the string contains all expected values (order might vary) - XCTAssertTrue(tagsString.contains("\"production\""), "Tags string should contain production") - XCTAssertTrue(tagsString.contains("\"api\""), "Tags string should contain api") - XCTAssertTrue(tagsString.contains("\"42\""), "Tags string should contain 42") - XCTAssertTrue(tagsString.hasPrefix("["), "Tags string should start with [") - XCTAssertTrue(tagsString.hasSuffix("]"), "Tags string should end with ]") - } - - // MARK: - Log Level Configuration Tests - - func testLogLevelConfiguration() { - XCTAssertEqual(sut.logLevel, .info) - } - - func testLogLevelFiltering_InfoThreshold_FiltersTraceAndDebug() { - sut.logLevel = .info - - sut.log(level: .trace, message: "Trace message", metadata: nil, source: "test", file: "TestFile.swift", function: "testFunction", line: 1) - sut.log(level: .debug, message: "Debug message", metadata: nil, source: "test", file: "TestFile.swift", function: "testFunction", line: 2) - - assertNoLogsCaptured() - } - - func testLogLevelFiltering_InfoThreshold_CapturesInfo() { - sut.logLevel = .info - - sut.log(level: .info, message: "Info message", metadata: nil, source: "test", file: "TestFile.swift", function: "testFunction", line: 3) - - assertLogCaptured( - .info, - "Info message", - [ - "sentry.origin": SentryLog.Attribute(string: "auto.logging.swift-log"), - "swift-log.level": SentryLog.Attribute(string: "info"), - "swift-log.source": SentryLog.Attribute(string: "test"), - "swift-log.file": SentryLog.Attribute(string: "TestFile.swift"), - "swift-log.function": SentryLog.Attribute(string: "testFunction"), - "swift-log.line": SentryLog.Attribute(string: "3") - ] - ) - } - - func testLogLevelFiltering_InfoThreshold_CapturesNotice() { - sut.logLevel = .info - - sut.log(level: .notice, message: "Notice message", metadata: nil, source: "test", file: "TestFile.swift", function: "testFunction", line: 4) - - assertLogCaptured( - .info, - "Notice message", - [ - "sentry.origin": SentryLog.Attribute(string: "auto.logging.swift-log"), - "swift-log.level": SentryLog.Attribute(string: "notice"), - "swift-log.source": SentryLog.Attribute(string: "test"), - "swift-log.file": SentryLog.Attribute(string: "TestFile.swift"), - "swift-log.function": SentryLog.Attribute(string: "testFunction"), - "swift-log.line": SentryLog.Attribute(string: "4") - ] - ) - } - - func testLogLevelFiltering_InfoThreshold_CapturesWarning() { - sut.logLevel = .info - - sut.log(level: .warning, message: "Warning message", metadata: nil, source: "test", file: "TestFile.swift", function: "testFunction", line: 5) - - assertLogCaptured( - .warn, - "Warning message", - [ - "sentry.origin": SentryLog.Attribute(string: "auto.logging.swift-log"), - "swift-log.level": SentryLog.Attribute(string: "warning"), - "swift-log.source": SentryLog.Attribute(string: "test"), - "swift-log.file": SentryLog.Attribute(string: "TestFile.swift"), - "swift-log.function": SentryLog.Attribute(string: "testFunction"), - "swift-log.line": SentryLog.Attribute(string: "5") - ] - ) - } - - func testLogLevelFiltering_InfoThreshold_CapturesError() { - sut.logLevel = .info - - sut.log(level: .error, message: "Error message", metadata: nil, source: "test", file: "TestFile.swift", function: "testFunction", line: 6) - - assertLogCaptured( - .error, - "Error message", - [ - "sentry.origin": SentryLog.Attribute(string: "auto.logging.swift-log"), - "swift-log.level": SentryLog.Attribute(string: "error"), - "swift-log.source": SentryLog.Attribute(string: "test"), - "swift-log.file": SentryLog.Attribute(string: "TestFile.swift"), - "swift-log.function": SentryLog.Attribute(string: "testFunction"), - "swift-log.line": SentryLog.Attribute(string: "6") - ] - ) - } - - func testLogLevelFiltering_InfoThreshold_CapturesCritical() { - sut.logLevel = .info - - sut.log(level: .critical, message: "Critical message", metadata: nil, source: "test", file: "TestFile.swift", function: "testFunction", line: 7) - - assertLogCaptured( - .fatal, - "Critical message", - [ - "sentry.origin": SentryLog.Attribute(string: "auto.logging.swift-log"), - "swift-log.level": SentryLog.Attribute(string: "critical"), - "swift-log.source": SentryLog.Attribute(string: "test"), - "swift-log.file": SentryLog.Attribute(string: "TestFile.swift"), - "swift-log.function": SentryLog.Attribute(string: "testFunction"), - "swift-log.line": SentryLog.Attribute(string: "7") - ] - ) - } - - func testMetadataSubscript() { - XCTAssertNil(sut.metadata["test_key"]) - XCTAssertNil(sut[metadataKey: "test_key_2"]) - - sut.metadata["test_key"] = "test_value" - XCTAssertEqual(sut.metadata["test_key"], .string("test_value")) - - sut[metadataKey: "test_key_2"] = "test_value_2" - XCTAssertEqual(sut[metadataKey: "test_key_2"], .string("test_value_2")) - - sut.metadata["test_key"] = nil - XCTAssertNil(sut.metadata["test_key"]) - - sut[metadataKey: "test_key_2"] = nil - XCTAssertNil(sut[metadataKey: "test_key_2"]) - } - - // MARK: - Helper Methods - - private func assertNoLogsCaptured( - file: StaticString = #file, - line: UInt = #line - ) { - let logs = fixture.batcher.addInvocations.invocations - XCTAssertEqual(logs.count, 0, "Expected no logs to be captured", file: file, line: line) - } - - private func assertLogCaptured( - _ expectedLevel: SentryLog.Level, - _ expectedBody: String, - _ expectedAttributes: [String: SentryLog.Attribute], - file: StaticString = #file, - line: UInt = #line - ) { - let logs = fixture.batcher.addInvocations.invocations - XCTAssertEqual(logs.count, 1, "Expected exactly one log to be captured", file: file, line: line) - - guard let capturedLog = logs.first else { - XCTFail("No log captured", file: file, line: line) - return - } - - XCTAssertEqual(capturedLog.level, expectedLevel, "Log level mismatch", file: file, line: line) - XCTAssertEqual(capturedLog.body, expectedBody, "Log body mismatch", file: file, line: line) - XCTAssertEqual(capturedLog.timestamp, fixture.dateProvider.date(), "Log timestamp mismatch", file: file, line: line) - - // Count expected default attributes dynamically - var expectedDefaultAttributeCount = 3 // sdk.name, sdk.version, environment are always present - if fixture.options.releaseName != nil { - expectedDefaultAttributeCount += 1 // sentry.release - } - if fixture.hub.scope.span != nil { - expectedDefaultAttributeCount += 1 // sentry.trace.parent_span_id - } - // OS and device attributes (up to 5 more if context is available) - if let contextDictionary = fixture.hub.scope.serialize()["context"] as? [String: [String: Any]] { - if let osContext = contextDictionary["os"] { - if osContext["name"] != nil { expectedDefaultAttributeCount += 1 } - if osContext["version"] != nil { expectedDefaultAttributeCount += 1 } - } - if contextDictionary["device"] != nil { - expectedDefaultAttributeCount += 1 // device.brand (always "Apple") - if let deviceContext = contextDictionary["device"] { - if deviceContext["model"] != nil { expectedDefaultAttributeCount += 1 } - if deviceContext["family"] != nil { expectedDefaultAttributeCount += 1 } - } - } - } - - // Compare attributes - XCTAssertEqual(capturedLog.attributes.count, expectedAttributes.count + expectedDefaultAttributeCount, "Attribute count mismatch", file: file, line: line) - - for (key, expectedAttribute) in expectedAttributes { - guard let actualAttribute = capturedLog.attributes[key] else { - XCTFail("Missing attribute key: \(key)", file: file, line: line) - continue - } - - XCTAssertEqual(actualAttribute.type, expectedAttribute.type, "Attribute type mismatch for key: \(key)", file: file, line: line) - - // Compare values based on type - switch expectedAttribute.type { - case "string": - let expectedValue = expectedAttribute.value as! String - let actualValue = actualAttribute.value as! String - XCTAssertEqual(actualValue, expectedValue, "String attribute value mismatch for key: \(key)", file: file, line: line) - case "boolean": - let expectedValue = expectedAttribute.value as! Bool - let actualValue = actualAttribute.value as! Bool - XCTAssertEqual(actualValue, expectedValue, "Boolean attribute value mismatch for key: \(key)", file: file, line: line) - case "integer": - let expectedValue = expectedAttribute.value as! Int - let actualValue = actualAttribute.value as! Int - XCTAssertEqual(actualValue, expectedValue, "Integer attribute value mismatch for key: \(key)", file: file, line: line) - case "double": - let expectedValue = expectedAttribute.value as! Double - let actualValue = actualAttribute.value as! Double - XCTAssertEqual(actualValue, expectedValue, accuracy: 0.000001, "Double attribute value mismatch for key: \(key)", file: file, line: line) - default: - XCTFail("Unknown attribute type for key: \(key). Type: \(expectedAttribute.type)", file: file, line: line) - } - } - } -} diff --git a/Utils/VersionBump/main.swift b/Utils/VersionBump/main.swift index 928c7f3e4f4..5a1924f802d 100644 --- a/Utils/VersionBump/main.swift +++ b/Utils/VersionBump/main.swift @@ -50,8 +50,7 @@ let files = [ let restrictFiles = [ "./Sources/Configuration/SDK.xcconfig", "./Sources/Configuration/Versioning.xcconfig", - "./Sources/Configuration/SentrySwiftUI.xcconfig", - "./Sources/Configuration/SentrySwiftLog.xcconfig" + "./Sources/Configuration/SentrySwiftUI.xcconfig" ] let args = CommandLine.arguments diff --git a/develop-docs/DECISIONS.md b/develop-docs/DECISIONS.md index db4ab097d3e..9827b716b78 100644 --- a/develop-docs/DECISIONS.md +++ b/develop-docs/DECISIONS.md @@ -450,9 +450,9 @@ Contributors: @philprime, @philipphofmann, @itaybre While we keep supporting iOS 16 in the v9 SDK, we will remove testing in iOS 16 due to flakiness when running on GitHub Actions simulators as the test runners keep timing out. -## swift-log dependency version constraint +## swift-log dependency removal -Date: 04.11.2025 -Contributors: @philprime, @denrase +Date: 10.11.2025 +Contributors: @philipphofmann, @noahsmartin, @denrase -SPM doesn't support peer-dependencies, so users will be locked into the swift-log version we declare. We use `from: "1.6.0"` which covers `1.6.0 < 2.0.0`, so future minor versions should be correctly resolved. As long as swift-log doesn't regularly change major versions, breaking API changes should be rare. We can always adjust the minimum supported version in future releases. +The `swift-log` dependeceny we have added is primarly intendet to be used on backaned projects. While it could be used on the client, we do not want to have external dependencies in our `Package.swift`. So fot it and other logging integrations, a separate repo will be created.