Merge branch 'release/v7.2.0'

Author: Jaben

.github/workflows/deploy.yml

@@ -8,8 +8,7 @@ jobs:
     strategy:
       matrix:
         dotnet-version: [8.x]
-        mongodb-version: ['5.0']
-        
+
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -32,13 +31,8 @@ jobs:
       with:
         useConfigFile: true
 
-    - name: Start MongoDB
-      uses: supercharge/mongodb-github-action@1.10.0
-      with:
-        mongodb-version: ${{ matrix.mongodb-version }}        
-
     - name: Run Tests
-      run: dotnet test        
+      run: dotnet test -p:GeneratePackageOnBuild=false        
 
     - name: Pack
       run: dotnet build -c Release -p:PackageVersion=${{ steps.gitversion.outputs.nuGetVersion }} -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg

CHANGES.md

@@ -1,3 +1,8 @@
+7.2.0
+ * Fixed: MongoDB error handling for v7.x compatibility using error codes instead of string matching (#98, #99) - Thanks to [ntark](https://github.com/ntark)!
+ * Added: Comprehensive unit tests for MongoDB error handling (#100)
+ * Improved: CI workflow optimization to skip package generation during test runs
+
 7.1.0
  * Fixed: Guid to BsonValue mapping error (#91)
  * Fixed: RollingInterval collection naming with proper formatting (#95)

README.md

@@ -7,21 +7,16 @@
 A Serilog sink that writes events as documents to [MongoDB](http://mongodb.org).
 
 **Package** - [Serilog.Sinks.MongoDB](http://nuget.org/packages/serilog.sinks.mongodb)
-**Platforms** - .NET 4.7.2, .NET 6.0, .NET Standard 2.1
+**Platforms** - .NET 4.7.2, .NET 6.0+, .NET Standard 2.1
 
 ## Whats New
 
-#### New in v7.x
-* Upgrade MongoDB.Driver to v3.0 - .NET Standard 2.0 support has been removed.
+See [CHANGES.md](CHANGES.md) for complete version history.
 
-#### New in v6.x
-* Upgrade MongoDB.Driver to v2.28.0 (Thanks to [Memoyu](https://github.com/Memoyu))
-* Add trace context to LogEntry (Thanks to [fernandovmp](https://github.com/fernandovmp))
-
-#### New in v5.x
-* Output structured MongoDB Bson logs by switching to `.MongoDBBson()` extensions. Existing `.MongoDB()` extensions will continue to work converting logs to Json and then to Bson.
-* Rolling Log Collection Naming (Thanks to [Revazashvili](https://github.com/Revazashvili) for the PR!). MongoDBBson sink only.
-* Expire TTL support. MongoDBBson sink only.
+#### New in v7.2
+* Fixed MongoDB v7.x compatibility - Error handling now uses error codes instead of string matching (#98, #99)
+* Added comprehensive unit tests for MongoDB error handling
+* Improved CI performance
 
 ## Installation
 Install the sink via NuGet Package Manager Console:
@@ -106,21 +101,156 @@ Keys and values are not case-sensitive. This is an example of configuring the Mo
       }
     },
     "WriteTo": [
-      { 
-      	"Name": "MongoDBBson", 
-        "Args": { 
+      {
+      	"Name": "MongoDBBson",
+        "Args": {
             "databaseUrl": "mongodb://username:password@ip:port/dbName?authSource=admin",
             "collectionName": "logs",
             "cappedMaxSizeMb": "1024",
             "cappedMaxDocuments": "50000",
             "rollingInterval": "Month"
         }
-      } 
+      }
     ]
   }
 }
 ```
 
+## Advanced Configuration
+
+### Authentication & Secure Connections
+
+For password-protected MongoDB instances, Azure Cosmos DB, or SSL/TLS connections:
+
+```csharp
+var log = new LoggerConfiguration()
+    .WriteTo.MongoDBBson(cfg =>
+    {
+        var mongoDbSettings = new MongoClientSettings
+        {
+            UseTls = true,
+            AllowInsecureTls = false, // set true only for dev/testing
+            Credential = MongoCredential.CreateCredential("databaseName", "username", "password"),
+            Server = new MongoServerAddress("your-server.com", 27017)
+        };
+
+        var mongoDbInstance = new MongoClient(mongoDbSettings).GetDatabase("logs");
+        cfg.SetMongoDatabase(mongoDbInstance);
+    })
+    .CreateLogger();
+```
+
+**Azure Cosmos DB** (MongoDB API):
+```csharp
+var connectionString = "mongodb://cosmosdb-account:key@cosmosdb-account.mongo.cosmos.azure.com:10255/?ssl=true&replicaSet=globaldb&retrywrites=false";
+var log = new LoggerConfiguration()
+    .WriteTo.MongoDBBson(connectionString)
+    .CreateLogger();
+```
+
+### TTL / Auto-Expiration
+
+Automatically delete old logs using MongoDB's TTL feature:
+
+```csharp
+var log = new LoggerConfiguration()
+    .WriteTo.MongoDBBson(cfg =>
+    {
+        cfg.SetMongoUrl("mongodb://localhost/logs");
+        cfg.SetExpireTTL(TimeSpan.FromDays(30)); // logs expire after 30 days
+    })
+    .CreateLogger();
+```
+
+### Exclude Redundant Fields
+
+Reduce storage costs by excluding the `MessageTemplate` field (the rendered message is still stored):
+
+```csharp
+var log = new LoggerConfiguration()
+    .WriteTo.MongoDBBson(cfg =>
+    {
+        cfg.SetMongoUrl("mongodb://localhost/logs");
+        cfg.SetExcludeMessageTemplate(true); // saves storage space
+    })
+    .CreateLogger();
+```
+
+### Rolling Collections
+
+Create time-based collections (e.g., one per day/month):
+
+```csharp
+var log = new LoggerConfiguration()
+    .WriteTo.MongoDBBson(cfg =>
+    {
+        cfg.SetMongoUrl("mongodb://localhost/logs");
+        cfg.SetCollectionName("log");
+        cfg.SetRollingInterval(RollingInterval.Day); // creates: log-20251004, log-20251005, etc.
+    })
+    .CreateLogger();
+```
+
+**Collection naming patterns:**
+- `RollingInterval.Day` → `log-yyyyMMdd` (e.g., `log-20251004`)
+- `RollingInterval.Month` → `log-yyyyMM` (e.g., `log-202510`)
+- `RollingInterval.Year` → `log-yyyy` (e.g., `log-2025`)
+
+**Querying rolling collections:**
+```csharp
+// Query specific date range - you need to target the correct collection(s)
+var collectionName = $"log-{DateTime.UtcNow:yyyyMMdd}";
+var collection = database.GetCollection<BsonDocument>(collectionName);
+var todayLogs = collection.Find(Builders<BsonDocument>.Filter.Empty).ToList();
+```
+
+## Migration Guide
+
+### From Legacy `.MongoDB()` to `.MongoDBBson()`
+
+The legacy `.MongoDB()` sink converts logs to JSON then to BSON. The newer `.MongoDBBson()` writes structured BSON directly for better performance and features.
+
+**Legacy (still supported):**
+```csharp
+.WriteTo.MongoDB("mongodb://localhost/logs") // converts to JSON first
+```
+
+**New Bson sink (recommended):**
+```csharp
+.WriteTo.MongoDBBson("mongodb://localhost/logs") // native BSON
+```
+
+**MongoDBBson exclusive features:**
+- TTL/Expiration (`SetExpireTTL`)
+- Exclude message template (`SetExcludeMessageTemplate`)
+- Rolling collections (`SetRollingInterval`)
+- Better type mapping and performance
+
+## Troubleshooting
+
+### MongoDB Connection Issues
+**Problem:** Application hangs or fails when MongoDB is unavailable
+**Solution:** Ensure your MongoDB connection string includes appropriate timeouts:
+```csharp
+"mongodb://localhost/logs?connectTimeoutMS=3000&serverSelectionTimeoutMS=3000"
+```
+
+### Type Mapping Errors
+**Problem:** `System.Guid cannot be mapped to BsonValue`
+**Solution:** Ensure you're using the latest version (v7.1+) which includes Guid mapping fixes.
+
+### Capped Collections Not Created
+**Problem:** Capped collection configuration not working
+**Solution:** Ensure the collection doesn't already exist. Drop existing collection first:
+```csharp
+database.DropCollection("logs");
+// Then configure with capped settings
+```
+
+### Rolling Collections Not Named Correctly
+**Problem:** Collection created without time format suffix
+**Solution:** Ensure you're using `MongoDBBson` sink (not legacy `MongoDB`) and v7.1+.
+
 ## Icon
 
 [MongoDB](https://icons8.com/icon/74402/mongodb) icon by [Icons8](https://icons8.com)

src/Serilog.Sinks.MongoDB/Helpers/MongoDbHelpers.cs

@@ -58,9 +58,7 @@ internal static void VerifyCollectionExists(
         {
             database.CreateCollection(collectionName, collectionCreationOptions);
         }
-        catch (MongoCommandException e) when (e.ErrorMessage.Contains(
-                                                  "collection already exists",
-                                                  StringComparison.InvariantCultureIgnoreCase))
+        catch (MongoCommandException e) when (e.CodeName == "NamespaceExists")
         {
             // handled
         }
@@ -89,8 +87,7 @@ internal static void VerifyExpireTTLSetup(
 
                 return;
             }
-            catch (MongoCommandException ex) when (ex.ErrorMessage.Contains(
-                                                       "already exists with different options"))
+            catch (MongoCommandException ex) when (ex.CodeName == "IndexOptionsConflict")
             {
                 // handled -- just drop and recreate
                 logCollection.Indexes.DropOne(ExpireTTLIndexName);

src/Serilog.Sinks.MongoDB/Serilog.Sinks.MongoDB.csproj

@@ -9,9 +9,9 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<PackageVersion>7.1.0</PackageVersion>
+		<PackageVersion>7.2.0</PackageVersion>
 		<Authors>Kiran Makkapati, Jaben Cargman, Serilog Contributors</Authors>
-		<Copyright>Copyright © Serilog Contributors 2014-2022</Copyright>
+		<Copyright>Copyright © Serilog Contributors 2014-2025</Copyright>
 		<Description>The MongoDB sink for Serilog</Description>
 		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
 		<PackageId>Serilog.Sinks.MongoDB</PackageId>
@@ -20,7 +20,7 @@
 		<PackageTags>serilog, mongodb</PackageTags>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<PackageReleaseNotes>
-			v7.1 - Bug fixes: Guid to BsonValue mapping (#91), RollingInterval collection naming (#95), SetRollingInterval method name correction (#97).
+			v7.2 - MongoDB v7.x compatibility fix: Error handling now uses error codes instead of string matching (#98, #99). Comprehensive unit tests added (#100). CI improvements.
 		</PackageReleaseNotes>
     </PropertyGroup>
 
@@ -43,7 +43,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-		<PackageReference Include="PolySharp" Version="1.14.1">
+		<PackageReference Include="PolySharp" Version="1.15.0">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

test/Serilog.Sinks.MongoDB.Tests/GlobalUsings.cs

@@ -0,0 +1,21 @@
+// Global using directives
+
+global using System.Diagnostics;
+
+global using AwesomeAssertions;
+
+global using EphemeralMongo;
+
+global using Microsoft.Extensions.Configuration;
+
+global using MongoDB.Bson;
+global using MongoDB.Bson.Serialization;
+global using MongoDB.Bson.Serialization.Serializers;
+global using MongoDB.Driver;
+
+global using NSubstitute;
+
+global using NUnit.Framework;
+
+global using Serilog.Events;
+global using Serilog.Helpers;

test/Serilog.Sinks.MongoDB.Tests/LoggerConfigurationMongoDBExtensionsTests.cs

@@ -1,33 +1,24 @@
-using FluentAssertions;
-
-using Microsoft.Extensions.Configuration;
-
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization;
-using MongoDB.Bson.Serialization.Serializers;
-using MongoDB.Driver;
-
-using NUnit.Framework;
-
-using Serilog.Helpers;
-
-namespace Serilog.Sinks.MongoDB.Tests;
+namespace Serilog.Sinks.MongoDB.Tests;
 
 [TestFixture]
 public class LoggerConfigurationMongoDbExtensionsTests
 {
-    [OneTimeSetUp]
-    public void SetupMongo()
-    {
-        BsonSerializer.TryRegisterSerializer(new GuidSerializer(GuidRepresentation.Standard));
-    }
-
-    private const string MongoConnectionString = "mongodb://localhost:27017";
+    private static string MongoConnectionString => MongoTestFixture.ConnectionString;
 
     private const string MongoDatabaseName = "mongodb-sink";
 
     private const string MongoCollectionName = "test";
 
+    private static IReadOnlyDictionary<string, string?> GetSerilogMongoConfiguration()
+    {
+        var databaseUrl = $"{MongoConnectionString}/{MongoDatabaseName}";
+
+        return new Dictionary<string, string?>
+        {
+            ["Serilog:WriteTo:0:Args:databaseUrl"] = databaseUrl
+        };
+    }
+
     private static void TestCollectionAndDocumentExists(RollingInterval? rollingInterval = null)
     {
         var (mongoClient, mongoDatabase) = GetDatabase();
@@ -90,6 +81,7 @@ public void Create_Collection_With_Rolling_Interval_From_Configuration()
     {
         var configuration = new ConfigurationBuilder()
             .AddJsonFile("serilog.json")
+            .AddInMemoryCollection(GetSerilogMongoConfiguration())
             .Build();
 
         var collectionName = RollingInterval.Month.GetCollectionName("test");