diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a25b598f3..43bde36268 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,9 +24,10 @@ jobs: # Zulu Community distribution of OpenJDK - name: set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: 1.8 + distribution: 'adopt' + java-version: '8' # use sequential key when bumping dependencies till single lock file is out of preview # https://docs.gradle.org/current/userguide/dependency_locking.html#single_lock_file_per_project diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml index 15c287533b..1a38073692 100644 --- a/.github/workflows/check-formatting.yml +++ b/.github/workflows/check-formatting.yml @@ -14,8 +14,9 @@ jobs: - name: Checkout 🛎️ uses: actions/checkout@v2.3.1 - name: set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: 1.8 + distribution: 'adopt' + java-version: '8' - name: Check formatting with Spotless run: make checkFormat diff --git a/.github/workflows/generate-javadocs.yml b/.github/workflows/generate-javadocs.yml index 4da0c25a8f..599b879329 100644 --- a/.github/workflows/generate-javadocs.yml +++ b/.github/workflows/generate-javadocs.yml @@ -11,9 +11,10 @@ jobs: - name: Checkout 🛎️ uses: actions/checkout@v2.3.1 - name: set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: 1.8 + distribution: 'adopt' + java-version: '8' - name: Generate Aggregate Javadocs run: | ./gradlew aggregateJavadocs diff --git a/CHANGELOG.md b/CHANGELOG.md index 64ac9efd4e..4aa37c6593 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * Fix: handle network errors in SentrySpanClientHttpRequestInterceptor (#1407) * Fix: set scope on transaction (#1409) * Fix: Apply user from the scope to transaction (#1424) +* Fix: Pass maxBreadcrumbs config. to sentry-native (#1425) # 4.4.0-alpha.2 diff --git a/sentry-android-ndk/src/main/jni/sentry.c b/sentry-android-ndk/src/main/jni/sentry.c index 2fdc4f0598..7d0ff47554 100644 --- a/sentry-android-ndk/src/main/jni/sentry.c +++ b/sentry-android-ndk/src/main/jni/sentry.c @@ -193,6 +193,7 @@ Java_io_sentry_android_ndk_SentryNdk_initSentryNative( jmethodID environment_mid = (*env)->GetMethodID(env, options_cls, "getEnvironment", "()Ljava/lang/String;"); jmethodID dist_mid = (*env)->GetMethodID(env, options_cls, "getDist", "()Ljava/lang/String;"); + jmethodID max_crumbs_mid = (*env)->GetMethodID(env, options_cls, "getMaxBreadcrumbs", "()I"); jstring outbox_path_j = (jstring) (*env)->CallObjectMethod(env, sentry_sdk_options, outbox_path_mid); @@ -202,6 +203,7 @@ Java_io_sentry_android_ndk_SentryNdk_initSentryNative( jstring environment = (jstring) (*env)->CallObjectMethod(env, sentry_sdk_options, environment_mid); jstring dist = (jstring) (*env)->CallObjectMethod(env, sentry_sdk_options, dist_mid); + jint max_crumbs = (jint) (*env)->CallIntMethod(env, sentry_sdk_options, max_crumbs_mid); ENSURE(outbox_path_j); const char *outbox_path_str = (*env)->GetStringUTFChars(env, outbox_path_j, 0); @@ -229,6 +231,8 @@ Java_io_sentry_android_ndk_SentryNdk_initSentryNative( sentry_options_set_transport(options, transport); sentry_options_set_debug(options, debug); + sentry_options_set_max_breadcrumbs(options, max_crumbs); + const char *dsn_str = (*env)->GetStringUTFChars(env, dsn, 0); sentry_options_set_dsn(options, dsn_str); (*env)->ReleaseStringUTFChars(env, dsn, dsn_str); diff --git a/sentry-android-okhttp/build.gradle.kts b/sentry-android-okhttp/build.gradle.kts index c636fb8c4a..bca0697f4e 100644 --- a/sentry-android-okhttp/build.gradle.kts +++ b/sentry-android-okhttp/build.gradle.kts @@ -89,6 +89,6 @@ tasks.withType { } configure { - failFast = true buildUponDefaultConfig = true + allRules = true } diff --git a/sentry-android-timber/build.gradle.kts b/sentry-android-timber/build.gradle.kts index bf500d6dfc..07d1e698d0 100644 --- a/sentry-android-timber/build.gradle.kts +++ b/sentry-android-timber/build.gradle.kts @@ -95,6 +95,6 @@ tasks.withType { } configure { - failFast = true buildUponDefaultConfig = true + allRules = true }