From 0b64cb9d8c135062cb14e335bcff33aa592fa748 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Wed, 10 Jul 2024 10:36:22 +0800 Subject: [PATCH] Revert "DEV: Remove `git_version` from `DiscourseLogstashLogger` log event (#27730)" (#27814) This reverts commit bb0daa33cd93eeffb230689d1daacd737f61b2e7. This commit was not causing the problems we thought it was. --- lib/discourse_logstash_logger.rb | 3 +++ spec/lib/discourse_logstash_logger_spec.rb | 1 + 2 files changed, 4 insertions(+) diff --git a/lib/discourse_logstash_logger.rb b/lib/discourse_logstash_logger.rb index fd2b6816985..8a7bcc04e4a 100644 --- a/lib/discourse_logstash_logger.rb +++ b/lib/discourse_logstash_logger.rb @@ -2,10 +2,12 @@ require "json" require "socket" +require_relative "git_utils" class DiscourseLogstashLogger < Logger PROCESS_PID = Process.pid HOST = Socket.gethostname + GIT_VERSION = GitUtils.git_version attr_accessor :customize_event, :type @@ -65,6 +67,7 @@ class DiscourseLogstashLogger < Logger "pid" => PROCESS_PID, "type" => @type.to_s, "host" => HOST, + "git_version" => GitUtils.git_version, } # Only log backtrace and env for Logger::WARN and above. diff --git a/spec/lib/discourse_logstash_logger_spec.rb b/spec/lib/discourse_logstash_logger_spec.rb index 33cecf2663e..857eca4d93c 100644 --- a/spec/lib/discourse_logstash_logger_spec.rb +++ b/spec/lib/discourse_logstash_logger_spec.rb @@ -21,6 +21,7 @@ RSpec.describe DiscourseLogstashLogger do "pid" => described_class::PROCESS_PID, "type" => "test", "host" => described_class::HOST, + "git_version" => described_class::GIT_VERSION, "method" => "GET", "path" => "/", "format" => "html",