From 6564cebd9043d803fd4a7995bd2d6d0fa5ff44f9 Mon Sep 17 00:00:00 2001 From: Andrew Lock Date: Mon, 23 Oct 2023 15:50:13 +0100 Subject: [PATCH] Remove obsolete methods that only applied to V1 --- .../Telemetry/ITelemetryController.cs | 16 ---------------- .../Telemetry/NullTelemetryController.cs | 13 ------------- .../Telemetry/TelemetryControllerV2.cs | 17 ----------------- tracer/src/Datadog.Trace/TracerManager.cs | 11 ++--------- .../src/Datadog.Trace/TracerManagerFactory.cs | 11 ++++------- .../CallTargetInvokerTelemetryTests.cs | 13 ------------- 6 files changed, 6 insertions(+), 75 deletions(-) diff --git a/tracer/src/Datadog.Trace/Telemetry/ITelemetryController.cs b/tracer/src/Datadog.Trace/Telemetry/ITelemetryController.cs index a1a954d119c3..eeba82062764 100644 --- a/tracer/src/Datadog.Trace/Telemetry/ITelemetryController.cs +++ b/tracer/src/Datadog.Trace/Telemetry/ITelemetryController.cs @@ -35,27 +35,11 @@ internal interface ITelemetryController /// void RecordTracerSettings(ImmutableTracerSettings settings, string defaultServiceName); - /// - /// Called when app sec security is enabled to record the security settings - /// - public void RecordSecuritySettings(SecuritySettings settings); - - /// - /// Called when IAST security is enabled to record the IAST settings - /// - public void RecordIastSettings(IastSettings settings); - /// /// Called to record profiler-related telemetry /// public void RecordProfilerSettings(Profiler profiler); - /// - /// Dispose resources for sending telemetry - /// - /// True if the controller should send "app closing" telemetry before disposing - public Task DisposeAsync(bool sendAppClosingTelemetry); - /// /// Dispose resources for sending telemetry /// diff --git a/tracer/src/Datadog.Trace/Telemetry/NullTelemetryController.cs b/tracer/src/Datadog.Trace/Telemetry/NullTelemetryController.cs index 9b01608ffa8d..55bc2895e769 100644 --- a/tracer/src/Datadog.Trace/Telemetry/NullTelemetryController.cs +++ b/tracer/src/Datadog.Trace/Telemetry/NullTelemetryController.cs @@ -32,19 +32,10 @@ public void RecordTracerSettings(ImmutableTracerSettings settings, string defaul { } - public void RecordSecuritySettings(SecuritySettings settings) - { - } - public void RecordProfilerSettings(Profiler profiler) { } - public Task DisposeAsync(bool sendAppClosingTelemetry) - { - return Task.CompletedTask; - } - public void Start() { } @@ -57,9 +48,5 @@ public Task DisposeAsync() { return Task.CompletedTask; } - - public void RecordIastSettings(IastSettings settings) - { - } } } diff --git a/tracer/src/Datadog.Trace/Telemetry/TelemetryControllerV2.cs b/tracer/src/Datadog.Trace/Telemetry/TelemetryControllerV2.cs index 85fb29149cae..dd652f97c867 100644 --- a/tracer/src/Datadog.Trace/Telemetry/TelemetryControllerV2.cs +++ b/tracer/src/Datadog.Trace/Telemetry/TelemetryControllerV2.cs @@ -9,11 +9,9 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; -using Datadog.Trace.AppSec; using Datadog.Trace.Configuration; using Datadog.Trace.Configuration.Telemetry; using Datadog.Trace.ContinuousProfiler; -using Datadog.Trace.Iast.Settings; using Datadog.Trace.Logging; using Datadog.Trace.Telemetry.Collectors; using Datadog.Trace.Telemetry.Metrics; @@ -95,16 +93,6 @@ public void Start() public void ProductChanged(TelemetryProductType product, bool enabled, ErrorData? error) => _products.ProductChanged(product, enabled, error); - public void RecordSecuritySettings(SecuritySettings settings) - { - // Nothing to record, remove this method when telemetry V1 is removed - } - - public void RecordIastSettings(IastSettings settings) - { - // Nothing to record, remove this method when telemetry V1 is removed - } - public void RecordProfilerSettings(Profiler profiler) { _configuration.Record(ConfigTelemetryData.ProfilerLoaded, profiler.Status.IsProfilerReady, ConfigurationOrigins.Default); @@ -123,11 +111,6 @@ public void IntegrationGeneratedSpan(IntegrationId integrationId) public void IntegrationDisabledDueToError(IntegrationId integrationId, string error) => _integrations.IntegrationDisabledDueToError(integrationId, error); - public Task DisposeAsync(bool sendAppClosingTelemetry) - { - return Task.CompletedTask; - } - public async Task DisposeAsync() { TerminateLoop(); diff --git a/tracer/src/Datadog.Trace/TracerManager.cs b/tracer/src/Datadog.Trace/TracerManager.cs index 4abcb67f5f34..22925472a670 100644 --- a/tracer/src/Datadog.Trace/TracerManager.cs +++ b/tracer/src/Datadog.Trace/TracerManager.cs @@ -246,13 +246,6 @@ private static async Task CleanUpOldTracerManager(TracerManager oldManager, Trac oldManager.Statsd?.Dispose(); } - var telemetryReplaced = false; - if (oldManager.Telemetry != newManager.Telemetry && oldManager.Telemetry is not null) - { - telemetryReplaced = true; - await oldManager.Telemetry.DisposeAsync(sendAppClosingTelemetry: false).ConfigureAwait(false); - } - var discoveryReplaced = false; if (oldManager.DiscoveryService != newManager.DiscoveryService && oldManager.DiscoveryService is not null) { @@ -283,8 +276,8 @@ private static async Task CleanUpOldTracerManager(TracerManager oldManager, Trac Log.Information( exception: null, - "Replaced global instances. AgentWriter: {AgentWriterReplaced}, StatsD: {StatsDReplaced}, RuntimeMetricsWriter: {RuntimeMetricsWriterReplaced}, Telemetry: {TelemetryReplaced}, Discovery: {DiscoveryReplaced}, DataStreamsManager: {DataStreamsManagerReplaced}, RemoteConfigurationManager: {ConfigurationManagerReplaced}, DynamicConfigurationManager: {DynamicConfigurationManagerReplaced}", - new object[] { agentWriterReplaced, statsdReplaced, runtimeMetricsWriterReplaced, telemetryReplaced, discoveryReplaced, dataStreamsReplaced, configurationManagerReplaced, dynamicConfigurationManagerReplaced }); + "Replaced global instances. AgentWriter: {AgentWriterReplaced}, StatsD: {StatsDReplaced}, RuntimeMetricsWriter: {RuntimeMetricsWriterReplaced}, Discovery: {DiscoveryReplaced}, DataStreamsManager: {DataStreamsManagerReplaced}, RemoteConfigurationManager: {ConfigurationManagerReplaced}, DynamicConfigurationManager: {DynamicConfigurationManagerReplaced}", + new object[] { agentWriterReplaced, statsdReplaced, runtimeMetricsWriterReplaced, discoveryReplaced, dataStreamsReplaced, configurationManagerReplaced, dynamicConfigurationManagerReplaced }); } catch (Exception ex) { diff --git a/tracer/src/Datadog.Trace/TracerManagerFactory.cs b/tracer/src/Datadog.Trace/TracerManagerFactory.cs index a48f382f40bb..e0ab2f188eab 100644 --- a/tracer/src/Datadog.Trace/TracerManagerFactory.cs +++ b/tracer/src/Datadog.Trace/TracerManagerFactory.cs @@ -137,14 +137,11 @@ internal TracerManager CreateTracerManager( telemetry ??= CreateTelemetryController(settings, discoveryService); telemetry.RecordTracerSettings(settings, defaultServiceName); - var security = Security.Instance; - telemetry.RecordSecuritySettings(security.Settings); - TelemetryFactory.Metrics.SetWafVersion(security.DdlibWafVersion); - telemetry.RecordIastSettings(Datadog.Trace.Iast.Iast.Instance.Settings); - ErrorData? initError = !string.IsNullOrEmpty(security.InitializationError) - ? new ErrorData(TelemetryErrorCode.AppsecConfigurationError, security.InitializationError) + TelemetryFactory.Metrics.SetWafVersion(Security.Instance.DdlibWafVersion); + ErrorData? initError = !string.IsNullOrEmpty(Security.Instance.InitializationError) + ? new ErrorData(TelemetryErrorCode.AppsecConfigurationError, Security.Instance.InitializationError) : null; - telemetry.ProductChanged(TelemetryProductType.AppSec, enabled: security.Enabled, initError); + telemetry.ProductChanged(TelemetryProductType.AppSec, enabled: Security.Instance.Enabled, initError); var profiler = Profiler.Instance; telemetry.RecordProfilerSettings(profiler); diff --git a/tracer/test/Datadog.Trace.Tests/Telemetry/CallTargetInvokerTelemetryTests.cs b/tracer/test/Datadog.Trace.Tests/Telemetry/CallTargetInvokerTelemetryTests.cs index dd4f433acccd..b2b71da7e219 100644 --- a/tracer/test/Datadog.Trace.Tests/Telemetry/CallTargetInvokerTelemetryTests.cs +++ b/tracer/test/Datadog.Trace.Tests/Telemetry/CallTargetInvokerTelemetryTests.cs @@ -124,19 +124,10 @@ public void RecordTracerSettings(ImmutableTracerSettings settings, string defaul { } - public void RecordSecuritySettings(SecuritySettings settings) - { - } - public void RecordProfilerSettings(Profiler profiler) { } - public Task DisposeAsync(bool sendAppClosingTelemetry) - { - return Task.CompletedTask; - } - public Task DisposeAsync() { return Task.CompletedTask; @@ -149,10 +140,6 @@ public void Start() public void ProductChanged(TelemetryProductType product, bool enabled, ErrorData? error) { } - - public void RecordIastSettings(IastSettings settings) - { - } } } }