Skip to content

Commit e4049d7

Browse files
author
Bartosz Litwiniuk
committed
Merge branch 'master' into release-candidate/3.8.4
2 parents 341f509 + a4f8d7c commit e4049d7

File tree

4 files changed

+34
-2
lines changed

4 files changed

+34
-2
lines changed

backtrace-library/src/main/java/backtraceio/library/BacktraceDatabase.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import backtraceio.library.breadcrumbs.BacktraceBreadcrumbs;
1515
import backtraceio.library.common.FileHelper;
1616
import backtraceio.library.common.TypeHelper;
17+
import backtraceio.library.common.serialization.DebugHelper;
1718
import backtraceio.library.enums.UnwindingMode;
1819
import backtraceio.library.enums.database.RetryBehavior;
1920
import backtraceio.library.events.OnServerResponseEventListener;
@@ -173,6 +174,7 @@ public Boolean setupNativeIntegration(BacktraceBase client, BacktraceCredentials
173174
return false;
174175
}
175176

177+
final long startSetupNativeIntegrationTime = DebugHelper.getCurrentTimeMillis();
176178
String minidumpSubmissionUrl = credentials.getMinidumpSubmissionUrl().toString();
177179
if (minidumpSubmissionUrl == null) {
178180
return false;
@@ -215,6 +217,10 @@ public Boolean setupNativeIntegration(BacktraceBase client, BacktraceCredentials
215217
this.addAttribute("breadcrumbs.lastId", Long.toString((breadcrumbId)));
216218
});
217219
}
220+
221+
final long endSetupNativeIntegrationTime = DebugHelper.getCurrentTimeMillis();
222+
BacktraceLogger.d(LOG_TAG, "Setup native integration took " + (endSetupNativeIntegrationTime - startSetupNativeIntegrationTime) + " milliseconds");
223+
218224
return _enabledNativeIntegration;
219225
}
220226

backtrace-library/src/main/java/backtraceio/library/breadcrumbs/BacktraceBreadcrumbs.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.util.HashMap;
1111
import java.util.Map;
1212

13+
import backtraceio.library.common.serialization.DebugHelper;
1314
import backtraceio.library.enums.BacktraceBreadcrumbLevel;
1415
import backtraceio.library.enums.BacktraceBreadcrumbType;
1516
import backtraceio.library.events.OnSuccessfulBreadcrumbAddEventListener;
@@ -32,12 +33,12 @@ public class BacktraceBreadcrumbs implements Breadcrumbs {
3233
private EnumSet<BacktraceBreadcrumbType> enabledBreadcrumbTypes;
3334

3435
/**
35-
* The Backtrace BroadcastReciever instance
36+
* The Backtrace BroadcastReceiver instance
3637
*/
3738
private BacktraceBroadcastReceiver backtraceBroadcastReceiver;
3839

3940
/**
40-
* The Backtrace ComponentCallbacks2 listener
41+
* The Backtrace ComponentCallbacks listener
4142
*/
4243
private BacktraceComponentListener backtraceComponentListener;
4344

@@ -147,6 +148,19 @@ public boolean enableBreadcrumbs(Context context, int maxBreadcrumbLogSizeBytes)
147148
@Override
148149
public boolean enableBreadcrumbs(Context context, EnumSet<BacktraceBreadcrumbType> breadcrumbTypesToEnable, int maxBreadcrumbLogSizeBytes) {
149150
this.context = context;
151+
152+
final long startEnablingReportsTime = DebugHelper.getCurrentTimeMillis();
153+
154+
final boolean enabled = enableBreadcrumbs(breadcrumbTypesToEnable, maxBreadcrumbLogSizeBytes);
155+
156+
final long endEnablingReportsTime = DebugHelper.getCurrentTimeMillis();
157+
158+
BacktraceLogger.d(LOG_TAG, "Enabling breadcrumbs took " + (endEnablingReportsTime - startEnablingReportsTime) + " milliseconds");
159+
160+
return enabled;
161+
}
162+
163+
private boolean enableBreadcrumbs(EnumSet<BacktraceBreadcrumbType> breadcrumbTypesToEnable, int maxBreadcrumbLogSizeBytes) {
150164
if (backtraceBreadcrumbsLogManager == null) {
151165
try {
152166
backtraceBreadcrumbsLogManager = new BacktraceBreadcrumbsLogManager(
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package backtraceio.library.common.serialization;
2+
3+
public class DebugHelper {
4+
5+
public static long getCurrentTimeMillis() {
6+
return System.currentTimeMillis();
7+
}
8+
}

backtrace-library/src/main/java/backtraceio/library/services/BacktraceMetrics.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import backtraceio.library.BacktraceCredentials;
1212
import backtraceio.library.common.BacktraceStringHelper;
1313
import backtraceio.library.common.BacktraceTimeHelper;
14+
import backtraceio.library.common.serialization.DebugHelper;
1415
import backtraceio.library.events.EventsOnServerResponseEventListener;
1516
import backtraceio.library.events.EventsRequestHandler;
1617
import backtraceio.library.interfaces.Api;
@@ -169,6 +170,7 @@ public void enable(BacktraceMetricsSettings settings, String uniqueEventName) {
169170
if (uniqueEventName == null || uniqueEventName.length() == 0) {
170171
throw new IllegalArgumentException("Unique event name must be defined!");
171172
}
173+
final long startMetricsSetup = DebugHelper.getCurrentTimeMillis();
172174

173175
setStartupUniqueEventName(uniqueEventName);
174176
this.settings = settings;
@@ -180,6 +182,8 @@ public void enable(BacktraceMetricsSettings settings, String uniqueEventName) {
180182
} catch (Exception e) {
181183
BacktraceLogger.e(LOG_TAG, "Could not enable metrics, exception " + e.getMessage());
182184
}
185+
final long endMetricsSetup = DebugHelper.getCurrentTimeMillis();
186+
BacktraceLogger.d(LOG_TAG, "Setup metrics integration took " + (endMetricsSetup - startMetricsSetup) + " milliseconds");
183187
}
184188

185189
private void verifyIfMetricsAvailable() {

0 commit comments

Comments
 (0)