logtail-rails 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0194357c22696c69efc90f63324d9e17b5b92c2a8a8f787a09fc56ef64939726'
-  data.tar.gz: 1f6023f784446349e83484c4663088b260af2f7eb62b114789380dacd154494d
+  metadata.gz: d7123b2162f46a2a107ead8671135561f7a5d53f49a66196f4684776ad14a7c5
+  data.tar.gz: 749ff8b0d6367026632cb6beee6a5742168aeb0b038d87b786ae683472c83409
 SHA512:
-  metadata.gz: 01fac73b610686a7ea103847e501a0ef69e14a08e23757e2dfe13e4cb7fe8b23c5d3bf0022aba98831ed42e95bfedc310b2458fb0d4b7510ca65f1d8d984de9d
-  data.tar.gz: bcc0d8246d57ab258c52964023a5239adf6794444749fa8a210ebbe29a63afcbb968e6b5ee6674c0308f39a4cbe5309d966c79529ad7693158905f1e3230fb91
+  metadata.gz: 248ef31c5d69238893ce2b0e8c0d1bc5de1a9edd94df498da0c2ef61dbe608ff0cfb2761c390eb18e70b24481bfc8455750d99340d539aed84c21feebf53d3b9
+  data.tar.gz: fe08fa5eba61b5908202ea011153721b02c703d239cc78b7edc0d76484debb5e80faddeaa4d2bdf41fde63190dd4fec068e705262326e5829d2de683256f10ab

data/.github/workflows/main.yml

@@ -5,6 +5,7 @@ on:
   pull_request:
   schedule:
     - cron: '20 5 * * 1'
+  workflow_dispatch:
 
 jobs:
   test:
@@ -15,37 +16,69 @@ jobs:
 
       matrix:
         ruby-version:
-          - 3.0.0
+          - 3.2.2
+          - 3.1.4
+          - 3.0.6
           - 2.7.2
           - 2.6.6
           - 2.5.8
+          - jruby-9.4.3.0
           - jruby-9.2.14.0
-          - truffleruby-21.0.0
+          - truffleruby-23.0.0
+          - truffleruby-22.1.0
         gemfile:
-          - rails-edge
+          - rails-7.0
           - rails-6.1
           - rails-6.0
           - rails-5.2
           - rails-5.1
           - rails-5.0
         exclude:
-          - gemfile: rails-edge
+          - gemfile: rails-7.0
             ruby-version: 2.6.6
-          - gemfile: rails-edge
+          - gemfile: rails-7.0
             ruby-version: 2.5.8
-          - gemfile: rails-edge
+          - gemfile: rails-7.0
             ruby-version: jruby-9.2.14.0
-          - gemfile: rails-edge
-            ruby-version: truffleruby-21.0.0
 
           - gemfile: rails-5.2
-            ruby-version: 3.0.0
+            ruby-version: 3.2.2
+          - gemfile: rails-5.2
+            ruby-version: 3.1.4
+          - gemfile: rails-5.2
+            ruby-version: 3.0.6
+          - gemfile: rails-5.2
+            ruby-version: jruby-9.4.3.0
+          - gemfile: rails-5.2
+            ruby-version: truffleruby-22.1.0
+          - gemfile: rails-5.2
+            ruby-version: truffleruby-23.0.0
 
           - gemfile: rails-5.1
-            ruby-version: 3.0.0
+            ruby-version: 3.2.2
+          - gemfile: rails-5.1
+            ruby-version: 3.1.4
+          - gemfile: rails-5.1
+            ruby-version: 3.0.6
+          - gemfile: rails-5.1
+            ruby-version: jruby-9.4.3.0
+          - gemfile: rails-5.1
+            ruby-version: truffleruby-23.0.0
+          - gemfile: rails-5.1
+            ruby-version: truffleruby-22.1.0
 
           - gemfile: rails-5.0
-            ruby-version: 3.0.0
+            ruby-version: 3.2.2
+          - gemfile: rails-5.0
+            ruby-version: 3.1.4
+          - gemfile: rails-5.0
+            ruby-version: 3.0.6
+          - gemfile: rails-5.0
+            ruby-version: jruby-9.4.3.0
+          - gemfile: rails-5.0
+            ruby-version: truffleruby-23.0.0
+          - gemfile: rails-5.0
+            ruby-version: truffleruby-22.1.0
 
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile

data/README.md

@@ -3,7 +3,7 @@
   [![Logtail ruby dashboard](https://user-images.githubusercontent.com/19272921/154085622-59997d5a-3f91-4bc9-a815-3b8ead16d28d.jpeg)](https://betterstack.com/logtail)
 
 [![ISC License](https://img.shields.io/badge/license-ISC-ff69b4.svg)](LICENSE.md)
-[![Gem Version](https://badge.fury.io/rb/logtail-ruby.svg)](https://badge.fury.io/rb/logtail-ruby)
+[![Gem Version](https://badge.fury.io/rb/logtail-rails.svg)](https://badge.fury.io/rb/logtail-rails)
 [![Build Status](https://github.com/logtail/logtail-ruby-rails/workflows/build/badge.svg)](https://github.com/logtail/logtail-ruby-rails/actions?query=workflow%3Abuild)
 
 Collect logs directly from your Ruby on Rails projects. To start logging Ruby projects explore the [Logtail Ruby library](https://github.com/logtail/logtail-ruby).

data/example-project/Gemfile

@@ -71,4 +71,4 @@ group :test do
   gem "webdrivers"
 end
 
-gem "logtail-rails", "~> 0.1.7"
+gem "logtail-rails", "~> 0.2.0"

data/gemfiles/rails-7.0.gemfile

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

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/railtie.rb

@@ -6,10 +6,6 @@ module Logtail
       # Installs Logtail into your Rails app automatically.
       class Railtie < ::Rails::Railtie
         railtie_name 'logtail-rails'
-        rake_tasks do
-          path = File.expand_path(__dir__)
-          load "#{path}/tasks/logtail.rake"
-        end
 
         config.logtail = Config.instance
 

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.1"
+      VERSION = "0.2.3"
     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.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Better Stack
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-12 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logtail
@@ -305,7 +305,7 @@ files:
 - gemfiles/rails-5.2.gemfile
 - gemfiles/rails-6.0.gemfile
 - gemfiles/rails-6.1.gemfile
-- gemfiles/rails-edge.gemfile
+- gemfiles/rails-7.0.gemfile
 - lib/logtail-rails.rb
 - lib/logtail-rails/action_controller.rb
 - lib/logtail-rails/action_controller/log_subscriber.rb
@@ -334,6 +334,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

data/gemfiles/rails-edge.gemfile

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rack', git: 'https://github.com/rack/rack', branch: 'master'
-gem 'arel', git: 'https://github.com/rails/arel', branch: 'master'
-gem 'rails', git: 'https://github.com/rails/rails', branch: 'main'
-
-gem 'logtail'
-gem 'logtail-rack'
-
-gemspec :path => '../'