Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add the filepath we check for datadog.json to the output of diagnostic tool #6273

Merged
merged 8 commits into from
Dec 9, 2024
+8 −4
Merged

add the filepath we check for datadog.json to the output of diagnostic tool #6273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5c2dca9
add json directory output to diag tool
chojomok Nov 12, 2024
b541379
Merge branch 'master' into mohammad/datadog_json_debug_log
chojomok Nov 12, 2024
42fde7b
dynamic info log based on if json exists
chojomok Nov 12, 2024
7f2dc85
fixed spacing whoops
chojomok Nov 12, 2024
de40196
Merge branch 'master' into mohammad/datadog_json_debug_log
chojomok Nov 18, 2024
77811cb
Merge branch 'master' into mohammad/datadog_json_debug_log
chojomok Nov 21, 2024
1332da8
Merge branch 'master' into mohammad/datadog_json_debug_log
chojomok Dec 4, 2024
4f23a42
Merge branch 'master' into mohammad/datadog_json_debug_log
chojomok Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions tracer/src/Datadog.Trace.Tools.dd_dotnet/Checks/ProcessConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,16 @@ internal static IConfigurationSource ExtractConfigurationSource(this ProcessInfo
}
}

var jsonConfigurationSource = JsonConfigurationSource.TryLoadJsonConfigurationFile(configurationSource, baseDirectory);

var jsonConfigurationSource = JsonConfigurationSource.TryLoadJsonConfigurationFile(configurationSource, baseDirectory, out string jsonDirectory);
chojomok marked this conversation as resolved.
Show resolved Hide resolved
if (jsonConfigurationSource != null)
{
Utils.WriteInfo("Loaded JSON configuration file from: " + jsonDirectory);
configurationSource.Add(jsonConfigurationSource);
}
else
{
Utils.WriteInfo("Did not find JSON configuration file to load from: " + jsonDirectory);
}

return configurationSource;
}
Expand Down
4 changes: 2 additions & 2 deletions tracer/src/Datadog.Trace.Tools.dd_dotnet/JsonConfigurationSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ public JsonConfigurationSource(string json)
_document = JsonDocument.Parse(json, new JsonDocumentOptions { AllowTrailingCommas = true });
}

internal static JsonConfigurationSource? TryLoadJsonConfigurationFile(IConfigurationSource configurationSource, string? baseDirectory)
internal static JsonConfigurationSource? TryLoadJsonConfigurationFile(IConfigurationSource configurationSource, string? baseDirectory, out string configurationFileName)
{
// if environment variable is not set, look for default file name in the current directory
var configurationFileName = configurationSource.GetString(ConfigurationKeys.ConfigurationFileName)
configurationFileName = configurationSource.GetString(ConfigurationKeys.ConfigurationFileName)
?? configurationSource.GetString("DD_DOTNET_TRACER_CONFIG_FILE")
?? Path.Combine(baseDirectory ?? AppDomain.CurrentDomain.BaseDirectory, "datadog.json");

Expand Down
Loading