Skip to content

Commit

Permalink
CR changes
Browse files Browse the repository at this point in the history
  • Loading branch information
adinauer committed Oct 18, 2024
1 parent efb1564 commit d11f50a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion sentry/src/main/java/io/sentry/Sentry.java
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,9 @@ private static void init(final @NotNull SentryOptions options, final boolean glo
return;
}

final @Nullable Boolean globalHubModeFromOptions = options.isGlobalHubMode();
final boolean globalHubModeToUse =
options.isGlobalHubMode() != null ? options.isGlobalHubMode() : globalHubMode;
globalHubModeFromOptions != null ? globalHubModeFromOptions : globalHubMode;
options
.getLogger()
.log(SentryLevel.INFO, "GlobalHubMode: '%s'", String.valueOf(globalHubModeToUse));
Expand Down
3 changes: 2 additions & 1 deletion sentry/src/main/java/io/sentry/SentryOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -2381,7 +2381,8 @@ public boolean isForceInit() {
* <p>If this is set to something other than `null`, it will take precedence over what is passed
* to Sentry.init.
*
* <p>Enabling this is intended for mobile and desktop apps, not backends.
* <p>Enabling this is intended for mobile and desktop apps, not backends. For Android the default
* value passed to Sentry.init is true (globalHubMode enabled), for backends it defaults to false.
*
* @param globalHubMode true = automatic scope forking is disabled
*/
Expand Down

0 comments on commit d11f50a

Please sign in to comment.