Add extra tests and fix a bug in adding event keys

Author: tejasd

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreTest.java

@@ -275,6 +275,21 @@ public void testCustomKeysMergedWithEventKeys() throws Exception {
     assertEquals("value", metadata.getCustomKeys().get("7"));
     assertEquals("value", metadata.getCustomKeys(Map.of()).get("7"));
     assertEquals("eventValue", metadata.getCustomKeys(eventKeysAndValues).get("7"));
+
+    // 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;
+      metadata.setCustomKey(key, value);
+      crashlyticsWorkers.common.await();
+      assertEquals(value, metadata.getCustomKeys().get(key));
+    }
+
+    assertEquals(UserMetadata.MAX_ATTRIBUTES, metadata.getCustomKeys().size());
+
+    assertEquals("value", metadata.getCustomKeys().get("7"));
+    assertEquals("value", metadata.getCustomKeys(Map.of()).get("7"));
+    assertEquals("eventValue", metadata.getCustomKeys(eventKeysAndValues).get("7"));
   }
 
   @Test

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/UserMetadata.java

@@ -159,14 +159,12 @@ public Map<String, String> getCustomKeys(Map<String, String> eventKeys) {
         continue;
       }
 
-      long ignoredEventKeysCount = eventKeys.size() - (MAX_ATTRIBUTES - globalKeys.size());
       Logger.getLogger()
           .w(
-              "Ignored "
-                  + ignoredEventKeysCount
-                  + " event specific keys. Maximum key count is "
-                  + MAX_ATTRIBUTES);
-      break;
+              "Ignored entry \""
+                  + entry.getKey()
+                  + "\" when adding event specific keys. Maximum allowable: "
+                  + MAX_ATTRIBUTE_SIZE);
     }
     return Collections.unmodifiableMap(result);
   }