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.

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

update multiline parser config logic #1180

Merged
merged 2 commits into from
Feb 28, 2024
Merged
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions build/common/installer/scripts/tomlparser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
@containerLogsRoute = "v2" # default for linux
@adxDatabaseName = "containerinsights" # default for all configurations
@logEnableMultiline = "false"
@stacktraceLanguages = "go,java,python,dotnet"
@stacktraceLanguages = "go,java,python" #supported languages for multiline logs. java is also used for dotnet stacktraces
if !@os_type.nil? && !@os_type.empty? && @os_type.strip.casecmp("windows") == 0
@containerLogsRoute = "v1" # default is v1 for windows until windows agent integrates windows ama
# This path format is necessary for fluent-bit in windows
Expand Down Expand Up @@ -175,7 +175,13 @@ def populateSettingValuesFromConfigMap(parsedConfig)
if invalid_lang
puts "config::WARN: stacktrace languages contains invalid languages. Disabling multiline stacktrace logging"
else
@stacktraceLanguages = multilineLanguages.join(",").downcase
multilineLanguages = multilineLanguages.map(&:downcase)
# the java multiline parser also captures dotnet
if multilineLanguages.include?("dotnet")
multilineLanguages.delete("dotnet")
multilineLanguages << "java" unless multilineLanguages.include?("java")
end
@stacktraceLanguages = multilineLanguages.join(",")
puts "config::Using config map setting for multiline languages"
end
else
Expand Down
Loading