Skip to content

Commit ebdd7ec

Browse files
markushimarkushi
authored
Merge 07bb07e into c383ed1 
2 parents c383ed1 + 07bb07e commit ebdd7ec

30 files changed

+733
-136
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Breaking changes:
1616
- Automatic user interaction tracking: every click now starts a new automatic transaction ([#2891](https://github.com/getsentry/sentry-java/pull/2891))
1717
- Previously performing a click on the same UI widget twice would keep the existing transaction running, the new behavior now better aligns with other SDKs
1818
- Android only: If global hub mode is enabled, Sentry.getSpan() returns the root span instead of the latest span ([#2855](https://github.com/getsentry/sentry-java/pull/2855))
19+
- Android only: Observe network state to upload any unsent envelopes ([#2910](https://github.com/getsentry/sentry-java/pull/2910))
1920

2021
### Fixes
2122

‎sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@
88
import io.sentry.DeduplicateMultithreadedEventProcessor;
99
import io.sentry.DefaultTransactionPerformanceCollector;
1010
import io.sentry.ILogger;
11+
import io.sentry.NoOpConnectionStatusProvider;
1112
import io.sentry.SendFireAndForgetEnvelopeSender;
1213
import io.sentry.SendFireAndForgetOutboxSender;
1314
import io.sentry.SentryLevel;
1415
import io.sentry.android.core.cache.AndroidEnvelopeCache;
1516
import io.sentry.android.core.internal.debugmeta.AssetsDebugMetaLoader;
1617
import io.sentry.android.core.internal.gestures.AndroidViewGestureTargetLocator;
1718
import io.sentry.android.core.internal.modules.AssetsModulesLoader;
19+
import io.sentry.android.core.internal.util.AndroidConnectionStatusProvider;
1820
import io.sentry.android.core.internal.util.AndroidMainThreadChecker;
1921
import io.sentry.android.core.internal.util.SentryFrameMetricsCollector;
2022
import io.sentry.android.fragment.FragmentLifecycleIntegration;
@@ -130,14 +132,19 @@ static void initializeIntegrationsAndProcessors(
130132
options.setEnvelopeDiskCache(new AndroidEnvelopeCache(options));
131133
}
132134

135+
if (options.getConnectionStatusProvider() instanceof NoOpConnectionStatusProvider) {
136+
options.setConnectionStatusProvider(
137+
new AndroidConnectionStatusProvider(context, options.getLogger(), buildInfoProvider));
138+
}
139+
133140
options.addEventProcessor(new DeduplicateMultithreadedEventProcessor(options));
134141
options.addEventProcessor(
135142
new DefaultAndroidEventProcessor(context, buildInfoProvider, options));
136143
options.addEventProcessor(new PerformanceAndroidEventProcessor(options, activityFramesTracker));
137144
options.addEventProcessor(new ScreenshotEventProcessor(options, buildInfoProvider));
138145
options.addEventProcessor(new ViewHierarchyEventProcessor(options));
139146
options.addEventProcessor(new AnrV2EventProcessor(context, options, buildInfoProvider));
140-
options.setTransportGate(new AndroidTransportGate(context, options.getLogger()));
147+
options.setTransportGate(new AndroidTransportGate(options));
141148
final SentryFrameMetricsCollector frameMetricsCollector =
142149
new SentryFrameMetricsCollector(context, options, buildInfoProvider);
143150
options.setTransactionProfiler(

‎sentry-android-core/src/main/java/io/sentry/android/core/AndroidTransportGate.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
package io.sentry.android.core;
22

3-
import android.content.Context;
4-
import io.sentry.ILogger;
5-
import io.sentry.android.core.internal.util.ConnectivityChecker;
3+
import io.sentry.IConnectionStatusProvider;
4+
import io.sentry.SentryOptions;
65
import io.sentry.transport.ITransportGate;
76
import org.jetbrains.annotations.NotNull;
87
import org.jetbrains.annotations.TestOnly;
98

109
final class AndroidTransportGate implements ITransportGate {
1110

12-
private final Context context;
13-
private final @NotNull ILogger logger;
11+
private final @NotNull SentryOptions options;
1412

15-
AndroidTransportGate(final @NotNull Context context, final @NotNull ILogger logger) {
16-
this.context = context;
17-
this.logger = logger;
13+
AndroidTransportGate(final @NotNull SentryOptions options) {
14+
this.options = options;
1815
}
1916

2017
@Override
2118
public boolean isConnected() {
22-
return isConnected(ConnectivityChecker.getConnectionStatus(context, logger));
19+
return isConnected(options.getConnectionStatusProvider().getConnectionStatus());
2320
}
2421

2522
@TestOnly
26-
boolean isConnected(final @NotNull ConnectivityChecker.Status status) {
23+
boolean isConnected(final @NotNull IConnectionStatusProvider.ConnectionStatus status) {
2724
// let's assume its connected if there's no permission or something as we can't really know
2825
// whether is online or not.
2926
switch (status) {

‎sentry-android-core/src/main/java/io/sentry/android/core/DeviceInfoUtil.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import android.util.DisplayMetrics;
1717
import io.sentry.DateUtils;
1818
import io.sentry.SentryLevel;
19-
import io.sentry.android.core.internal.util.ConnectivityChecker;
2019
import io.sentry.android.core.internal.util.CpuInfoUtils;
2120
import io.sentry.android.core.internal.util.DeviceOrientations;
2221
import io.sentry.android.core.internal.util.RootChecker;
@@ -180,8 +179,8 @@ private void setDeviceIO(final @NotNull Device device, final boolean includeDyna
180179
}
181180

182181
Boolean connected;
183-
switch (ConnectivityChecker.getConnectionStatus(context, options.getLogger())) {
184-
case NOT_CONNECTED:
182+
switch (options.getConnectionStatusProvider().getConnectionStatus()) {
183+
case DISCONNECTED:
185184
connected = false;
186185
break;
187186
case CONNECTED:
@@ -223,8 +222,7 @@ private void setDeviceIO(final @NotNull Device device, final boolean includeDyna
223222

224223
if (device.getConnectionType() == null) {
225224
// wifi, ethernet or cellular, null if none
226-
device.setConnectionType(
227-
ConnectivityChecker.getConnectionType(context, options.getLogger(), buildInfoProvider));
225+
device.setConnectionType(options.getConnectionStatusProvider().getConnectionType());
228226
}
229227
}
230228

‎sentry-android-core/src/main/java/io/sentry/android/core/NetworkBreadcrumbsIntegration.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import io.sentry.SentryLevel;
1919
import io.sentry.SentryOptions;
2020
import io.sentry.TypeCheckHint;
21-
import io.sentry.android.core.internal.util.ConnectivityChecker;
21+
import io.sentry.android.core.internal.util.AndroidConnectionStatusProvider;
2222
import io.sentry.util.Objects;
2323
import java.io.Closeable;
2424
import java.io.IOException;
@@ -71,7 +71,7 @@ public void register(final @NotNull IHub hub, final @NotNull SentryOptions optio
7171

7272
networkCallback = new NetworkBreadcrumbsNetworkCallback(hub, buildInfoProvider);
7373
final boolean registered =
74-
ConnectivityChecker.registerNetworkCallback(
74+
AndroidConnectionStatusProvider.registerNetworkCallback(
7575
context, logger, buildInfoProvider, networkCallback);
7676

7777
// The specific error is logged in the ConnectivityChecker method
@@ -88,7 +88,7 @@ public void register(final @NotNull IHub hub, final @NotNull SentryOptions optio
8888
@Override
8989
public void close() throws IOException {
9090
if (networkCallback != null) {
91-
ConnectivityChecker.unregisterNetworkCallback(
91+
AndroidConnectionStatusProvider.unregisterNetworkCallback(
9292
context, logger, buildInfoProvider, networkCallback);
9393
logger.log(SentryLevel.DEBUG, "NetworkBreadcrumbsIntegration remove.");
9494
}
@@ -210,7 +210,7 @@ static class NetworkBreadcrumbConnectionDetail {
210210
this.signalStrength = strength > -100 ? strength : 0;
211211
this.isVpn = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN);
212212
String connectionType =
213-
ConnectivityChecker.getConnectionType(networkCapabilities, buildInfoProvider);
213+
AndroidConnectionStatusProvider.getConnectionType(networkCapabilities, buildInfoProvider);
214214
this.type = connectionType != null ? connectionType : "";
215215
}
216216

‎sentry-android-core/src/main/java/io/sentry/android/core/SendCachedEnvelopeIntegration.java‎

Lines changed: 58 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,33 @@
11
package io.sentry.android.core;
22

3+
import io.sentry.IConnectionStatusProvider;
34
import io.sentry.IHub;
45
import io.sentry.Integration;
56
import io.sentry.SendCachedEnvelopeFireAndForgetIntegration;
67
import io.sentry.SentryLevel;
78
import io.sentry.SentryOptions;
89
import io.sentry.util.LazyEvaluator;
910
import io.sentry.util.Objects;
11+
import java.io.Closeable;
12+
import java.io.IOException;
1013
import java.util.concurrent.Future;
1114
import java.util.concurrent.RejectedExecutionException;
1215
import java.util.concurrent.TimeUnit;
1316
import java.util.concurrent.TimeoutException;
17+
import java.util.concurrent.atomic.AtomicBoolean;
1418
import org.jetbrains.annotations.NotNull;
19+
import org.jetbrains.annotations.Nullable;
1520

16-
final class SendCachedEnvelopeIntegration implements Integration {
21+
final class SendCachedEnvelopeIntegration
22+
implements Integration, IConnectionStatusProvider.IConnectionStatusObserver, Closeable {
1723

1824
private final @NotNull SendCachedEnvelopeFireAndForgetIntegration.SendFireAndForgetFactory
1925
factory;
2026
private final @NotNull LazyEvaluator<Boolean> startupCrashMarkerEvaluator;
27+
private final AtomicBoolean startupCrashHandled = new AtomicBoolean(false);
28+
private @Nullable IConnectionStatusProvider connectionStatusProvider;
29+
private @Nullable IHub hub;
30+
private @Nullable SentryAndroidOptions options;
2131

2232
public SendCachedEnvelopeIntegration(
2333
final @NotNull SendCachedEnvelopeFireAndForgetIntegration.SendFireAndForgetFactory factory,
@@ -29,7 +39,8 @@ public SendCachedEnvelopeIntegration(
2939
@Override
3040
public void register(@NotNull IHub hub, @NotNull SentryOptions options) {
3141
Objects.requireNonNull(hub, "Hub is required");
32-
final SentryAndroidOptions androidOptions =
42+
this.hub = hub;
43+
this.options =
3344
Objects.requireNonNull(
3445
(options instanceof SentryAndroidOptions) ? (SentryAndroidOptions) options : null,
3546
"SentryAndroidOptions is required");
@@ -40,51 +51,82 @@ public void register(@NotNull IHub hub, @NotNull SentryOptions options) {
4051
return;
4152
}
4253

54+
connectionStatusProvider = options.getConnectionStatusProvider();
55+
connectionStatusProvider.addConnectionStatusObserver(this);
56+
57+
sendCachedEnvelopes(hub, this.options);
58+
}
59+
60+
@Override
61+
public void close() throws IOException {
62+
if (connectionStatusProvider != null) {
63+
connectionStatusProvider.removeConnectionStatusObserver(this);
64+
}
65+
}
66+
67+
@Override
68+
public void onConnectionStatusChanged(IConnectionStatusProvider.ConnectionStatus status) {
69+
if (hub != null && options != null) {
70+
sendCachedEnvelopes(hub, options);
71+
}
72+
}
73+
74+
private synchronized void sendCachedEnvelopes(
75+
final @NotNull IHub hub, final @NotNull SentryAndroidOptions options) {
76+
77+
if (connectionStatusProvider != null
78+
&& connectionStatusProvider.getConnectionStatus()
79+
== IConnectionStatusProvider.ConnectionStatus.DISCONNECTED) {
80+
options.getLogger().log(SentryLevel.INFO, "SendCachedEnvelopeIntegration, no connection.");
81+
return;
82+
}
83+
4384
final SendCachedEnvelopeFireAndForgetIntegration.SendFireAndForget sender =
44-
factory.create(hub, androidOptions);
85+
factory.create(hub, options);
4586

4687
if (sender == null) {
47-
androidOptions.getLogger().log(SentryLevel.ERROR, "SendFireAndForget factory is null.");
88+
options.getLogger().log(SentryLevel.ERROR, "SendCachedEnvelopeIntegration factory is null.");
4889
return;
4990
}
5091

5192
try {
52-
Future<?> future =
53-
androidOptions
93+
final Future<?> future =
94+
options
5495
.getExecutorService()
5596
.submit(
5697
() -> {
5798
try {
5899
sender.send();
59100
} catch (Throwable e) {
60-
androidOptions
101+
options
61102
.getLogger()
62103
.log(SentryLevel.ERROR, "Failed trying to send cached events.", e);
63104
}
64105
});
65106

66-
if (startupCrashMarkerEvaluator.getValue()) {
67-
androidOptions
68-
.getLogger()
69-
.log(SentryLevel.DEBUG, "Startup Crash marker exists, blocking flush.");
107+
// startupCrashMarkerEvaluator remains true on subsequent runs, let's ensure we only block on
108+
// the very first execution (=app start)
109+
if (startupCrashMarkerEvaluator.getValue()
110+
&& startupCrashHandled.compareAndSet(false, true)) {
111+
options.getLogger().log(SentryLevel.DEBUG, "Startup Crash marker exists, blocking flush.");
70112
try {
71-
future.get(androidOptions.getStartupCrashFlushTimeoutMillis(), TimeUnit.MILLISECONDS);
113+
future.get(options.getStartupCrashFlushTimeoutMillis(), TimeUnit.MILLISECONDS);
72114
} catch (TimeoutException e) {
73-
androidOptions
115+
options
74116
.getLogger()
75117
.log(SentryLevel.DEBUG, "Synchronous send timed out, continuing in the background.");
76118
}
77119
}
78-
androidOptions.getLogger().log(SentryLevel.DEBUG, "SendCachedEnvelopeIntegration installed.");
120+
options.getLogger().log(SentryLevel.DEBUG, "SendCachedEnvelopeIntegration installed.");
79121
} catch (RejectedExecutionException e) {
80-
androidOptions
122+
options
81123
.getLogger()
82124
.log(
83125
SentryLevel.ERROR,
84126
"Failed to call the executor. Cached events will not be sent. Did you call Sentry.close()?",
85127
e);
86128
} catch (Throwable e) {
87-
androidOptions
129+
options
88130
.getLogger()
89131
.log(SentryLevel.ERROR, "Failed to call the executor. Cached events will not be sent", e);
90132
}

0 commit comments

Comments
 (0)