appsignal 2.10.1 → 2.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1de45798b4fd2af3eefc01d96fa642464150926cfe5e8c642ea33095b89cef10
-  data.tar.gz: 23a8cb34b9b3765e5f8b15eb6c5e06dda0f7a9ae467e4b0f127c05b88085203d
+  metadata.gz: 79d4435bb752fd9bf7c142cbfd998e39f3ed5e076e3cbab2b495d3a67ad43ada
+  data.tar.gz: ecaa124c56de18417510e0f9798c02888a68ccabc8187e6412739f4669a664e2
 SHA512:
-  metadata.gz: 96fb3bbf24c994b13ce58ddf25dd360a8aaa53ba858bffcc99423167499545fee12c83af70d1fad93523c9b6fe2f56f1ef466876b7ba1906ed80fecabfa8efc2
-  data.tar.gz: a9586d4827abefe990d257bca89923138d513142d50f533ee001e095c9d30015778ed71d0767fb5c0a9ba81db7865caec1983e8ccf509de316ee875c1a37f219
+  metadata.gz: 44d8db3ff5eeee9e20062db3a706b4826a34cf5af03c0faf74d5b2a060176a2e4b6a9c187297cf5f071e43a45e0141d253f316f04ca65a6a44d56ce8e4a4d87d
+  data.tar.gz: 0f723ad1d12acef218607e83e7f06639c85969e3dda91c700f285d540a875f89d098e0cdac7a7ea2860d1d736815b106a86977967b497eec56dc361d31b6173a

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.10.3
+- Only warn about reused transactions once. Repeated occurrences are logged as
+  debug messages. PR #585
+
+## 2.10.2
+- Fix wait_for test suite helper. PR #581
+- Fix exception handling of config file issues. PR #582
+  - The improvement introduced in #517 didn't fetch the class name correctly
+    causing an error on most scenarios.
+
 ## 2.10.1
 - Update to more recent bundled SSL CA certificates. PR #577
 - Remove TLS version lock from transmitter used by diagnose command, preventing

data/lib/appsignal.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require "json"
-require "logger"
 require "securerandom"
 
+require "appsignal/logger"
 require "appsignal/helpers/instrumentation"
 require "appsignal/helpers/metrics"
 
@@ -195,7 +195,7 @@ module Appsignal
     end
 
     def logger
-      @logger ||= Logger.new(in_memory_log).tap do |l|
+      @logger ||= Appsignal::Logger.new(in_memory_log).tap do |l|
         l.level = Logger::INFO
         l.formatter = log_formatter("appsignal")
       end
@@ -294,12 +294,12 @@ module Appsignal
     private
 
     def start_stdout_logger
-      @logger = Logger.new($stdout)
+      @logger = Appsignal::Logger.new($stdout)
       logger.formatter = log_formatter("appsignal")
     end
 
     def start_file_logger(path)
-      @logger = Logger.new(path)
+      @logger = Appsignal::Logger.new(path)
       logger.formatter = log_formatter
     rescue SystemCallError => error
       start_stdout_logger

data/lib/appsignal/config.rb

@@ -284,7 +284,7 @@ module Appsignal
       message = "An error occured while loading the AppSignal config file." \
         " Skipping file config.\n" \
         "File: #{config_file.inspect}\n" \
-        "#{e.name}: #{e}"
+        "#{e.class.name}: #{e}"
       $stderr.puts "appsignal: #{message}"
       logger.error "#{message}\n#{e.backtrace.join("\n")}"
       nil

data/lib/appsignal/logger.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "logger"
+require "set"
+
+# Subclass of logger with method to only log a warning once
+# prevents the log from filling up with repeated messages.
+module Appsignal
+  class Logger < ::Logger
+    def seen_keys
+      @seen_keys ||= Set.new
+    end
+
+    def warn_once_then_debug(key, message)
+      if !seen_keys.add?(key).nil?
+        warn message
+      else
+        debug message
+      end
+    end
+  end
+end

data/lib/appsignal/transaction.rb

@@ -25,7 +25,7 @@ module Appsignal
           Thread.current[:appsignal_transaction] = Appsignal::Transaction.new(id, namespace, request, options)
         else
           # Otherwise, log the issue about trying to start another transaction
-          Appsignal.logger.warn "Trying to start new transaction with id " \
+          Appsignal.logger.warn_once_then_debug :transaction_id, "Trying to start new transaction with id " \
             "'#{id}', but a transaction with id '#{current.transaction_id}' " \
             "is already running. Using transaction '#{current.transaction_id}'."
 

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "2.10.1".freeze
+  VERSION = "2.10.3".freeze
 end

data/spec/lib/appsignal/config_spec.rb

@@ -258,7 +258,7 @@ describe Appsignal::Config do
         message = "An error occured while loading the AppSignal config file. " \
           "Skipping file config.\n" \
           "File: #{File.join(config_path, "config", "appsignal.yml").inspect}\n" \
-          "NotExistingConstant: uninitialized constant NotExistingConstant\n"
+          "KeyError: key not found"
         expect(log).to contains_log :error, message
         expect(log).to include("/appsignal/config.rb:") # Backtrace
         expect(stdout.read).to_not include("appsignal:")

data/spec/lib/appsignal/logger_spec.rb

@@ -0,0 +1,25 @@
+describe Appsignal::Logger do
+  let(:log) { std_stream }
+  let(:logger) do
+    Appsignal::Logger.new(log).tap do |l|
+      l.formatter = logger_formatter
+    end
+  end
+
+  describe "#seen_keys" do
+    it "returns a Set" do
+      expect(logger.seen_keys).to be_a(Set)
+    end
+  end
+
+  describe "#warn_once_then_debug" do
+    it "only warns once, then uses debug" do
+      message = "This is a log line"
+      3.times { logger.warn_once_then_debug(:key, message) }
+
+      logs = log_contents(log)
+      expect(logs.scan(/#{Regexp.escape(log_line(:WARN, message))}/).count).to eql(1)
+      expect(logs.scan(/#{Regexp.escape(log_line(:DEBUG, message))}/).count).to eql(2)
+    end
+  end
+end

data/spec/lib/appsignal_spec.rb

@@ -1021,6 +1021,7 @@ describe Appsignal do
             Appsignal.start_logger
             Appsignal.logger.error("Log to file")
           end
+          expect(Appsignal.logger).to be_a(Appsignal::Logger)
         end
 
         it "logs to file" do
@@ -1043,6 +1044,7 @@ describe Appsignal do
             initialize_config
             Appsignal.start_logger
             Appsignal.logger.error("Log to not writable log file")
+            expect(Appsignal.logger).to be_a(Appsignal::Logger)
           end
         end
 
@@ -1073,6 +1075,7 @@ describe Appsignal do
           Appsignal.start_logger
           Appsignal.logger.error("Log to not writable log path")
         end
+        expect(Appsignal.logger).to be_a(Appsignal::Logger)
       end
       after do
         FileUtils.chmod 0o755, Appsignal::Config.system_tmp_dir
@@ -1101,6 +1104,7 @@ describe Appsignal do
           Appsignal.start_logger
           Appsignal.logger.error("Log to stdout")
         end
+        expect(Appsignal.logger).to be_a(Appsignal::Logger)
       end
       around { |example| recognize_as_heroku { example.run } }
 

data/spec/support/fixtures/projects/broken/config/appsignal.yml

@@ -1 +1 @@
-<%= NotExistingConstant.not_existing_method %>
+<%= ENV.fetch("I AM A KEY THAT DOES NOT EXIST") %>

data/spec/support/helpers/log_helpers.rb

@@ -12,15 +12,22 @@ module LogHelpers
   end
 
   def test_logger(log)
-    Logger.new(log).tap do |logger|
-      logger.formatter =
-        proc do |severity, _datetime, _progname, msg|
-          # This format is used in the `contains_log` matcher.
-          "[#{severity}] #{msg}\n"
-        end
+    Appsignal::Logger.new(log).tap do |logger|
+      logger.formatter = logger_formatter
     end
   end
 
+  def logger_formatter
+    proc do |severity, _datetime, _progname, msg|
+      log_line(severity, msg)
+    end
+  end
+
+  def log_line(severity, message)
+    # This format is used in the `contains_log` matcher.
+    "[#{severity}] #{message}\n"
+  end
+
   def log_contents(log)
     log.rewind
     log.read

data/spec/support/helpers/wait_for_helper.rb

@@ -16,13 +16,13 @@ module WaitForHelper
   def wait_for(name)
     max_wait = 5_000
     i = 0
-    while i <= max_wait
+    while i < max_wait
       break if yield
       i += 1
       sleep 0.001
     end
 
-    return unless i == max_wait
+    return unless i >= max_wait
     raise "Waited 5 seconds for #{name} condition, but was not met."
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.3
 platform: ruby
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2020-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -237,6 +237,7 @@ files:
 - lib/appsignal/integrations/sinatra.rb
 - lib/appsignal/integrations/webmachine.rb
 - lib/appsignal/js_exception_transaction.rb
+- lib/appsignal/logger.rb
 - lib/appsignal/marker.rb
 - lib/appsignal/minutely.rb
 - lib/appsignal/rack/generic_instrumentation.rb
@@ -314,6 +315,7 @@ files:
 - spec/lib/appsignal/integrations/sinatra_spec.rb
 - spec/lib/appsignal/integrations/webmachine_spec.rb
 - spec/lib/appsignal/js_exception_transaction_spec.rb
+- spec/lib/appsignal/logger_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/minutely_spec.rb
 - spec/lib/appsignal/rack/generic_instrumentation_spec.rb
@@ -392,7 +394,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
@@ -452,6 +454,7 @@ test_files:
 - spec/lib/appsignal/integrations/sinatra_spec.rb
 - spec/lib/appsignal/integrations/webmachine_spec.rb
 - spec/lib/appsignal/js_exception_transaction_spec.rb
+- spec/lib/appsignal/logger_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/minutely_spec.rb
 - spec/lib/appsignal/rack/generic_instrumentation_spec.rb