OTEL implementation, so far matching EventCounters infrastructure. (#33633)

cincuranet · web-flow · commit 0d015c65bafc · 2024-06-06T08:40:45.000+02:00
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -40,5 +40,6 @@
     <MicrosoftCodeAnalysisVersion>4.8.0</MicrosoftCodeAnalysisVersion>
     <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.24121.1</MicrosoftCodeAnalysisTestingVersion>
     <AzureIdentityVersion>1.11.3</AzureIdentityVersion>
+    <OpenTelemetryExporterInMemoryVersion>1.8.1</OpenTelemetryExporterInMemoryVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/EFCore.Analyzers/EFDiagnostics.cs b/src/EFCore.Analyzers/EFDiagnostics.cs
@@ -16,4 +16,5 @@ public static class EFDiagnostics
     public const string ExperimentalApi = "EF9001";
     public const string ProviderExperimentalApi = "EF9002";
     public const string PrecompiledQueryExperimental = "EF9100";
+    public const string MetricsExperimental = "EF9101";
 }
diff --git a/src/EFCore.Cosmos/EFCore.Cosmos.csproj b/src/EFCore.Cosmos/EFCore.Cosmos.csproj
@@ -9,6 +9,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>$(PackageTags);CosmosDb;SQL API</PackageTags>
     <ImplicitUsings>true</ImplicitUsings>
+    <NoWarn>$(NoWarn);EF9101</NoWarn> <!-- Metrics is experimental -->
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.QueryingEnumerable.cs b/src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.QueryingEnumerable.cs
@@ -155,7 +155,7 @@ public bool MoveNext()
                         {
                             var sqlQuery = _queryingEnumerable.GenerateQuery();
 
-                            EntityFrameworkEventSource.Log.QueryExecuting();
+                            EntityFrameworkMetricsData.ReportQueryExecuting();
 
                             _enumerator = _cosmosQueryContext.CosmosClient
                                 .ExecuteSqlQuery(
@@ -253,7 +253,7 @@ public async ValueTask<bool> MoveNextAsync()
                         {
                             var sqlQuery = _queryingEnumerable.GenerateQuery();
 
-                            EntityFrameworkEventSource.Log.QueryExecuting();
+                            EntityFrameworkMetricsData.ReportQueryExecuting();
 
                             _enumerator = _cosmosQueryContext.CosmosClient
                                 .ExecuteSqlQueryAsync(
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.ReadItemQueryingEnumerable.cs b/src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.ReadItemQueryingEnumerable.cs
@@ -225,7 +225,7 @@ public bool MoveNext()
                                 throw new InvalidOperationException(CosmosStrings.PartitionKeyMissing);
                             }
 
-                            EntityFrameworkEventSource.Log.QueryExecuting();
+                            EntityFrameworkMetricsData.ReportQueryExecuting();
 
                             _item = _cosmosQueryContext.CosmosClient.ExecuteReadItem(
                                 _cosmosContainer,
@@ -277,7 +277,7 @@ public async ValueTask<bool> MoveNextAsync()
                                 throw new InvalidOperationException(CosmosStrings.PartitionKeyMissing);
                             }
 
-                            EntityFrameworkEventSource.Log.QueryExecuting();
+                            EntityFrameworkMetricsData.ReportQueryExecuting();
 
                             _item = await _cosmosQueryContext.CosmosClient.ExecuteReadItemAsync(
                                     _cosmosContainer,
diff --git a/src/EFCore.InMemory/EFCore.InMemory.csproj b/src/EFCore.InMemory/EFCore.InMemory.csproj
@@ -9,6 +9,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>$(PackageTags);In-Memory</PackageTags>
     <ImplicitUsings>true</ImplicitUsings>
+    <NoWarn>$(NoWarn);EF9101</NoWarn> <!-- Metrics is experimental -->
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryShapedQueryCompilingExpressionVisitor.QueryingEnumerable.cs b/src/EFCore.InMemory/Query/Internal/InMemoryShapedQueryCompilingExpressionVisitor.QueryingEnumerable.cs
@@ -155,7 +155,7 @@ private bool MoveNextHelper()
             {
                 if (_enumerator == null)
                 {
-                    EntityFrameworkEventSource.Log.QueryExecuting();
+                    EntityFrameworkMetricsData.ReportQueryExecuting();
 
                     _enumerator = _innerEnumerable.GetEnumerator();
                     _queryContext.InitializeStateManager(_standAloneStateManager);
diff --git a/src/EFCore.Relational/EFCore.Relational.csproj b/src/EFCore.Relational/EFCore.Relational.csproj
@@ -10,6 +10,7 @@
     <ImplicitUsings>true</ImplicitUsings>
     <NoWarn>$(NoWarn);EF9100</NoWarn> <!-- Precomiled query is experimental -->
     <NoWarn>$(NoWarn);EF9002</NoWarn> <!-- Experimental provider-facing feature -->
+    <NoWarn>$(NoWarn);EF9101</NoWarn> <!-- Metrics is experimental -->
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.Relational/Query/Internal/FromSqlQueryingEnumerable.cs b/src/EFCore.Relational/Query/Internal/FromSqlQueryingEnumerable.cs
@@ -268,7 +268,7 @@ public bool MoveNext()
 
         private static bool InitializeReader(Enumerator enumerator)
         {
-            EntityFrameworkEventSource.Log.QueryExecuting();
+            EntityFrameworkMetricsData.ReportQueryExecuting();
 
             var relationalCommand = enumerator._relationalCommand =
                 enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);
@@ -390,7 +390,7 @@ await _relationalQueryContext.ExecutionStrategy.ExecuteAsync(
 
         private static async Task<bool> InitializeReaderAsync(AsyncEnumerator enumerator, CancellationToken cancellationToken)
         {
-            EntityFrameworkEventSource.Log.QueryExecuting();
+            EntityFrameworkMetricsData.ReportQueryExecuting();
 
             var relationalCommand = enumerator._relationalCommand =
                 enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);
diff --git a/src/EFCore.Relational/Query/Internal/GroupBySingleQueryingEnumerable.cs b/src/EFCore.Relational/Query/Internal/GroupBySingleQueryingEnumerable.cs
@@ -338,7 +338,7 @@ public bool MoveNext()
 
         private static bool InitializeReader(Enumerator enumerator)
         {
-            EntityFrameworkEventSource.Log.QueryExecuting();
+            EntityFrameworkMetricsData.ReportQueryExecuting();
 
             var relationalCommand = enumerator._relationalCommand =
                 enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);
@@ -525,7 +525,7 @@ await _relationalQueryContext.ExecutionStrategy.ExecuteAsync(
 
         private static async Task<bool> InitializeReaderAsync(AsyncEnumerator enumerator, CancellationToken cancellationToken)
         {
-            EntityFrameworkEventSource.Log.QueryExecuting();
+            EntityFrameworkMetricsData.ReportQueryExecuting();
 
             var relationalCommand = enumerator._relationalCommand =
                 enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);
diff --git a/src/EFCore.Relational/Query/Internal/GroupBySplitQueryingEnumerable.cs b/src/EFCore.Relational/Query/Internal/GroupBySplitQueryingEnumerable.cs
@@ -338,7 +338,7 @@ public bool MoveNext()
 
         private static bool InitializeReader(Enumerator enumerator)
         {
-            EntityFrameworkEventSource.Log.QueryExecuting();
+            EntityFrameworkMetricsData.ReportQueryExecuting();
 
             var relationalCommand = enumerator._relationalCommand =
                 enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);
@@ -516,7 +516,7 @@ await _relatedDataLoaders(
 
         private static async Task<bool> InitializeReaderAsync(AsyncEnumerator enumerator, CancellationToken cancellationToken)
         {
-            EntityFrameworkEventSource.Log.QueryExecuting();
+            EntityFrameworkMetricsData.ReportQueryExecuting();
 
             var relationalCommand = enumerator._relationalCommand =
                 enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);
diff --git a/src/EFCore.Relational/Query/Internal/SingleQueryingEnumerable.cs b/src/EFCore.Relational/Query/Internal/SingleQueryingEnumerable.cs
@@ -265,7 +265,7 @@ public bool MoveNext()
 
         private static bool InitializeReader(Enumerator enumerator)
         {
-            EntityFrameworkEventSource.Log.QueryExecuting();
+            EntityFrameworkMetricsData.ReportQueryExecuting();
 
             var relationalCommand = enumerator._relationalCommand =
                 enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);
@@ -426,7 +426,7 @@ await _relationalQueryContext.ExecutionStrategy.ExecuteAsync(
 
         private static async Task<bool> InitializeReaderAsync(AsyncEnumerator enumerator, CancellationToken cancellationToken)
         {
-            EntityFrameworkEventSource.Log.QueryExecuting();
+            EntityFrameworkMetricsData.ReportQueryExecuting();
 
             var relationalCommand = enumerator._relationalCommand =
                 enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);
diff --git a/src/EFCore.Relational/Query/Internal/SplitQueryingEnumerable.cs b/src/EFCore.Relational/Query/Internal/SplitQueryingEnumerable.cs
@@ -259,7 +259,7 @@ public bool MoveNext()
 
         private static bool InitializeReader(Enumerator enumerator)
         {
-            EntityFrameworkEventSource.Log.QueryExecuting();
+            EntityFrameworkMetricsData.ReportQueryExecuting();
 
             var relationalCommand = enumerator._relationalCommand =
                 enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);
@@ -414,7 +414,7 @@ await _relatedDataLoaders(
 
         private static async Task<bool> InitializeReaderAsync(AsyncEnumerator enumerator, CancellationToken cancellationToken)
         {
-            EntityFrameworkEventSource.Log.QueryExecuting();
+            EntityFrameworkMetricsData.ReportQueryExecuting();
 
             var relationalCommand = enumerator._relationalCommand =
                 enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);
diff --git a/src/EFCore.Relational/Query/RelationalShapedQueryCompilingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalShapedQueryCompilingExpressionVisitor.cs
@@ -144,7 +144,7 @@ public static int NonQueryResult(
                     (relationalQueryContext, relationalCommandResolver, commandSource),
                     static (_, state) =>
                     {
-                        EntityFrameworkEventSource.Log.QueryExecuting();
+                        EntityFrameworkMetricsData.ReportQueryExecuting();
 
                         var relationalCommand = state.relationalCommandResolver.RentAndPopulateRelationalCommand(state.relationalQueryContext);
 
@@ -222,7 +222,7 @@ public static Task<int> NonQueryResultAsync(
                     (relationalQueryContext, relationalCommandResolver, commandSource),
                     static (_, state, cancellationToken) =>
                     {
-                        EntityFrameworkEventSource.Log.QueryExecuting();
+                        EntityFrameworkMetricsData.ReportQueryExecuting();
 
                         var relationalCommand = state.relationalCommandResolver.RentAndPopulateRelationalCommand(state.relationalQueryContext);
 
diff --git a/src/EFCore/ChangeTracking/Internal/StateManager.cs b/src/EFCore/ChangeTracking/Internal/StateManager.cs
@@ -1282,7 +1282,7 @@ protected virtual int SaveChanges(IList<IUpdateEntry> entriesToSave)
 
         try
         {
-            EntityFrameworkEventSource.Log.SavingChanges();
+            EntityFrameworkMetricsData.ReportSavingChanges();
 
             return _database.SaveChanges(entriesToSave);
         }
@@ -1306,7 +1306,7 @@ protected virtual async Task<int> SaveChangesAsync(
 
         try
         {
-            EntityFrameworkEventSource.Log.SavingChanges();
+            EntityFrameworkMetricsData.ReportSavingChanges();
 
             return await _database.SaveChangesAsync(entriesToSave, cancellationToken)
                 .ConfigureAwait(false);
diff --git a/src/EFCore/DbContext.cs b/src/EFCore/DbContext.cs
@@ -130,7 +130,7 @@ public DbContext(DbContextOptions options)
             .GetRequiredService<IDbSetInitializer>()
             .InitializeSets(this);
 
-        EntityFrameworkEventSource.Log.DbContextInitializing();
+        EntityFrameworkMetricsData.ReportDbContextInitializing();
     }
 
     /// <summary>
@@ -659,7 +659,7 @@ public virtual int SaveChanges(bool acceptAllChangesOnSuccess)
         }
         catch (DbUpdateConcurrencyException exception)
         {
-            EntityFrameworkEventSource.Log.OptimisticConcurrencyFailure();
+            EntityFrameworkMetricsData.ReportOptimisticConcurrencyFailure();
 
             SaveChangesFailed?.Invoke(this, new SaveChangesFailedEventArgs(acceptAllChangesOnSuccess, exception));
 
@@ -804,7 +804,7 @@ public virtual async Task<int> SaveChangesAsync(
         }
         catch (DbUpdateConcurrencyException exception)
         {
-            EntityFrameworkEventSource.Log.OptimisticConcurrencyFailure();
+            EntityFrameworkMetricsData.ReportOptimisticConcurrencyFailure();
 
             SaveChangesFailed?.Invoke(this, new SaveChangesFailedEventArgs(acceptAllChangesOnSuccess, exception));
 
@@ -1119,7 +1119,7 @@ private bool DisposeSync(bool leaseActive, bool contextShouldBeDisposed)
         }
         else if (!_disposed)
         {
-            EntityFrameworkEventSource.Log.DbContextDisposing();
+            EntityFrameworkMetricsData.ReportDbContextDisposing();
 
             _dbContextDependencies?.InfrastructureLogger.ContextDisposed(this);
 
diff --git a/src/EFCore/EFCore.csproj b/src/EFCore/EFCore.csproj
@@ -14,6 +14,7 @@ Microsoft.EntityFrameworkCore.DbSet
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ImplicitUsings>true</ImplicitUsings>
     <NoWarn>$(NoWarn);EF9100</NoWarn> <!-- Precompiled query is experimental -->
+    <NoWarn>$(NoWarn);EF9101</NoWarn> <!-- Metrics is experimental -->
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/EFCore/Infrastructure/EntityFrameworkEventSource.cs b/src/EFCore/Infrastructure/EntityFrameworkEventSource.cs
diff --git a/src/EFCore/Infrastructure/EntityFrameworkMetricsData.cs b/src/EFCore/Infrastructure/EntityFrameworkMetricsData.cs
diff --git a/src/EFCore/Infrastructure/Internal/EntityFrameworkMetrics.cs b/src/EFCore/Infrastructure/Internal/EntityFrameworkMetrics.cs
diff --git a/src/EFCore/Query/Internal/CompiledQueryCache.cs b/src/EFCore/Query/Internal/CompiledQueryCache.cs
diff --git a/src/EFCore/Storage/ExecutionStrategy.cs b/src/EFCore/Storage/ExecutionStrategy.cs
diff --git a/test/EFCore.Tests/EFCore.Tests.csproj b/test/EFCore.Tests/EFCore.Tests.csproj
diff --git a/test/EFCore.Tests/Infrastructure/EntityFrameworkMetricsTest.cs b/test/EFCore.Tests/Infrastructure/EntityFrameworkMetricsTest.cs
diff --git a/test/EFCore.Tests/Infrastructure/EventSourceTest.cs b/test/EFCore.Tests/Infrastructure/EventSourceTest.cs

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,5 @@ public static class EFDiagnostics`
`16`	`16`	`public const string ExperimentalApi = "EF9001";`
`17`	`17`	`public const string ProviderExperimentalApi = "EF9002";`
`18`	`18`	`public const string PrecompiledQueryExperimental = "EF9100";`
	`19`	`+ public const string MetricsExperimental = "EF9101";`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public bool MoveNext()`
`155`	`155`	`{`
`156`	`156`	`var sqlQuery = _queryingEnumerable.GenerateQuery();`
`157`	`157`
`158`		`- EntityFrameworkEventSource.Log.QueryExecuting();`
	`158`	`+ EntityFrameworkMetricsData.ReportQueryExecuting();`
`159`	`159`
`160`	`160`	`_enumerator = _cosmosQueryContext.CosmosClient`
`161`	`161`	`.ExecuteSqlQuery(`
`@@ -253,7 +253,7 @@ public async ValueTask<bool> MoveNextAsync()`
`253`	`253`	`{`
`254`	`254`	`var sqlQuery = _queryingEnumerable.GenerateQuery();`
`255`	`255`
`256`		`- EntityFrameworkEventSource.Log.QueryExecuting();`
	`256`	`+ EntityFrameworkMetricsData.ReportQueryExecuting();`
`257`	`257`
`258`	`258`	`_enumerator = _cosmosQueryContext.CosmosClient`
`259`	`259`	`.ExecuteSqlQueryAsync(`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ public bool MoveNext()`
`225`	`225`	`throw new InvalidOperationException(CosmosStrings.PartitionKeyMissing);`
`226`	`226`	`}`
`227`	`227`
`228`		`- EntityFrameworkEventSource.Log.QueryExecuting();`
	`228`	`+ EntityFrameworkMetricsData.ReportQueryExecuting();`
`229`	`229`
`230`	`230`	`_item = _cosmosQueryContext.CosmosClient.ExecuteReadItem(`
`231`	`231`	`_cosmosContainer,`
`@@ -277,7 +277,7 @@ public async ValueTask<bool> MoveNextAsync()`
`277`	`277`	`throw new InvalidOperationException(CosmosStrings.PartitionKeyMissing);`
`278`	`278`	`}`
`279`	`279`
`280`		`- EntityFrameworkEventSource.Log.QueryExecuting();`
	`280`	`+ EntityFrameworkMetricsData.ReportQueryExecuting();`
`281`	`281`
`282`	`282`	`_item = await _cosmosQueryContext.CosmosClient.ExecuteReadItemAsync(`
`283`	`283`	`_cosmosContainer,`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ private bool MoveNextHelper()`
`155`	`155`	`{`
`156`	`156`	`if (_enumerator == null)`
`157`	`157`	`{`
`158`		`- EntityFrameworkEventSource.Log.QueryExecuting();`
	`158`	`+ EntityFrameworkMetricsData.ReportQueryExecuting();`
`159`	`159`
`160`	`160`	`_enumerator = _innerEnumerable.GetEnumerator();`
`161`	`161`	`_queryContext.InitializeStateManager(_standAloneStateManager);`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ public bool MoveNext()`
`268`	`268`
`269`	`269`	`private static bool InitializeReader(Enumerator enumerator)`
`270`	`270`	`{`
`271`		`- EntityFrameworkEventSource.Log.QueryExecuting();`
	`271`	`+ EntityFrameworkMetricsData.ReportQueryExecuting();`
`272`	`272`
`273`	`273`	`var relationalCommand = enumerator._relationalCommand =`
`274`	`274`	`enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);`
`@@ -390,7 +390,7 @@ await _relationalQueryContext.ExecutionStrategy.ExecuteAsync(`
`390`	`390`
`391`	`391`	`private static async Task<bool> InitializeReaderAsync(AsyncEnumerator enumerator, CancellationToken cancellationToken)`
`392`	`392`	`{`
`393`		`- EntityFrameworkEventSource.Log.QueryExecuting();`
	`393`	`+ EntityFrameworkMetricsData.ReportQueryExecuting();`
`394`	`394`
`395`	`395`	`var relationalCommand = enumerator._relationalCommand =`
`396`	`396`	`enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ public bool MoveNext()`
`338`	`338`
`339`	`339`	`private static bool InitializeReader(Enumerator enumerator)`
`340`	`340`	`{`
`341`		`- EntityFrameworkEventSource.Log.QueryExecuting();`
	`341`	`+ EntityFrameworkMetricsData.ReportQueryExecuting();`
`342`	`342`
`343`	`343`	`var relationalCommand = enumerator._relationalCommand =`
`344`	`344`	`enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);`
`@@ -525,7 +525,7 @@ await _relationalQueryContext.ExecutionStrategy.ExecuteAsync(`
`525`	`525`
`526`	`526`	`private static async Task<bool> InitializeReaderAsync(AsyncEnumerator enumerator, CancellationToken cancellationToken)`
`527`	`527`	`{`
`528`		`- EntityFrameworkEventSource.Log.QueryExecuting();`
	`528`	`+ EntityFrameworkMetricsData.ReportQueryExecuting();`
`529`	`529`
`530`	`530`	`var relationalCommand = enumerator._relationalCommand =`
`531`	`531`	`enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ public bool MoveNext()`
`265`	`265`
`266`	`266`	`private static bool InitializeReader(Enumerator enumerator)`
`267`	`267`	`{`
`268`		`- EntityFrameworkEventSource.Log.QueryExecuting();`
	`268`	`+ EntityFrameworkMetricsData.ReportQueryExecuting();`
`269`	`269`
`270`	`270`	`var relationalCommand = enumerator._relationalCommand =`
`271`	`271`	`enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);`
`@@ -426,7 +426,7 @@ await _relationalQueryContext.ExecutionStrategy.ExecuteAsync(`
`426`	`426`
`427`	`427`	`private static async Task<bool> InitializeReaderAsync(AsyncEnumerator enumerator, CancellationToken cancellationToken)`
`428`	`428`	`{`
`429`		`- EntityFrameworkEventSource.Log.QueryExecuting();`
	`429`	`+ EntityFrameworkMetricsData.ReportQueryExecuting();`
`430`	`430`
`431`	`431`	`var relationalCommand = enumerator._relationalCommand =`
`432`	`432`	`enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);`
Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ public bool MoveNext()`
`259`	`259`
`260`	`260`	`private static bool InitializeReader(Enumerator enumerator)`
`261`	`261`	`{`
`262`		`- EntityFrameworkEventSource.Log.QueryExecuting();`
	`262`	`+ EntityFrameworkMetricsData.ReportQueryExecuting();`
`263`	`263`
`264`	`264`	`var relationalCommand = enumerator._relationalCommand =`
`265`	`265`	`enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);`
`@@ -414,7 +414,7 @@ await _relatedDataLoaders(`
`414`	`414`
`415`	`415`	`private static async Task<bool> InitializeReaderAsync(AsyncEnumerator enumerator, CancellationToken cancellationToken)`
`416`	`416`	`{`
`417`		`- EntityFrameworkEventSource.Log.QueryExecuting();`
	`417`	`+ EntityFrameworkMetricsData.ReportQueryExecuting();`
`418`	`418`
`419`	`419`	`var relationalCommand = enumerator._relationalCommand =`
`420`	`420`	`enumerator._relationalCommandResolver.RentAndPopulateRelationalCommand(enumerator._relationalQueryContext);`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public static int NonQueryResult(`
`144`	`144`	`(relationalQueryContext, relationalCommandResolver, commandSource),`
`145`	`145`	`static (_, state) =>`
`146`	`146`	`{`
`147`		`- EntityFrameworkEventSource.Log.QueryExecuting();`
	`147`	`+ EntityFrameworkMetricsData.ReportQueryExecuting();`
`148`	`148`
`149`	`149`	`var relationalCommand = state.relationalCommandResolver.RentAndPopulateRelationalCommand(state.relationalQueryContext);`
`150`	`150`
`@@ -222,7 +222,7 @@ public static Task<int> NonQueryResultAsync(`
`222`	`222`	`(relationalQueryContext, relationalCommandResolver, commandSource),`
`223`	`223`	`static (_, state, cancellationToken) =>`
`224`	`224`	`{`
`225`		`- EntityFrameworkEventSource.Log.QueryExecuting();`
	`225`	`+ EntityFrameworkMetricsData.ReportQueryExecuting();`
`226`	`226`
`227`	`227`	`var relationalCommand = state.relationalCommandResolver.RentAndPopulateRelationalCommand(state.relationalQueryContext);`
`228`	`228`
Original file line number	Diff line number	Diff line change
`@@ -1282,7 +1282,7 @@ protected virtual int SaveChanges(IList<IUpdateEntry> entriesToSave)`
`1282`	`1282`
`1283`	`1283`	`try`
`1284`	`1284`	`{`
`1285`		`- EntityFrameworkEventSource.Log.SavingChanges();`
	`1285`	`+ EntityFrameworkMetricsData.ReportSavingChanges();`
`1286`	`1286`
`1287`	`1287`	`return _database.SaveChanges(entriesToSave);`
`1288`	`1288`	`}`
`@@ -1306,7 +1306,7 @@ protected virtual async Task<int> SaveChangesAsync(`
`1306`	`1306`
`1307`	`1307`	`try`
`1308`	`1308`	`{`
`1309`		`- EntityFrameworkEventSource.Log.SavingChanges();`
	`1309`	`+ EntityFrameworkMetricsData.ReportSavingChanges();`
`1310`	`1310`
`1311`	`1311`	`return await _database.SaveChangesAsync(entriesToSave, cancellationToken)`
`1312`	`1312`	`.ConfigureAwait(false);`