From 47acadfca51a4a041bcd937ab9fc3e33d5978502 Mon Sep 17 00:00:00 2001 From: GitHub Date: Fri, 24 Jan 2025 13:44:30 +0000 Subject: [PATCH 1/4] chore: update scripts/update-sentry-native-ndk.sh to 0.7.19 --- CHANGELOG.md | 6 ++++++ buildSrc/src/main/java/Config.kt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4608e9bdf7..56717b36f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,12 @@ - There was up to three of these, one for `io.sentry.opentelemetry.agent.AgentMarker`, `io.sentry.opentelemetry.agent.AgentlessMarker` and `io.sentry.opentelemetry.agent.AgentlessSpringMarker`. - These were not indicators of something being wrong but rather the SDK looking at what is available at runtime to configure itself accordingly. +### Dependencies + +- Bump Native SDK from v0.7.14 to v0.7.19 ([#4076](https://github.com/getsentry/sentry-java/pull/4076)) + - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0719) + - [diff](https://github.com/getsentry/sentry-native/compare/v0.7.14...0.7.19) + ## 8.0.0 ### Summary diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index c52cfdc642..aa7ddffb55 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -153,7 +153,7 @@ object Config { val apolloKotlin = "com.apollographql.apollo3:apollo-runtime:3.8.2" - val sentryNativeNdk = "io.sentry:sentry-native-ndk:0.7.14" + val sentryNativeNdk = "io.sentry:sentry-native-ndk:0.7.19" object OpenTelemetry { val otelVersion = "1.44.1" From 61e77c0af628ed9bf08e7a9be38f6c81e17229f7 Mon Sep 17 00:00:00 2001 From: GitHub Date: Wed, 29 Jan 2025 18:43:32 +0000 Subject: [PATCH 2/4] chore: update scripts/update-sentry-native-ndk.sh to 0.7.19 --- CHANGELOG.md | 3 +++ buildSrc/src/main/java/Config.kt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 011259b2d7..b1b02de058 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,9 @@ ### Dependencies - Bump Spring Boot to `3.4.2` ([#4081](https://github.com/getsentry/sentry-java/pull/4081)) +- Bump Native SDK from v0.7.14 to v0.7.19 ([#4076](https://github.com/getsentry/sentry-java/pull/4076)) + - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0719) + - [diff](https://github.com/getsentry/sentry-native/compare/v0.7.14...0.7.19) ## 8.0.0 diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index aadf7b14f8..59a54600cf 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -153,7 +153,7 @@ object Config { val apolloKotlin = "com.apollographql.apollo3:apollo-runtime:3.8.2" - val sentryNativeNdk = "io.sentry:sentry-native-ndk:0.7.14" + val sentryNativeNdk = "io.sentry:sentry-native-ndk:0.7.19" object OpenTelemetry { val otelVersion = "1.44.1" From 8e851befcf93be5153fa4a46dd4356ffab472f54 Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Thu, 30 Jan 2025 11:14:25 +0100 Subject: [PATCH 3/4] Propagate NDK handler strategy to Ndk Options --- .../main/java/io/sentry/android/ndk/SentryNdk.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdk.java b/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdk.java index aafd66b059..cce8e35b82 100644 --- a/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdk.java +++ b/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdk.java @@ -1,5 +1,6 @@ package io.sentry.android.ndk; +import io.sentry.android.core.NdkHandlerStrategy; import io.sentry.android.core.SentryAndroidOptions; import io.sentry.ndk.NativeModuleListLoader; import io.sentry.ndk.NdkOptions; @@ -54,6 +55,16 @@ public static void init(@NotNull final SentryAndroidOptions options) { options.getMaxBreadcrumbs(), options.getNativeSdkName()); + final int handlerStrategy = options.getNdkHandlerStrategy(); + if (handlerStrategy == NdkHandlerStrategy.SENTRY_HANDLER_STRATEGY_DEFAULT.getValue()) { + ndkOptions.setNdkHandlerStrategy( + io.sentry.ndk.NdkHandlerStrategy.SENTRY_HANDLER_STRATEGY_DEFAULT); + } else if (handlerStrategy + == NdkHandlerStrategy.SENTRY_HANDLER_STRATEGY_CHAIN_AT_START.getValue()) { + ndkOptions.setNdkHandlerStrategy( + io.sentry.ndk.NdkHandlerStrategy.SENTRY_HANDLER_STRATEGY_CHAIN_AT_START); + } + //noinspection UnstableApiUsage io.sentry.ndk.SentryNdk.init(ndkOptions); From 7d66959bec2ca83bef5db58b369c6ed91bda81a9 Mon Sep 17 00:00:00 2001 From: Markus Hintersteiner Date: Thu, 30 Jan 2025 11:16:28 +0100 Subject: [PATCH 4/4] Fix Changelog --- CHANGELOG.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6099cebdf..b1b02de058 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,12 +24,6 @@ ### Dependencies - Bump Spring Boot to `3.4.2` ([#4081](https://github.com/getsentry/sentry-java/pull/4081)) -- Bump Native SDK from v0.7.14 to v0.7.19 ([#4076](https://github.com/getsentry/sentry-java/pull/4076)) - - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0719) - - [diff](https://github.com/getsentry/sentry-native/compare/v0.7.14...0.7.19) - -### Dependencies - - Bump Native SDK from v0.7.14 to v0.7.19 ([#4076](https://github.com/getsentry/sentry-java/pull/4076)) - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0719) - [diff](https://github.com/getsentry/sentry-native/compare/v0.7.14...0.7.19)