Skip to content

Inject firebase common executors to Crashlytics #6019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 7, 2024
Merged

Inject firebase common executors to Crashlytics #6019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a51bc6f
Inject firebase common executors to Crashlytics
themiswang Jun 6, 2024
7849d56
remove unused imports
themiswang Jun 6, 2024
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
2 changes: 1 addition & 1 deletion ...java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ public void onReportSend_successfulReportsAreDeleted() {
when(reportSender.enqueueReport(mockReport1, false)).thenReturn(successfulTask);
when(reportSender.enqueueReport(mockReport2, false)).thenReturn(failedTask);

when(idManager.fetchTrueFid(any())).thenReturn(new FirebaseInstallationId("fid", "authToken"));
when(idManager.fetchTrueFid(anyBoolean())).thenReturn(new FirebaseInstallationId("fid", "authToken"));
reportingCoordinator.sendReports(Runnable::run);

verify(reportSender).enqueueReport(mockReport1, false);
Expand Down
11 changes: 10 additions & 1 deletion firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/CrashlyticsRegistrar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@

import com.google.firebase.FirebaseApp;
import com.google.firebase.analytics.connector.AnalyticsConnector;
import com.google.firebase.annotations.concurrent.Background;
import com.google.firebase.annotations.concurrent.Blocking;
import com.google.firebase.components.Component;
import com.google.firebase.components.ComponentContainer;
import com.google.firebase.components.ComponentRegistrar;
import com.google.firebase.components.Dependency;
import com.google.firebase.components.Qualified;
import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponent;
import com.google.firebase.inject.Deferred;
import com.google.firebase.installations.FirebaseInstallationsApi;
Expand All @@ -29,10 +32,14 @@
import com.google.firebase.sessions.api.SessionSubscriber;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ExecutorService;

/** @hide */
public class CrashlyticsRegistrar implements ComponentRegistrar {
private static final String LIBRARY_NAME = "fire-cls";
private final Qualified<ExecutorService> backgroundExecutorService = Qualified.qualified(Background.class, ExecutorService.class);
private final Qualified<ExecutorService> blockingExecutorService = Qualified.qualified(Blocking.class, ExecutorService.class);


static {
// Add Crashlytics as a dependency of Sessions when this class is loaded into memory.
Expand All @@ -46,6 +53,8 @@ public List<Component<?>> getComponents() {
.name(LIBRARY_NAME)
.add(Dependency.required(FirebaseApp.class))
.add(Dependency.required(FirebaseInstallationsApi.class))
.add(Dependency.required(backgroundExecutorService))
.add(Dependency.required(blockingExecutorService))
.add(Dependency.deferred(CrashlyticsNativeComponent.class))
.add(Dependency.deferred(AnalyticsConnector.class))
.add(Dependency.deferred(FirebaseRemoteConfigInterop.class))
Expand All @@ -70,6 +79,6 @@ private FirebaseCrashlytics buildCrashlytics(ComponentContainer container) {
container.getDeferred(FirebaseRemoteConfigInterop.class);

return FirebaseCrashlytics.init(
app, firebaseInstallations, nativeComponent, analyticsConnector, remoteConfigInterop);
app, firebaseInstallations, nativeComponent, analyticsConnector, remoteConfigInterop, container.get(backgroundExecutorService), container.get(blockingExecutorService));
}
}
6 changes: 5 additions & 1 deletion firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import com.google.android.gms.tasks.Tasks;
import com.google.firebase.FirebaseApp;
import com.google.firebase.analytics.connector.AnalyticsConnector;
import com.google.firebase.annotations.concurrent.Background;
import com.google.firebase.annotations.concurrent.Blocking;
import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponent;
import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponentDeferredProxy;
import com.google.firebase.crashlytics.internal.DevelopmentPlatformProvider;
Expand Down Expand Up @@ -68,7 +70,9 @@ public class FirebaseCrashlytics {
@NonNull FirebaseInstallationsApi firebaseInstallationsApi,
@NonNull Deferred<CrashlyticsNativeComponent> nativeComponent,
@NonNull Deferred<AnalyticsConnector> analyticsConnector,
@NonNull Deferred<FirebaseRemoteConfigInterop> remoteConfigInteropDeferred) {
@NonNull Deferred<FirebaseRemoteConfigInterop> remoteConfigInteropDeferred,
@Background ExecutorService liteExecutorService,
@Blocking ExecutorService blockingExecutorService) {

Context context = app.getApplicationContext();
final String appIdentifier = context.getPackageName();
Expand Down
Loading