@sentry/react-native 5.14.0 → 5.14.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 5.14.1
+
+### Fixes
+
+- Add hermes to Pod dependencies to fix profiling with `use_frameworks` ([#3416](https://github.com/getsentry/sentry-react-native/pull/3416))
+- Define SentryCurrentDateProvider in RNSentry ([#3418](https://github.com/getsentry/sentry-react-native/pull/3418))
+
 ## 5.14.0
 
 ### Features

package/RNSentry.podspec

@@ -1,12 +1,20 @@
+require_relative './scripts/sentry_utils.rb'
 require 'json'
 version = JSON.parse(File.read('package.json'))["version"]
 
+rn_package = parse_rn_package_json()
+rn_version = get_rn_version(rn_package)
+is_hermes_default = is_hermes_default(rn_version)
+is_profiling_supported = is_profiling_supported(rn_version)
+
 folly_flags = ' -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1'
 folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
 
 is_new_arch_enabled = ENV["RCT_NEW_ARCH_ENABLED"] == "1"
+is_using_hermes = (ENV['USE_HERMES'] == nil && is_hermes_default) || ENV['USE_HERMES'] == '1'
 new_arch_enabled_flag = (is_new_arch_enabled ? folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED" : "")
-other_cflags = "$(inherited)" + new_arch_enabled_flag
+sentry_profiling_supported_flag = (is_profiling_supported ? " -DSENTRY_PROFILING_SUPPORTED=1" : "")
+other_cflags = "$(inherited)" + new_arch_enabled_flag + sentry_profiling_supported_flag
 
 Pod::Spec.new do |s|
   s.name           = 'RNSentry'
@@ -43,4 +51,9 @@ Pod::Spec.new do |s|
     s.dependency "RCTTypeSafety"
     s.dependency "ReactCommon/turbomodule/core"
   end
+
+  if is_using_hermes then
+    s.dependency 'React-hermes'
+    s.dependency 'hermes-engine'
+  end
 end

package/dist/js/version.d.ts

@@ -1,4 +1,4 @@
 export declare const SDK_PACKAGE_NAME = "npm:@sentry/react-native";
 export declare const SDK_NAME = "sentry.javascript.react-native";
-export declare const SDK_VERSION = "5.14.0";
+export declare const SDK_VERSION = "5.14.1";
 //# sourceMappingURL=version.d.ts.map

package/dist/js/version.js

@@ -1,4 +1,4 @@
 export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';
 export const SDK_NAME = 'sentry.javascript.react-native';
-export const SDK_VERSION = '5.14.0';
+export const SDK_VERSION = '5.14.1';
 //# sourceMappingURL=version.js.map

package/dist/js/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/js/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,0BAA0B,CAAC;AAC3D,MAAM,CAAC,MAAM,QAAQ,GAAG,gCAAgC,CAAC;AACzD,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC","sourcesContent":["export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';\nexport const SDK_NAME = 'sentry.javascript.react-native';\nexport const SDK_VERSION = '5.14.0';\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/js/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,0BAA0B,CAAC;AAC3D,MAAM,CAAC,MAAM,QAAQ,GAAG,gCAAgC,CAAC;AACzD,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC","sourcesContent":["export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';\nexport const SDK_NAME = 'sentry.javascript.react-native';\nexport const SDK_VERSION = '5.14.1';\n"]}

package/ios/RNSentry.h

@@ -32,3 +32,15 @@ SentrySDK (Private)
                                        symbolicate: (SymbolicateCallbackType) symbolicate;
 
 @end
+
+@interface SentryCurrentDateProvider : NSObject
+
+- (NSDate *)date;
+
+- (dispatch_time_t)dispatchTimeNow;
+
+- (NSInteger)timezoneOffset;
+
+- (uint64_t)systemTime;
+
+@end

package/ios/RNSentry.mm

@@ -7,7 +7,7 @@
 #import "RCTConvert.h"
 #endif
 
-#if __has_include(<hermes/hermes.h>)
+#if __has_include(<hermes/hermes.h>) && SENTRY_PROFILING_SUPPORTED
 #define SENTRY_PROFILING_ENABLED 1
 #import <Sentry/SentryProfilingConditionals.h>
 #else
@@ -22,7 +22,6 @@
 #import <Sentry/SentryBinaryImageCache.h>
 #import <Sentry/SentryDependencyContainer.h>
 #import <Sentry/SentryFormatter.h>
-#import <Sentry/SentryCurrentDateProvider.h>
 
 // This guard prevents importing Hermes in JSC apps
 #if SENTRY_PROFILING_ENABLED
@@ -655,6 +654,7 @@ RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSDictionary *, stopProfiling)
 
         facebook::hermes::HermesRuntime::disableSamplingProfiler();
         std::stringstream ss;
+        // Before RN 0.69 Hermes used llvh::raw_ostream (profiling is supported for 0.69 and newer)
         facebook::hermes::HermesRuntime::dumpSampledTraceToStream(ss);
 
         std::string s = ss.str();

package/package.json

@@ -2,7 +2,7 @@
   "name": "@sentry/react-native",
   "homepage": "https://github.com/getsentry/sentry-react-native",
   "repository": "https://github.com/getsentry/sentry-react-native",
-  "version": "5.14.0",
+  "version": "5.14.1",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",

package/scripts/sentry_utils.rb

@@ -0,0 +1,33 @@
+def parse_rn_package_json()
+  rn_path = File.dirname(`node --print "require.resolve('react-native/package.json')"`)
+  env_rn_path = ENV['REACT_NATIVE_NODE_MODULES_DIR']
+  if env_rn_path != nil
+    rn_path = env_rn_path
+  end
+
+  rn_package_json_path = File.join(rn_path, 'package.json')
+  if !File.exist?(rn_package_json_path)
+    raise "React Native `package.json` not found, it doesn't exist in #{rn_package_json_path}, use `REACT_NATIVE_NODE_MODULES_DIR` env variable to specify a custom location"
+  end
+
+  return JSON.parse(File.read(rn_package_json_path))
+end
+
+def get_rn_version(package)
+  version = package['version'].split('.')
+  result = {
+    :major => version[0].to_i,
+    :minor => version[1].to_i,
+  }
+  return result
+end
+
+def is_hermes_default(rn_version)
+  return (rn_version[:major] >= 1 || (rn_version[:major] == 0 && rn_version[:minor] >= 70))
+end
+
+# before RN 0.69 Hermes was not shipped with RN
+# users could use unexpected version of Hermes
+def is_profiling_supported(rn_version)
+  return (rn_version[:major] >= 1 || (rn_version[:major] == 0 && rn_version[:minor] >= 69))
+end

package/ts3.8/dist/js/version.d.ts

@@ -1,4 +1,4 @@
 export declare const SDK_PACKAGE_NAME = "npm:@sentry/react-native";
 export declare const SDK_NAME = "sentry.javascript.react-native";
-export declare const SDK_VERSION = "5.14.0";
+export declare const SDK_VERSION = "5.14.1";
 //# sourceMappingURL=version.d.ts.map