🐛 Source Mongo: fix potential npe when collecting stats (#28760)

* avoid NPE in getCollectionStats * remove accidental whitespace * update mongo changelog
airbytehq · Jul 27, 2023 · 0622860 · 0622860
1 parent eab3f34
commit 0622860
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 13 deletions.
diff --git a/airbyte-db/db-lib/src/main/java/io/airbyte/db/mongodb/MongoDatabase.java b/airbyte-db/db-lib/src/main/java/io/airbyte/db/mongodb/MongoDatabase.java
@@ -137,12 +137,18 @@ public Stream<JsonNode> read(final String collectionName, final List<String> col
   public Map<String, Object> getCollectionStats(final String collectionName) {
     try {
       final Document collectionStats = getDatabase().runCommand(new BsonDocument("collStats", new BsonString(collectionName)));
-      return Map.of(COLLECTION_COUNT_KEY, collectionStats.get("count"),
-          COLLECTION_STORAGE_SIZE_KEY, collectionStats.get("storageSize"));
-    } catch (final MongoCommandException e) {
-      LOGGER.warn("Unable to retrieve collection statistics", e);
-      return Map.of();
+      final var count = collectionStats.get("count");
+      final var storageSize = collectionStats.get("storageSize");
+
+      if (count != null && storageSize != null) {
+        return Map.of(COLLECTION_COUNT_KEY, collectionStats.get("count"),
+            COLLECTION_STORAGE_SIZE_KEY, collectionStats.get("storageSize"));
+      }
+    } catch (final Exception e) {
+      LOGGER.warn("Unable to retrieve collection statistics - {}", e.getMessage(), e);
     }
+
+    return Map.of();
   }
 
   public String getServerType() {

diff --git a/airbyte-integrations/connectors/source-mongodb-strict-encrypt/Dockerfile b/airbyte-integrations/connectors/source-mongodb-strict-encrypt/Dockerfile
@@ -24,5 +24,5 @@ ENV APPLICATION source-mongodb-strict-encrypt
 
 COPY --from=build /airbyte /airbyte
 
-LABEL io.airbyte.version=0.2.3
+LABEL io.airbyte.version=0.2.4
 LABEL io.airbyte.name=airbyte/source-mongodb-strict-encrypt
diff --git a/airbyte-integrations/connectors/source-mongodb-strict-encrypt/metadata.yaml b/airbyte-integrations/connectors/source-mongodb-strict-encrypt/metadata.yaml
@@ -7,7 +7,7 @@ data:
   connectorSubtype: database
   connectorType: source
   definitionId: b2e713cd-cc36-4c0a-b5bd-b47cb8a0561e
-  dockerImageTag: 0.2.3
+  dockerImageTag: 0.2.4
   dockerRepository: airbyte/source-mongodb-strict-encrypt
   githubIssueLabel: source-mongodb-v2
   icon: mongodb.svg

diff --git a/airbyte-integrations/connectors/source-mongodb-v2/Dockerfile b/airbyte-integrations/connectors/source-mongodb-v2/Dockerfile
@@ -24,5 +24,5 @@ ENV APPLICATION source-mongodb-v2
 
 COPY --from=build /airbyte /airbyte
 
-LABEL io.airbyte.version=0.2.2
+LABEL io.airbyte.version=0.2.4
 LABEL io.airbyte.name=airbyte/source-mongodb-v2
diff --git a/airbyte-integrations/connectors/source-mongodb-v2/metadata.yaml b/airbyte-integrations/connectors/source-mongodb-v2/metadata.yaml
@@ -2,15 +2,15 @@ data:
   connectorSubtype: database
   connectorType: source
   definitionId: b2e713cd-cc36-4c0a-b5bd-b47cb8a0561e
-  dockerImageTag: 0.2.3
+  dockerImageTag: 0.2.4
   dockerRepository: airbyte/source-mongodb-v2
   githubIssueLabel: source-mongodb-v2
   icon: mongodb.svg
   license: ELv2
   name: MongoDb
   registries:
     cloud:
-      dockerImageTag: 0.2.3
+      dockerImageTag: 0.2.4
       dockerRepository: airbyte/source-mongodb-strict-encrypt
       enabled: true
     oss:

diff --git a/...source-mongodb-v2/src/main/java/io.airbyte.integrations.source.mongodb/MongoDbSource.java b/...source-mongodb-v2/src/main/java/io.airbyte.integrations.source.mongodb/MongoDbSource.java
@@ -265,8 +265,7 @@ private Optional<Bson> generateFilter(final CursorInfo cursorInfo, final BsonTyp
   public void close() {}
 
   private void recordStatistics(final MongoDatabase database, final String collectionName) {
-    final Map<String, Object> data = new HashMap<>();
-    data.putAll(database.getCollectionStats(collectionName));
+    final Map<String, Object> data = new HashMap<>(database.getCollectionStats(collectionName));
     data.put("version", database.getServerVersion());
     data.put("type", database.getServerType());
     LOGGER.info(Jsons.serialize(data));

diff --git a/docs/integrations/sources/mongodb-v2.md b/docs/integrations/sources/mongodb-v2.md
@@ -101,7 +101,8 @@ For more information regarding configuration parameters, please see [MongoDb Doc
 ## Changelog
 
 | Version | Date       | Pull Request                                             | Subject                                                                                                   |
-|:--------|:-----------| :------------------------------------------------------- |:----------------------------------------------------------------------------------------------------------|
+|:--------|:-----------|:---------------------------------------------------------|:----------------------------------------------------------------------------------------------------------|
+| 0.2.4   | 2023-07-26 | [28760](https://github.com/airbytehq/airbyte/pull/28760) | Fix bug preventing some syncs from succeeding when collecting stats                                       |
 | 0.2.3   | 2023-07-26 | [28733](https://github.com/airbytehq/airbyte/pull/28733) | Fix bug preventing syncs from discovering field types                                                     |
 | 0.2.2   | 2023-07-25 | [28692](https://github.com/airbytehq/airbyte/pull/28692) | Fix bug preventing statistics retrieval from views                                                        |
 | 0.2.1   | 2023-07-21 | [28527](https://github.com/airbytehq/airbyte/pull/28527) | Log server information                                                                                    |