logtail-rails 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed20f6d4677ee4cce10f91ce1acde469e3f201c12092aaccec4d172137089119
-  data.tar.gz: 3c8e38d62f4a9b58c37ec1aae0f1cdddbbddec16cd8caf3d790cba641fd8effa
+  metadata.gz: 4d238560ec59e0d1b0d936ae0b3b92e11865ba2e80fcc4adeb4d6cb43676c7ae
+  data.tar.gz: 97e280b2a2c9297a0862dbbd733a4a36e902928b749be07bed9c904243a167f9
 SHA512:
-  metadata.gz: f0394b6d9ec9e4282082ed6abde5ae81a6ec0768faa738c5f6c753535bfb7ddf4e3913839393ef59ddd968d99816a53abf7ad7f6f173ced965c4abb28c20f695
-  data.tar.gz: 1a77af8d51a25997f1af62d066868fd73bda872b2932c499d688c04829d2a5abad15b3398435db95164e81b8948040725186bb5f36135756cdcf1cc544de9050
+  metadata.gz: bc9b5ab10bb6cb45a9896a1056399c5adb5a8297cc06d7b424bd077884ff3848c6892d526004a2c3dc620ff4b2ce0505fc589be9c0d3b4d60485fd8165b7d5eb
+  data.tar.gz: 2cbd54fa234e026c71feba8f050e41d6a5b5ae513b806548921943bade86665248a826274d949924b4607a7ce1e72e2fb31137629991ac3cf3c30f59c3d5983c

data/.github/workflows/main.yml

@@ -27,6 +27,7 @@ jobs:
           - truffleruby-23.0.0
           - truffleruby-22.1.0
         gemfile:
+          - rails-edge
           - rails-7.0
           - rails-6.1
           - rails-6.0
@@ -34,6 +35,17 @@ jobs:
           - rails-5.1
           - rails-5.0
         exclude:
+          - gemfile: rails-edge
+            ruby-version: 2.6.6
+          - gemfile: rails-edge
+            ruby-version: 2.5.8
+          - gemfile: rails-edge
+            ruby-version: jruby-9.4.3.0
+          - gemfile: rails-edge
+            ruby-version: jruby-9.2.14.0
+          - gemfile: rails-edge
+            ruby-version: truffleruby-23.0.0
+
           - gemfile: rails-7.0
             ruby-version: 2.6.6
           - gemfile: rails-7.0

data/gemfiles/rails-edge.gemfile

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gem 'rails', github: 'rails/rails', branch: 'main'
+
+gem 'logtail'
+gem 'logtail-rack'
+
+if RUBY_PLATFORM == "java"
+  gem 'mime-types', '2.6.2'
+end
+
+gemspec :path => '../'

data/lib/logtail-rails/action_controller/log_subscriber.rb

@@ -7,6 +7,7 @@ module Logtail
       # @private
       class LogSubscriber < Integrator
         def initialize
+          require "action_controller"
           require "action_controller/log_subscriber"
           require "logtail-rails/action_controller/log_subscriber/logtail_log_subscriber"
         rescue LoadError => e

data/lib/logtail-rails/action_view/log_subscriber/logtail_log_subscriber.rb

@@ -25,6 +25,7 @@ module Logtail
               )
             end
           end
+          subscribe_log_level :render_template, :info if defined?(subscribe_log_level)
 
           def render_partial(event)
             return true if silence?
@@ -66,6 +67,18 @@ module Logtail
             end
           end
 
+          def self.attach_to(*)
+            super
+
+            if ::Rails::VERSION::MAJOR > 7 || ::Rails::VERSION::MAJOR == 7 && ::Rails::VERSION::MINOR >= 1
+              # Clean extra listeners subscribed in parent's attach_to method
+              ::ActiveSupport::Notifications.notifier.listeners_for("render_template.action_view")
+                .concat(::ActiveSupport::Notifications.notifier.listeners_for("render_layout.action_view")).flatten
+                .filter { |listener| listener.delegate.class == ::ActionView::LogSubscriber::Start }
+                .each { |listener| ActiveSupport::Notifications.unsubscribe(listener) }
+            end
+          end
+
           private
           def log_rendering_start(*args)
             # Consolidates 2 template rendering events into 1. We don't need 2 events for

data/lib/logtail-rails/active_support_log_subscriber.rb

@@ -18,6 +18,11 @@ module Logtail
         # I don't know why this has to be so complicated, but it is. This code was taken from
         # lograge :/
         def unsubscribe!(component, type)
+          if defined?(type.detach_from)
+            type.detach_from(component)
+            return
+          end
+
           subscriber = find(component, type)
 
           if !subscriber

data/lib/logtail-rails/logger.rb

@@ -32,7 +32,16 @@ module Logtail
         io_device = STDOUT
       end
 
-      self.create_logger(io_device)
+      logger = self.create_logger(io_device)
+
+      if defined?(Sidekiq)
+        Sidekiq.configure_server do |config|
+          logger = self.create_logger(io_device, config.logger) if config.logger.class == Sidekiq::Logger
+          config.logger = logger
+        end
+      end
+
+      logger
     end
   end
 end

data/lib/logtail-rails/sidekiq.rb

@@ -0,0 +1,38 @@
+# integrates Logtail::CurrentContext with Sidekiq::Context if installed
+
+begin
+  require 'sidekiq/job_logger'
+
+  class Sidekiq::JobLogger
+    def call(_item, _queue)
+      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+      Logtail::CurrentContext.with({ sidekiq: Sidekiq::Context.current.to_h }) do
+        @logger.info("start")
+
+        yield
+      end
+
+      Sidekiq::Context.add(:elapsed, elapsed(start))
+      Logtail::CurrentContext.with({ sidekiq: Sidekiq::Context.current.to_h }) do
+        @logger.info('done')
+      end
+    rescue Exception
+      Sidekiq::Context.add(:elapsed, elapsed(start))
+      Logtail::CurrentContext.with({ sidekiq: Sidekiq::Context.current.to_h }) do
+        @logger.info('fail')
+      end
+
+      raise
+    end
+
+    private
+
+    def elapsed(start)
+      (Process.clock_gettime(::Process::CLOCK_MONOTONIC) - start).round(3)
+    end
+  end
+
+rescue LoadError
+  # sidekiq is not present
+end

data/lib/logtail-rails/version.rb

@@ -1,7 +1,7 @@
 module Logtail
   module Integrations
     module Rails
-      VERSION = "0.2.2"
+      VERSION = "0.2.4"
     end
   end
 end

data/lib/logtail-rails.rb

@@ -21,6 +21,7 @@ require "logtail-rails/action_controller"
 require "logtail-rails/action_dispatch"
 require "logtail-rails/action_view"
 require "logtail-rails/active_record"
+require "logtail-rails/sidekiq"
 
 require "logtail-rails/log_entry"
 require "logtail-rails/logger"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logtail-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Better Stack
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-12 00:00:00.000000000 Z
+date: 2023-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logtail
@@ -306,6 +306,7 @@ files:
 - gemfiles/rails-6.0.gemfile
 - gemfiles/rails-6.1.gemfile
 - gemfiles/rails-7.0.gemfile
+- gemfiles/rails-edge.gemfile
 - lib/logtail-rails.rb
 - lib/logtail-rails/action_controller.rb
 - lib/logtail-rails/action_controller/log_subscriber.rb
@@ -334,6 +335,7 @@ files:
 - lib/logtail-rails/rack_logger.rb
 - lib/logtail-rails/railtie.rb
 - lib/logtail-rails/session_context.rb
+- lib/logtail-rails/sidekiq.rb
 - lib/logtail-rails/version.rb
 - logtail-rails.gemspec
 homepage: https://github.com/logtail/logtail-ruby-rails