From 37aecfd230bde38d31dd4497e0fdba844738e098 Mon Sep 17 00:00:00 2001 From: Angel Leon Date: Thu, 5 Dec 2024 13:01:46 -0700 Subject: [PATCH 001/110] fix: avoid android.os.strictmode.UnbufferedIoViolation by using BufferedInputStream - Wrap InputStream with BufferedInputStream to ensure buffered I/O and prevent UnbufferedIoViolation in Android 14 (SDK 34). - Use try-with-resources to automatically close streams, improving resource management. - Retain existing functionality for converting InputStream to a UTF-8 string. This change ensures compliance with Android 14's stricter I/O policies. --- .../common/SessionReportingCoordinator.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinator.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinator.java index 29e2301591a..61bce5b555b 100644 --- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinator.java +++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinator.java @@ -419,13 +419,15 @@ private static CrashlyticsReport.ApplicationExitInfo convertApplicationExitInfo( @VisibleForTesting @RequiresApi(api = Build.VERSION_CODES.KITKAT) public static String convertInputStreamToString(InputStream inputStream) throws IOException { - ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - byte[] bytes = new byte[DEFAULT_BUFFER_SIZE]; - int length; - while ((length = inputStream.read(bytes)) != -1) { - byteArrayOutputStream.write(bytes, 0, length); + try (BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream); + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) { + byte[] bytes = new byte[DEFAULT_BUFFER_SIZE]; + int length; + while ((length = bufferedInputStream.read(bytes)) != -1) { + byteArrayOutputStream.write(bytes, 0, length); + } + return byteArrayOutputStream.toString(StandardCharsets.UTF_8.name()); } - return byteArrayOutputStream.toString(StandardCharsets.UTF_8.name()); } /** Finds the first ANR ApplicationExitInfo within the session. */ From be98d00c744a91794f0877931b20d938e8f47feb Mon Sep 17 00:00:00 2001 From: Tejas Deshpande Date: Thu, 5 Dec 2024 15:53:30 -0500 Subject: [PATCH 002/110] Add an overload to FirebaseCrashlytics.recordException to attach additional custom key value pairs (#6528) This PR adds a method `public void recordException(@NonNull Throwable throwable, CustomKeysAndValues keysAndValues)` as an overload to the existing `recordException` method in Crashlytics to allow attaching additional custom keys to the specific event. Details: - The total number of custom key/value pairs are still restricted to 64 - App level custom keys take precedence over event specific custom keys for the 64 key/value pair limit - The values of event keys override the value of global custom keys if they're identical Additionally: - Creates a new EventMetadata class to represent `sessionId` and `timestamp` attached to non fatal events. --- firebase-crashlytics/CHANGELOG.md | 3 +- firebase-crashlytics/api.txt | 3 +- .../common/CrashlyticsControllerTest.java | 8 +- .../internal/common/CrashlyticsCoreTest.java | 137 +++++++++++++ .../SessionReportingCoordinatorTest.java | 184 +++++++++++++----- .../crashlytics/FirebaseCrashlytics.java | 27 ++- .../common/CrashlyticsController.java | 10 +- .../internal/common/CrashlyticsCore.java | 4 +- .../common/SessionReportingCoordinator.java | 48 +++-- .../internal/metadata/EventMetadata.kt | 31 +++ .../internal/metadata/KeysMap.java | 6 +- .../internal/metadata/UserMetadata.java | 44 +++++ 12 files changed, 428 insertions(+), 77 deletions(-) create mode 100644 firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/EventMetadata.kt diff --git a/firebase-crashlytics/CHANGELOG.md b/firebase-crashlytics/CHANGELOG.md index 5b57a9581e7..4d526585b44 100644 --- a/firebase-crashlytics/CHANGELOG.md +++ b/firebase-crashlytics/CHANGELOG.md @@ -1,5 +1,6 @@ # Unreleased - +* [feature] Added an overload for `recordException` that allows logging additional custom + keys to the non fatal event [#3551] # 19.3.0 * [fixed] Fixed inefficiency in the Kotlin `FirebaseCrashlytics.setCustomKeys` extension. diff --git a/firebase-crashlytics/api.txt b/firebase-crashlytics/api.txt index 3fb22e31b6e..c8fa0079300 100644 --- a/firebase-crashlytics/api.txt +++ b/firebase-crashlytics/api.txt @@ -20,10 +20,11 @@ package com.google.firebase.crashlytics { method public void deleteUnsentReports(); method public boolean didCrashOnPreviousExecution(); method @NonNull public static com.google.firebase.crashlytics.FirebaseCrashlytics getInstance(); + method public boolean isCrashlyticsCollectionEnabled(); method public void log(@NonNull String); method public void recordException(@NonNull Throwable); + method public void recordException(@NonNull Throwable, @NonNull com.google.firebase.crashlytics.CustomKeysAndValues); method public void sendUnsentReports(); - method public boolean isCrashlyticsCollectionEnabled(); method public void setCrashlyticsCollectionEnabled(boolean); method public void setCrashlyticsCollectionEnabled(@Nullable Boolean); method public void setCustomKey(@NonNull String, boolean); diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerTest.java index 82cd14bcf74..9260a7f7950 100644 --- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerTest.java +++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerTest.java @@ -44,6 +44,7 @@ import com.google.firebase.crashlytics.internal.NativeSessionFileProvider; import com.google.firebase.crashlytics.internal.analytics.AnalyticsEventLogger; import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorkers; +import com.google.firebase.crashlytics.internal.metadata.EventMetadata; import com.google.firebase.crashlytics.internal.metadata.LogFileManager; import com.google.firebase.crashlytics.internal.metadata.UserMetadata; import com.google.firebase.crashlytics.internal.model.CrashlyticsReport; @@ -57,6 +58,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.TreeSet; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; @@ -216,14 +218,14 @@ public void testWriteNonFatal_callsSessionReportingCoordinatorPersistNonFatal() when(mockSessionReportingCoordinator.listSortedOpenSessionIds()) .thenReturn(new TreeSet<>(Collections.singleton(sessionId))); - controller.writeNonFatalException(thread, nonFatal); + controller.writeNonFatalException(thread, nonFatal, Map.of()); crashlyticsWorkers.common.submit(() -> controller.doCloseSessions(testSettingsProvider)); crashlyticsWorkers.common.await(); crashlyticsWorkers.diskWrite.await(); verify(mockSessionReportingCoordinator) - .persistNonFatalEvent(eq(nonFatal), eq(thread), eq(sessionId), anyLong()); + .persistNonFatalEvent(eq(nonFatal), eq(thread), any(EventMetadata.class)); } @SdkSuppress(minSdkVersion = 30) // ApplicationExitInfo @@ -377,7 +379,7 @@ public void testLoggedExceptionsAfterCrashOk() { testSettingsProvider, Thread.currentThread(), new RuntimeException()); // This should not throw. - controller.writeNonFatalException(Thread.currentThread(), new RuntimeException()); + controller.writeNonFatalException(Thread.currentThread(), new RuntimeException(), Map.of()); } /** diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreTest.java index 6bd0924f3d0..56ac7f825c5 100644 --- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreTest.java +++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreTest.java @@ -159,6 +159,143 @@ public void testCustomAttributes() throws Exception { assertEquals(longValue, metadata.getCustomKeys().get(key1)); } + @Test + public void testCustomAttributes_retrievedWithEmptyEventKeys() throws Exception { + UserMetadata metadata = crashlyticsCore.getController().getUserMetadata(); + + assertTrue(metadata.getCustomKeys(Map.of()).isEmpty()); + + final String id = "id012345"; + crashlyticsCore.setUserId(id); + crashlyticsWorkers.common.await(); + assertEquals(id, metadata.getUserId()); + + final StringBuffer idBuffer = new StringBuffer(id); + while (idBuffer.length() < UserMetadata.MAX_ATTRIBUTE_SIZE) { + idBuffer.append("0"); + } + final String longId = idBuffer.toString(); + final String superLongId = longId + "more chars"; + + crashlyticsCore.setUserId(superLongId); + crashlyticsWorkers.common.await(); + assertEquals(longId, metadata.getUserId()); + + final String key1 = "key1"; + final String value1 = "value1"; + crashlyticsCore.setCustomKey(key1, value1); + crashlyticsWorkers.common.await(); + assertEquals(value1, metadata.getCustomKeys(Map.of()).get(key1)); + + // Adding an existing key with the same value should return false + assertFalse(metadata.setCustomKey(key1, value1)); + assertTrue(metadata.setCustomKey(key1, "someOtherValue")); + assertTrue(metadata.setCustomKey(key1, value1)); + assertFalse(metadata.setCustomKey(key1, value1)); + + final String longValue = longId.replaceAll("0", "x"); + final String superLongValue = longValue + "some more chars"; + + // test truncation of custom keys and attributes + crashlyticsCore.setCustomKey(superLongId, superLongValue); + crashlyticsWorkers.common.await(); + assertNull(metadata.getCustomKeys(Map.of()).get(superLongId)); + assertEquals(longValue, metadata.getCustomKeys().get(longId)); + + // test the max number of attributes. We've already set 2. + for (int i = 2; i < UserMetadata.MAX_ATTRIBUTES; ++i) { + final String key = "key" + i; + final String value = "value" + i; + crashlyticsCore.setCustomKey(key, value); + crashlyticsWorkers.common.await(); + assertEquals(value, metadata.getCustomKeys(Map.of()).get(key)); + } + // should be full now, extra key, value pairs will be dropped. + final String key = "new key"; + crashlyticsCore.setCustomKey(key, "some value"); + crashlyticsWorkers.common.await(); + assertFalse(metadata.getCustomKeys(Map.of()).containsKey(key)); + + // should be able to update existing keys + crashlyticsCore.setCustomKey(key1, longValue); + crashlyticsWorkers.common.await(); + assertEquals(longValue, metadata.getCustomKeys(Map.of()).get(key1)); + + // when we set a key to null, it should still exist with an empty value + crashlyticsCore.setCustomKey(key1, null); + crashlyticsWorkers.common.await(); + assertEquals("", metadata.getCustomKeys(Map.of()).get(key1)); + + // keys and values are trimmed. + crashlyticsCore.setCustomKey(" " + key1 + " ", " " + longValue + " "); + crashlyticsWorkers.common.await(); + assertTrue(metadata.getCustomKeys(Map.of()).containsKey(key1)); + assertEquals(longValue, metadata.getCustomKeys(Map.of()).get(key1)); + } + + @Test + public void testCustomKeysMergedWithEventKeys() throws Exception { + UserMetadata metadata = crashlyticsCore.getController().getUserMetadata(); + + Map keysAndValues = new HashMap<>(); + keysAndValues.put("customKey1", "value"); + keysAndValues.put("customKey2", "value"); + keysAndValues.put("customKey3", "value"); + + crashlyticsCore.setCustomKeys(keysAndValues); + crashlyticsWorkers.common.await(); + + Map eventKeysAndValues = new HashMap<>(); + eventKeysAndValues.put("eventKey1", "eventValue"); + eventKeysAndValues.put("eventKey2", "eventValue"); + + // Tests reading custom keys with event keys. + assertEquals(keysAndValues.size(), metadata.getCustomKeys().size()); + assertEquals(keysAndValues.size(), metadata.getCustomKeys(Map.of()).size()); + assertEquals( + keysAndValues.size() + eventKeysAndValues.size(), + metadata.getCustomKeys(eventKeysAndValues).size()); + + // Tests event keys don't add to custom keys in future reads. + assertEquals(keysAndValues.size(), metadata.getCustomKeys().size()); + assertEquals(keysAndValues.size(), metadata.getCustomKeys(Map.of()).size()); + + // Tests additional event keys. + eventKeysAndValues.put("eventKey3", "eventValue"); + eventKeysAndValues.put("eventKey4", "eventValue"); + assertEquals( + keysAndValues.size() + eventKeysAndValues.size(), + metadata.getCustomKeys(eventKeysAndValues).size()); + + // Tests overriding custom key with event keys. + keysAndValues.put("eventKey1", "value"); + crashlyticsCore.setCustomKeys(keysAndValues); + crashlyticsWorkers.common.await(); + + assertEquals("value", metadata.getCustomKeys().get("eventKey1")); + assertEquals("value", metadata.getCustomKeys(Map.of()).get("eventKey1")); + assertEquals("eventValue", metadata.getCustomKeys(eventKeysAndValues).get("eventKey1")); + + // Test the event key behavior when the count of custom keys is max. + for (int i = keysAndValues.size(); i < UserMetadata.MAX_ATTRIBUTES; ++i) { + final String key = "key" + i; + final String value = "value" + i; + crashlyticsCore.setCustomKey(key, value); + crashlyticsWorkers.common.await(); + assertEquals(value, metadata.getCustomKeys().get(key)); + } + + assertEquals(UserMetadata.MAX_ATTRIBUTES, metadata.getCustomKeys().size()); + + // Tests event keys override global custom keys when the key exists. + assertEquals("value", metadata.getCustomKeys().get("eventKey1")); + assertEquals("value", metadata.getCustomKeys(Map.of()).get("eventKey1")); + assertEquals("eventValue", metadata.getCustomKeys(eventKeysAndValues).get("eventKey1")); + + // Test when event keys *don't* override global custom keys. + assertNull(metadata.getCustomKeys(eventKeysAndValues).get("eventKey2")); + } + @Test public void testBulkCustomKeys() throws Exception { final double DELTA = 1e-15; diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorTest.java index f1015447441..0f5cf09233b 100644 --- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorTest.java +++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorTest.java @@ -34,12 +34,16 @@ import com.google.android.gms.tasks.Task; import com.google.android.gms.tasks.Tasks; import com.google.firebase.concurrent.TestOnlyExecutors; +import com.google.firebase.crashlytics.internal.CrashlyticsTestCase; import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorkers; +import com.google.firebase.crashlytics.internal.metadata.EventMetadata; import com.google.firebase.crashlytics.internal.metadata.LogFileManager; +import com.google.firebase.crashlytics.internal.metadata.RolloutAssignment; import com.google.firebase.crashlytics.internal.metadata.UserMetadata; import com.google.firebase.crashlytics.internal.model.CrashlyticsReport; import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.CustomAttribute; import com.google.firebase.crashlytics.internal.persistence.CrashlyticsReportPersistence; +import com.google.firebase.crashlytics.internal.persistence.FileStore; import com.google.firebase.crashlytics.internal.send.DataTransportCrashlyticsReportSender; import java.io.File; import java.util.ArrayList; @@ -54,13 +58,14 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -public class SessionReportingCoordinatorTest { +public class SessionReportingCoordinatorTest extends CrashlyticsTestCase { + + private static final String TEST_SESSION_ID = "testSessionId"; @Mock private CrashlyticsReportDataCapture dataCapture; @Mock private CrashlyticsReportPersistence reportPersistence; @Mock private DataTransportCrashlyticsReportSender reportSender; @Mock private LogFileManager logFileManager; - @Mock private UserMetadata reportMetadata; @Mock private IdManager idManager; @Mock private CrashlyticsReport mockReport; @Mock private CrashlyticsReport.Session.Event mockEvent; @@ -70,6 +75,7 @@ public class SessionReportingCoordinatorTest { @Mock private Exception mockException; @Mock private Thread mockThread; + private UserMetadata reportMetadata; private SessionReportingCoordinator reportingCoordinator; private AutoCloseable mocks; @@ -80,6 +86,9 @@ public class SessionReportingCoordinatorTest { public void setUp() { mocks = MockitoAnnotations.openMocks(this); + FileStore testFileStore = new FileStore(getContext()); + reportMetadata = new UserMetadata(TEST_SESSION_ID, testFileStore, crashlyticsWorkers); + reportingCoordinator = new SessionReportingCoordinator( dataCapture, @@ -138,7 +147,8 @@ public void testNonFatalEvent_persistsNormalPriorityEventWithoutAllThreadsForSes mockEventInteractions(); reportingCoordinator.onBeginSession(sessionId, timestamp); - reportingCoordinator.persistNonFatalEvent(mockException, mockThread, sessionId, timestamp); + reportingCoordinator.persistNonFatalEvent( + mockException, mockThread, new EventMetadata(sessionId, timestamp)); crashlyticsWorkers.diskWrite.await(); @@ -163,7 +173,8 @@ public void testNonFatalEvent_addsLogsToEvent() throws Exception { when(logFileManager.getLogString()).thenReturn(testLog); reportingCoordinator.onBeginSession(sessionId, timestamp); - reportingCoordinator.persistNonFatalEvent(mockException, mockThread, sessionId, timestamp); + reportingCoordinator.persistNonFatalEvent( + mockException, mockThread, new EventMetadata(sessionId, timestamp)); crashlyticsWorkers.diskWrite.await(); @@ -184,7 +195,8 @@ public void testNonFatalEvent_addsNoLogsToEventWhenNoneAvailable() throws Except when(logFileManager.getLogString()).thenReturn(null); reportingCoordinator.onBeginSession(sessionId, timestamp); - reportingCoordinator.persistNonFatalEvent(mockException, mockThread, sessionId, timestamp); + reportingCoordinator.persistNonFatalEvent( + mockException, mockThread, new EventMetadata(sessionId, timestamp)); crashlyticsWorkers.diskWrite.await(); @@ -257,11 +269,12 @@ public void testNonFatalEvent_addsSortedKeysToEvent() throws Exception { expectedCustomAttributes.add(customAttribute1); expectedCustomAttributes.add(customAttribute2); - when(reportMetadata.getCustomKeys()).thenReturn(attributes); - when(reportMetadata.getInternalKeys()).thenReturn(attributes); + addCustomKeysToUserMetadata(attributes); + addInternalKeysToUserMetadata(attributes); reportingCoordinator.onBeginSession(sessionId, timestamp); - reportingCoordinator.persistNonFatalEvent(mockException, mockThread, sessionId, timestamp); + reportingCoordinator.persistNonFatalEvent( + mockException, mockThread, new EventMetadata(sessionId, timestamp)); crashlyticsWorkers.diskWrite.await(); @@ -281,12 +294,9 @@ public void testNonFatalEvent_addsNoKeysToEventWhenNoneAvailable() throws Except final String sessionId = "testSessionId"; - final Map attributes = Collections.emptyMap(); - - when(reportMetadata.getCustomKeys()).thenReturn(attributes); - reportingCoordinator.onBeginSession(sessionId, timestamp); - reportingCoordinator.persistNonFatalEvent(mockException, mockThread, sessionId, timestamp); + reportingCoordinator.persistNonFatalEvent( + mockException, mockThread, new EventMetadata(sessionId, timestamp)); crashlyticsWorkers.diskWrite.await(); @@ -297,33 +307,117 @@ public void testNonFatalEvent_addsNoKeysToEventWhenNoneAvailable() throws Except verify(logFileManager, never()).clearLog(); } + @Test + public void testNonFatalEvent_addsUserInfoKeysToEventWhenAvailable() throws Exception { + final long timestamp = System.currentTimeMillis(); + + mockEventInteractions(); + + final String sessionId = "testSessionId"; + + final String testKey1 = "testKey1"; + final String testValue1 = "testValue1"; + + final Map userInfo = new HashMap<>(); + userInfo.put(testKey1, testValue1); + + final CustomAttribute customAttribute1 = + CustomAttribute.builder().setKey(testKey1).setValue(testValue1).build(); + + final List expectedCustomAttributes = new ArrayList<>(); + expectedCustomAttributes.add(customAttribute1); + + reportingCoordinator.onBeginSession(sessionId, timestamp); + reportingCoordinator.persistNonFatalEvent( + mockException, mockThread, new EventMetadata(sessionId, timestamp, userInfo)); + + crashlyticsWorkers.diskWrite.await(); + + verify(mockEventAppBuilder).setCustomAttributes(expectedCustomAttributes); + verify(mockEventAppBuilder).build(); + verify(mockEventBuilder).setApp(mockEventApp); + verify(mockEventBuilder).build(); + verify(logFileManager, never()).clearLog(); + } + + @Test + public void testNonFatalEvent_mergesUserInfoKeysWithCustomKeys() throws Exception { + final long timestamp = System.currentTimeMillis(); + + mockEventInteractions(); + + final String sessionId = "testSessionId"; + + final String testKey1 = "testKey1"; + final String testValue1 = "testValue1"; + + final String testKey2 = "testKey2"; + final String testValue2 = "testValue2"; + + final Map attributes = new HashMap<>(); + attributes.put(testKey1, testValue1); + attributes.put(testKey2, testValue2); + + addCustomKeysToUserMetadata(attributes); + + final String testValue1UserInfo = "testValue1"; + final String testKey3 = "testKey3"; + final String testValue3 = "testValue3"; + + final Map userInfo = new HashMap<>(); + userInfo.put(testKey1, testValue1UserInfo); + userInfo.put(testKey3, testValue3); + + final CustomAttribute customAttribute1 = + CustomAttribute.builder().setKey(testKey1).setValue(testValue1UserInfo).build(); + final CustomAttribute customAttribute2 = + CustomAttribute.builder().setKey(testKey2).setValue(testValue2).build(); + final CustomAttribute customAttribute3 = + CustomAttribute.builder().setKey(testKey3).setValue(testValue3).build(); + + final List expectedCustomAttributes = + List.of(customAttribute1, customAttribute2, customAttribute3); + + reportingCoordinator.onBeginSession(sessionId, timestamp); + reportingCoordinator.persistNonFatalEvent( + mockException, mockThread, new EventMetadata(sessionId, timestamp, userInfo)); + + crashlyticsWorkers.diskWrite.await(); + + verify(mockEventAppBuilder).setCustomAttributes(expectedCustomAttributes); + verify(mockEventAppBuilder).build(); + verify(mockEventBuilder).setApp(mockEventApp); + verify(mockEventBuilder).build(); + verify(logFileManager, never()).clearLog(); + } + @Test public void testNonFatalEvent_addRolloutsEvent() throws Exception { long timestamp = System.currentTimeMillis(); String sessionId = "testSessionId"; mockEventInteractions(); - List rolloutsState = - new ArrayList(); - rolloutsState.add(mockRolloutAssignment()); - when(reportMetadata.getRolloutsState()).thenReturn(rolloutsState); + List rolloutsState = new ArrayList<>(); + rolloutsState.add(fakeRolloutAssignment()); + reportMetadata.updateRolloutsState(rolloutsState); + crashlyticsWorkers.diskWrite.await(); reportingCoordinator.onBeginSession(sessionId, timestamp); - reportingCoordinator.persistNonFatalEvent(mockException, mockThread, sessionId, timestamp); + reportingCoordinator.persistNonFatalEvent( + mockException, mockThread, new EventMetadata(sessionId, timestamp)); crashlyticsWorkers.diskWrite.await(); verify(mockEventAppBuilder, never()).setCustomAttributes(anyList()); verify(mockEventAppBuilder, never()).build(); verify(mockEventBuilder, never()).setApp(mockEventApp); - verify(reportMetadata).getRolloutsState(); // first build for custom keys // second build for rollouts verify(mockEventBuilder, times(2)).build(); } @Test - public void testFatalEvent_addsSortedCustomKeysToEvent() { + public void testFatalEvent_addsSortedCustomKeysToEvent() throws Exception { final long timestamp = System.currentTimeMillis(); mockEventInteractions(); @@ -348,7 +442,7 @@ public void testFatalEvent_addsSortedCustomKeysToEvent() { expectedCustomAttributes.add(customAttribute1); expectedCustomAttributes.add(customAttribute2); - when(reportMetadata.getCustomKeys()).thenReturn(attributes); + addCustomKeysToUserMetadata(attributes); reportingCoordinator.onBeginSession(sessionId, timestamp); reportingCoordinator.persistFatalEvent(mockException, mockThread, sessionId, timestamp); @@ -361,7 +455,7 @@ public void testFatalEvent_addsSortedCustomKeysToEvent() { } @Test - public void testFatalEvent_addsSortedInternalKeysToEvent() { + public void testFatalEvent_addsSortedInternalKeysToEvent() throws Exception { final long timestamp = System.currentTimeMillis(); mockEventInteractions(); @@ -386,7 +480,7 @@ public void testFatalEvent_addsSortedInternalKeysToEvent() { expectedCustomAttributes.add(customAttribute1); expectedCustomAttributes.add(customAttribute2); - when(reportMetadata.getInternalKeys()).thenReturn(attributes); + addInternalKeysToUserMetadata(attributes); reportingCoordinator.onBeginSession(sessionId, timestamp); reportingCoordinator.persistFatalEvent(mockException, mockThread, sessionId, timestamp); @@ -406,10 +500,6 @@ public void testFatalEvent_addsNoKeysToEventWhenNoneAvailable() { final String sessionId = "testSessionId"; - final Map attributes = Collections.emptyMap(); - - when(reportMetadata.getCustomKeys()).thenReturn(attributes); - reportingCoordinator.onBeginSession(sessionId, timestamp); reportingCoordinator.persistFatalEvent(mockException, mockThread, sessionId, timestamp); @@ -421,15 +511,16 @@ public void testFatalEvent_addsNoKeysToEventWhenNoneAvailable() { } @Test - public void testFatalEvent_addRolloutsToEvent() { + public void testFatalEvent_addRolloutsToEvent() throws Exception { long timestamp = System.currentTimeMillis(); String sessionId = "testSessionId"; mockEventInteractions(); - List rolloutsState = - new ArrayList(); - rolloutsState.add(mockRolloutAssignment()); - when(reportMetadata.getRolloutsState()).thenReturn(rolloutsState); + List rolloutsState = new ArrayList<>(); + rolloutsState.add(fakeRolloutAssignment()); + + reportMetadata.updateRolloutsState(rolloutsState); + crashlyticsWorkers.diskWrite.await(); reportingCoordinator.onBeginSession(sessionId, timestamp); reportingCoordinator.persistFatalEvent(mockException, mockThread, sessionId, timestamp); @@ -437,7 +528,6 @@ public void testFatalEvent_addRolloutsToEvent() { verify(mockEventAppBuilder, never()).setCustomAttributes(anyList()); verify(mockEventAppBuilder, never()).build(); verify(mockEventBuilder, never()).setApp(mockEventApp); - verify(reportMetadata).getRolloutsState(); // first build for custom keys // second build for rollouts verify(mockEventBuilder, times(2)).build(); @@ -522,6 +612,21 @@ public void testRemoveAllReports_deletesPersistedReports() { verify(reportPersistence).deleteAllReports(); } + private void addCustomKeysToUserMetadata(Map customKeys) throws Exception { + reportMetadata.setCustomKeys(customKeys); + for (Map.Entry entry : customKeys.entrySet()) { + reportMetadata.setInternalKey(entry.getKey(), entry.getValue()); + } + crashlyticsWorkers.diskWrite.await(); + } + + private void addInternalKeysToUserMetadata(Map internalKeys) throws Exception { + for (Map.Entry entry : internalKeys.entrySet()) { + reportMetadata.setInternalKey(entry.getKey(), entry.getValue()); + } + crashlyticsWorkers.diskWrite.await(); + } + private void mockEventInteractions() { when(mockEvent.toBuilder()).thenReturn(mockEventBuilder); when(mockEventBuilder.build()).thenReturn(mockEvent); @@ -556,16 +661,7 @@ private static CrashlyticsReportWithSessionId mockReportWithSessionId(String ses mockReport(sessionId), sessionId, new File("fake")); } - private static CrashlyticsReport.Session.Event.RolloutAssignment mockRolloutAssignment() { - return CrashlyticsReport.Session.Event.RolloutAssignment.builder() - .setTemplateVersion(2) - .setParameterKey("my_feature") - .setParameterValue("false") - .setRolloutVariant( - CrashlyticsReport.Session.Event.RolloutAssignment.RolloutVariant.builder() - .setRolloutId("rollout_1") - .setVariantId("enabled") - .build()) - .build(); + private static RolloutAssignment fakeRolloutAssignment() { + return RolloutAssignment.create("rollout_1", "my_feature", "false", "enabled", 2); } } diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.java index 1eb2e1a367b..46f992aaf12 100644 --- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.java +++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.java @@ -43,6 +43,7 @@ import com.google.firebase.remoteconfig.interop.FirebaseRemoteConfigInterop; import com.google.firebase.sessions.api.FirebaseSessionsDependencies; import java.util.List; +import java.util.Map; import java.util.concurrent.ExecutorService; /** @@ -208,7 +209,31 @@ public void recordException(@NonNull Throwable throwable) { Logger.getLogger().w("A null value was passed to recordException. Ignoring."); return; } - core.logException(throwable); + + core.logException(throwable, Map.of()); + } + + /** + * Records a non-fatal report to send to Crashlytics. + * + *

Combined with app level custom keys, the event is restricted to a maximum of 64 key/value + * pairs. New keys beyond that limit are ignored. Keys or values that exceed 1024 characters are + * truncated. + * + *

The values of event keys override the values of app level custom keys if they're identical. + * + * @param throwable a {@link Throwable} to be recorded as a non-fatal event. + * @param keysAndValues A dictionary of keys and the values to associate with the non fatal + * exception, in addition to the app level custom keys. + */ + public void recordException( + @NonNull Throwable throwable, @NonNull CustomKeysAndValues keysAndValues) { + if (throwable == null) { // Users could call this with null despite the annotation. + Logger.getLogger().w("A null value was passed to recordException. Ignoring."); + return; + } + + core.logException(throwable, keysAndValues.keysAndValues); } /** diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java index 7726d9e6924..b55a26678d4 100644 --- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java +++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java @@ -35,6 +35,7 @@ import com.google.firebase.crashlytics.internal.analytics.AnalyticsEventLogger; import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsTasks; import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorkers; +import com.google.firebase.crashlytics.internal.metadata.EventMetadata; import com.google.firebase.crashlytics.internal.metadata.LogFileManager; import com.google.firebase.crashlytics.internal.metadata.UserMetadata; import com.google.firebase.crashlytics.internal.model.CrashlyticsReport; @@ -405,7 +406,10 @@ void writeToLog(final long timestamp, final String msg) { } /** Log a caught exception - write out Throwable as event section of protobuf */ - void writeNonFatalException(@NonNull final Thread thread, @NonNull final Throwable ex) { + void writeNonFatalException( + @NonNull final Thread thread, + @NonNull final Throwable ex, + @NonNull Map eventKeys) { // Capture and close over the current time, so that we get the exact call time, // rather than the time at which the task executes. final long timestampMillis = System.currentTimeMillis(); @@ -417,7 +421,9 @@ void writeNonFatalException(@NonNull final Thread thread, @NonNull final Throwab Logger.getLogger().w("Tried to write a non-fatal exception while no session was open."); return; } - reportingCoordinator.persistNonFatalEvent(ex, thread, currentSessionId, timestampSeconds); + EventMetadata eventMetadata = + new EventMetadata(currentSessionId, timestampSeconds, eventKeys); + reportingCoordinator.persistNonFatalEvent(ex, thread, eventMetadata); } } diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCore.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCore.java index d967447590e..f1f250e52b9 100644 --- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCore.java +++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCore.java @@ -313,9 +313,9 @@ public static String getVersion() { * Throwable was thrown. The Throwable will always be processed on a background thread, so it is * safe to invoke this method from the main thread. */ - public void logException(@NonNull Throwable throwable) { + public void logException(@NonNull Throwable throwable, @NonNull Map eventKeys) { crashlyticsWorkers.common.submit( - () -> controller.writeNonFatalException(Thread.currentThread(), throwable)); + () -> controller.writeNonFatalException(Thread.currentThread(), throwable, eventKeys)); } /** diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinator.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinator.java index 61bce5b555b..f40b60ca74a 100644 --- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinator.java +++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinator.java @@ -25,6 +25,7 @@ import com.google.android.gms.tasks.Tasks; import com.google.firebase.crashlytics.internal.Logger; import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorkers; +import com.google.firebase.crashlytics.internal.metadata.EventMetadata; import com.google.firebase.crashlytics.internal.metadata.LogFileManager; import com.google.firebase.crashlytics.internal.metadata.UserMetadata; import com.google.firebase.crashlytics.internal.model.CrashlyticsReport; @@ -124,13 +125,14 @@ public void onBeginSession(@NonNull String sessionId, long timestampSeconds) { public void persistFatalEvent( @NonNull Throwable event, @NonNull Thread thread, @NonNull String sessionId, long timestamp) { Logger.getLogger().v("Persisting fatal event for session " + sessionId); - persistEvent(event, thread, sessionId, EVENT_TYPE_CRASH, timestamp, true); + EventMetadata eventMetadata = new EventMetadata(sessionId, timestamp); + persistEvent(event, thread, EVENT_TYPE_CRASH, eventMetadata, true); } public void persistNonFatalEvent( - @NonNull Throwable event, @NonNull Thread thread, @NonNull String sessionId, long timestamp) { - Logger.getLogger().v("Persisting non-fatal event for session " + sessionId); - persistEvent(event, thread, sessionId, EVENT_TYPE_LOGGED, timestamp, false); + @NonNull Throwable event, @NonNull Thread thread, @NonNull EventMetadata eventMetadata) { + Logger.getLogger().v("Persisting non-fatal event for session " + eventMetadata.getSessionId()); + persistEvent(event, thread, EVENT_TYPE_LOGGED, eventMetadata, false); } @RequiresApi(api = Build.VERSION_CODES.R) @@ -253,23 +255,20 @@ private CrashlyticsReportWithSessionId ensureHasFid(CrashlyticsReportWithSession } private CrashlyticsReport.Session.Event addMetaDataToEvent( - CrashlyticsReport.Session.Event capturedEvent) { + CrashlyticsReport.Session.Event capturedEvent, Map eventCustomKeys) { CrashlyticsReport.Session.Event eventWithLogsAndCustomKeys = - addLogsAndCustomKeysToEvent(capturedEvent, logFileManager, reportMetadata); + addLogsCustomKeysAndEventKeysToEvent( + capturedEvent, logFileManager, reportMetadata, eventCustomKeys); CrashlyticsReport.Session.Event eventWithRollouts = addRolloutsStateToEvent(eventWithLogsAndCustomKeys, reportMetadata); return eventWithRollouts; } - private CrashlyticsReport.Session.Event addLogsAndCustomKeysToEvent( - CrashlyticsReport.Session.Event capturedEvent) { - return addLogsAndCustomKeysToEvent(capturedEvent, logFileManager, reportMetadata); - } - - private CrashlyticsReport.Session.Event addLogsAndCustomKeysToEvent( + private CrashlyticsReport.Session.Event addLogsCustomKeysAndEventKeysToEvent( CrashlyticsReport.Session.Event capturedEvent, LogFileManager logFileManager, - UserMetadata reportMetadata) { + UserMetadata reportMetadata, + Map eventKeys) { final CrashlyticsReport.Session.Event.Builder eventBuilder = capturedEvent.toBuilder(); final String content = logFileManager.getLogString(); @@ -284,7 +283,7 @@ private CrashlyticsReport.Session.Event addLogsAndCustomKeysToEvent( // logFileManager.clearLog(); // Clear log to prepare for next event. final List sortedCustomAttributes = - getSortedCustomAttributes(reportMetadata.getCustomKeys()); + getSortedCustomAttributes(reportMetadata.getCustomKeys(eventKeys)); final List sortedInternalKeys = getSortedCustomAttributes(reportMetadata.getInternalKeys()); @@ -299,6 +298,14 @@ private CrashlyticsReport.Session.Event addLogsAndCustomKeysToEvent( return eventBuilder.build(); } + private CrashlyticsReport.Session.Event addLogsAndCustomKeysToEvent( + CrashlyticsReport.Session.Event capturedEvent, + LogFileManager logFileManager, + UserMetadata reportMetadata) { + return addLogsCustomKeysAndEventKeysToEvent( + capturedEvent, logFileManager, reportMetadata, Map.of()); + } + private CrashlyticsReport.Session.Event addRolloutsStateToEvent( CrashlyticsReport.Session.Event capturedEvent, UserMetadata reportMetadata) { List reportRolloutAssignments = @@ -319,9 +326,8 @@ private CrashlyticsReport.Session.Event addRolloutsStateToEvent( private void persistEvent( @NonNull Throwable event, @NonNull Thread thread, - @NonNull String sessionId, @NonNull String eventType, - long timestamp, + @NonNull EventMetadata eventMetadata, boolean isFatal) { final boolean isHighPriority = eventType.equals(EVENT_TYPE_CRASH); @@ -331,23 +337,25 @@ private void persistEvent( event, thread, eventType, - timestamp, + eventMetadata.getTimestamp(), EVENT_THREAD_IMPORTANCE, MAX_CHAINED_EXCEPTION_DEPTH, isFatal); - CrashlyticsReport.Session.Event finallizedEvent = addMetaDataToEvent(capturedEvent); + CrashlyticsReport.Session.Event finallizedEvent = + addMetaDataToEvent(capturedEvent, eventMetadata.getAdditionalCustomKeys()); // Non-fatal, persistence write task we move to diskWriteWorker if (!isFatal) { crashlyticsWorkers.diskWrite.submit( () -> { Logger.getLogger().d("disk worker: log non-fatal event to persistence"); - reportPersistence.persistEvent(finallizedEvent, sessionId, isHighPriority); + reportPersistence.persistEvent( + finallizedEvent, eventMetadata.getSessionId(), isHighPriority); }); return; } - reportPersistence.persistEvent(finallizedEvent, sessionId, isHighPriority); + reportPersistence.persistEvent(finallizedEvent, eventMetadata.getSessionId(), isHighPriority); } private boolean onReportSendComplete(@NonNull Task task) { diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/EventMetadata.kt b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/EventMetadata.kt new file mode 100644 index 00000000000..fef5899cef5 --- /dev/null +++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/EventMetadata.kt @@ -0,0 +1,31 @@ +// Copyright 2024 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.firebase.crashlytics.internal.metadata + +/** + * A class that represents information to attach to a specific event. + * + * @property sessionId the sessionId to attach to the event. + * @property timestamp the timestamp to attach to the event. + * @property additionalCustomKeys a [Map] of key value pairs to attach to the event, + * in addition to the global custom keys. + */ +internal data class EventMetadata +@JvmOverloads +constructor( + val sessionId: String, + val timestamp: Long, + val additionalCustomKeys: Map = mapOf() +) diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/KeysMap.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/KeysMap.java index 620c7dca9d9..5d688b5e134 100644 --- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/KeysMap.java +++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/KeysMap.java @@ -47,11 +47,11 @@ public synchronized boolean setKey(String key, String value) { String sanitizedKey = sanitizeKey(key); // The entry can be added if we're under the size limit or we're updating an existing entry if (keys.size() < maxEntries || keys.containsKey(sanitizedKey)) { - String santitizedAttribute = sanitizeString(value, maxEntryLength); - if (CommonUtils.nullSafeEquals(keys.get(sanitizedKey), santitizedAttribute)) { + String sanitizedAttribute = sanitizeString(value, maxEntryLength); + if (CommonUtils.nullSafeEquals(keys.get(sanitizedKey), sanitizedAttribute)) { return false; } - keys.put(sanitizedKey, value == null ? "" : santitizedAttribute); + keys.put(sanitizedKey, value == null ? "" : sanitizedAttribute); return true; } Logger.getLogger() diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/UserMetadata.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/UserMetadata.java index 36ca7fda8a5..ec7403078d7 100644 --- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/UserMetadata.java +++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/UserMetadata.java @@ -17,10 +17,13 @@ import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import com.google.firebase.crashlytics.internal.Logger; import com.google.firebase.crashlytics.internal.common.CommonUtils; import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorkers; import com.google.firebase.crashlytics.internal.model.CrashlyticsReport; import com.google.firebase.crashlytics.internal.persistence.FileStore; +import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicMarkableReference; @@ -135,6 +138,47 @@ public void setUserId(String identifier) { crashlyticsWorkers.diskWrite.submit(this::serializeUserDataIfNeeded); } + /** + * Returns a {@link Map} containing all the custom keys to attach to the event. + * It overrides the values of app level custom keys with the values of event level custom keys if + * they're identical, and event keys or values that exceed 1024 characters are truncated. + * Combined with app level custom keys, the map is restricted to 64 key value pairs. + * + * @param eventKeys a {@link Map} representing event specific keys. + * @return a {@link Map} containing all the custom keys to attach to the event. + */ + public Map getCustomKeys(Map eventKeys) { + // In case of empty event keys, preserve existing behavior. + if (eventKeys.isEmpty()) { + return customKeys.getKeys(); + } + + // Otherwise merge the event keys with custom keys as appropriate. + Map globalKeys = customKeys.getKeys(); + HashMap result = new HashMap<>(globalKeys); + int eventKeysOverLimit = 0; + for (Map.Entry entry : eventKeys.entrySet()) { + String sanitizedKey = KeysMap.sanitizeString(entry.getKey(), MAX_ATTRIBUTE_SIZE); + if (result.size() < MAX_ATTRIBUTES || result.containsKey(sanitizedKey)) { + String sanitizedValue = KeysMap.sanitizeString(entry.getValue(), MAX_ATTRIBUTE_SIZE); + result.put(sanitizedKey, sanitizedValue); + } else { + eventKeysOverLimit++; + } + } + + if (eventKeysOverLimit > 0) { + Logger.getLogger() + .w( + "Ignored " + + eventKeysOverLimit + + " keys when adding event specific keys. Maximum allowable: " + + MAX_ATTRIBUTE_SIZE); + } + + return Collections.unmodifiableMap(result); + } + /** * @return defensive copy of the custom keys. */ From 8e5e9551463215bc95d8c5addb00f36c022a47d3 Mon Sep 17 00:00:00 2001 From: Tejas Deshpande Date: Thu, 5 Dec 2024 16:47:12 -0500 Subject: [PATCH 003/110] Add a kotlin method for recording an exception with custom keys (#6546) --- firebase-crashlytics/api.txt | 3 +- .../firebase/crashlytics/CrashlyticsTests.kt | 29 ++++++++++++++----- .../crashlytics/FirebaseCrashlytics.kt | 4 +++ .../firebase/crashlytics/KeyValueBuilder.kt | 2 +- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/firebase-crashlytics/api.txt b/firebase-crashlytics/api.txt index c8fa0079300..28576427fab 100644 --- a/firebase-crashlytics/api.txt +++ b/firebase-crashlytics/api.txt @@ -39,11 +39,12 @@ package com.google.firebase.crashlytics { public final class FirebaseCrashlyticsKt { method @NonNull public static com.google.firebase.crashlytics.FirebaseCrashlytics getCrashlytics(@NonNull com.google.firebase.Firebase); + method public static void recordException(@NonNull com.google.firebase.crashlytics.FirebaseCrashlytics, @NonNull Throwable throwable, @NonNull kotlin.jvm.functions.Function1 init); method public static void setCustomKeys(@NonNull com.google.firebase.crashlytics.FirebaseCrashlytics, @NonNull kotlin.jvm.functions.Function1 init); } public final class KeyValueBuilder { - ctor public KeyValueBuilder(@NonNull com.google.firebase.crashlytics.FirebaseCrashlytics crashlytics); + ctor @Deprecated public KeyValueBuilder(@NonNull com.google.firebase.crashlytics.FirebaseCrashlytics crashlytics); method public void key(@NonNull String key, boolean value); method public void key(@NonNull String key, double value); method public void key(@NonNull String key, float value); diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/CrashlyticsTests.kt b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/CrashlyticsTests.kt index 9ac371797b3..64f8ba8bfa6 100644 --- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/CrashlyticsTests.kt +++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/CrashlyticsTests.kt @@ -62,21 +62,36 @@ class CrashlyticsTests { @Test fun keyValueBuilder() { val keyValueBuilder = KeyValueBuilder() - keyValueBuilder.key("hello", "world") - keyValueBuilder.key("hello2", 23) - keyValueBuilder.key("hello3", 0.1) + keyValueBuilder.key("string", "world") + keyValueBuilder.key("int", Int.MAX_VALUE) + keyValueBuilder.key("float", Float.MAX_VALUE) + keyValueBuilder.key("boolean", true) + keyValueBuilder.key("double", Double.MAX_VALUE) + keyValueBuilder.key("long", Long.MAX_VALUE) val result: Map = keyValueBuilder.build().keysAndValues - assertThat(result).containsExactly("hello", "world", "hello2", "23", "hello3", "0.1") + val expectedKeys = + mapOf( + "string" to "world", + "int" to "${Int.MAX_VALUE}", + "float" to "${Float.MAX_VALUE}", + "boolean" to "${true}", + "double" to "${Double.MAX_VALUE}", + "long" to "${Long.MAX_VALUE}" + ) + assertThat(result).isEqualTo(expectedKeys) } @Test fun keyValueBuilder_withCrashlyticsInstance() { @Suppress("DEPRECATION") val keyValueBuilder = KeyValueBuilder(Firebase.crashlytics) - keyValueBuilder.key("hello", "world") - keyValueBuilder.key("hello2", 23) - keyValueBuilder.key("hello3", 0.1) + keyValueBuilder.key("string", "world") + keyValueBuilder.key("int", Int.MAX_VALUE) + keyValueBuilder.key("float", Float.MAX_VALUE) + keyValueBuilder.key("boolean", true) + keyValueBuilder.key("double", Double.MAX_VALUE) + keyValueBuilder.key("long", Long.MAX_VALUE) val result: Map = keyValueBuilder.build().keysAndValues diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.kt b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.kt index 3df07752caf..676d9877669 100644 --- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.kt +++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.kt @@ -30,6 +30,10 @@ val Firebase.crashlytics: FirebaseCrashlytics fun FirebaseCrashlytics.setCustomKeys(init: KeyValueBuilder.() -> Unit) = setCustomKeys(KeyValueBuilder().apply(init).build()) +/** Records a non-fatal report to send to Crashlytics with additional custom keys */ +fun FirebaseCrashlytics.recordException(throwable: Throwable, init: KeyValueBuilder.() -> Unit) = + recordException(throwable, KeyValueBuilder().apply(init).build()) + /** @suppress */ @Keep internal class FirebaseCrashlyticsKtxRegistrar : ComponentRegistrar { diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/KeyValueBuilder.kt b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/KeyValueBuilder.kt index 6d8835f4934..74d3793e215 100644 --- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/KeyValueBuilder.kt +++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/KeyValueBuilder.kt @@ -16,7 +16,7 @@ package com.google.firebase.crashlytics -/** Helper class to enable convenient syntax in [setCustomKeys] */ +/** Helper class to enable convenient syntax in [setCustomKeys] and [recordException] */ class KeyValueBuilder private constructor( private val crashlytics: FirebaseCrashlytics?, From 82d1b97ec7acb358031c81bb53a941c29729a4b6 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Thu, 5 Dec 2024 17:58:15 -0500 Subject: [PATCH 004/110] firebase-dataconnect minimal demo app added (#6561) --- firebase-dataconnect/demo/.gitignore | 24 ++ .../.idea/runConfigurations/spotlessApply.xml | 24 ++ firebase-dataconnect/demo/build.gradle.kts | 261 ++++++++++++++ .../demo/firebase/.firebaserc | 5 + .../demo/firebase/dataconnect/.gitignore | 15 + .../dataconnect/connector/connector.yaml | 5 + .../dataconnect/connector/operations.gql | 50 +++ .../firebase/dataconnect/dataconnect.yaml | 9 + .../firebase/dataconnect/schema/schema.gql | 24 ++ .../demo/firebase/firebase.json | 8 + .../demo/google-services.json | 14 + firebase-dataconnect/demo/gradle.properties | 7 + .../demo/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + firebase-dataconnect/demo/gradlew | 252 ++++++++++++++ firebase-dataconnect/demo/gradlew.bat | 94 ++++++ firebase-dataconnect/demo/settings.gradle.kts | 31 ++ .../demo/src/main/AndroidManifest.xml | 37 ++ .../dataconnect/minimaldemo/MainActivity.kt | 138 ++++++++ .../minimaldemo/MainActivityViewModel.kt | 318 ++++++++++++++++++ .../dataconnect/minimaldemo/MyApplication.kt | 153 +++++++++ .../firebase/dataconnect/minimaldemo/arbs.kt | 190 +++++++++++ .../dataconnect/minimaldemo/strings.kt | 89 +++++ .../src/main/res/layout/activity_main.xml | 99 ++++++ 24 files changed, 1854 insertions(+) create mode 100644 firebase-dataconnect/demo/.gitignore create mode 100644 firebase-dataconnect/demo/.idea/runConfigurations/spotlessApply.xml create mode 100644 firebase-dataconnect/demo/build.gradle.kts create mode 100644 firebase-dataconnect/demo/firebase/.firebaserc create mode 100644 firebase-dataconnect/demo/firebase/dataconnect/.gitignore create mode 100644 firebase-dataconnect/demo/firebase/dataconnect/connector/connector.yaml create mode 100644 firebase-dataconnect/demo/firebase/dataconnect/connector/operations.gql create mode 100644 firebase-dataconnect/demo/firebase/dataconnect/dataconnect.yaml create mode 100644 firebase-dataconnect/demo/firebase/dataconnect/schema/schema.gql create mode 100644 firebase-dataconnect/demo/firebase/firebase.json create mode 100644 firebase-dataconnect/demo/google-services.json create mode 100644 firebase-dataconnect/demo/gradle.properties create mode 100644 firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.jar create mode 100644 firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.properties create mode 100755 firebase-dataconnect/demo/gradlew create mode 100644 firebase-dataconnect/demo/gradlew.bat create mode 100644 firebase-dataconnect/demo/settings.gradle.kts create mode 100644 firebase-dataconnect/demo/src/main/AndroidManifest.xml create mode 100644 firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MainActivity.kt create mode 100644 firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MainActivityViewModel.kt create mode 100644 firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MyApplication.kt create mode 100644 firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/arbs.kt create mode 100644 firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/strings.kt create mode 100644 firebase-dataconnect/demo/src/main/res/layout/activity_main.xml diff --git a/firebase-dataconnect/demo/.gitignore b/firebase-dataconnect/demo/.gitignore new file mode 100644 index 00000000000..ee8a7cf69a2 --- /dev/null +++ b/firebase-dataconnect/demo/.gitignore @@ -0,0 +1,24 @@ +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +.gradle/ +.idea/ +.kotlin/ + +build/ +local.properties + +*.log +*.hprof +/dataConnectGeneratedSources/ diff --git a/firebase-dataconnect/demo/.idea/runConfigurations/spotlessApply.xml b/firebase-dataconnect/demo/.idea/runConfigurations/spotlessApply.xml new file mode 100644 index 00000000000..93b3583a85c --- /dev/null +++ b/firebase-dataconnect/demo/.idea/runConfigurations/spotlessApply.xml @@ -0,0 +1,24 @@ + + + + + + + true + true + false + false + + + diff --git a/firebase-dataconnect/demo/build.gradle.kts b/firebase-dataconnect/demo/build.gradle.kts new file mode 100644 index 00000000000..d79ba7d2e24 --- /dev/null +++ b/firebase-dataconnect/demo/build.gradle.kts @@ -0,0 +1,261 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import com.android.build.api.variant.ApplicationAndroidComponentsExtension +import java.nio.charset.StandardCharsets + +plugins { + // Use whichever versions of these dependencies suit your application. + // The versions shown here were the latest versions as of December 03, 2024. + // Note, however, that the version of kotlin("plugin.serialization") _must_, + // in general, match the version of kotlin("android"). + id("com.android.application") version "8.7.3" + id("com.google.gms.google-services") version "4.4.2" + val kotlinVersion = "2.1.0" + kotlin("android") version kotlinVersion + kotlin("plugin.serialization") version kotlinVersion + + // The following code in this "plugins" block can be omitted from customer + // facing documentation as it is an implementation detail of this application. + id("com.diffplug.spotless") version "7.0.0.BETA4" +} + +dependencies { + // Use whichever versions of these dependencies suit your application. + // The versions shown here were the latest versions as of December 03, 2024. + implementation("com.google.firebase:firebase-dataconnect:16.0.0-beta03") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3") + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("androidx.activity:activity-ktx:1.9.3") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7") + implementation("com.google.android.material:material:1.12.0") + + // The following code in this "dependencies" block can be omitted from customer + // facing documentation as it is an implementation detail of this application. + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.3") + implementation("io.kotest:kotest-property:5.9.1") + implementation("io.kotest.extensions:kotest-property-arbs:2.1.2") +} + +// The remaining code in this file can be omitted from customer facing +// documentation. It's here just to make things compile and/or configure +// optional components of the build (e.g. spotless code formatting). + +android { + namespace = "com.google.firebase.dataconnect.minimaldemo" + compileSdk = 35 + defaultConfig { + minSdk = 21 + targetSdk = 35 + versionCode = 1 + versionName = "1.0" + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + isCoreLibraryDesugaringEnabled = true + } + buildFeatures.viewBinding = true + kotlinOptions.jvmTarget = "1.8" +} + +spotless { + val ktfmtVersion = "0.53" + kotlin { + target("**/*.kt") + targetExclude("build/") + ktfmt(ktfmtVersion).googleStyle() + } + kotlinGradle { + target("**/*.gradle.kts") + targetExclude("build/") + ktfmt(ktfmtVersion).googleStyle() + } + json { + target("**/*.json") + targetExclude("build/") + simple().indentWithSpaces(2) + } + yaml { + target("**/*.yaml") + targetExclude("build/") + jackson() + .yamlFeature("INDENT_ARRAYS", true) + .yamlFeature("MINIMIZE_QUOTES", true) + .yamlFeature("WRITE_DOC_START_MARKER", false) + } + format("xml") { + target("**/*.xml") + targetExclude("build/") + trimTrailingWhitespace() + indentWithSpaces(2) + endWithNewline() + } +} + +abstract class DataConnectGenerateSourcesTask : DefaultTask() { + + @get:InputDirectory abstract val inputDirectory: DirectoryProperty + + @get:OutputDirectory abstract val outputDirectory: DirectoryProperty + + @get:Internal abstract val nodeExecutableDirectory: DirectoryProperty + + @get:Internal abstract val firebaseCommand: Property + + @get:Internal abstract val workDirectory: DirectoryProperty + + @get:Inject protected abstract val execOperations: ExecOperations + + @get:Inject protected abstract val providerFactory: ProviderFactory + + @get:Inject protected abstract val fileSystemOperations: FileSystemOperations + + @TaskAction + fun run(inputChanges: InputChanges) { + if (inputChanges.isIncremental) { + val onlyLogFilesChanged = + inputChanges.getFileChanges(inputDirectory).all { it.file.name.endsWith(".log") } + if (onlyLogFilesChanged) { + didWork = false + return + } + } + + val inputDirectory: File = inputDirectory.get().asFile + val outputDirectory: File = outputDirectory.get().asFile + val nodeExecutableDirectory: File? = nodeExecutableDirectory.orNull?.asFile + val firebaseCommand: String? = firebaseCommand.orNull + val workDirectory: File = workDirectory.get().asFile + + outputDirectory.deleteRecursively() + outputDirectory.mkdirs() + workDirectory.deleteRecursively() + workDirectory.mkdirs() + + val newPath: String? = + if (nodeExecutableDirectory === null) { + null + } else { + val nodeExecutableDirectoryAbsolutePath = nodeExecutableDirectory.absolutePath + val oldPath = providerFactory.environmentVariable("PATH").orNull + if (oldPath === null) { + nodeExecutableDirectoryAbsolutePath + } else { + nodeExecutableDirectoryAbsolutePath + File.pathSeparator + oldPath + } + } + + val logFile = + if (logger.isInfoEnabled) { + null + } else { + File(workDirectory, "dataconnect.sdk.generate.log.txt") + } + + val execResult = + logFile?.outputStream().use { logStream -> + execOperations.runCatching { + exec { + commandLine(firebaseCommand ?: "firebase", "--debug", "dataconnect:sdk:generate") + workingDir(inputDirectory) + isIgnoreExitValue = false + if (newPath !== null) { + environment("PATH", newPath) + } + if (logStream !== null) { + standardOutput = logStream + errorOutput = logStream + } + } + } + } + + execResult.onFailure { exception -> + logFile?.readText(StandardCharsets.UTF_8)?.lines()?.forEach { line -> + logger.warn("{}", line.trimEnd()) + } + throw exception + } + } +} + +abstract class CopyDirectoryTask : DefaultTask() { + + @get:InputDirectory abstract val srcDirectory: DirectoryProperty + + @get:OutputDirectory abstract val destDirectory: DirectoryProperty + + @get:Inject protected abstract val fileSystemOperations: FileSystemOperations + + @TaskAction + fun run() { + val srcDirectory: File = srcDirectory.get().asFile + val destDirectory: File = destDirectory.get().asFile + + logger.info("srcDirectory: {}", srcDirectory.absolutePath) + logger.info("destDirectory: {}", destDirectory.absolutePath) + + destDirectory.deleteRecursively() + destDirectory.mkdirs() + + fileSystemOperations.copy { + from(srcDirectory) + into(destDirectory) + } + } +} + +run { + val dataConnectTaskGroupName = "Firebase Data Connect Minimal App" + val projectDirectory = layout.projectDirectory + + val generateSourcesTask = + tasks.register("dataConnectGenerateSources") { + group = dataConnectTaskGroupName + description = + "Run firebase dataconnect:sdk:generate to generate the Data Connect Kotlin SDK sources" + + inputDirectory = projectDirectory.dir("firebase") + outputDirectory = projectDirectory.dir("dataConnectGeneratedSources") + + nodeExecutableDirectory = + project.providers.gradleProperty("dataConnect.minimalApp.nodeExecutableDirectory").map { + projectDirectory.dir(it) + } + firebaseCommand = project.providers.gradleProperty("dataConnect.minimalApp.firebaseCommand") + + workDirectory = layout.buildDirectory.dir(name) + } + + val androidComponents = extensions.getByType() + androidComponents.onVariants { variant -> + val variantNameTitleCase = variant.name[0].uppercase() + variant.name.substring(1) + val copyTaskName = "dataConnectCopy${variantNameTitleCase}GeneratedSources" + val copyTask = + tasks.register(copyTaskName) { + group = dataConnectTaskGroupName + description = + "Copy the generated Data Connect Kotlin SDK sources into the " + + "generated code directory for the \"${variant.name}\" variant." + srcDirectory = generateSourcesTask.flatMap { it.outputDirectory } + } + + variant.sources.java!!.addGeneratedSourceDirectory(copyTask, CopyDirectoryTask::destDirectory) + } +} diff --git a/firebase-dataconnect/demo/firebase/.firebaserc b/firebase-dataconnect/demo/firebase/.firebaserc new file mode 100644 index 00000000000..77b37b80ab8 --- /dev/null +++ b/firebase-dataconnect/demo/firebase/.firebaserc @@ -0,0 +1,5 @@ +{ + "projects": { + "default": "fakeproject" + } +} diff --git a/firebase-dataconnect/demo/firebase/dataconnect/.gitignore b/firebase-dataconnect/demo/firebase/dataconnect/.gitignore new file mode 100644 index 00000000000..e0a389a7884 --- /dev/null +++ b/firebase-dataconnect/demo/firebase/dataconnect/.gitignore @@ -0,0 +1,15 @@ +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +/.dataconnect/ diff --git a/firebase-dataconnect/demo/firebase/dataconnect/connector/connector.yaml b/firebase-dataconnect/demo/firebase/dataconnect/connector/connector.yaml new file mode 100644 index 00000000000..0f8db03a8ed --- /dev/null +++ b/firebase-dataconnect/demo/firebase/dataconnect/connector/connector.yaml @@ -0,0 +1,5 @@ +connectorId: ctry3q3tp6kzx +generate: + kotlinSdk: + outputDir: ../../../dataConnectGeneratedSources + package: com.google.firebase.dataconnect.minimaldemo.connector diff --git a/firebase-dataconnect/demo/firebase/dataconnect/connector/operations.gql b/firebase-dataconnect/demo/firebase/dataconnect/connector/operations.gql new file mode 100644 index 00000000000..85c30c43329 --- /dev/null +++ b/firebase-dataconnect/demo/firebase/dataconnect/connector/operations.gql @@ -0,0 +1,50 @@ +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +mutation InsertItem( + $string: String, + $int: Int, + $int64: Int64, + $float: Float, + $boolean: Boolean, + $date: Date, + $timestamp: Timestamp, + $any: Any, +) @auth(level: PUBLIC) { + key: zwda6x9zyy_insert(data: { + string: $string, + int: $int, + int64: $int64, + float: $float, + boolean: $boolean, + date: $date, + timestamp: $timestamp, + any: $any, + }) +} + +query GetItemByKey( + $key: zwda6x9zyy_Key! +) @auth(level: PUBLIC) { + item: zwda6x9zyy(key: $key) { + string + int + int64 + float + boolean + date + timestamp + any + } +} diff --git a/firebase-dataconnect/demo/firebase/dataconnect/dataconnect.yaml b/firebase-dataconnect/demo/firebase/dataconnect/dataconnect.yaml new file mode 100644 index 00000000000..341a3fc587a --- /dev/null +++ b/firebase-dataconnect/demo/firebase/dataconnect/dataconnect.yaml @@ -0,0 +1,9 @@ +specVersion: v1beta +serviceId: srv3ar8skbsza +location: us-central1 +schema: + source: ./schema + datasource: + postgresql: null +connectorDirs: + - ./connector diff --git a/firebase-dataconnect/demo/firebase/dataconnect/schema/schema.gql b/firebase-dataconnect/demo/firebase/dataconnect/schema/schema.gql new file mode 100644 index 00000000000..5b9c93cef13 --- /dev/null +++ b/firebase-dataconnect/demo/firebase/dataconnect/schema/schema.gql @@ -0,0 +1,24 @@ +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +type zwda6x9zyy @table { + string: String + int: Int + int64: Int64 + float: Float + boolean: Boolean + date: Date + timestamp: Timestamp + any: Any +} diff --git a/firebase-dataconnect/demo/firebase/firebase.json b/firebase-dataconnect/demo/firebase/firebase.json new file mode 100644 index 00000000000..5994e591654 --- /dev/null +++ b/firebase-dataconnect/demo/firebase/firebase.json @@ -0,0 +1,8 @@ +{ + "dataconnect": {"source": "dataconnect"}, + "emulators": { + "singleProjectMode": true, + "dataconnect": {"port": 9399}, + "ui": {"enabled": true} + } +} diff --git a/firebase-dataconnect/demo/google-services.json b/firebase-dataconnect/demo/google-services.json new file mode 100644 index 00000000000..34bccc8818b --- /dev/null +++ b/firebase-dataconnect/demo/google-services.json @@ -0,0 +1,14 @@ +{ + "client": [{ + "client_info": { + "android_client_info": {"package_name": "com.google.firebase.dataconnect.minimaldemo"}, + "mobilesdk_app_id": "1:12345678901:android:1234567890abcdef123456" + }, + "api_key": [{"current_key": "AIzayDNSXIbFmlXbIE6mCzDLQAqITYefhixbX4A"}] + }], + "configuration_version": "1", + "project_info": { + "project_number": "12345678901", + "project_id": "fakeproject" + } +} diff --git a/firebase-dataconnect/demo/gradle.properties b/firebase-dataconnect/demo/gradle.properties new file mode 100644 index 00000000000..12a9a7c6e9c --- /dev/null +++ b/firebase-dataconnect/demo/gradle.properties @@ -0,0 +1,7 @@ +org.gradle.configuration-cache=true +org.gradle.parallel=true +org.gradle.caching=true + +android.useAndroidX=true + +org.gradle.jvmargs=-Xmx2g diff --git a/firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.jar b/firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.properties b/firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000000..e2847c82004 --- /dev/null +++ b/firebase-dataconnect/demo/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/firebase-dataconnect/demo/gradlew b/firebase-dataconnect/demo/gradlew new file mode 100755 index 00000000000..f5feea6d6b1 --- /dev/null +++ b/firebase-dataconnect/demo/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/firebase-dataconnect/demo/gradlew.bat b/firebase-dataconnect/demo/gradlew.bat new file mode 100644 index 00000000000..9b42019c791 --- /dev/null +++ b/firebase-dataconnect/demo/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/firebase-dataconnect/demo/settings.gradle.kts b/firebase-dataconnect/demo/settings.gradle.kts new file mode 100644 index 00000000000..72011613a80 --- /dev/null +++ b/firebase-dataconnect/demo/settings.gradle.kts @@ -0,0 +1,31 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} diff --git a/firebase-dataconnect/demo/src/main/AndroidManifest.xml b/firebase-dataconnect/demo/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..157258a1a8b --- /dev/null +++ b/firebase-dataconnect/demo/src/main/AndroidManifest.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + diff --git a/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MainActivity.kt b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MainActivity.kt new file mode 100644 index 00000000000..06c51458c25 --- /dev/null +++ b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MainActivity.kt @@ -0,0 +1,138 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.firebase.dataconnect.minimaldemo + +import android.os.Bundle +import android.view.View.OnClickListener +import android.widget.CompoundButton.OnCheckedChangeListener +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.flowWithLifecycle +import androidx.lifecycle.lifecycleScope +import com.google.firebase.dataconnect.minimaldemo.MainActivityViewModel.State.OperationState +import com.google.firebase.dataconnect.minimaldemo.databinding.ActivityMainBinding +import kotlinx.coroutines.flow.collectLatest +import kotlinx.coroutines.launch + +class MainActivity : AppCompatActivity() { + + private lateinit var myApplication: MyApplication + private lateinit var viewBinding: ActivityMainBinding + private val viewModel: MainActivityViewModel by viewModels { MainActivityViewModel.Factory } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + myApplication = application as MyApplication + + viewBinding = ActivityMainBinding.inflate(layoutInflater) + setContentView(viewBinding.root) + + viewBinding.insertItemButton.setOnClickListener(insertButtonOnClickListener) + viewBinding.getItemButton.setOnClickListener(getItemButtonOnClickListener) + viewBinding.useEmulatorCheckBox.setOnCheckedChangeListener(useEmulatorOnCheckedChangeListener) + viewBinding.debugLoggingCheckBox.setOnCheckedChangeListener(debugLoggingOnCheckedChangeListener) + + lifecycleScope.launch { + viewModel.state.flowWithLifecycle(lifecycle).collectLatest(::collectViewModelState) + } + } + + override fun onResume() { + super.onResume() + lifecycleScope.launch { + viewBinding.useEmulatorCheckBox.isChecked = myApplication.getUseDataConnectEmulator() + viewBinding.debugLoggingCheckBox.isChecked = myApplication.getDataConnectDebugLoggingEnabled() + } + } + + private fun collectViewModelState(state: MainActivityViewModel.State) { + val (insertProgressText, insertSequenceNumber) = + when (state.insertItem) { + is OperationState.New -> Pair(null, null) + is OperationState.InProgress -> + Pair( + "Inserting item: ${state.insertItem.variables.toDisplayString()}", + state.insertItem.sequenceNumber, + ) + is OperationState.Completed -> + Pair( + state.insertItem.result.fold( + onSuccess = { + "Inserted item with id=${it.id}:\n${state.insertItem.variables.toDisplayString()}" + }, + onFailure = { "Inserting item ${state.insertItem.variables} FAILED: $it" }, + ), + state.insertItem.sequenceNumber, + ) + } + + val (getProgressText, getSequenceNumber) = + when (state.getItem) { + is OperationState.New -> Pair(null, null) + is OperationState.InProgress -> + Pair( + "Retrieving item with ID ${state.getItem.variables.id}...", + state.getItem.sequenceNumber, + ) + is OperationState.Completed -> + Pair( + state.getItem.result.fold( + onSuccess = { + "Retrieved item with ID ${state.getItem.variables.id}:\n${it?.toDisplayString()}" + }, + onFailure = { "Retrieving item with ID ${state.getItem.variables.id} FAILED: $it" }, + ), + state.getItem.sequenceNumber, + ) + } + + viewBinding.insertItemButton.isEnabled = state.insertItem !is OperationState.InProgress + viewBinding.getItemButton.isEnabled = + state.getItem !is OperationState.InProgress && state.lastInsertedKey !== null + + viewBinding.progressText.text = + if (getSequenceNumber === null) { + insertProgressText + } else if (insertSequenceNumber === null) { + getProgressText + } else if (insertSequenceNumber > getSequenceNumber) { + insertProgressText + } else { + getProgressText + } + } + + private val insertButtonOnClickListener = OnClickListener { viewModel.insertItem() } + + private val getItemButtonOnClickListener = OnClickListener { viewModel.getItem() } + + private val debugLoggingOnCheckedChangeListener = OnCheckedChangeListener { _, isChecked -> + if (!lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) { + return@OnCheckedChangeListener + } + myApplication.coroutineScope.launch { + myApplication.setDataConnectDebugLoggingEnabled(isChecked) + } + } + + private val useEmulatorOnCheckedChangeListener = OnCheckedChangeListener { _, isChecked -> + if (!lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) { + return@OnCheckedChangeListener + } + myApplication.coroutineScope.launch { myApplication.setUseDataConnectEmulator(isChecked) } + } +} diff --git a/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MainActivityViewModel.kt b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MainActivityViewModel.kt new file mode 100644 index 00000000000..2cfffe725df --- /dev/null +++ b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MainActivityViewModel.kt @@ -0,0 +1,318 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.firebase.dataconnect.minimaldemo + +import android.util.Log +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory.Companion.APPLICATION_KEY +import androidx.lifecycle.viewModelScope +import androidx.lifecycle.viewmodel.initializer +import androidx.lifecycle.viewmodel.viewModelFactory +import com.google.firebase.dataconnect.minimaldemo.connector.GetItemByKeyQuery +import com.google.firebase.dataconnect.minimaldemo.connector.InsertItemMutation +import com.google.firebase.dataconnect.minimaldemo.connector.Zwda6x9zyyKey +import com.google.firebase.dataconnect.minimaldemo.connector.execute +import io.kotest.property.Arb +import io.kotest.property.RandomSource +import io.kotest.property.arbitrary.next +import java.util.Objects +import kotlinx.coroutines.CoroutineStart +import kotlinx.coroutines.Deferred +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.async +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.serialization.Serializable + +class MainActivityViewModel(private val app: MyApplication) : ViewModel() { + + private val _state = + MutableStateFlow( + State( + insertItem = State.OperationState.New, + getItem = State.OperationState.New, + lastInsertedKey = null, + nextSequenceNumber = 19999000, + ) + ) + val state: StateFlow = _state.asStateFlow() + + private val rs = RandomSource.default() + + fun insertItem() { + while (true) { + if (tryInsertItem()) { + break + } + } + } + + private fun tryInsertItem(): Boolean { + val arb = Arb.insertItemVariables() + val variables = if (rs.random.nextFloat() < 0.333f) arb.edgecase(rs)!! else arb.next(rs) + + val oldState = _state.value + + // If there is already an "insert" in progress, then just return and let the in-progress + // operation finish. + when (oldState.getItem) { + is State.OperationState.InProgress -> return true + is State.OperationState.New, + is State.OperationState.Completed -> Unit + } + + // Create a new coroutine to perform the "insert" operation, but don't start it yet by + // specifying start=CoroutineStart.LAZY because we won't start it until the state is + // successfully set. + val newInsertJob: Deferred = + viewModelScope.async(start = CoroutineStart.LAZY) { + app.getConnector().insertItem.ref(variables).execute().data.key + } + + // Update the state and start the coroutine if it is successfully set. + val insertItemOperationInProgressState = + State.OperationState.InProgress(oldState.nextSequenceNumber, variables, newInsertJob) + val newState = oldState.withInsertInProgress(insertItemOperationInProgressState) + if (!_state.compareAndSet(oldState, newState)) { + return false + } + + // Actually start the coroutine now that the state has been set. + Log.i(TAG, "Inserting item: $variables") + newState.startInsert(insertItemOperationInProgressState) + return true + } + + @OptIn(ExperimentalCoroutinesApi::class) + private fun State.startInsert( + insertItemOperationInProgressState: + State.OperationState.InProgress + ) { + require(insertItemOperationInProgressState === insertItem) + val job: Deferred = insertItemOperationInProgressState.job + val variables: InsertItemMutation.Variables = insertItemOperationInProgressState.variables + + job.start() + + job.invokeOnCompletion { exception -> + val result = + if (exception !== null) { + Log.w(TAG, "WARNING: Inserting item FAILED: $exception (variables=$variables)", exception) + Result.failure(exception) + } else { + val key = job.getCompleted() + Log.i(TAG, "Inserted item with key: $key (variables=${variables})") + Result.success(key) + } + + while (true) { + val oldState = _state.value + if (oldState.insertItem !== insertItemOperationInProgressState) { + break + } + + val insertItemOperationCompletedState = + State.OperationState.Completed(oldState.nextSequenceNumber, variables, result) + val newState = oldState.withInsertCompleted(insertItemOperationCompletedState) + if (_state.compareAndSet(oldState, newState)) { + break + } + } + } + } + + fun getItem() { + while (true) { + if (tryGetItem()) { + break + } + } + } + + private fun tryGetItem(): Boolean { + val oldState = _state.value + + // If there is no previous successful "insert" operation, then we don't know any ID's to get, + // so just do nothing. + val key: Zwda6x9zyyKey = oldState.lastInsertedKey ?: return true + + // If there is already a "get" in progress, then just return and let the in-progress operation + // finish. + when (oldState.getItem) { + is State.OperationState.InProgress -> return true + is State.OperationState.New, + is State.OperationState.Completed -> Unit + } + + // Create a new coroutine to perform the "get" operation, but don't start it yet by specifying + // start=CoroutineStart.LAZY because we won't start it until the state is successfully set. + val newGetJob: Deferred = + viewModelScope.async(start = CoroutineStart.LAZY) { + app.getConnector().getItemByKey.execute(key).data.item + } + + // Update the state and start the coroutine if it is successfully set. + val getItemOperationInProgressState = + State.OperationState.InProgress(oldState.nextSequenceNumber, key, newGetJob) + val newState = oldState.withGetInProgress(getItemOperationInProgressState) + if (!_state.compareAndSet(oldState, newState)) { + return false + } + + // Actually start the coroutine now that the state has been set. + Log.i(TAG, "Getting item with key: $key") + newState.startGet(getItemOperationInProgressState) + return true + } + + @OptIn(ExperimentalCoroutinesApi::class) + private fun State.startGet( + getItemOperationInProgressState: + State.OperationState.InProgress + ) { + require(getItemOperationInProgressState === getItem) + val job: Deferred = getItemOperationInProgressState.job + val key: Zwda6x9zyyKey = getItemOperationInProgressState.variables + + job.start() + + job.invokeOnCompletion { exception -> + val result = + if (exception !== null) { + Log.w(TAG, "WARNING: Getting item with key $key FAILED: $exception", exception) + Result.failure(exception) + } else { + val item = job.getCompleted() + Log.i(TAG, "Got item with key $key: $item") + Result.success(item) + } + + while (true) { + val oldState = _state.value + if (oldState.getItem !== getItemOperationInProgressState) { + break + } + + val getItemOperationCompletedState = + State.OperationState.Completed( + oldState.nextSequenceNumber, + getItemOperationInProgressState.variables, + result, + ) + val newState = oldState.withGetCompleted(getItemOperationCompletedState) + if (_state.compareAndSet(oldState, newState)) { + break + } + } + } + } + + @Serializable + class State( + val insertItem: OperationState, + val getItem: OperationState, + val lastInsertedKey: Zwda6x9zyyKey?, + val nextSequenceNumber: Long, + ) { + + fun withInsertInProgress( + insertItem: OperationState.InProgress + ): State = + State( + insertItem = insertItem, + getItem = getItem, + lastInsertedKey = lastInsertedKey, + nextSequenceNumber = nextSequenceNumber + 1, + ) + + fun withInsertCompleted( + insertItem: OperationState.Completed + ): State = + State( + insertItem = insertItem, + getItem = getItem, + lastInsertedKey = insertItem.result.getOrNull() ?: lastInsertedKey, + nextSequenceNumber = nextSequenceNumber + 1, + ) + + fun withGetInProgress( + getItem: OperationState.InProgress + ): State = + State( + insertItem = insertItem, + getItem = getItem, + lastInsertedKey = lastInsertedKey, + nextSequenceNumber = nextSequenceNumber + 1, + ) + + fun withGetCompleted( + getItem: OperationState.Completed + ): State = + State( + insertItem = insertItem, + getItem = getItem, + lastInsertedKey = lastInsertedKey, + nextSequenceNumber = nextSequenceNumber + 1, + ) + + override fun hashCode() = Objects.hash(insertItem, getItem, lastInsertedKey, nextSequenceNumber) + + override fun equals(other: Any?) = + other is State && + insertItem == other.insertItem && + getItem == other.getItem && + lastInsertedKey == other.lastInsertedKey && + nextSequenceNumber == other.nextSequenceNumber + + override fun toString() = + "State(" + + "insertItem=$insertItem, " + + "getItem=$getItem, " + + "lastInsertedKey=$lastInsertedKey, " + + "sequenceNumber=$nextSequenceNumber)" + + sealed interface OperationState { + data object New : OperationState + + sealed interface SequencedOperationState : + OperationState { + val sequenceNumber: Long + } + + data class InProgress( + override val sequenceNumber: Long, + val variables: Variables, + val job: Deferred, + ) : SequencedOperationState + + data class Completed( + override val sequenceNumber: Long, + val variables: Variables, + val result: Result, + ) : SequencedOperationState + } + } + + companion object { + private const val TAG = "MainActivityViewModel" + + val Factory: ViewModelProvider.Factory = viewModelFactory { + initializer { MainActivityViewModel(this[APPLICATION_KEY] as MyApplication) } + } + } +} diff --git a/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MyApplication.kt b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MyApplication.kt new file mode 100644 index 00000000000..eb70e8af475 --- /dev/null +++ b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/MyApplication.kt @@ -0,0 +1,153 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.firebase.dataconnect.minimaldemo + +import android.app.Application +import android.content.SharedPreferences +import android.util.Log +import com.google.firebase.dataconnect.FirebaseDataConnect +import com.google.firebase.dataconnect.LogLevel +import com.google.firebase.dataconnect.logLevel +import com.google.firebase.dataconnect.minimaldemo.connector.Ctry3q3tp6kzxConnector +import com.google.firebase.dataconnect.minimaldemo.connector.instance +import kotlinx.coroutines.CoroutineExceptionHandler +import kotlinx.coroutines.CoroutineName +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.cancel +import kotlinx.coroutines.launch +import kotlinx.coroutines.sync.Mutex +import kotlinx.coroutines.sync.withLock +import kotlinx.coroutines.withContext + +class MyApplication : Application() { + + /** + * A [CoroutineScope] whose lifetime matches that of this [Application] object. + * + * Namely, the scope will be cancelled when [onTerminate] is called. + * + * This scope's [Job] is a [SupervisorJob], and, therefore, uncaught exceptions will _not_ + * terminate the application. + */ + val coroutineScope = + CoroutineScope( + SupervisorJob() + + CoroutineName("MyApplication@${System.identityHashCode(this@MyApplication)}") + + CoroutineExceptionHandler { context, throwable -> + val coroutineName = context[CoroutineName]?.name + Log.w( + TAG, + "WARNING: ignoring uncaught exception thrown from coroutine " + + "named \"$coroutineName\": $throwable " + + "(error code 8xrn9vvddd)", + throwable, + ) + } + ) + + private val initialLogLevel = FirebaseDataConnect.logLevel + private val connectorMutex = Mutex() + private var connector: Ctry3q3tp6kzxConnector? = null + + override fun onCreate() { + super.onCreate() + + coroutineScope.launch { + if (getDataConnectDebugLoggingEnabled()) { + FirebaseDataConnect.logLevel = LogLevel.DEBUG + } + } + } + + suspend fun getConnector(): Ctry3q3tp6kzxConnector { + connectorMutex.withLock { + val oldConnector = connector + if (oldConnector !== null) { + return oldConnector + } + + val newConnector = Ctry3q3tp6kzxConnector.instance + + if (getUseDataConnectEmulator()) { + newConnector.dataConnect.useEmulator() + } + + connector = newConnector + return newConnector + } + } + + private suspend fun getSharedPreferences(): SharedPreferences = + withContext(Dispatchers.IO) { + getSharedPreferences("MyApplicationSharedPreferences", MODE_PRIVATE) + } + + suspend fun getDataConnectDebugLoggingEnabled(): Boolean = + getSharedPreferences().all[SharedPrefsKeys.IS_DATA_CONNECT_LOGGING_ENABLED] as? Boolean ?: false + + suspend fun setDataConnectDebugLoggingEnabled(enabled: Boolean) { + FirebaseDataConnect.logLevel = if (enabled) LogLevel.DEBUG else initialLogLevel + editSharedPreferences { putBoolean(SharedPrefsKeys.IS_DATA_CONNECT_LOGGING_ENABLED, enabled) } + } + + suspend fun getUseDataConnectEmulator(): Boolean = + getSharedPreferences().all[SharedPrefsKeys.IS_USE_DATA_CONNECT_EMULATOR] as? Boolean ?: true + + suspend fun setUseDataConnectEmulator(enabled: Boolean) { + val requiresRestart = getUseDataConnectEmulator() != enabled + editSharedPreferences { putBoolean(SharedPrefsKeys.IS_USE_DATA_CONNECT_EMULATOR, enabled) } + + if (requiresRestart) { + connectorMutex.withLock { + val oldConnector = connector + connector = null + oldConnector?.dataConnect?.close() + } + } + } + + private suspend fun editSharedPreferences(block: SharedPreferences.Editor.() -> Unit) { + val prefs = getSharedPreferences() + withContext(Dispatchers.IO) { + val editor = prefs.edit() + block(editor) + if (!editor.commit()) { + Log.w( + TAG, + "WARNING: failed to save changes to SharedPreferences; " + + "ignoring the failure (error code wzy99s7jmy)", + ) + } + } + } + + override fun onTerminate() { + coroutineScope.cancel("MyApplication.onTerminate() called") + super.onTerminate() + } + + private object SharedPrefsKeys { + const val IS_DATA_CONNECT_LOGGING_ENABLED = "isDataConnectDebugLoggingEnabled" + const val IS_USE_DATA_CONNECT_EMULATOR = "useDataConnectEmulator" + } + + companion object { + private const val TAG = "MyApplication" + } +} diff --git a/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/arbs.kt b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/arbs.kt new file mode 100644 index 00000000000..a77016f9659 --- /dev/null +++ b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/arbs.kt @@ -0,0 +1,190 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.firebase.dataconnect.minimaldemo + +import android.annotation.SuppressLint +import com.google.firebase.Timestamp +import com.google.firebase.dataconnect.LocalDate +import com.google.firebase.dataconnect.OptionalVariable +import com.google.firebase.dataconnect.minimaldemo.connector.InsertItemMutation +import com.google.firebase.dataconnect.toJavaLocalDate +import io.kotest.property.Arb +import io.kotest.property.RandomSource +import io.kotest.property.Sample +import io.kotest.property.arbitrary.boolean +import io.kotest.property.arbitrary.double +import io.kotest.property.arbitrary.enum +import io.kotest.property.arbitrary.filterNot +import io.kotest.property.arbitrary.int +import io.kotest.property.arbitrary.long +import io.kotest.property.arbitrary.map +import io.kotest.property.arbitrary.next +import io.kotest.property.arbs.fooddrink.iceCreamFlavors +import io.kotest.property.asSample +import java.time.Instant +import java.time.LocalDateTime +import java.time.Month +import java.time.Year +import java.time.ZoneOffset +import java.util.concurrent.locks.ReentrantLock +import kotlin.concurrent.withLock + +fun Arb.Companion.insertItemVariables(): Arb = + InsertItemMutationVariablesArb() + +private class InsertItemMutationVariablesArb( + private val string: Arb = Arb.iceCreamFlavors().map { it.value }, + private val int: Arb = Arb.int(), + private val int64: Arb = Arb.long(), + private val float: Arb = Arb.double().filterNot { it.isNaN() || it.isInfinite() }, + private val boolean: Arb = Arb.boolean(), + private val date: Arb = Arb.dataConnectLocalDate(), + private val timestamp: Arb = Arb.firebaseTimestamp(), +) : Arb() { + override fun edgecase(rs: RandomSource): InsertItemMutation.Variables = + InsertItemMutation.Variables( + string = string.optionalEdgeCase(rs), + int = int.optionalEdgeCase(rs), + int64 = int64.optionalEdgeCase(rs), + float = float.optionalEdgeCase(rs), + boolean = boolean.optionalEdgeCase(rs), + date = date.optionalEdgeCase(rs), + timestamp = timestamp.optionalEdgeCase(rs), + any = OptionalVariable.Undefined, + ) + + override fun sample(rs: RandomSource): Sample = + InsertItemMutation.Variables( + string = OptionalVariable.Value(string.next(rs)), + int = OptionalVariable.Value(int.next(rs)), + int64 = OptionalVariable.Value(int64.next(rs)), + float = OptionalVariable.Value(float.next(rs)), + boolean = OptionalVariable.Value(boolean.next(rs)), + date = OptionalVariable.Value(date.next(rs)), + timestamp = OptionalVariable.Value(timestamp.next(rs)), + any = OptionalVariable.Undefined, + ) + .asSample() +} + +fun Arb.Companion.dataConnectLocalDate(): Arb = DataConnectLocalDateArb() + +private class DataConnectLocalDateArb : Arb() { + + private val yearArb: Arb = Arb.int(MIN_YEAR..MAX_YEAR).map { Year.of(it) } + private val monthArb: Arb = Arb.enum() + private val dayArbByMonthLengthLock = ReentrantLock() + private val dayArbByMonthLength = mutableMapOf>() + + override fun edgecase(rs: RandomSource): LocalDate { + val year = yearArb.maybeEdgeCase(rs, edgeCaseProbability = 0.33f) + val month = monthArb.maybeEdgeCase(rs, edgeCaseProbability = 0.33f) + val day = Arb.dayOfMonth(year, month).maybeEdgeCase(rs, edgeCaseProbability = 0.33f) + return LocalDate(year = year.value, month = month.value, day = day) + } + + override fun sample(rs: RandomSource): Sample { + val year = yearArb.sample(rs).value + val month = monthArb.sample(rs).value + val day = Arb.dayOfMonth(year, month).sample(rs).value + return LocalDate(year = year.value, month = month.value, day = day).asSample() + } + + private fun Arb.Companion.dayOfMonth(year: Year, month: Month): Arb { + val monthLength = year.atMonth(month).lengthOfMonth() + return dayArbByMonthLengthLock.withLock { + dayArbByMonthLength.getOrPut(monthLength) { Arb.int(1..monthLength) } + } + } + + companion object { + const val MIN_YEAR = 1583 + const val MAX_YEAR = 9999 + } +} + +fun Arb.Companion.firebaseTimestamp(): Arb = FirebaseTimestampArb() + +private class FirebaseTimestampArb : Arb() { + + private val localDateArb = Arb.dataConnectLocalDate() + private val hourArb = Arb.int(1..23) + private val minuteArb = Arb.int(1..59) + private val secondArb = Arb.int(1..59) + private val nanosecondArb = Arb.int(0..999_999_999) + + override fun edgecase(rs: RandomSource) = + localDateArb + .maybeEdgeCase(rs, edgeCaseProbability = 0.2f) + .toTimestampAtTime( + hour = hourArb.maybeEdgeCase(rs, edgeCaseProbability = 0.2f), + minute = minuteArb.maybeEdgeCase(rs, edgeCaseProbability = 0.2f), + second = secondArb.maybeEdgeCase(rs, edgeCaseProbability = 0.2f), + nanosecond = nanosecondArb.maybeEdgeCase(rs, edgeCaseProbability = 0.2f), + ) + + override fun sample(rs: RandomSource) = + localDateArb + .next(rs) + .toTimestampAtTime( + hour = hourArb.next(rs), + minute = minuteArb.next(rs), + second = secondArb.next(rs), + nanosecond = nanosecondArb.next(rs), + ) + .asSample() + + companion object { + + // Suppress the spurious "Call requires API level 26" warning, which can be safely ignored + // because this application uses "desugaring" to ensure access to the java.time APIs even in + // Android API versions less than 26. + // See https://developer.android.com/studio/write/java8-support-table for details. + @SuppressLint("NewApi") + private fun LocalDate.toTimestampAtTime( + hour: Int, + minute: Int, + second: Int, + nanosecond: Int, + ): Timestamp { + val localDateTime: LocalDateTime = toJavaLocalDate().atTime(hour, minute, second, nanosecond) + val instant: Instant = localDateTime.toInstant(ZoneOffset.UTC) + return Timestamp(instant) + } + } +} + +private fun Arb.optionalEdgeCase(rs: RandomSource): OptionalVariable { + val discriminator = rs.random.nextFloat() + return if (discriminator < 0.25f) { + OptionalVariable.Undefined + } else if (discriminator < 0.50f) { + OptionalVariable.Value(null) + } else { + OptionalVariable.Value(edgecase(rs) ?: next(rs)) + } +} + +private fun Arb.maybeEdgeCase(rs: RandomSource, edgeCaseProbability: Float = 0.5f): T { + require(edgeCaseProbability >= 0.0 && edgeCaseProbability < 1.0) { + "invalid edgeCaseProbability: $edgeCaseProbability" + } + return if (rs.random.nextFloat() >= edgeCaseProbability) { + sample(rs).value + } else { + edgecase(rs) ?: sample(rs).value + } +} diff --git a/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/strings.kt b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/strings.kt new file mode 100644 index 00000000000..3ddf838ed2d --- /dev/null +++ b/firebase-dataconnect/demo/src/main/kotlin/com/google/firebase/dataconnect/minimaldemo/strings.kt @@ -0,0 +1,89 @@ +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.firebase.dataconnect.minimaldemo + +import android.annotation.SuppressLint +import com.google.firebase.Timestamp +import com.google.firebase.dataconnect.AnyValue +import com.google.firebase.dataconnect.LocalDate +import com.google.firebase.dataconnect.OptionalVariable +import com.google.firebase.dataconnect.minimaldemo.connector.GetItemByKeyQuery +import com.google.firebase.dataconnect.minimaldemo.connector.InsertItemMutation +import com.google.firebase.dataconnect.toJavaLocalDate +import java.time.ZoneId +import java.time.format.DateTimeFormatter +import java.time.format.FormatStyle +import java.util.Locale + +fun InsertItemMutation.Variables.toDisplayString(): String = + displayStringForItem( + string = string, + int = int, + int64 = int64, + float = float, + boolean = boolean, + date = date, + timestamp = timestamp, + any = any, + ) + +fun GetItemByKeyQuery.Data.Item.toDisplayString(): String = + displayStringForItem( + string = OptionalVariable.Value(string), + int = OptionalVariable.Value(int), + int64 = OptionalVariable.Value(int64), + float = OptionalVariable.Value(float), + boolean = OptionalVariable.Value(boolean), + date = OptionalVariable.Value(date), + timestamp = OptionalVariable.Value(timestamp), + any = OptionalVariable.Value(any), + ) + +fun displayStringForItem( + string: OptionalVariable, + int: OptionalVariable, + int64: OptionalVariable, + float: OptionalVariable, + boolean: OptionalVariable, + date: OptionalVariable, + timestamp: OptionalVariable, + any: OptionalVariable, +) = buildString { + append("string=").append(string).appendLine() + append("int=").append(int).appendLine() + append("int64=").append(int64).appendLine() + append("float=").append(float).appendLine() + append("boolean=").append(boolean).appendLine() + append("date=").append(date.toDisplayString { it.toDisplayString() }).appendLine() + append("timestamp=").append(timestamp.toDisplayString { it.toDisplayString() }).appendLine() + append("any=").append(any) +} + +private fun OptionalVariable.toDisplayString(stringer: (T) -> String): String = + when (this) { + is OptionalVariable.Undefined -> toString() + is OptionalVariable.Value -> value?.let(stringer) ?: "null" + } + +private fun LocalDate.toDisplayString(): String = + toJavaLocalDate().format(DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG)) + +@SuppressLint("NewApi") +private fun Timestamp.toDisplayString(): String = + DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG) + .withLocale(Locale.getDefault()) + .withZone(ZoneId.systemDefault()) + .format(toInstant()) diff --git a/firebase-dataconnect/demo/src/main/res/layout/activity_main.xml b/firebase-dataconnect/demo/src/main/res/layout/activity_main.xml new file mode 100644 index 00000000000..0b3fd7d5931 --- /dev/null +++ b/firebase-dataconnect/demo/src/main/res/layout/activity_main.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + +