remove our custom instrumentation and add #nullable to listener

Author: chojomok

nuget.config

@@ -5,6 +5,5 @@
     <clear />
     <add key="Azure" value="https://pkgs.dev.azure.com/datadoghq/dd-trace-dotnet/_packaging/Public_Feed/nuget/v3/index.json" />
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
-    <add key="quartz" value="https://f.feedz.io/quartznet/quartznet/nuget/index.json" />
   </packageSources>
 </configuration>

tracer/missing-nullability-files.csv

@@ -108,7 +108,6 @@ src/Datadog.Trace/DiagnosticListeners/DiagnosticManager.cs
 src/Datadog.Trace/DiagnosticListeners/DiagnosticObserver.cs
 src/Datadog.Trace/DiagnosticListeners/EndpointFeatureProxy.cs
 src/Datadog.Trace/DiagnosticListeners/IDiagnosticManager.cs
-src/Datadog.Trace/DiagnosticListeners/QuartzDiagnosticObserver.cs
 src/Datadog.Trace/DiagnosticListeners/RouteEndpoint.cs
 src/Datadog.Trace/DogStatsd/NoOpStatsd.cs
 src/Datadog.Trace/DogStatsd/StatsdExtensions.cs
@@ -496,8 +495,6 @@ src/Datadog.Trace/ClrProfiler/AutoInstrumentation/OpenTelemetry/TracerProviderBu
 src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Process/EnvironmentVariablesScrubber.cs
 src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Process/ProcessStartIntegration.cs
 src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Process/ProcessStartTags.cs
-src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Quartz/IJobDetailImplProxy.cs
-src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Quartz/IJobDiagnosticDataProxy.cs
 src/Datadog.Trace/ClrProfiler/AutoInstrumentation/RabbitMQ/RabbitMQConstants.cs
 src/Datadog.Trace/Debugger/Configurations/Models/Capture.cs
 src/Datadog.Trace/Debugger/Configurations/Models/DebuggerExpression.cs

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Quartz/IJobDetailImplProxy.cs

@@ -87,6 +87,5 @@ internal enum IntegrationId
         DatadogTraceManual,
         EmailHtmlInjection,
         Protobuf,
-        Quartz
     }
 }

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Quartz/IJobDiagnosticDataProxy.cs

@@ -3,14 +3,14 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
 // </copyright>
 
+#nullable enable
 #if !NETFRAMEWORK
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Threading.Tasks;
 using Datadog.Trace.AppSec;
-using Datadog.Trace.ClrProfiler.AutoInstrumentation.Quartz;
 using Datadog.Trace.Configuration;
 using Datadog.Trace.Debugger;
 using Datadog.Trace.Debugger.SpanCodeOrigin;
@@ -29,22 +29,20 @@ namespace Datadog.Trace.DiagnosticListeners
     /// </summary>
     internal sealed class QuartzDiagnosticObserver : DiagnosticObserver
     {
-        public const IntegrationId IntegrationId = Configuration.IntegrationId.Quartz;
-
         private const string DiagnosticListenerName = "Quartz";
 
         private static readonly IDatadogLogger Log = DatadogLogging.GetLoggerFor<QuartzDiagnosticObserver>();
-        private readonly Tracer _tracer;
-        private readonly Security _security;
-        private readonly Iast.Iast _iast;
-        private readonly SpanCodeOrigin _spanCodeOrigin;
+        private readonly Tracer? _tracer;
+        private readonly Security? _security;
+        private readonly Iast.Iast? _iast;
+        private readonly SpanCodeOrigin? _spanCodeOrigin;
 
         public QuartzDiagnosticObserver()
             : this(null, null, null, null)
         {
         }
 
-        public QuartzDiagnosticObserver(Tracer tracer, Security security, Iast.Iast iast, SpanCodeOrigin spanCodeOrigin)
+        public QuartzDiagnosticObserver(Tracer? tracer, Security? security, Iast.Iast? iast, SpanCodeOrigin? spanCodeOrigin)
         {
             _tracer = tracer;
             _security = security;
@@ -60,7 +58,7 @@ public QuartzDiagnosticObserver(Tracer tracer, Security security, Iast.Iast iast
 
         private Iast.Iast CurrentIast => _iast ?? Iast.Iast.Instance;
 
-        private SpanCodeOrigin CurrentCodeOrigin => _spanCodeOrigin ?? DebuggerManager.Instance.CodeOrigin;
+        private SpanCodeOrigin? CurrentCodeOrigin => _spanCodeOrigin ?? DebuggerManager.Instance.CodeOrigin;
 
         protected override void OnNext(string eventName, object arg)
         {
@@ -70,15 +68,12 @@ protected override void OnNext(string eventName, object arg)
                 {
                     case "Quartz.Job.Execute.Start":
                     case "Quartz.Job.Veto.Start":
-                        // OnStartSpan(arg);
                         break;
                     case "Quartz.Job.Execute.Stop":
                     case "Quartz.Job.Veto.Stop":
-                       // OnStopSpan(arg);
                         break;
                     case "Quartz.Job.Execute.Exception":
                     case "Quartz.Job.Veto.Exception":
-                        // OnException(arg);
                         break;
                 }
             }
@@ -87,27 +82,6 @@ protected override void OnNext(string eventName, object arg)
                 Log.Error(ex, "Error processing Quartz diagnostic event: {EventName}", eventName);
             }
         }
-
-        private void OnStartSpan(object arg)
-        {
-            Log.Information("Quartz JobExecution.Start event received");
-            QuartzCommon.CreateScope(CurrentTracer, arg, QuartzCommon.OnJobExecuteOperation);
-        }
-
-        private void OnStopSpan(object arg)
-        {
-            Log.Information("Quartz JobExecution.Stop event received");
-            CurrentTracer.ActiveScope.Close();
-        }
-
-        private void OnException(object arg)
-        {
-            Log.Information("Quartz JobExecution.Exception event received");
-            if (arg is Exception exception)
-            {
-                CurrentTracer.ActiveScope.Span.SetException(exception);
-            }
-        }
     }
 }
 #endif

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Quartz/QuartzCommon.cs

@@ -17,7 +17,7 @@ internal static partial class IntegrationIdExtensions
     /// The number of members in the enum.
     /// This is a non-distinct count of defined names.
     /// </summary>
-    public const int Length = 76;
+    public const int Length = 75;
 
     /// <summary>
     /// Returns the string representation of the <see cref="Datadog.Trace.Configuration.IntegrationId"/> value.
@@ -105,7 +105,6 @@ public static string ToStringFast(this Datadog.Trace.Configuration.IntegrationId
             Datadog.Trace.Configuration.IntegrationId.DatadogTraceManual => nameof(Datadog.Trace.Configuration.IntegrationId.DatadogTraceManual),
             Datadog.Trace.Configuration.IntegrationId.EmailHtmlInjection => nameof(Datadog.Trace.Configuration.IntegrationId.EmailHtmlInjection),
             Datadog.Trace.Configuration.IntegrationId.Protobuf => nameof(Datadog.Trace.Configuration.IntegrationId.Protobuf),
-            Datadog.Trace.Configuration.IntegrationId.Quartz => nameof(Datadog.Trace.Configuration.IntegrationId.Quartz),
             _ => value.ToString(),
         };
 
@@ -194,7 +193,6 @@ public static Datadog.Trace.Configuration.IntegrationId[] GetValues()
             Datadog.Trace.Configuration.IntegrationId.DatadogTraceManual,
             Datadog.Trace.Configuration.IntegrationId.EmailHtmlInjection,
             Datadog.Trace.Configuration.IntegrationId.Protobuf,
-            Datadog.Trace.Configuration.IntegrationId.Quartz,
         };
 
     /// <summary>
@@ -283,6 +281,5 @@ public static string[] GetNames()
             nameof(Datadog.Trace.Configuration.IntegrationId.DatadogTraceManual),
             nameof(Datadog.Trace.Configuration.IntegrationId.EmailHtmlInjection),
             nameof(Datadog.Trace.Configuration.IntegrationId.Protobuf),
-            nameof(Datadog.Trace.Configuration.IntegrationId.Quartz),
         };
 }