getsentry · philprime · Mar 4, 2026 · Mar 10, 2026 · Mar 10, 2026 · Mar 10, 2026
@@ -74,11 +74,13 @@ run_api_stability_for_prs: &run_api_stability_for_prs
   - "scripts/build-xcframework-slice.sh"
   - "scripts/assemble-xcframework.sh"
   - "scripts/update-api.sh"
+  - "scripts/extract-objc-api.sh"
   - "scripts/ci-diagnostics.sh"
 
   # API files
   - "sdk_api.json"
   - "sdk_api_sentryswiftui.json"
+  - "sdk_objc_api.json"
 
   # Build configuration
   - "Makefile"

@@ -48,6 +48,7 @@ jobs:
         run: |
           mv sdk_api.json sdk_api_base.json
           mv sdk_api_sentryswiftui.json sdk_api_sentryswiftui_base.json
+          mv sdk_api_objc.json sdk_api_objc_base.json
           ./scripts/update-api.sh
 
       - name: Diagnose breaking changes for Sentry
@@ -87,6 +88,18 @@ jobs:
             cat sentryswiftui_result.json
             exit 1
           fi
+
+      - name: Diagnose breaking changes for SentryObjC
+        if: always()
+        run: |
+          if diff -q "sdk_api_objc_base.json" "sdk_api_objc.json" > /dev/null; then
+            echo "No SentryObjC API changes detected."
+          else
+            echo "❌ SentryObjC public API changes are detected. If they're intended run "make generate-public-api" and commit the changes."
+            diff "sdk_api_objc_base.json" "sdk_api_objc.json" || true
+            exit 1
+          fi
+
       - name: Run CI Diagnostics
         if: failure()
         run: ./scripts/ci-diagnostics.sh

@@ -104,6 +104,8 @@ jobs:
             config: Debug
           - scheme: iOS-ObjectiveC
             config: Debug
+          - scheme: iOS-ObjectiveCpp-NoModules
+            config: Debug
           - scheme: SPM
             config: Debug
           - scheme: DistributionSample

@@ -11,6 +11,8 @@
   When building from source with Swift 6.1+ (using `Package@swift-6.1.swift`), you can enable the `NoUIFramework` trait to avoid linking UIKit or AppKit. Use this for command-line tools, headless server contexts, or other environments where UI frameworks are unavailable.
   In Xcode 26.4 and later, add the Sentry package as a dependency and the `SentrySPM` product, then enable the `NoUIFramework` trait on the package reference (Package Dependencies → select Sentry → Traits).
 - Metric kit app hangs now report a full flamegraph rather than just one stacktrace during the hang. (#7185)
+- Add SentryObjC wrapper SDK to provide pure Objective-C compatibility layer that wraps the main Sentry SDK with stable, documented Objective-C interfaces. (#7598)
+  This SDK is designed for projects that require strict Objective-C compatibility without Swift dependencies.
 
 ### Fixes
 

@@ -230,6 +230,7 @@ build-xcframework-sample:
 build-samples: \
 	build-sample-DistributionSample \
 	build-sample-iOS-ObjectiveC \
+	build-sample-iOS-ObjectiveCpp-NoModules \
 	build-sample-iOS-Swift \
 	build-sample-iOS-Swift6 \
 	build-sample-iOS-SwiftUI \
@@ -324,9 +325,8 @@ build-sample-visionOS-SwiftUI-SPM:
 
 ## Build the iOS-ObjectiveCpp-NoModules sample app
 #
-# Builds the ObjC++ without-modules sample that reproduces #4543.
-# This target is expected to FAIL until the pure ObjC SDK wrapper (#6342)
-# is implemented. Use it to verify the fix.
+# Builds the ObjC++ without-modules sample that uses SentryObjC (#6342).
+# Uses #import <SentryObjC/SentryObjC.h> for ObjC++ without -fmodules.
 .PHONY: build-sample-iOS-ObjectiveCpp-NoModules
 build-sample-iOS-ObjectiveCpp-NoModules:
 	xcodegen --spec Samples/iOS-ObjectiveCpp-NoModules/iOS-ObjectiveCpp-NoModules.yml
@@ -816,6 +816,15 @@ analyze:
 generate-public-api:
 	./scripts/update-api.sh
 
+## Generate SentryObjC public API snapshot
+#
+# Extracts SentryObjC public API from headers to sdk_objc_api.json.
+# Use for quick iteration; full API generation runs via generate-public-api.
+.PHONY: generate-objc-api
+generate-objc-api:
+	python3 scripts/extract-objc-api.py > sdk_objc_api.json
+	@echo "--> sdk_objc_api.json updated"
+
 # ============================================================================
 # VERSION MANAGEMENT
 # ============================================================================

@@ -96,7 +96,7 @@ targets += [
         name: "SentryObjCInternal",
         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", "Resources", "Configuration", "SentryCppHelper", "SentryDistribution", "SentryDistributionTests", "SentryObjC", "SentryObjCBridge"],
         cSettings: [
             .headerSearchPath("Sentry"),
             .headerSearchPath("SentryCrash/Recording"),
@@ -107,6 +107,28 @@ targets += [
             .headerSearchPath("SentryCrash/Reporting/Filters/Tools")])
 ]
 
+// Swift bridge that exposes SDK functionality to pure ObjC code (no modules)
+products.append(.library(name: "SentryObjC", targets: ["SentryObjCInternal", "SentryObjCBridge", "SentryObjC"]))
+targets += [
+    .target(
+        name: "SentryObjCBridge",
+        dependencies: ["SentryObjCInternal"],
+        path: "Sources/SentryObjCBridge",
+        swiftSettings: [
+            .unsafeFlags(["-enable-library-evolution"])
+        ]),
+
+    .target(
+        name: "SentryObjC",
+        dependencies: ["SentryObjCBridge"],
+        path: "Sources/SentryObjC",
+        publicHeadersPath: "Public",
+        cSettings: [
+            .headerSearchPath("Public")
+        ]
+    )
+]
+
 let package = Package(
     name: "Sentry",
     platforms: [.iOS(.v15), .macOS(.v10_14), .tvOS(.v15), .watchOS(.v8), .visionOS(.v1)],

@@ -97,7 +97,7 @@ targets += [
         name: "SentryObjCInternal",
         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", "Resources", "Configuration", "SentryCppHelper", "SentryDistribution", "SentryDistributionTests", "SentryObjC", "SentryObjCBridge"],
         cSettings: [
             .headerSearchPath("Sentry"),
             .headerSearchPath("SentryCrash/Recording"),
@@ -110,6 +110,28 @@ targets += [
         ])
 ]
 
+// Swift bridge that exposes SDK functionality to pure ObjC code (no modules)
+products.append(.library(name: "SentryObjC", targets: ["SentryObjCInternal", "SentryObjCBridge", "SentryObjC"]))
+targets += [
+    .target(
+        name: "SentryObjCBridge",
+        dependencies: ["SentryObjCInternal"],
+        path: "Sources/SentryObjCBridge",
+        swiftSettings: [
+            .unsafeFlags(["-enable-library-evolution"])
+        ]),
+
+    .target(
+        name: "SentryObjC",
+        dependencies: ["SentryObjCBridge"],
+        path: "Sources/SentryObjC",
+        publicHeadersPath: "Public",
+        cSettings: [
+            .headerSearchPath("Public")
+        ]
+    )
+]
+
 let package = Package(
     name: "Sentry",
     platforms: [.iOS(.v15), .macOS(.v10_14), .tvOS(.v15), .watchOS(.v8), .visionOS(.v1)],

@@ -1,32 +1,21 @@
-// Demonstrates the issue from #4543 / #6342: Using Sentry from Objective-C++
-// with CLANG_ENABLE_MODULES=NO. We must use #import instead of @import.
-//
-// With modules disabled, #import <Sentry/Sentry.h> does NOT expose Swift APIs
-// (SentrySDK, SentryOptions, options.sessionReplay). We intentionally do NOT
-// include Sentry-Swift.h here because that fails with forward declaration
-// errors (UIView, UIWindowLevel, etc.) when included from .mm files without
-// modules. So we only have #import <Sentry/Sentry.h> and the build fails with
-// "use of undeclared identifier 'SentrySDK'" - reproducing the issue.
-//
-// The sample will NOT build until the pure ObjC SDK wrapper (#6342) is implemented.
+// Uses Sentry from Objective-C++ with CLANG_ENABLE_MODULES=NO via the pure
+// ObjC wrapper (SentryObjC). Import the umbrella header to access SentrySDK,
+// SentryOptions, sessionReplay, etc. without requiring Swift modules.
 
 #import "AppDelegate.h"
-#import <Sentry/Sentry.h>
+#import <SentryObjC.h>
 #import <UIKit/UIKit.h>
 
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    // Fails: SentrySDK undeclared - #import <Sentry/Sentry.h> does not expose
-    // Swift APIs when CLANG_ENABLE_MODULES=NO (SDK 8.54+).
-    [SentrySDK startWithConfigureOptions:^(SentryOptions *options) {
+    [SentryObjCSDK startWithConfigureOptions:^(SentryOptions *options) {
         options.dsn = @"https://6cc9bae94def43cab8444a99e0031c28@o447951.ingest.sentry.io/5428557";
         options.debug = YES;
         options.tracesSampleRate = @1.0;
 
-        // This fails: options.sessionReplay not exposed without @import
         options.sessionReplay.sessionSampleRate = 0;
         options.sessionReplay.onErrorSampleRate = 1;
     }];

@@ -1,24 +1,21 @@
-// Objective-C++ file - same module restrictions as AppDelegate.mm.
-// Cannot use @import Sentry here; must use #import.
-// No Sentry-Swift.h - would cause forward declaration errors from .mm without modules.
+// Objective-C++ file - uses SentryObjC for full SDK access without modules.
 
 #import "ViewController.h"
-#import <Sentry/Sentry.h>
+#import <SentryObjC.h>
 #import <UIKit/UIKit.h>
 
 @implementation ViewController
 
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-    // Fails: SentrySDK undeclared with #import alone
-    [SentrySDK addBreadcrumb:[[SentryBreadcrumb alloc] init]];
+    [SentryObjCSDK addBreadcrumb:[[SentryBreadcrumb alloc] init]];
 }
 
 - (IBAction)captureError:(id)sender
 {
     NSError *error = [NSError errorWithDomain:@"iOS-ObjectiveCpp-NoModules" code:1 userInfo:nil];
-    [SentrySDK captureError:error];
+    [SentryObjCSDK captureError:error];
 }
 
 @end
@@ -1,6 +1,8 @@
 # iOS-ObjectiveCpp-NoModules
 
-This sample replicates the issue documented in [getsentry/sentry-cocoa#4543](https://github.com/getsentry/sentry-cocoa/issues/4543): **using the Sentry SDK from Objective-C++ when `-fmodules` and `-fcxx-modules` are not supported.**
+This sample demonstrates **using the Sentry SDK from Objective-C++ when `-fmodules` and `-fcxx-modules` are not supported**.
+
+Originally documented the issue in [getsentry/sentry-cocoa#4543](https://github.com/getsentry/sentry-cocoa/issues/4543). Now demonstrates the solution via **SentryObjC**.
 
 ## Problem
 
@@ -18,21 +20,33 @@ With modules disabled:
 
 **Result:** `SentrySDK`, `SentryOptions`, `options.sessionReplay` and other Swift-bridged APIs are unavailable. The SDK is effectively unusable from ObjC++ without modules.
 
-## This Sample
+## Solution: SentryObjC
 
-- Uses **Objective-C++** (`.mm` files) for AppDelegate and ViewController
-- Sets **`CLANG_ENABLE_MODULES = NO`** in the build configuration
-- Uses only `#import <Sentry/Sentry.h>` in `.mm` files (does **not** import `Sentry-Swift.h`)
-- Demonstrates that Swift-bridged APIs like `SentrySDK` and `options.sessionReplay` are unavailable from ObjC++ without modules
+The **SentryObjC** product (introduced in [#6342](https://github.com/getsentry/sentry-cocoa/issues/6342)) provides a pure Objective-C wrapper around the main SDK:
+
+```objc
+#import <SentryObjC.h>  // Pure ObjC - no Swift modules required
 
-**Build status:** The sample **does NOT build** and reproduces the issue. With only `#import <Sentry/Sentry.h>` (no `Sentry-Swift.h`), the compiler reports `error: use of undeclared identifier 'SentrySDK'`. Attempting to include `#import <Sentry/Sentry-Swift.h>` in this setup (see comments in `AppDelegate.mm` / `ViewController.mm`) fails with forward declaration errors when used from `.mm` files without modules. The sample exists to:
+[SentryObjCSDK startWithConfigureOptions:^(SentryOptions *options) {
+    options.dsn = @"...";
+    options.tracesSampleRate = @1.0;
+    options.sessionReplay.sessionSampleRate = 0;  // All Swift APIs now available!
+}];
+```
+
+**Key differences from the main Sentry framework:**
 
-1. Document the exact pattern that fails for ObjC++ consumers in production
-2. Serve as a test case for the fix in [getsentry/sentry-cocoa#6342](https://github.com/getsentry/sentry-cocoa/issues/6342)
+- ✅ Pure Objective-C public interface
+- ✅ No Swift modules or `Sentry-Swift.h` required
+- ✅ Works in Objective-C++ (`.mm` files) without modules
+- ✅ Full access to all SDK features (SentrySDK, SentryOptions, sessionReplay, etc.)
 
-## Planned Fix (#6342)
+## This Sample
 
-Issue [#6342](https://github.com/getsentry/sentry-cocoa/issues/6342) proposes a **pure Objective-C SDK wrapper** that can be imported without modules. Once implemented, this sample should build successfully.
+- Uses **Objective-C++** (`.mm` files) for AppDelegate and ViewController
+- Sets **`CLANG_ENABLE_MODULES = NO`** in the build configuration
+- Depends on **SentryObjC** (SPM product) and imports `#import <SentryObjC.h>`
+- Builds successfully with full access to SentrySDK, SentryOptions, sessionReplay, etc.
 
 ## Generating the Project
 
@@ -44,5 +58,5 @@ xcodegen generate
 Or from the repo root:
 
 ```bash
-make xcode-ci  # regenerates all sample projects including this one
+make build-sample-iOS-ObjectiveCpp-NoModules
 ```
@@ -1,14 +1,8 @@
 # yaml-language-server: $schema=../../schema/xcodegen.schema.json
 #
-# This sample replicates the issue from #4543: using Sentry from Objective-C++
-# without modules (-fmodules / -fcxx-modules). Many projects (React Native ≤0.76,
-# Haxe, custom build systems) cannot enable modules and must use #import instead
-# of @import. With CLANG_ENABLE_MODULES=NO, Swift APIs (SentrySDK, sessionReplay,
-# etc.) are not available via #import <Sentry/Sentry.h> alone.
-#
-# This sample does NOT build with the current SDK. It exists to:
-# - Document the exact failure mode for ObjC++ consumers
-# - Serve as a test case for the fix in #6342 (pure ObjC SDK wrapper)
+# This sample uses Sentry from Objective-C++ without modules (-fmodules /
+# -fcxx-modules). It depends on SentryObjC, the pure ObjC wrapper that exposes
+# the full SDK API via #import <SentryObjC.h>.
 #
 # See README.md in this directory for details.
 
@@ -18,9 +12,9 @@ generateEmptyDirectories: true
 configs:
   Debug: debug
   Release: release
-projectReferences:
+packages:
   Sentry:
-    path: ../../Sentry.xcodeproj
+    path: ../..
 options:
   bundleIdPrefix: io.sentry
 targets:
@@ -58,8 +52,8 @@ targets:
         group: App/Configurations
         buildPhase: none
     dependencies:
-      - target: Sentry/Sentry
-      - target: Sentry/SentrySwiftUI
+      - package: Sentry
+        product: SentryObjC
     configFiles:
       Debug: App/Configurations/iOS-ObjectiveCpp-NoModules.xcconfig
       Release: App/Configurations/iOS-ObjectiveCpp-NoModules.xcconfig

diff --git a/Sources/Sentry/SentryNSExceptionCaptureHelper.m b/Sources/Sentry/SentryNSExceptionCaptureHelper.m
@@ -5,28 +5,31 @@
 #    import "SentryCrash.h"
 #    import "SentryNSExceptionCaptureHelper.h"
 #    import "SentrySwift.h"
+#    import <stdatomic.h>
 
 @implementation SentryNSExceptionCaptureHelper
 
-static BOOL _insideReportException = NO;
+// Thread-safe flag to prevent duplicate exception captures when
+// _crashOnException: is called from within reportException:
+static _Atomic BOOL _insideReportException = NO;
 
 + (void)reportException:(NSException *)exception
 {
-    _insideReportException = YES;
+    atomic_store(&_insideReportException, YES);
     [self captureException:exception];
 }
 
 + (void)reportExceptionDidFinish
 {
-    _insideReportException = NO;
+    atomic_store(&_insideReportException, NO);
 }
 
 + (void)crashOnException:(NSException *)exception
 {
     // When called from within reportException: (i.e., [super reportException:] internally
     // dispatches to _crashOnException: when NSApplicationCrashOnExceptions is YES),
     // the exception was already captured, so skip to avoid duplicate reports.
-    if (!_insideReportException) {
+    if (!atomic_load(&_insideReportException)) {
         [self captureException:exception];
     }
 }