Skip to content
This repository has been archived by the owner on Aug 30, 2023. It is now read-only.

adding logs to installed integrations #265

Merged
merged 2 commits into from
Feb 11, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ public final void register(IHub hub, SentryOptions options) {
}

private void register(IHub hub, SentryAndroidOptions options) {
options.getLogger().log(SentryLevel.DEBUG, "ANR enabled: %s", options.isAnrEnabled());
options
.getLogger()
.log(SentryLevel.DEBUG, "AnrIntegration enabled: %s", options.isAnrEnabled());

if (options.isAnrEnabled() && anrWatchDog == null) {
options
Expand All @@ -43,6 +45,8 @@ private void register(IHub hub, SentryAndroidOptions options) {
error -> reportANR(hub, options.getLogger(), error),
options.getLogger());
anrWatchDog.start();

options.getLogger().log(SentryLevel.DEBUG, "AnrIntegration installed.");
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,21 @@ public final void register(IHub hub, SentryOptions options) {
ILogger logger = options.getLogger();
String path = getPath(options);
if (path == null) {
logger.log(SentryLevel.WARNING, "Null given as a path to %s. Nothing will be registered.");
logger.log(
SentryLevel.WARNING,
"Null given as a path to EnvelopeFileObserverIntegration. Nothing will be registered.");
} else {
logger.log(SentryLevel.DEBUG, "Registering CachedEventReaderIntegration for path: %s", path);
logger.log(
SentryLevel.DEBUG, "Registering EnvelopeFileObserverIntegration for path: %s", path);

EnvelopeSender envelopeSender =
new EnvelopeSender(
hub, new io.sentry.core.EnvelopeReader(), options.getSerializer(), logger);

observer = new EnvelopeFileObserver(path, envelopeSender, logger);
observer.startWatching();

options.getLogger().log(SentryLevel.DEBUG, "EnvelopeFileObserverIntegration installed.");
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,22 @@ private boolean isNdkAvailable() {

@Override
public final void register(IHub hub, SentryOptions options) {
boolean enabled = options.isEnableNdk() && isNdkAvailable();
options.getLogger().log(SentryLevel.DEBUG, "NdkIntegration enabled: %s", enabled);

// Note: `hub` isn't used here because the NDK integration writes files to disk which are picked
// up by another
// integration. The NDK directory watching must happen before this integration runs.
if (options.isEnableNdk() && isNdkAvailable()) {
if (enabled) {
try {
Class<?> cls = Class.forName("io.sentry.android.ndk.SentryNdk");

Method method = cls.getMethod("init", SentryOptions.class);
Object[] args = new Object[1];
args[0] = options;
method.invoke(null, args);

options.getLogger().log(SentryLevel.DEBUG, "NdkIntegration installed.");
} catch (ClassNotFoundException e) {
options.setEnableNdk(false);
options.getLogger().log(SentryLevel.ERROR, "Failed to load SentryNdk.", e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ interface SendFireAndForgetFactory {
public final void register(@NotNull IHub hub, @NotNull SentryOptions options) {
String cachedDir = options.getCacheDirPath();
if (cachedDir == null) {
options.getLogger().log(SentryLevel.WARNING, "No cache dir path is defined in options.");
options
.getLogger()
.log(
SentryLevel.WARNING,
"No cache dir path is defined in options to SendCachedEventFireAndForgetIntegration.");
return;
}

Expand All @@ -49,6 +53,10 @@ public final void register(@NotNull IHub hub, @NotNull SentryOptions options) {
.getLogger()
.log(SentryLevel.DEBUG, "Scheduled sending cached files from %s", cachedDir);
es.shutdown();

options
.getLogger()
.log(SentryLevel.DEBUG, "SendCachedEventFireAndForgetIntegration installed.");
} catch (Exception e) {
options
.getLogger()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public final void register(IHub hub, SentryOptions options) {
}

threadAdapter.setDefaultUncaughtExceptionHandler(this);

options.getLogger().log(SentryLevel.DEBUG, "UncaughtExceptionHandlerIntegration installed.");
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class SendCachedEventFireAndForgetIntegrationTest {
fixture.options.cacheDirPath = null
val sut = fixture.getSut()
sut.register(fixture.hub!!, fixture.options)
verify(fixture.logger)!!.log(eq(SentryLevel.WARNING), eq("No cache dir path is defined in options."))
verify(fixture.logger)!!.log(eq(SentryLevel.WARNING), eq("No cache dir path is defined in options to SendCachedEventFireAndForgetIntegration."))
verifyNoMoreInteractions(fixture.hub)
}
}