hubrise_initializer 1.0.2 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73fece447334c17d9c081201771dcb5acd2b87d43c58f14b72d67ac453942da1
-  data.tar.gz: da9c1fc14a2a2c900f1bce183db046633ec969bff4c6d969df81e869839fe693
+  metadata.gz: 9f9790a54b0c9d27bbf7feeb4233ba20200618d10e8b6dac2f576aa0719075dc
+  data.tar.gz: 2c7ad455dd3a9e29b7c6a0632b921c29b48e81bb1c2d48ba65d4703d30b2f1c9
 SHA512:
-  metadata.gz: cf1c8cf7d21077a1c27b202df3eee8da957fe98df8320b8c78dd8727a314a0152267dbe5901099c999b7b8b64ed13590ab8124b89b7147a8bef3848d7746e78a
-  data.tar.gz: caae113f0e6fa7eaf00cfff82e7d36a934890a5dd95fdf748fe43696a6297c534ebdc458532f216217f82d49c5112ffee71757c28bd7d2d8b6f0c687c9721206
+  metadata.gz: 960c86b65e78b659750c5d05ff63b8cf7b2160ee905e5ff5b63b9ff3dc7020e1b1392cc1a05978134479d97b782c15ed4545938ce385f6ed14e475115c520ec2
+  data.tar.gz: 21c0a7b5c5e194e4119f031a3736c0a34f0d6d56c678dc84d8e6c8b6c1c91a57197e975662b4de1ff5bd484976a30b7d1b61c8ad3ad813f1d5cd3f6f18f9e573

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hubrise_initializer (1.0.1)
+    hubrise_initializer (1.0.5)
       act-fluent-logger-rails (~> 0.6)
       lograge (~> 0.11)
       lograge-sql

data/README.md

@@ -11,7 +11,7 @@ gem 'hubrise_initializer'
 
 In `config/application.rb`:
 ```
-HubriseInitializer.configure(:logger, :delayed_job_logger, :web_console)
+HubriseInitializer.configure(:logger, :web_console)
 ```
 
 ## Configuration
@@ -46,7 +46,9 @@ To upload the latest version to RubyGems.org:
 
 2. Tag the repository:
 ```bash
-VERSION=1.0.2
+bundle install
+VERSION=1.0.5
+git add Gemfile.lock
 git add lib/hubrise_initializer/version.rb
 git commit -m "Version $VERSION"
 git tag v$VERSION
@@ -60,4 +62,5 @@ git push
 rm -f hubrise_initializer-*.gem
 gem build hubrise_initializer
 gem push hubrise_initializer-*.gem
+rm -f hubrise_initializer-*.gem
 ``` 

data/lib/hubrise_initializer/lograge.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require_relative "../hubrise_initializer"
+
 class HubriseInitializer
   class Lograge
     class << self
@@ -8,20 +10,19 @@ class HubriseInitializer
 
       def custom_payload(controller)
         request = controller.request
-        request_headers = process_request_headers(request)
         response = controller.response
+        extra = controller.request.env[HubriseInitializer::LOGRAGE_INFO_ENV] || {}
 
         {
           release: ENV["RELEASE"],
           host: request.host,
           ip: request.ip,
-          access_token: request_headers["X-Access-Token"], # For the API
           params: request.query_string.presence,
-        }.compact
+        }.merge(extra)
           .merge(
             if ENV["RAILS_LOGRAGE_QUERY"] == "true"
               {
-                request_headers: request_headers.to_s,
+                request_headers: process_request_headers(request).to_s,
                 request_body: truncate_body(switch_to_utf8(request.raw_post)),
                 response_headers: response.headers.to_h.to_s,
                 response_body: truncate_body(switch_to_utf8(response.body)),

data/lib/hubrise_initializer/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 class HubriseInitializer
-  VERSION = "1.0.2"
+  VERSION = "1.0.5"
 end

data/lib/hubrise_initializer.rb

@@ -12,14 +12,16 @@ class HubriseInitializer
         case initializer
         when :logger
           configure_logger
-        when :delayed_job_logger
-          configure_delayed_job_logger
         when :web_console
           configure_web_console
         end
       end
     end
 
+    def lograge_info(controller, details)
+      (controller.request.env[LOGRAGE_INFO_ENV] ||= {}).merge!(details)
+    end
+
     private
 
     def configure_logger
@@ -56,23 +58,22 @@ class HubriseInitializer
           # Log to a file (Rails default)
         end
       end
+
+      if defined?(ActiveJob)
+        configure_active_job_logger
+      end
     end
 
-    def configure_delayed_job_logger
-      Rails.application.configure do
-        Delayed::Worker.logger = case ENV["RAILS_LOGGER"]
-        when "stdout"
-          # Log to STDOUT (docker-compose)
+    def configure_active_job_logger
+      Rails.application.initializer("hubrise_initializer.active_job.logger", after: "active_job.logger") do
+        ActiveJob::Base.logger = case ENV["RAILS_LOGGER"]
+        when "stdout", "fluentd"
+          # Do not send ActiveJobs logs to fluentd as this would create new Elasticsearch entries detached from the
+          # request.
           ActiveSupport::Logger.new(STDOUT)
 
-        when "fluentd"
-          # Log to fluentd (kubernetes)
-          # ENV['FLUENTD_URL'] is used internally by this logger
-          ActFluentLoggerRails::Logger.new
-
         else
-          # Log to a file
-          ActiveSupport::Logger.new(File.join(Rails.root, "log", "delayed_job.log"))
+          ActiveSupport::Logger.new(File.join(Rails.root, "log", "active_job.log"))
         end
       end
     end
@@ -89,4 +90,6 @@ class HubriseInitializer
       end
     end
   end
+
+  LOGRAGE_INFO_ENV = "rails-initializer-lograge-info"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hubrise_initializer
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.5
 platform: ruby
 authors:
 - Antoine Monnier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lograge