Locally vendored helpers

Author: alwx

packages/core/RNSentry.podspec

@@ -47,8 +47,7 @@ Pod::Spec.new do |s|
   s.compiler_flags = other_cflags
 
   s.pod_target_xcconfig = {
-    'DEFINES_MODULE' => 'YES',
-    'HEADER_SEARCH_PATHS' => '$(inherited) "${PODS_ROOT}/Sentry/Sources/Sentry" "${PODS_ROOT}/Sentry/Sources/Sentry/include"'
+    'DEFINES_MODULE' => 'YES'
   }
 
   s.dependency 'Sentry', '9.12.1'

packages/core/ios/RNSentry+fetchNativeStack.m

@@ -1,7 +1,7 @@
 #import "RNSentry.h"
 #import "RNSentryBreadcrumb.h"
+#import "RNSentryHexFormatter.h"
 #import "RNSentryId.h"
-#import "SentryFormatter.h"
 #import <Sentry/PrivateSentrySDKOnly.h>
 @import Sentry;
 
@@ -25,12 +25,12 @@ - (NSDictionary *)fetchNativeStackFramesBy:(NSArray<NSNumber *> *)instructionsAd
         SentryBinaryImageInfo *_Nullable image = [[[SentryDependencyContainer sharedInstance]
             binaryImageCache] imageByAddress:[addr unsignedLongLongValue]];
         if (image != nil) {
-            NSString *imageAddr = sentry_formatHexAddressUInt64([image address]);
+            NSString *imageAddr = rnsentry_formatHexAddressUInt64([image address]);
             [imagesAddrToRetrieveDebugMetaImages addObject:imageAddr];
 
             NSDictionary<NSString *, id> *_Nonnull nativeFrame = @{
                 @"platform" : @"cocoa",
-                @"instruction_addr" : sentry_formatHexAddress(addr),
+                @"instruction_addr" : rnsentry_formatHexAddress(addr),
                 @"package" : [image name],
                 @"image_addr" : imageAddr,
                 @"in_app" : [NSNumber numberWithBool:[appPackageName isEqualToString:[image name]]],
@@ -45,7 +45,7 @@ - (NSDictionary *)fetchNativeStackFramesBy:(NSArray<NSNumber *> *)instructionsAd
                     NSMutableDictionary<NSString *, id> *_Nonnull symbolicated
                         = nativeFrame.mutableCopy;
                     symbolicated[@"symbol_addr"]
-                        = sentry_formatHexAddressUInt64((uintptr_t)symbolsBuffer.dli_saddr);
+                        = rnsentry_formatHexAddressUInt64((uintptr_t)symbolsBuffer.dli_saddr);
                     symbolicated[@"function"] = [NSString stringWithCString:symbolsBuffer.dli_sname
                                                                    encoding:NSUTF8StringEncoding];
 
@@ -57,7 +57,7 @@ - (NSDictionary *)fetchNativeStackFramesBy:(NSArray<NSNumber *> *)instructionsAd
         } else {
             [serializedFrames addObject:@{
                 @"platform" : @"cocoa",
-                @"instruction_addr" : sentry_formatHexAddress(addr),
+                @"instruction_addr" : rnsentry_formatHexAddress(addr),
             }];
         }
     }

packages/core/ios/RNSentryHexFormatter.h

@@ -0,0 +1,40 @@
+#import <Foundation/Foundation.h>
+
+// 2 for the "0x" prefix, plus 16 for the hex value, plus 1 for the null terminator.
+#define RN_SENTRY_HEX_ADDRESS_LENGTH 19
+
+/**
+ * Formats a 64-bit unsigned integer as a zero-padded hex address string
+ * (e.g. @c 0x000000010f1a2b3c).
+ *
+ * Inlined here so we don't need to reach into sentry-cocoa's private
+ * @c SentryFormatter.h via @c HEADER_SEARCH_PATHS. Keep behavior identical
+ * to @c sentry_snprintfHexAddress in sentry-cocoa.
+ */
+static inline NSString *
+rnsentry_snprintfHexAddress(uint64_t value)
+{
+    char buffer[RN_SENTRY_HEX_ADDRESS_LENGTH];
+    snprintf(buffer, RN_SENTRY_HEX_ADDRESS_LENGTH, "0x%016llx", value);
+    return [NSString stringWithCString:buffer encoding:NSASCIIStringEncoding];
+}
+
+/**
+ * Formats an @c NSNumber address as a zero-padded hex string.
+ * Drop-in replacement for sentry-cocoa's @c sentry_formatHexAddress.
+ */
+static inline NSString *
+rnsentry_formatHexAddress(NSNumber *value)
+{
+    return rnsentry_snprintfHexAddress([value unsignedLongLongValue]);
+}
+
+/**
+ * Formats a @c uint64_t address as a zero-padded hex string.
+ * Drop-in replacement for sentry-cocoa's @c sentry_formatHexAddressUInt64.
+ */
+static inline NSString *
+rnsentry_formatHexAddressUInt64(uint64_t value)
+{
+    return rnsentry_snprintfHexAddress(value);
+}