From ad3394e179ccb6d8a01edf1fc598b084e6f98654 Mon Sep 17 00:00:00 2001 From: Andrew Lock Date: Fri, 22 Nov 2024 13:31:50 +0000 Subject: [PATCH] Fine Kevin, you win --- .../Configuration/ImmutableTracerSettings.cs | 4 ++-- .../Configuration/IntegrationSettingsHelper.cs | 4 ++-- tracer/src/Datadog.Trace.Manual/Tracer.cs | 4 ++-- .../Tracer/GetUpdatedImmutableTracerSettingsIntegration.cs | 6 +++--- .../InstrumentationDefinitions.g.cs | 2 +- .../InstrumentationDefinitions.g.cs | 2 +- .../InstrumentationDefinitions.g.cs | 2 +- .../InstrumentationDefinitions.g.cs | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tracer/src/Datadog.Trace.Manual/Configuration/ImmutableTracerSettings.cs b/tracer/src/Datadog.Trace.Manual/Configuration/ImmutableTracerSettings.cs index c371f2d4dbd2..1a9ce8d79364 100644 --- a/tracer/src/Datadog.Trace.Manual/Configuration/ImmutableTracerSettings.cs +++ b/tracer/src/Datadog.Trace.Manual/Configuration/ImmutableTracerSettings.cs @@ -19,7 +19,7 @@ public sealed class ImmutableTracerSettings /// /// Initializes a new instance of the class. /// - internal ImmutableTracerSettings(Dictionary initialValues) + internal ImmutableTracerSettings(IDictionary initialValues) { AgentUri = GetValue(initialValues, TracerSettingKeyConstants.AgentUriKey, null) ?? new Uri("http://127.0.0.1:8126"); CustomSamplingRules = GetValue(initialValues, TracerSettingKeyConstants.CustomSamplingRules, null); @@ -45,7 +45,7 @@ internal ImmutableTracerSettings(Dictionary initialValues) Integrations = IntegrationSettingsHelper.ParseImmutableFromAutomatic(initialValues); - static T GetValue(Dictionary results, string key, T defaultValue) + static T GetValue(IDictionary results, string key, T defaultValue) { if (results.TryGetValue(key, out var value) && value is T t) diff --git a/tracer/src/Datadog.Trace.Manual/Configuration/IntegrationSettingsHelper.cs b/tracer/src/Datadog.Trace.Manual/Configuration/IntegrationSettingsHelper.cs index b1b2f2f44838..bacebaa410a2 100644 --- a/tracer/src/Datadog.Trace.Manual/Configuration/IntegrationSettingsHelper.cs +++ b/tracer/src/Datadog.Trace.Manual/Configuration/IntegrationSettingsHelper.cs @@ -20,7 +20,7 @@ static IntegrationSettings CreateSettingFunc(string name, bool? enabled, bool? a => new(name, enabled, analyticsEnabled, analyticsSampleRate); } - public static ImmutableIntegrationSettingsCollection ParseImmutableFromAutomatic(Dictionary initialValues) + public static ImmutableIntegrationSettingsCollection ParseImmutableFromAutomatic(IDictionary initialValues) { var settings = Populate(initialValues, CreateSettingFunc); return new ImmutableIntegrationSettingsCollection(settings); @@ -30,7 +30,7 @@ static ImmutableIntegrationSettings CreateSettingFunc(string name, bool? enabled } private static Dictionary Populate( - Dictionary initialValues, + IDictionary initialValues, Func createSettingFunc) { if (!initialValues.TryGetValue(TracerSettingKeyConstants.IntegrationSettingsKey, out var raw) diff --git a/tracer/src/Datadog.Trace.Manual/Tracer.cs b/tracer/src/Datadog.Trace.Manual/Tracer.cs index cd57403cfca5..51a8d778c447 100644 --- a/tracer/src/Datadog.Trace.Manual/Tracer.cs +++ b/tracer/src/Datadog.Trace.Manual/Tracer.cs @@ -99,7 +99,7 @@ public ImmutableTracerSettings Settings else if (_settings is null) { // in manual only mode - _settings = new ImmutableTracerSettings(new()); + _settings = new ImmutableTracerSettings(new Dictionary()); } return _settings; @@ -155,7 +155,7 @@ private static void Configure(Dictionary settings) /// settings, only if the ImmutableTracerSettings (automatic) provided is different to the current one. /// [Instrumented] - private Dictionary? GetUpdatedImmutableTracerSettings(object? automaticTracer, ref object? automaticSettings) + private IDictionary? GetUpdatedImmutableTracerSettings(object? automaticTracer, ref object? automaticSettings) { _ = automaticTracer; _ = automaticSettings; diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/ManualInstrumentation/Tracer/GetUpdatedImmutableTracerSettingsIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/ManualInstrumentation/Tracer/GetUpdatedImmutableTracerSettingsIntegration.cs index b25c8d767cd2..891ba2069004 100644 --- a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/ManualInstrumentation/Tracer/GetUpdatedImmutableTracerSettingsIntegration.cs +++ b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/ManualInstrumentation/Tracer/GetUpdatedImmutableTracerSettingsIntegration.cs @@ -18,7 +18,7 @@ namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tr AssemblyName = "Datadog.Trace.Manual", TypeName = "Datadog.Trace.Tracer", MethodName = "GetUpdatedImmutableTracerSettings", - ReturnTypeName = "System.Collections.Generic.Dictionary`2[System.String,System.Object]", + ReturnTypeName = "System.Collections.Generic.IDictionary`2[System.String,System.Object]", ParameterTypeNames = [ClrNames.Object, "System.Object&"], MinimumVersion = "3.7.0", // added in 3.7.0 MaximumVersion = ManualInstrumentationConstants.MaxVersion, @@ -41,8 +41,8 @@ internal static CallTargetState OnMethodBegin(TTarget instance, ref obj return CallTargetState.GetDefault(); } - internal static CallTargetReturn?> OnMethodEnd(TTarget instance, Dictionary? returnValue, Exception? exception, in CallTargetState state) + internal static CallTargetReturn?> OnMethodEnd(TTarget instance, IDictionary? returnValue, Exception? exception, in CallTargetState state) { - return new CallTargetReturn?>(state.State as Dictionary); + return new CallTargetReturn?>(state.State as Dictionary); } } diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs index 17becec57d97..500499e34499 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs @@ -272,7 +272,7 @@ static InstrumentationDefinitions() new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("get_ActiveScope"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("Datadog.Trace.IScope"), 1, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetActiveScopeIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("get_DefaultServiceName"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.String"), 1, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetDefaultServiceNameIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("GetAutomaticTracerInstance"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Object"), 1, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetAutomaticTracerInstanceIntegration"), 0, 1), - new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("GetUpdatedImmutableTracerSettings"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Collections.Generic.Dictionary`2[System.String,System.Object]", "System.Object", "System.Object&"), 3, 3, 7, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetUpdatedImmutableTracerSettingsIntegration"), 0, 1), + new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("GetUpdatedImmutableTracerSettings"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Collections.Generic.IDictionary`2[System.String,System.Object]", "System.Object", "System.Object&"), 3, 3, 7, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetUpdatedImmutableTracerSettingsIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("StartActive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("Datadog.Trace.IScope", "System.String", "Datadog.Trace.ISpanContext", "System.String", "System.Nullable`1[System.DateTimeOffset]", "System.Nullable`1[System.Boolean]"), 6, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.StartActiveImplementationIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("StartActive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("Datadog.Trace.IScope", "System.String"), 2, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.StartActiveOperationNameIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("StartActive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("Datadog.Trace.IScope", "System.String", "Datadog.Trace.SpanCreationSettings"), 3, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.StartActiveSpanCreationSettingsIntegration"), 0, 1), diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs index 5e6f0897f2ee..58cb092c1df1 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs @@ -280,7 +280,7 @@ static InstrumentationDefinitions() new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("get_ActiveScope"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("Datadog.Trace.IScope"), 1, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetActiveScopeIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("get_DefaultServiceName"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.String"), 1, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetDefaultServiceNameIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("GetAutomaticTracerInstance"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Object"), 1, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetAutomaticTracerInstanceIntegration"), 0, 1), - new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("GetUpdatedImmutableTracerSettings"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Collections.Generic.Dictionary`2[System.String,System.Object]", "System.Object", "System.Object&"), 3, 3, 7, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetUpdatedImmutableTracerSettingsIntegration"), 0, 1), + new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("GetUpdatedImmutableTracerSettings"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Collections.Generic.IDictionary`2[System.String,System.Object]", "System.Object", "System.Object&"), 3, 3, 7, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetUpdatedImmutableTracerSettingsIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("StartActive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("Datadog.Trace.IScope", "System.String", "Datadog.Trace.ISpanContext", "System.String", "System.Nullable`1[System.DateTimeOffset]", "System.Nullable`1[System.Boolean]"), 6, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.StartActiveImplementationIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("StartActive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("Datadog.Trace.IScope", "System.String"), 2, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.StartActiveOperationNameIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("StartActive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("Datadog.Trace.IScope", "System.String", "Datadog.Trace.SpanCreationSettings"), 3, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.StartActiveSpanCreationSettingsIntegration"), 0, 1), diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs index cc9aaea72247..f82aeef7a280 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs @@ -277,7 +277,7 @@ static InstrumentationDefinitions() new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("get_ActiveScope"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("Datadog.Trace.IScope"), 1, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetActiveScopeIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("get_DefaultServiceName"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.String"), 1, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetDefaultServiceNameIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("GetAutomaticTracerInstance"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Object"), 1, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetAutomaticTracerInstanceIntegration"), 0, 1), - new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("GetUpdatedImmutableTracerSettings"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Collections.Generic.Dictionary`2[System.String,System.Object]", "System.Object", "System.Object&"), 3, 3, 7, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetUpdatedImmutableTracerSettingsIntegration"), 0, 1), + new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("GetUpdatedImmutableTracerSettings"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Collections.Generic.IDictionary`2[System.String,System.Object]", "System.Object", "System.Object&"), 3, 3, 7, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetUpdatedImmutableTracerSettingsIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("StartActive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("Datadog.Trace.IScope", "System.String", "Datadog.Trace.ISpanContext", "System.String", "System.Nullable`1[System.DateTimeOffset]", "System.Nullable`1[System.Boolean]"), 6, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.StartActiveImplementationIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("StartActive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("Datadog.Trace.IScope", "System.String"), 2, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.StartActiveOperationNameIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("StartActive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("Datadog.Trace.IScope", "System.String", "Datadog.Trace.SpanCreationSettings"), 3, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.StartActiveSpanCreationSettingsIntegration"), 0, 1), diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs index cc9aaea72247..f82aeef7a280 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs @@ -277,7 +277,7 @@ static InstrumentationDefinitions() new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("get_ActiveScope"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("Datadog.Trace.IScope"), 1, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetActiveScopeIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("get_DefaultServiceName"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.String"), 1, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetDefaultServiceNameIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("GetAutomaticTracerInstance"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Object"), 1, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetAutomaticTracerInstanceIntegration"), 0, 1), - new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("GetUpdatedImmutableTracerSettings"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Collections.Generic.Dictionary`2[System.String,System.Object]", "System.Object", "System.Object&"), 3, 3, 7, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetUpdatedImmutableTracerSettingsIntegration"), 0, 1), + new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("GetUpdatedImmutableTracerSettings"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("System.Collections.Generic.IDictionary`2[System.String,System.Object]", "System.Object", "System.Object&"), 3, 3, 7, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.GetUpdatedImmutableTracerSettingsIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("StartActive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("Datadog.Trace.IScope", "System.String", "Datadog.Trace.ISpanContext", "System.String", "System.Nullable`1[System.DateTimeOffset]", "System.Nullable`1[System.Boolean]"), 6, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.StartActiveImplementationIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("StartActive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("Datadog.Trace.IScope", "System.String"), 2, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.StartActiveOperationNameIntegration"), 0, 1), new (NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Manual"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.Tracer"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("StartActive"), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16StringArray("Datadog.Trace.IScope", "System.String", "Datadog.Trace.SpanCreationSettings"), 3, 3, 0, 0, 3, 65535, 65535, NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String(assemblyFullName), NativeCallTargetUnmanagedMemoryHelper.AllocateAndWriteUtf16String("Datadog.Trace.ClrProfiler.AutoInstrumentation.ManualInstrumentation.Tracer.StartActiveSpanCreationSettingsIntegration"), 0, 1),