Grishina/ef commands metrics (#138)

Modify AddEfCommandsMetrics to allow several metrics counters

---------

Co-authored-by: Ekaterina Grishina <[email protected]>
Co-authored-by: Vitaly Shcherbinov <[email protected]>

src/EntityFramework/DbContextOptionsBuilderExtensions.cs

@@ -12,15 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using System.Collections.Generic;
+using System.Linq;
 using Microsoft.EntityFrameworkCore;
 
 namespace Mindbox.DiagnosticContext.EntityFramework;
 
 public static class EntityFrameworkDiagnosticContextExtensions
 {
-	public static DbContextOptionsBuilder AddEfCommandsMetrics(this DbContextOptionsBuilder serviceCollection)
+	public static DbContextOptionsBuilder AddEfCommandsMetrics(
+		this DbContextOptionsBuilder serviceCollection,
+		IEnumerable<IEfCommandMetricsCounter>? metricsCounters = null)
 	{
-		return serviceCollection
-			.AddInterceptors(new EfCommandsScorerInterceptor());
+		var counters = metricsCounters?.ToList() ?? [];
+
+		if (counters.All(counter => counter is not EfCommandsMetrics))
+			counters.Add(EfCommandsMetrics.Instance);
+
+		return serviceCollection.AddInterceptors(new EfCommandsScorerInterceptor(counters));
 	}
 }

src/EntityFramework/EfCommandsMetrics.cs

@@ -16,7 +16,7 @@
 
 namespace Mindbox.DiagnosticContext.EntityFramework;
 
-internal class EfCommandsMetrics
+internal class EfCommandsMetrics : IEfCommandMetricsCounter
 {
 	private static readonly AsyncLocal<EfCommandsMetrics> _instance = new();
 

src/EntityFramework/EfCommandsScorerInterceptor.cs

@@ -12,14 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using System.Collections.Generic;
 using System.Data.Common;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 
 namespace Mindbox.DiagnosticContext.EntityFramework;
 
-internal class EfCommandsScorerInterceptor : DbCommandInterceptor
+internal class EfCommandsScorerInterceptor(
+	IEnumerable<IEfCommandMetricsCounter> metricsCounters)
+	: DbCommandInterceptor
 {
 	public override InterceptionResult<DbDataReader> ReaderExecuting(
 		DbCommand command,
@@ -87,9 +90,11 @@ public override async ValueTask<int> NonQueryExecutedAsync(
 		int result,
 		CancellationToken cancellationToken = default) => ReportCommandFinished(result);
 
-	private static T ReportCommandStarted<T>(T result)
+	private T ReportCommandStarted<T>(T result)
 	{
-		EfCommandsMetrics.Instance.ReportCommandStarted();
+		foreach (var counter in metricsCounters)
+			counter.ReportCommandStarted();
+
 		return result;
 	}
 

src/EntityFramework/IEfCommandMetricsCounter.cs

@@ -0,0 +1,20 @@
+// Copyright 2021 Mindbox Ltd
+//
+// 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.
+
+namespace Mindbox.DiagnosticContext.EntityFramework;
+
+public interface IEfCommandMetricsCounter
+{
+	void ReportCommandStarted();
+}