logtail-rails 0.1.8 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eb050c970571683d40dcd025672d9fb0eebcc72261627e7716115b7e16bd3a4
-  data.tar.gz: abc54338cfdb59ddc885fc5c3589119b21e9ce6a7bb6d7f8b73301f6f94f2233
+  metadata.gz: '0194357c22696c69efc90f63324d9e17b5b92c2a8a8f787a09fc56ef64939726'
+  data.tar.gz: 1f6023f784446349e83484c4663088b260af2f7eb62b114789380dacd154494d
 SHA512:
-  metadata.gz: 493ff5967c0a198b4667bd693074267f4ebe6e543363496a93825e41dd03736ced0e85357c207e1c3ce225375527c9feef424e51f0bd040b977403326e410c6a
-  data.tar.gz: d5886072cbfbd130164e68bc7d23c3aaf1e335ee2b8dbb5e115c380c57ae437e6d45ba8797c824847014e3372b4c01600692ede1701c0c283721022c01e18640
+  metadata.gz: 01fac73b610686a7ea103847e501a0ef69e14a08e23757e2dfe13e4cb7fe8b23c5d3bf0022aba98831ed42e95bfedc310b2458fb0d4b7510ca65f1d8d984de9d
+  data.tar.gz: bcc0d8246d57ab258c52964023a5239adf6794444749fa8a210ebbe29a63afcbb968e6b5ee6674c0308f39a4cbe5309d966c79529ad7693158905f1e3230fb91

data/.github/workflows/main.yml

@@ -1,6 +1,10 @@
 name: build
 
-on: [ push, pull_request ]
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '20 5 * * 1'
 
 jobs:
   test:
@@ -15,9 +19,6 @@ jobs:
           - 2.7.2
           - 2.6.6
           - 2.5.8
-          - 2.4.10
-          - 2.3.8
-          - 2.2.10
           - jruby-9.2.14.0
           - truffleruby-21.0.0
         gemfile:
@@ -32,96 +33,19 @@ jobs:
             ruby-version: 2.6.6
           - gemfile: rails-edge
             ruby-version: 2.5.8
-          - gemfile: rails-edge
-            ruby-version: 2.4.10
-          - gemfile: rails-edge
-            ruby-version: 2.3.8
-          - gemfile: rails-edge
-            ruby-version: 2.2.10
           - gemfile: rails-edge
             ruby-version: jruby-9.2.14.0
           - gemfile: rails-edge
             ruby-version: truffleruby-21.0.0
 
-          - ruby-version: 3.0.0
-            gemfile: rails-5.2
-          - ruby-version: 3.0.0
-            gemfile: rails-5.1
-          - ruby-version: 3.0.0
-            gemfile: rails-5.0
-
-          - gemfile: rails-6.1
-            ruby-version: 2.4.10
-          - gemfile: rails-6.1
-            ruby-version: 2.3.8
-          - gemfile: rails-6.1
-            ruby-version: 2.2.10
-          - gemfile: rails-6.1
-            ruby-version: 2.2.10
-
-          - gemfile: rails-6.0
-            ruby-version: 2.4.10
-          - gemfile: rails-6.0
-            ruby-version: 2.3.8
-          - gemfile: rails-6.0
-            ruby-version: 2.2.10
-
           - gemfile: rails-5.2
-            ruby-version: 2.2.10
-
-    env:
-      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
-      RAILS_ENV: test
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Selected Gemfile
-        run: echo $BUNDLE_GEMFILE
-
-      - name: Set up Ruby ${{ matrix.ruby-version }}
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-          bundler-cache: true
-
-      - name: Run tests
-        run: bundle exec rspec --format documentation
-
+            ruby-version: 3.0.0
 
-  test_bundler_v1:
-    runs-on: ubuntu-20.04
+          - gemfile: rails-5.1
+            ruby-version: 3.0.0
 
-    strategy:
-      fail-fast: false
-
-      matrix:
-        ruby-version:
-          - 2.6.6
-          - 2.5.8
-          - 2.4.10
-          - 2.3.8
-          - 2.2.10
-        gemfile:
-          - rails-4.2
-          - rails-4.1
-          - rails-4.0
-          - rails-3.2
-
-        exclude:
-          - gemfile: rails-4.1
-            ruby-version: 2.6.6
-          - gemfile: rails-4.1
-            ruby-version: 2.5.8
-          - gemfile: rails-4.1
-            ruby-version: 2.4.10
-
-          - gemfile: rails-4.0
-            ruby-version: 2.6.6
-          - gemfile: rails-4.0
-            ruby-version: 2.5.8
-          - gemfile: rails-4.0
-            ruby-version: 2.4.10
+          - gemfile: rails-5.0
+            ruby-version: 3.0.0
 
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
@@ -136,7 +60,6 @@ jobs:
       - name: Set up Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1
         with:
-          bundler: 1.17
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
 

data/README.md

@@ -17,8 +17,8 @@ Collect logs directly from your Ruby on Rails projects. To start logging Ruby pr
 - Performant, light weight, with a thoughtful design.
 
 ### Supported language versions
-- Ruby 2.7.0 or newer
-- Rails 6.1.4.2 or newer
+- Ruby 2.5 or newer
+- Rails 5.0 or newer
 
 # Installation
 Install the Logtail Ruby on Rails client library, run the following command:

data/lib/logtail-rails/overrides/active_support_tagged_logging.rb

@@ -1,10 +1,9 @@
 # This is an override instead of an integration because without this Logtail would not
 # work properly if ActiveSupport::TaggedLogging is used.
-#
-# This is called after 'active_support_3_tagged_logging' where the constant is loaded and
-# replaced. I want to make sure we don't attempt to load it again undoing the patches
-# applied there.
-if defined?(ActiveSupport::TaggedLogging)
+
+begin
+  require "active_support/tagged_logging"
+
   module Logtail
     module Overrides
       # @private
@@ -63,4 +62,6 @@ if defined?(ActiveSupport::TaggedLogging)
       end
     end
   end
+
+rescue Exception
 end

data/lib/logtail-rails/overrides.rb

@@ -1,5 +1,4 @@
 # The order is relevant
-require "logtail-rails/overrides/active_support_3_tagged_logging"
 require "logtail-rails/overrides/active_support_tagged_logging"
 require "logtail-rails/overrides/active_support_buffered_logger"
 require "logtail-rails/overrides/lograge"

data/lib/logtail-rails/version.rb

@@ -1,7 +1,7 @@
 module Logtail
   module Integrations
     module Rails
-      VERSION = "0.1.8"
+      VERSION = "0.2.1"
     end
   end
 end

data/logtail-rails.gemspec

@@ -5,14 +5,14 @@ require "logtail-rails/version"
 Gem::Specification.new do |spec|
   spec.name = "logtail-rails"
   spec.version = Logtail::Integrations::Rails::VERSION
-  spec.authors = ["Logtail"]
+  spec.authors = ["Better Stack"]
   spec.email = ["hello@betterstack.com"]
 
   spec.summary = %q{Better Stack Rails integration}
   spec.homepage = "https://github.com/logtail/logtail-ruby-rails"
   spec.license = "ISC"
 
-  spec.required_ruby_version = '>= 2.2.0'
+  spec.required_ruby_version = '>= 2.5.0'
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/logtail/logtail-ruby-rails"
@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "logtail", "~> 0.1"
   spec.add_runtime_dependency "logtail-rack", "~> 0.1"
 
-  spec.add_runtime_dependency 'activerecord', '>= 3.0.0'
-  spec.add_runtime_dependency 'railties', '>= 3.0.0'
-  spec.add_runtime_dependency 'actionpack', '>= 3.0.0'
+  spec.add_runtime_dependency 'activerecord', '>= 5.0.0'
+  spec.add_runtime_dependency 'railties', '>= 5.0.0'
+  spec.add_runtime_dependency 'actionpack', '>= 5.0.0'
 
   spec.add_development_dependency "bundler", ">= 0.0"
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: logtail-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.1
 platform: ruby
 authors:
-- Logtail
+- Better Stack
 autorequire:
 bindir: exe
 cert_chain: []
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -300,12 +300,6 @@ files:
 - example-project/tmp/storage/.keep
 - example-project/vendor/.keep
 - example-project/vendor/javascript/.keep
-- gemfiles/rails-3.0.gemfile
-- gemfiles/rails-3.1.gemfile
-- gemfiles/rails-3.2.gemfile
-- gemfiles/rails-4.0.gemfile
-- gemfiles/rails-4.1.gemfile
-- gemfiles/rails-4.2.gemfile
 - gemfiles/rails-5.0.gemfile
 - gemfiles/rails-5.1.gemfile
 - gemfiles/rails-5.2.gemfile
@@ -333,7 +327,6 @@ files:
 - lib/logtail-rails/log_entry.rb
 - lib/logtail-rails/logger.rb
 - lib/logtail-rails/overrides.rb
-- lib/logtail-rails/overrides/active_support_3_tagged_logging.rb
 - lib/logtail-rails/overrides/active_support_buffered_logger.rb
 - lib/logtail-rails/overrides/active_support_tagged_logging.rb
 - lib/logtail-rails/overrides/lograge.rb
@@ -358,14 +351,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Better Stack Rails integration

data/gemfiles/rails-3.0.gemfile

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '~> 3.0.0'
-
-gem 'logtail'
-gem 'logtail-rack'
-
-gemspec :path => '../'

data/gemfiles/rails-3.1.gemfile

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '~> 3.1.0'
-
-gem 'logtail'
-gem 'logtail-rack'
-
-gemspec :path => '../'

data/gemfiles/rails-3.2.gemfile

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '~> 3.2.0'
-
-gem 'logtail'
-gem 'logtail-rack'
-
-gemspec :path => '../'

data/gemfiles/rails-4.0.gemfile

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

data/gemfiles/rails-4.1.gemfile

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

data/gemfiles/rails-4.2.gemfile

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

data/lib/logtail-rails/overrides/active_support_3_tagged_logging.rb

@@ -1,111 +0,0 @@
-# Please note, this patch is merely an upgrade, backporting improved tagged logging code
-# from newer versions of Rails:
-# https://github.com/rails/rails/blob/5-1-stable/activesupport/lib/active_support/tagged_logging.rb
-# The behavior of tagged logging will not change in any way.
-#
-# This patch is specifically for Rails 3. The legacy approach to wrapping the logger in
-# ActiveSupport::TaggedLogging is rather poor, hence the reason it was changed entirely
-# for Rails 4 and 5. The problem is that ActiveSupport::TaggedLogging is a wrapping
-# class that entirely redefines the public API for the logger. As a result, any deviations
-# from this API in the logger are not exposed (such as accepting event data as a second argument).
-# This is assuming, so we're fixing it here.
-
-begin
-  require "active_support/tagged_logging"
-
-  # Instead of patching the class we're pulling the code from Rails master. This brings in
-  # a number of improvements while also addressing the issue above.
-  if ActiveSupport::TaggedLogging.instance_of?(Class)
-    ActiveSupport.send(:remove_const, :TaggedLogging)
-
-    require "active_support/core_ext/module/delegation"
-    require "active_support/core_ext/object/blank"
-    require "logger"
-
-    module ActiveSupport
-      # Wraps any standard Logger object to provide tagging capabilities.
-      #
-      #   logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
-      #   logger.tagged('BCX') { logger.info 'Stuff' }                            # Logs "[BCX] Stuff"
-      #   logger.tagged('BCX', "Jason") { logger.info 'Stuff' }                   # Logs "[BCX] [Jason] Stuff"
-      #   logger.tagged('BCX') { logger.tagged('Jason') { logger.info 'Stuff' } } # Logs "[BCX] [Jason] Stuff"
-      #
-      # This is used by the default Rails.logger as configured by Railties to make
-      # it easy to stamp log lines with subdomains, request ids, and anything else
-      # to aid debugging of multi-user production applications.
-      module TaggedLogging
-        module Formatter # :nodoc:
-          # This method is invoked when a log event occurs.
-          def call(severity, timestamp, progname, msg)
-            super(severity, timestamp, progname, "#{tags_text}#{msg}")
-          end
-
-          def tagged(*tags)
-            new_tags = push_tags(*tags)
-            yield self
-          ensure
-            pop_tags(new_tags.size)
-          end
-
-          def push_tags(*tags)
-            tags.flatten.reject(&:blank?).tap do |new_tags|
-              current_tags.concat new_tags
-            end
-          end
-
-          def pop_tags(size = 1)
-            current_tags.pop size
-          end
-
-          def clear_tags!
-            current_tags.clear
-          end
-
-          def current_tags
-            # We use our object ID here to avoid conflicting with other instances
-            thread_key = @thread_key ||= "activesupport_tagged_logging_tags:#{object_id}".freeze
-            Thread.current[thread_key] ||= []
-          end
-
-          def tags_text
-            tags = current_tags
-            if tags.any?
-              tags.collect { |tag| "[#{tag}] " }.join
-            end
-          end
-        end
-
-        # Simple formatter which only displays the message.
-        class SimpleFormatter < ::Logger::Formatter
-          # This method is invoked when a log event occurs
-          def call(severity, timestamp, progname, msg)
-            "#{String === msg ? msg : msg.inspect}\n"
-          end
-        end
-
-        def self.new(logger)
-          if logger.respond_to?(:formatter=) && logger.respond_to?(:formatter)
-            # Ensure we set a default formatter so we aren't extending nil!
-            logger.formatter ||= SimpleFormatter.new
-            logger.formatter.extend Formatter
-          end
-
-          logger.extend(self)
-        end
-
-        delegate :push_tags, :pop_tags, :clear_tags!, to: :formatter
-
-        def tagged(*tags)
-          formatter.tagged(*tags) { yield self }
-        end
-
-        def flush
-          clear_tags!
-          super if defined?(super)
-        end
-      end
-    end
-  end
-
-rescue Exception
-end