spike: add log message with encoding info

elastic · Feb 23, 2024 · 49ca706 · 49ca706
1 parent d6546b7
commit 49ca706
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/ci/integration_tests.sh b/ci/integration_tests.sh
@@ -14,6 +14,8 @@ if [ -n "$BUILD_JAVA_HOME" ]; then
  GRADLE_OPTS="$GRADLE_OPTS -Dorg.gradle.java.home=$BUILD_JAVA_HOME"
 fi
 
+echo "LOCALE INFO:"$'\n'"$(locale | pr -to2)"
+
 if [[ $1 = "setup" ]]; then
  echo "Setup only, no tests will be run"
  exit 0

diff --git a/logstash-core/lib/logstash/runner.rb b/logstash-core/lib/logstash/runner.rb
@@ -326,6 +326,16 @@ def execute
  jvmArgs = ManagementFactory.getRuntimeMXBean().getInputArguments()
  logger.info "JVM bootstrap flags: #{jvmArgs}"
 
+ ruby_encoding_info = %w(external internal locale filesystem).map do |type|
+ Encoding.find(type)&.name&.then { |name| "#{type}:#{name}" }
+ end.compact.join(", ")
+
+ logger.info <<~ENCODINGINFO.tr("\n", ' ')
+ Ruby.Encoding=(#{ruby_encoding_info})
+ Java.Locale=`#{java.util.Locale::getDefault().toLanguageTag()}`
+ Java.Charset=`#{java.nio.charset.Charset::defaultCharset().displayName()}`
+ ENCODINGINFO
+
  # Add local modules to the registry before everything else
  LogStash::Modules::Util.register_local_modules(LogStash::Environment::LOGSTASH_HOME)
 

diff --git a/qa/integration/specs/monitoring_api_spec.rb b/qa/integration/specs/monitoring_api_spec.rb
@@ -25,6 +25,16 @@
 describe "Test Monitoring API" do
  before(:all) {
  @fixture = Fixture.new(__FILE__)
+ ruby_encoding_info = %w(external internal locale filesystem).map do |type|
+ Encoding.find(type)&.name&.then { |name| "#{type}:#{name}" }
+ end.compact.join(", ")
+
+ $stderr.puts <<~ENCODINGINFO.tr("\n", ' ')
+ INFO(spec runner process)
+ Ruby.Encoding=(#{ruby_encoding_info})
+ Java.Locale=`#{java.util.Locale::getDefault().toLanguageTag()}`
+ Java.Charset=`#{java.nio.charset.Charset::defaultCharset().displayName()}`
+ ENCODINGINFO
  }
 
  after(:all) {
@@ -171,7 +181,6 @@
 
  it "can retrieve queue stats" do
  logstash_service = @fixture.get_service("logstash")
- logstash_service.env_variables = { 'LANG' => 'en_US.UTF-8' }
  logstash_service.start_with_stdin('--pipeline.id' => pipeline_id)
  logstash_service.wait_for_logstash
 
@@ -202,7 +211,6 @@
 
  it "retrieves the pipeline flow statuses" do
  logstash_service = @fixture.get_service("logstash")
- logstash_service.env_variables = { 'LANG' => 'en_US.UTF-8' }
  logstash_service.start_with_stdin('--pipeline.id' => pipeline_id)
  logstash_service.wait_for_logstash
  number_of_events.times {
@@ -252,7 +260,6 @@
  EOPIPELINE
 
  logstash_service = @fixture.get_service("logstash")
- logstash_service.env_variables = { 'LANG' => 'en_US.UTF-8' }
  logstash_service.start_with_stdin('--pipeline.id' => pipeline_id, '--config.string' => plugins_config)
  logstash_service.wait_for_logstash
  number_of_events.times {