Merge fd73f1e into 08fc5f9

Author: denrase

.github/actions/prepare-package.swift/action.yml

@@ -43,9 +43,14 @@ runs:
       env:
         PACKAGE_FILE: ${{ inputs.package-file }}
       run: |
-        sed -i '' 's/url.*//g' $PACKAGE_FILE
+        # Remove Sentry binary framework URLs and convert checksums to paths
+        sed -i '' 's/url: "https:\/\/github\.com\/getsentry\/sentry-cocoa\/releases\/download\/.*"//g' $PACKAGE_FILE
         sed -i '' 's/checksum: ".*" \/\/Sentry-Static/path: "Sentry.xcframework.zip"/g' $PACKAGE_FILE
         sed -i '' 's/checksum: ".*" \/\/Sentry-Dynamic-WithARM64e/path: "Sentry-Dynamic-WithARM64e.xcframework.zip"/g' $PACKAGE_FILE
         sed -i '' 's/checksum: ".*" \/\/Sentry-Dynamic/path: "Sentry-Dynamic.xcframework.zip"/g' $PACKAGE_FILE
         sed -i '' 's/checksum: ".*" \/\/Sentry-WithoutUIKitOrAppKit-WithARM64e/path: "Sentry-WithoutUIKitOrAppKit-WithARM64e.xcframework.zip"/g' $PACKAGE_FILE
         sed -i '' 's/checksum: ".*" \/\/Sentry-WithoutUIKitOrAppKit/path: "Sentry-WithoutUIKitOrAppKit.xcframework.zip"/g' $PACKAGE_FILE
+        # Clean up orphaned commas and fix syntax
+        sed -i '' '/^[[:space:]]*,$/d' $PACKAGE_FILE
+        sed -i '' 's/name: "Sentry\(-.*\)\?"$/name: "Sentry\1",/g' $PACKAGE_FILE
+        sed -i '' 's/platforms: \[\.iOS(\.v11), \.macOS(\.v10_13), \.tvOS(\.v11), \.watchOS(\.v4)\]$/platforms: [.iOS(.v11), .macOS(.v10_13), .tvOS(.v11), .watchOS(.v4)],/g' $PACKAGE_FILE

.github/workflows/test.yml

@@ -338,6 +338,15 @@ jobs:
             device: "iPhone 15 Pro"
             scheme: "SentrySwiftUI"
 
+            # iOS 17
+          - name: iOS 17 SentrySwiftLog
+            runs-on: macos-14
+            platform: "iOS"
+            xcode: "15.4"
+            test-destination-os: "17.5"
+            device: "iPhone 15 Pro"
+            scheme: "SentrySwiftLog"
+
           # tvOS 18
           - name: tvOS 18 Sentry
             runs-on: macos-15

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Features
 
 - Add SentryDistribution as Swift Package Manager target (#6149)
+- Add `SentrySwiftLog` Integration ([#6286](https://github.com/getsentry/sentry-cocoa/pull/6286))
 
 ## 8.56.2
 

Package.swift

@@ -16,7 +16,8 @@ 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: "SentryDistribution", targets: ["SentryDistribution"]),
+    .library(name: "SentrySwiftLog", targets: ["Sentry", "SentrySwiftLog"])
 ]
 
 var targets: [Target] = [
@@ -45,21 +46,31 @@ var targets: [Target] = [
         url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.56.2/Sentry-WithoutUIKitOrAppKit-WithARM64e.xcframework.zip",
         checksum: "0c716f6a6475d8fd6e78b9204c74adffef5c0989f057c5d795989a667ae58047" //Sentry-WithoutUIKitOrAppKit-WithARM64e
     ),
-    .target (
+    .target(
         name: "SentrySwiftUI",
         dependencies: ["Sentry", "SentryInternal"],
         path: "Sources/SentrySwiftUI",
         exclude: ["SentryInternal/", "module.modulemap"],
         linkerSettings: [
             .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",
         sources: [
             "SentryInternal/"
         ],
-        publicHeadersPath: "SentryInternal/"),
+        publicHeadersPath: "SentryInternal/"
+    ),
     .target(
         name: "SentryCppHelper",
         dependencies: ["Sentry"],
@@ -104,7 +115,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", "Resources", "Configuration", "SentryCppHelper", "SentryDistribution", "SentryDistributionTests"],
+            exclude: ["Sentry/SentryDummyPublicEmptyClass.m", "Sentry/SentryDummyPrivateEmptyClass.m", "Swift", "SentrySwiftUI", "SentrySwiftLog", "Resources", "Configuration", "SentryCppHelper", "SentryDistribution", "SentryDistributionTests"],
             cSettings: [
                 .headerSearchPath("Sentry/include/HybridPublic"),
                 .headerSearchPath("Sentry"),
@@ -114,14 +125,19 @@ if let env = env, String(cString: env, encoding: .utf8) == "1" {
                 .headerSearchPath("SentryCrash/Installations"),
                 .headerSearchPath("SentryCrash/Reporting/Filters"),
                 .headerSearchPath("SentryCrash/Reporting/Filters/Tools"),
-                .define("SDK_V9")])
+                .define("SDK_V9")
+            ]
+        )
     ])
 }
 
 let package = Package(
     name: "Sentry",
     platforms: [.iOS(.v11), .macOS(.v10_13), .tvOS(.v11), .watchOS(.v4)],
     products: products,
+    dependencies: [
+        .package(url: "https://github.com/apple/swift-log", from: "1.6.0")
+    ],
     targets: targets,
     cxxLanguageStandard: .cxx14
 )

Samples/iOS15-SwiftUI/iOS15-SwiftUI/App.swift

@@ -2,12 +2,20 @@ import Foundation
 import SentrySampleShared
 import SwiftUI
 
+import Logging
+import SentrySwiftLog
+
 @main
 struct SwiftUIApp: App {
     @UIApplicationDelegateAdaptor private var appDelegate: MyAppDelegate
 
     init() {
         SentrySDKWrapper.shared.startSentry()
+        
+        // Use structured logs with swift-log
+        LoggingSystem.bootstrap { _ in
+            return SentryLogHandler(logLevel: .trace)
+        }
     }
 
     var body: some Scene {

Samples/iOS15-SwiftUI/iOS15-SwiftUI/ContentView.swift

@@ -1,6 +1,8 @@
 import Sentry
 import SwiftUI
 
+import Logging
+
 struct ContentView: View {
 
     private func captureError() {
@@ -9,6 +11,15 @@ struct ContentView: View {
         }
     }
 
+    private func swiftLog() {
+        let logger = Logger(label: "io.sentry.iOS15-SwiftUI")
+        logger.trace(
+            "swift-log",
+            metadata: ["foo": "bar"],
+            source: "iOS"
+        )
+    }
+    
     func captureErrorAsync() async {
         let error = NSError(domain: "SampleErrorDomain", code: 1, userInfo: [NSLocalizedDescriptionKey: "Object does not exist"])
         SentrySDK.capture(error: error)
@@ -19,6 +30,9 @@ struct ContentView: View {
             Button(action: captureError) {
                 Text("Capture Error")
             }
+            Button(action: swiftLog) {
+                Text("swift-log")
+            }
         }
     }
 }