logster 2.9.2 → 2.9.7

data/lib/logster/configuration.rb

@@ -18,7 +18,8 @@ module Logster
       :gems_dir,
       :max_env_bytes,
       :max_env_count_per_message,
-      :maximum_message_length
+      :maximum_message_length,
+      :use_full_hostname
     )
 
     attr_writer :subdirectory
@@ -39,6 +40,7 @@ module Logster
       @enable_backtrace_links = true
       @gems_dir = Gem.dir + "/gems/"
       @maximum_message_length = 2000
+      @use_full_hostname = nil
 
       @allow_grouping = false
 

data/lib/logster/message.rb

@@ -80,7 +80,8 @@ module Logster
     end
 
     def self.hostname
-      @hostname ||= `hostname`.strip! rescue "<unknown>"
+      command = Logster.config.use_full_hostname ? `hostname -f` : `hostname`
+      @hostname ||= command.strip! rescue "<unknown>"
     end
 
     def populate_from_env(env)
@@ -99,7 +100,7 @@ module Logster
           env["time"] = @timestamp || get_timestamp
         end
       end
-      @env = Message.populate_from_env(env)
+      self.env = Message.populate_from_env(env)
     end
 
     def self.default_env
@@ -113,7 +114,8 @@ module Logster
 
     # in its own method so it can be overridden
     def grouping_hash
-      { message: self.message, severity: self.severity, backtrace: self.backtrace }
+      message = self.message.gsub(/[0-9a-f]+/i, "X")
+      { message: message, severity: self.severity, backtrace: self.backtrace }
     end
 
     # todo - memoize?

data/lib/logster/redis_store.rb

@@ -342,7 +342,7 @@ module Logster
     def rate_limited?(ip_address, perform: false, limit: 60)
       key = ip_rate_limit_key(ip_address)
 
-      limited = @redis.exists(key)
+      limited = @redis.call([:exists, key])
       if Integer === limited
         limited = limited != 0
       end

data/lib/logster/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Logster
-  VERSION = "2.9.2"
+  VERSION = "2.9.7"
 end

data/logster.gemspec

@@ -15,7 +15,9 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/discourse/logster"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.required_ruby_version = ">= 2.5.0"
+
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.start_with?("website") || f.start_with?("bin")
   end
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -33,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "byebug", "~> 11.1.0"
-  spec.add_development_dependency "rubocop-discourse", "~> 2.1.2"
+  spec.add_development_dependency "rubocop-discourse", "~> 2.4.1"
 end

data/test/logster/middleware/test_reporter.rb

@@ -28,19 +28,19 @@ class TestReporter < Minitest::Test
 
     reporter = Logster::Middleware::Reporter.new(nil)
     env = Rack::MockRequest.env_for("/logs/report_js_error?message=hello")
-    status, = reporter.call(env)
+    reporter.call(env)
 
     assert_equal(Logger::Severity::WARN, Logster.store.latest[-1].severity)
 
     reporter = Logster::Middleware::Reporter.new(nil)
     env = Rack::MockRequest.env_for("/logs/report_js_error?message=hello&severity=invalid")
-    status, = reporter.call(env)
+    reporter.call(env)
 
     assert_equal(Logger::Severity::WARN, Logster.store.latest[-1].severity)
 
     reporter = Logster::Middleware::Reporter.new(nil)
     env = Rack::MockRequest.env_for("/logs/report_js_error?message=hello&severity=error")
-    status, = reporter.call(env)
+    reporter.call(env)
 
     assert_equal(Logger::Severity::ERROR, Logster.store.latest[-1].severity)
   end

data/test/logster/test_base_store.rb

@@ -188,4 +188,16 @@ class TestBaseStore < Minitest::Test
       refute_includes(store.reported.first.env.keys.map(&:to_sym), :backtrace)
     end
   end
+
+  def test_envs_with_invalid_encoding_dont_raise_errors
+    msg = @store.report(
+      Logger::WARN,
+      '',
+      'me have invalid encoding',
+      env: {
+        axe: "a\xF1xasa"
+      }
+    )
+    assert_equal("a�xasa", msg.env[:axe])
+  end
 end

data/test/logster/test_message.rb

@@ -78,6 +78,18 @@ class TestMessage < MiniTest::Test
     Logster.config.application_version = nil
   end
 
+  def test_use_full_hostname
+    Logster::Message.instance_variable_set(:@hostname, nil)
+    Logster.config.use_full_hostname = true
+    msg = Logster::Message.new(0, '', 'test', 10)
+    msg.populate_from_env({})
+
+    assert_equal(`hostname -f`.strip!, msg.env["hostname"])
+  ensure
+    Logster.config.use_full_hostname = nil
+    Logster::Message.instance_variable_set(:@hostname, nil)
+  end
+
   def test_merging_sums_count_for_both_messages
     msg1 = Logster::Message.new(0, '', 'test', 10, count: 15)
     msg2 = Logster::Message.new(0, '', 'test', 20, count: 13)

data/test/logster/test_redis_store.rb

@@ -1044,6 +1044,24 @@ class TestRedisStore < Minitest::Test
     end
   end
 
+  def test_messages_that_differ_only_by_numbers_or_hashes_are_merged
+    config_reset(allow_grouping: true) do
+      first_message = <<~TEXT
+        DistributedMutex("download_20450e291e8f1e5ba03ca7f20fb7d9da570c94a6"):
+        held for too long, expected max: 60 secs, took an extra 73 secs
+      TEXT
+      msg = @store.report(Logger::WARN, '', first_message, backtrace: caller)
+
+      second_message = <<~TEXT
+        DistributedMutex("download_e09ae082c60a351dedec67ed869652862b232a0b"):
+        held for too long, expected max: 60 secs, took an extra 287 secs
+      TEXT
+      msg2 = @store.report(Logger::WARN, '', second_message, backtrace: caller)
+
+      assert_equal(msg.key, msg2.key)
+    end
+  end
+
   private
 
   def config_reset(configs)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logster
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.9.7
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.4.1
 description: UI for viewing logs in Rack
 email:
 - sam.saffron@gmail.com
@@ -143,9 +143,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -288,14 +288,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: UI for viewing logs in Rack

data/.travis.yml

@@ -1,17 +0,0 @@
-language: ruby
-
-matrix:
-  fast_finish: true
-
-rvm:
-  - 2.5.3
-  - 2.6.5
-  - 2.7.0
-
-services:
-  - redis-server
-
-before_install:
-  - gem install bundler -v 1.17.2
-
-sudo: false