Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

**Features**:

- Forward `enable_logs` option through `NdkOptions` so the Android SDK can enable native structured logging. ([#1971](https://github.com/getsentry/sentry-native/pull/1971))
- Report enabled Qt and WER integrations in event SDK metadata (`sdk.integrations`) alongside the configured crash backend. ([#1969](https://github.com/
getsentry/sentry-native/pull/1969))

Expand Down
2 changes: 2 additions & 0 deletions ndk/lib/api/sentry-native-ndk.api
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,10 @@ public final class io/sentry/ndk/NdkOptions {
public fun getTracesSampleRate ()F
public fun isDebug ()Z
public fun isEnableAppHangTracking ()Z
public fun isEnableLogs ()Z
public fun setAppHangTimeoutMillis (J)V
public fun setEnableAppHangTracking (Z)V
public fun setEnableLogs (Z)V
public fun setNdkHandlerStrategy (Lio/sentry/ndk/NdkHandlerStrategy;)V
public fun setTracesSampleRate (F)V
}
Expand Down
9 changes: 9 additions & 0 deletions ndk/lib/src/main/java/io/sentry/ndk/NdkOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public final class NdkOptions {
private float tracesSampleRate = 0;
private boolean enableAppHangTracking = false;
private long appHangTimeoutMillis = 5000;
private boolean enableLogs = false;

public NdkOptions(
@NotNull String dsn,
Expand Down Expand Up @@ -106,4 +107,12 @@ public void setAppHangTimeoutMillis(final long appHangTimeoutMillis) {
public long getAppHangTimeoutMillis() {
return appHangTimeoutMillis;
}

public void setEnableLogs(final boolean enableLogs) {
this.enableLogs = enableLogs;
}

public boolean isEnableLogs() {
return enableLogs;
}
}
7 changes: 7 additions & 0 deletions ndk/lib/src/main/jni/sentry.c
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,9 @@ Java_io_sentry_ndk_SentryNdk_initSentryNative(
jmethodID app_hang_timeout_mid = (*env)->GetMethodID(
env, options_cls, "getAppHangTimeoutMillis", "()J");

jmethodID enable_logs_mid
= (*env)->GetMethodID(env, options_cls, "isEnableLogs", "()Z");

(*env)->DeleteLocalRef(env, options_cls);

char *outbox_path = NULL;
Expand Down Expand Up @@ -522,6 +525,10 @@ Java_io_sentry_ndk_SentryNdk_initSentryNative(
}
sentry_options_set_app_hang_timeout(options, (uint64_t)app_hang_timeout);

jboolean enable_logs = (jboolean)(*env)->CallBooleanMethod(
env, sentry_ndk_options, enable_logs_mid);
sentry_options_set_enable_logs(options, enable_logs);
Comment thread
romtsn marked this conversation as resolved.

int rv = sentry_init(options);
return (jint)rv;

Expand Down
Loading