GenericDiagnosticOptions.IgnoreEvent() was removed by mistake; Privat…

…eAssets() was missing on System.Data.SqlClient for .NET 5; fixes broken release-notes link in NuGet package
opentracing-contrib · Dec 12, 2020 · 423d556 · 423d556
1 parent c6213e4
commit 423d556
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -8,7 +8,7 @@
     <PackageIconUrl>https://avatars0.githubusercontent.com/u/15482765</PackageIconUrl>
     <PackageProjectUrl>https://github.com/opentracing-contrib/csharp-netcore</PackageProjectUrl>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <PackageReleaseNotes Condition="'$(Version)' != ''">https://github.com/opentracing-contrib/csharp-netcore/releases/tag/$(Version)</PackageReleaseNotes>
+    <PackageReleaseNotes Condition="'$(Version)' != ''">https://github.com/opentracing-contrib/csharp-netcore/releases/tag/v$(Version)</PackageReleaseNotes>
 
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/src/OpenTracing.Contrib.NetCore/GenericListeners/GenericDiagnosticOptions.cs b/src/OpenTracing.Contrib.NetCore/GenericListeners/GenericDiagnosticOptions.cs
@@ -7,5 +7,21 @@ public sealed class GenericDiagnosticOptions
         public HashSet<string> IgnoredListenerNames { get; } = new HashSet<string>();
 
         public Dictionary<string, HashSet<string>> IgnoredEvents { get; } = new Dictionary<string, HashSet<string>>();
+
+        public void IgnoreEvent(string diagnosticListenerName, string eventName)
+        {
+            if (diagnosticListenerName == null || eventName == null)
+                return;
+
+            HashSet<string> ignoredListenerEvents;
+
+            if (!IgnoredEvents.TryGetValue(diagnosticListenerName, out ignoredListenerEvents))
+            {
+                ignoredListenerEvents = new HashSet<string>();
+                IgnoredEvents.Add(diagnosticListenerName, ignoredListenerEvents);
+            }
+
+            ignoredListenerEvents.Add(eventName);
+        }
     }
 }
diff --git a/src/OpenTracing.Contrib.NetCore/OpenTracing.Contrib.NetCore.csproj b/src/OpenTracing.Contrib.NetCore/OpenTracing.Contrib.NetCore.csproj
@@ -60,7 +60,7 @@ Instrumented components: HttpClient calls, ASP.NET Core, Entity Framework Core a
     <PackageReference Include="Microsoft.Data.SqlClient" Version="2.0.1" PrivateAssets="All" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[5.0.1,6)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[5.0.1,6)" PrivateAssets="All" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>