logtail-rails 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7123b2162f46a2a107ead8671135561f7a5d53f49a66196f4684776ad14a7c5
-  data.tar.gz: 749ff8b0d6367026632cb6beee6a5742168aeb0b038d87b786ae683472c83409
+  metadata.gz: 97d938a7a8be17f755842dcf6625ea5cef8aee115de0e81a9a8d33722a16d2da
+  data.tar.gz: fecfdfab18c9b31582a52987e5271c012707bc7a3cdcb628a261a204a4933c74
 SHA512:
-  metadata.gz: 248ef31c5d69238893ce2b0e8c0d1bc5de1a9edd94df498da0c2ef61dbe608ff0cfb2761c390eb18e70b24481bfc8455750d99340d539aed84c21feebf53d3b9
-  data.tar.gz: fe08fa5eba61b5908202ea011153721b02c703d239cc78b7edc0d76484debb5e80faddeaa4d2bdf41fde63190dd4fec068e705262326e5829d2de683256f10ab
+  metadata.gz: a1f6e1992c6d09df1df6649984d52d655671e4eb7bf031294e9e3eaf2edf7fc0cd5ae403ec42de01440e66fac99c36059b014207e56be0c2d072dd51a544e53a
+  data.tar.gz: 63c827e685b29dce41f1c175972ef2eaf2e803ce7fedb771207fc5c3bc07e12c6edd7f9d3e53e32e71b9410d58de43ef3aa68b0d899b1434d1afffb198922995

data/.github/workflows/main.yml

@@ -2,7 +2,6 @@ name: build
 
 on:
   push:
-  pull_request:
   schedule:
     - cron: '20 5 * * 1'
   workflow_dispatch:
@@ -16,17 +15,19 @@ jobs:
 
       matrix:
         ruby-version:
-          - 3.2.2
-          - 3.1.4
-          - 3.0.6
-          - 2.7.2
-          - 2.6.6
-          - 2.5.8
+          - 3.2
+          - 3.1
+          - 3.0
+          - 2.7
+          - 2.6
+          - 2.5
           - jruby-9.4.3.0
           - jruby-9.2.14.0
           - truffleruby-23.0.0
           - truffleruby-22.1.0
         gemfile:
+          - rails-edge
+          - rails-7.1
           - rails-7.0
           - rails-6.1
           - rails-6.0
@@ -34,19 +35,39 @@ jobs:
           - rails-5.1
           - rails-5.0
         exclude:
+          - gemfile: rails-edge
+            ruby-version: 2.6
+          - gemfile: rails-edge
+            ruby-version: 2.5
+          - 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.1
+            ruby-version: 2.6
+          - gemfile: rails-7.1
+            ruby-version: 2.5
+          - gemfile: rails-7.1
+            ruby-version: jruby-9.4.3.0
+          - gemfile: rails-7.1
+            ruby-version: jruby-9.2.14.0
+
           - gemfile: rails-7.0
-            ruby-version: 2.6.6
+            ruby-version: 2.6
           - gemfile: rails-7.0
-            ruby-version: 2.5.8
+            ruby-version: 2.5
           - gemfile: rails-7.0
             ruby-version: jruby-9.2.14.0
 
           - gemfile: rails-5.2
-            ruby-version: 3.2.2
+            ruby-version: 3.2
           - gemfile: rails-5.2
-            ruby-version: 3.1.4
+            ruby-version: 3.1
           - gemfile: rails-5.2
-            ruby-version: 3.0.6
+            ruby-version: 3.0
           - gemfile: rails-5.2
             ruby-version: jruby-9.4.3.0
           - gemfile: rails-5.2
@@ -55,11 +76,11 @@ jobs:
             ruby-version: truffleruby-23.0.0
 
           - gemfile: rails-5.1
-            ruby-version: 3.2.2
+            ruby-version: 3.2
           - gemfile: rails-5.1
-            ruby-version: 3.1.4
+            ruby-version: 3.1
           - gemfile: rails-5.1
-            ruby-version: 3.0.6
+            ruby-version: 3.0
           - gemfile: rails-5.1
             ruby-version: jruby-9.4.3.0
           - gemfile: rails-5.1
@@ -68,11 +89,11 @@ jobs:
             ruby-version: truffleruby-22.1.0
 
           - gemfile: rails-5.0
-            ruby-version: 3.2.2
+            ruby-version: 3.2
           - gemfile: rails-5.0
-            ruby-version: 3.1.4
+            ruby-version: 3.1
           - gemfile: rails-5.0
-            ruby-version: 3.0.6
+            ruby-version: 3.0
           - gemfile: rails-5.0
             ruby-version: jruby-9.4.3.0
           - gemfile: rails-5.0

data/README.md

@@ -4,7 +4,7 @@
 
 [![ISC License](https://img.shields.io/badge/license-ISC-ff69b4.svg)](LICENSE.md)
 [![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)
+[![Build Status](https://github.com/logtail/logtail-ruby-rails/actions/workflows/main.yml/badge.svg)](https://github.com/logtail/logtail-ruby-rails/actions/workflows/main.yml)
 
 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

@@ -1,10 +1,10 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.1.2"
+ruby "3.2.2"
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem "rails", "~> 7.0.6"
+gem "rails", "~> 7.1.0"
 
 # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
 gem "sprockets-rails"
@@ -13,7 +13,7 @@ gem "sprockets-rails"
 gem "sqlite3", "~> 1.4"
 
 # Use the Puma web server [https://github.com/puma/puma]
-gem "puma", "~> 5.0"
+gem "puma", "~> 6.0"
 
 # Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
 gem "importmap-rails"
@@ -71,4 +71,4 @@ group :test do
   gem "webdrivers"
 end
 
-gem "logtail-rails", "~> 0.2.0"
+gem "logtail-rails", "~> 0.2.5"

data/example-project/config/application.rb

@@ -9,7 +9,7 @@ Bundler.require(*Rails.groups)
 module ExampleProject
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 7.0
+    config.load_defaults 7.1
 
     # Configuration for the application, engines, and railties goes here.
     #
@@ -19,6 +19,6 @@ module ExampleProject
     # config.time_zone = "Central Time (US & Canada)"
     # config.eager_load_paths << Rails.root.join("extras")
 
-    config.logger = Logtail::Logger.create_default_logger("<SOURCE_TOKEN>")
+    config.logger = Logtail::Logger.create_default_logger("YhLXLk5djXYbxK16moYEhjeu")
   end
 end

data/example-project/config/initializers/{filter_parameter_logging.rb → filter_logging.rb}

@@ -6,3 +6,8 @@
 Rails.application.config.filter_parameters += [
   :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
 ]
+
+# Configure HTTP headers to be filtered from the log. Use this to limit dissemination of sensitive information.
+Logtail::Integrations::Rack::HTTPEvents.http_header_filters = [
+  :authorization, :proxy_authorization, :cookie
+]

data/gemfiles/rails-7.1.gemfile

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

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

@@ -16,6 +16,35 @@ module Logtail
       include ::LoggerSilence
     end
 
+    # Logtail::Logger also works as ActiveSupport::BroadcastLogger
+    def is_a?(clazz)
+      return true if clazz == ::ActiveSupport::BroadcastLogger
+
+      super(clazz)
+    end
+
+    def broadcasts
+      [self] + @extra_loggers
+    end
+
+    def broadcast_to(*io_devices_and_loggers)
+      io_devices_and_loggers.each do |io_device_or_logger|
+        extra_logger = is_a_logger?(io_device_or_logger) ? io_device_or_logger : self.class.new(io_device_or_logger)
+
+        @extra_loggers << extra_logger
+      end
+    end
+
+    def stop_broadcasting_to(io_device_or_logger)
+      if is_a_logger?(io_device_or_logger)
+        @extra_loggers.delete(logger)
+
+        return
+      end
+
+      @extra_loggers = @extra_loggers.reject { |logger| ::ActiveSupport::Logger.logger_outputs_to?(logger, io_device_or_logger) }
+    end
+
     def self.create_logger(*io_devices_and_loggers)
       logger = Logtail::Logger.new(*io_devices_and_loggers)
 

data/lib/logtail-rails/version.rb

@@ -1,7 +1,7 @@
 module Logtail
   module Integrations
     module Rails
-      VERSION = "0.2.3"
+      VERSION = "0.2.5"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logtail-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Better Stack
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-14 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logtail
@@ -266,7 +266,7 @@ files:
 - example-project/config/importmap.rb
 - example-project/config/initializers/assets.rb
 - example-project/config/initializers/content_security_policy.rb
-- example-project/config/initializers/filter_parameter_logging.rb
+- example-project/config/initializers/filter_logging.rb
 - example-project/config/initializers/inflections.rb
 - example-project/config/initializers/permissions_policy.rb
 - example-project/config/locales/en.yml
@@ -306,6 +306,8 @@ files:
 - gemfiles/rails-6.0.gemfile
 - gemfiles/rails-6.1.gemfile
 - gemfiles/rails-7.0.gemfile
+- gemfiles/rails-7.1.gemfile
+- gemfiles/rails-edge.gemfile
 - lib/logtail-rails.rb
 - lib/logtail-rails/action_controller.rb
 - lib/logtail-rails/action_controller/log_subscriber.rb
@@ -359,7 +361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Better Stack Rails integration