hubrise_initializer 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d194962f743d2f8b6bff39108061f025f0cae54246db364f073b1deeaac2ba62
-  data.tar.gz: f0febb9e3d615f8287c8b053e9f12190b4a07eb4990ede915f84d72851f67fd0
+  metadata.gz: 45fb130be84b2efa48bb2f12d55dd7cb6b8317024a499ef235d3147e5369ebd2
+  data.tar.gz: 2c10bf4fad684afbfd4ea1e46df5ede030d1280e815fa44f03a45fa73af67d92
 SHA512:
-  metadata.gz: 6dba383db0c277229ae8fc7098c0c14fb0beb07f48d5b35f77acc1b6942f571d1150e7501aa3cc2f53dd9f6b6fa8c11924abc13a9745a17c216f2db822225700
-  data.tar.gz: 837634d42cdf90e5c4655385cf8611c0868cbb14a14579bcc77ef4ab03d6eb6274c07f6c9c67d2d9eab9aa8b05814e1c9751e7463d8a7c913653cf31e1f2f81d
+  metadata.gz: 4ee262e8887201121d64dd34311aae1ab827fe57c99c4fc6d881ed9130d969f982fdaafbc9e9329aeca0b69d3802fcd955381cc67011f7ac1fa458346aad7cd4
+  data.tar.gz: e5d7f33383067d08b404e013b98ca3eb588a942e0eb57a8fd92b5d6e7db919e4fe1c679fa1df55b1c6fbc4012f5ced4fd9ea76549e82487f958c8bbc3960d1a5

data/Gemfile

@@ -2,6 +2,7 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 6.0"
+gem "rspec"
 gem "rspec-rails", "~> 5.0"
 gem "hubrise_initializer", path: "."
 

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    hubrise_initializer (1.0.1)
+    hubrise_initializer (1.0.4)
       act-fluent-logger-rails (~> 0.6)
       lograge (~> 0.11)
       lograge-sql
       logstash-event (~> 1.2)
-      rspec
 
 GEM
   remote: https://rubygems.org/
@@ -211,6 +210,7 @@ PLATFORMS
 DEPENDENCIES
   hubrise_initializer!
   rails (~> 6.0)
+  rspec
   rspec-rails (~> 5.0)
   rubocop (= 0.81.0)
   webmock

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.1
+bundle install
+VERSION=1.0.4
+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/hubrise_initializer.gemspec

@@ -21,5 +21,4 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("lograge-sql")
   spec.add_runtime_dependency("act-fluent-logger-rails", "~> 0.6")
   spec.add_runtime_dependency("logstash-event", "~> 1.2")
-  spec.add_runtime_dependency("rspec")
 end

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.1"
+  VERSION = "1.0.4"
 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
+    def configure_active_job_logger
       Rails.application.configure do
-        Delayed::Worker.logger = case ENV["RAILS_LOGGER"]
-        when "stdout"
-          # Log to STDOUT (docker-compose)
+        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.1
+  version: 1.0.4
 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
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email: 
 executables: []