Skip to content

Commit ff7082e

Browse files
committed
Fix bug in HandsOff config
1 parent 3ce48b3 commit ff7082e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

tracer/src/Datadog.Trace/LibDatadog/HandsOffConfiguration/ConfiguratorHelper.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ internal static ConfigurationResult GetConfiguration(string? handsOffLocalConfig
3535
var configHandle = IntPtr.Zero;
3636
Error? resultError = null;
3737
LibraryConfigs? libraryConfigs = null;
38+
LibraryConfigResult configurationResult = default;
3839
try
3940
{
4041
languageCs = new CharSlice(TracerConstants.Language);
@@ -55,7 +56,7 @@ internal static ConfigurationResult GetConfiguration(string? handsOffLocalConfig
5556
NativeInterop.LibraryConfig.ConfiguratorWithFleetPath(configHandle, fleetPath.Value);
5657
}
5758

58-
var configurationResult = NativeInterop.LibraryConfig.ConfiguratorGet(configHandle);
59+
configurationResult = NativeInterop.LibraryConfig.ConfiguratorGet(configHandle);
5960
var result = configurationResult.Result;
6061

6162
if (configurationResult.Tag == ResultTag.Err)
@@ -108,7 +109,7 @@ internal static ConfigurationResult GetConfiguration(string? handsOffLocalConfig
108109

109110
if (libraryConfigs.HasValue)
110111
{
111-
NativeInterop.LibraryConfig.LibraryConfigDrop(libraryConfigs.Value);
112+
NativeInterop.LibraryConfig.LibraryConfigDrop(configurationResult);
112113
}
113114

114115
if (configHandle != IntPtr.Zero)

tracer/src/Datadog.Trace/LibDatadog/NativeInterop.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,6 @@ internal static extern TracerMemfdHandleResult StoreTracerMetadata(
143143
internal static extern void ConfiguratorDrop(IntPtr configurator);
144144

145145
[DllImport(DllName, EntryPoint = "ddog_library_config_drop")]
146-
internal static extern void LibraryConfigDrop(LibraryConfigs configs);
146+
internal static extern void LibraryConfigDrop(LibraryConfigResult configs);
147147
}
148148
}

0 commit comments

Comments
 (0)