appsignal 3.1.0-java → 3.1.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5b5a232369f0d030bf17e1397dc12e7f5b9cce53b2469468a65cde362ef7903
-  data.tar.gz: eb490806ae18a93d7ec24eb071c63b22c1f599b62fbd82e5a47d0f00ebeee50c
+  metadata.gz: 5bb9d094ed8de471e90dea7cd631a31ffea0777c09dbe4bfac516cc1820cbdcf
+  data.tar.gz: 790ec312c3349ee2b6889d8fca238e6cea7daa537c71cf81b7438152c2a2a2cb
 SHA512:
-  metadata.gz: a3f0c5ed5ab18b10c70145c748b674c33b0e70ec67715b800f05da4b2f829268ef1d7d9aa3173afa55927c746d11cebc6bd2571438ead0074a141b0fa168b32a
-  data.tar.gz: 130d790bd57b4e39ee9011e56a11c60ff72dda6e266aa7335ceea0f63e1e41093c815a9c4286c5db2129198acf169c9d65a6b025eb15e4b930ac905e62439d8c
+  metadata.gz: a3ecfceba446f9a876c903b796a2b91c4ba44ab53856e9a6518d4681f86144547bdffd6d367a309ae05c5e15ebc30a52ca4b666dcec1c651b321d90c0eb8014f
+  data.tar.gz: c5705bfeca7ec423ee1888572f84ef70fd15abdb5501cd0c9e73c2d5855b498d7e03ac8c50ab1aa88137d3335376cd2d0b767503c0ec17d9b2c7b209cd04e80f

data/CHANGELOG.md

@@ -1,5 +1,41 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.1.3
+
+### Added
+
+- [811a1082](https://github.com/appsignal/appsignal-ruby/commit/811a10825043ed584f23d870e3a420ee409eb151) patch - Add the `Transaction.current?` helper to determine if any Transaction is currently active or not. AppSignal `NilTransaction`s are not considered active transactions.
+
+### Changed
+
+- [dc50d889](https://github.com/appsignal/appsignal-ruby/commit/dc50d8892699bf17b2399865ead8b27ce45b60ed) patch - Rename the (so far privately reported) `gc_total_time` metric to `gc_time`. It no longer reports the total time of Garbage Collection measured, but only the time between two (minutely) measurements.
+
+### Fixed
+
+- [7cfed987](https://github.com/appsignal/appsignal-ruby/commit/7cfed98761cf81d475261c553486b24843460cf3) patch - Fix error on unknown HTTP request method. When a request is made with an unknown request method, triggering and `ActionController::UnknownHttpMethod`, it will no longer break the AppSignal instrumentation but omit the request method in the sample data.
+
+## 3.1.2
+
+### Changed
+
+- [1b95bb4c](https://github.com/appsignal/appsignal-ruby/commit/1b95bb4c8df08128cfa2db0d918ffcb909e5ee4c) patch - Report Garbage Collection total time metric as the delta between measurements. This reports a more user friendly metric that doesn't always goes up until the app restarts or gets a new deploy. This metric is reported 0 by default without `GC::Profiler.enable` having been called.
+- [61a78fb0](https://github.com/appsignal/appsignal-ruby/commit/61a78fb028b04ae6f0a4ca1fc469d744f23c5029) patch - Bump agent to 06391fb
+  
+  - Accept "warning" value for the `log_level` config option.
+  - Add aarch64 Linux musl build.
+  - Improve debug logging from the extension.
+  - Fix high CPU issue for appsignal-agent when nothing could be read from the socket.
+
+## 3.1.1
+
+### Changed
+
+- [e225c798](https://github.com/appsignal/appsignal-ruby/commit/e225c798c65aef6085bb689597b7f3359fe138f7) patch - Report all Ruby VM metrics as gauges. We previously reported some metrics as distributions, but all fields for those distributions would report the same values.
+
+### Fixed
+
+- [31fd19c6](https://github.com/appsignal/appsignal-ruby/commit/31fd19c6019db2c68b359f1fc4ed3d5e4843e349) patch - Add hostname tag for Ruby VM metrics. This allows us to graph every host separately and multiple hosts won't overwrite each other metrics.
+
 ## 3.1.0
 
 ### Added

data/appsignal.gemspec

@@ -39,12 +39,16 @@ Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength
   gem.add_development_dependency "rake", ">= 12"
   gem.add_development_dependency "rspec", "~> 3.8"
   gem.add_development_dependency "timecop"
-  gem.add_development_dependency "webmock"
   gem.add_development_dependency "yard", ">= 0.9.20"
   gem.add_development_dependency "pry"
 
   # Dependencies that need to be locked to a specific version in developement
   ruby_version = Gem::Version.new(RUBY_VERSION)
+  if ruby_version < Gem::Version.new("2.3.0")
+    gem.add_development_dependency "webmock", "3.14.0"
+  else
+    gem.add_development_dependency "webmock"
+  end
   if ruby_version > Gem::Version.new("2.5.0")
     # RuboCop dependency parallel depends on Ruby > 2.4
     gem.add_development_dependency "rubocop", "0.50.0"

data/ext/agent.yml

@@ -3,92 +3,99 @@
 # appsignal-agent repository.
 # Modifications to this file will be overwritten with the next agent release.
 ---
-version: d573c9b
+version: '06391fb'
 mirrors:
 - https://appsignal-agent-releases.global.ssl.fastly.net
 - https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: a9a86594e50f22e7f7fd93a050e334048248a6dc971015e66c26150c4a689345
+      checksum: 9bf41c183d94c80e980f57ea2e29d08bae97e8097b5284a2b91a5484bf866f8c
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 04a69d0b608aa0e834c96c75a3bb226e7ca252fd2c74e439fdd43bf297d6bde2
+      checksum: 4d3789e65cf00e446600e883d95d097323ebb3835703c67c8d09f434f09ab496
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: a9a86594e50f22e7f7fd93a050e334048248a6dc971015e66c26150c4a689345
+      checksum: 9bf41c183d94c80e980f57ea2e29d08bae97e8097b5284a2b91a5484bf866f8c
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 04a69d0b608aa0e834c96c75a3bb226e7ca252fd2c74e439fdd43bf297d6bde2
+      checksum: 4d3789e65cf00e446600e883d95d097323ebb3835703c67c8d09f434f09ab496
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   aarch64-darwin:
     static:
-      checksum: 92f7f71b685985b310a9f3693a96a5db6b9133b0af807d000b90248e097063c7
+      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: ffb54af4c35dd281a4735b57d8e537b8b08e87e08841e5d344caff325948a9e8
+      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm64-darwin:
     static:
-      checksum: 92f7f71b685985b310a9f3693a96a5db6b9133b0af807d000b90248e097063c7
+      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: ffb54af4c35dd281a4735b57d8e537b8b08e87e08841e5d344caff325948a9e8
+      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm-darwin:
     static:
-      checksum: 92f7f71b685985b310a9f3693a96a5db6b9133b0af807d000b90248e097063c7
+      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: ffb54af4c35dd281a4735b57d8e537b8b08e87e08841e5d344caff325948a9e8
+      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   aarch64-linux:
     static:
-      checksum: 79f1e7f9c34ab36c06d5c3d676173ee7c1219af2f51dc77865897598dc01349a
+      checksum: 0f2430e637eb77ce2093f021777087e87cb1e7be7c86a53771172696791c4879
       filename: appsignal-aarch64-linux-all-static.tar.gz
     dynamic:
-      checksum: cfd8e98238e2c7cdb10c0e136c47ab8e2dacab0a14d8ccf0e4c6c14946e325f1
+      checksum: 0e4f9305aeaaa2d7847e83be04227b865723a0591574108d78040b5921a677a7
       filename: appsignal-aarch64-linux-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: 835c6f823a2c6e9f8fa12704bf0953e3610dc9836355b57d2d6981e6ae412fb4
+      checksum: 449ba623aaa1853c2d211bf1e2d3a14e5ae09225a62457cbdbcc0983a5713a52
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: febc5d80a7b0fd9644e2d68d068d28c66359bbef9473f01e9f71fb07fd73bcb8
+      checksum: dae994292d602eaf0910bd2ce53f0163e19767a4cbb8e5d0db99c0010d6df486
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: 835c6f823a2c6e9f8fa12704bf0953e3610dc9836355b57d2d6981e6ae412fb4
+      checksum: 449ba623aaa1853c2d211bf1e2d3a14e5ae09225a62457cbdbcc0983a5713a52
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: febc5d80a7b0fd9644e2d68d068d28c66359bbef9473f01e9f71fb07fd73bcb8
+      checksum: dae994292d602eaf0910bd2ce53f0163e19767a4cbb8e5d0db99c0010d6df486
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86_64-linux:
     static:
-      checksum: 6eb6f0df2f8c62a29769bf7f21cefaec92a24ee0ab363acc5bd4f9c2d1241c53
+      checksum: 394796c0ddeb4881c9f2e6ce82f840e66bcb69e027324f6c04f6671067445fbb
       filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: ce710ff2edea2fc7b3b6bafd10af849e95f513abf5d775b9a8361ffed45b70c3
+      checksum: 9ca4762c464482b0a5a89898a839388597dd57a17a21527a67f3e3db0e540a03
       filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: b16d46074527da5700e10e5a8b176aeb46b7bbb19431653029eda04437bef918
+      checksum: 673271c8c5fd55053d8a719bcd307f787db4ca4633baf8cf961c442bf1805614
       filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: 261b79ab790e6a12a748d4649a4389e96d5cf7d1f981c3b56ed331f164d1627b
+      checksum: 609d59376d6633652015e838eb649229fe2523d443a5471232b869f48eb99640
       filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
+  aarch64-linux-musl:
+    static:
+      checksum: e90ca19bf61596be022ba04897e8902b3401add58f351a40a3d3a7af241d0bbb
+      filename: appsignal-aarch64-linux-musl-all-static.tar.gz
+    dynamic:
+      checksum: afb66c65fb82b672887bc6b6e82d82f09d9855a5497a7abb06b438dadea97aca
+      filename: appsignal-aarch64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: e7bfc1dc355ce1237aaee6fdf967c78ecca533db41b09c2b10716e7f8593dbe0
+      checksum: cb45da91c51123859e5ef5cea850460c28d6e77dfa08b90375178d9017162ba8
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 97af9419cf00e22ea544a2365785a6b5df2a990f17e7735b3bbec1a690b68f0b
+      checksum: 6a03e02c2526e05edaa7fa932b2e764318c63ec93d517c6c00f6b7541bfe71f3
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: e7bfc1dc355ce1237aaee6fdf967c78ecca533db41b09c2b10716e7f8593dbe0
+      checksum: cb45da91c51123859e5ef5cea850460c28d6e77dfa08b90375178d9017162ba8
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 97af9419cf00e22ea544a2365785a6b5df2a990f17e7735b3bbec1a690b68f0b
+      checksum: 6a03e02c2526e05edaa7fa932b2e764318c63ec93d517c6c00f6b7541bfe71f3
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/lib/appsignal/helpers/instrumentation.rb

@@ -325,7 +325,8 @@ module Appsignal
             "value is not an exception: #{exception.inspect}"
           return
         end
-        return if !active? || Appsignal::Transaction.current.nil?
+        return if !active? || !Appsignal::Transaction.current?
+
         transaction = Appsignal::Transaction.current
         transaction.set_error(exception)
         transaction.set_tags(tags) if tags
@@ -359,7 +360,7 @@ module Appsignal
       # @since 2.2.0
       def set_action(action)
         return if !active? ||
-            Appsignal::Transaction.current.nil? ||
+            !Appsignal::Transaction.current? ||
             action.nil?
         Appsignal::Transaction.current.set_action(action)
       end
@@ -398,7 +399,7 @@ module Appsignal
       # @since 2.2.0
       def set_namespace(namespace)
         return if !active? ||
-            Appsignal::Transaction.current.nil? ||
+            !Appsignal::Transaction.current? ||
             namespace.nil?
         Appsignal::Transaction.current.set_namespace(namespace)
       end
@@ -438,8 +439,9 @@ module Appsignal
       #   Tagging guide
       def tag_request(tags = {})
         return unless active?
+        return unless Appsignal::Transaction.current?
+
         transaction = Appsignal::Transaction.current
-        return false unless transaction
         transaction.set_tags(tags)
       end
       alias :tag_job :tag_request
@@ -471,8 +473,9 @@ module Appsignal
       # @since 2.12.0
       def add_breadcrumb(category, action, message = "", metadata = {}, time = Time.now.utc)
         return unless active?
+        return unless Appsignal::Transaction.current?
+
         transaction = Appsignal::Transaction.current
-        return false unless transaction
         transaction.add_breadcrumb(category, action, message, metadata, time)
       end
 

data/lib/appsignal/hooks/active_job.rb

@@ -20,9 +20,11 @@ module Appsignal
       module ActiveJobClassInstrumentation
         def execute(job)
           job_status = nil
-          current_transaction = Appsignal::Transaction.current
+          has_wrapper_transaction = Appsignal::Transaction.current?
           transaction =
-            if current_transaction.nil_transaction?
+            if has_wrapper_transaction
+              Appsignal::Transaction.current
+            else
               # No standalone integration started before ActiveJob integration.
               # We don't have a separate integration for this QueueAdapter like
               # we do for Sidekiq.
@@ -33,8 +35,6 @@ module Appsignal
                 Appsignal::Transaction::BACKGROUND_JOB,
                 Appsignal::Transaction::GenericRequest.new({})
               )
-            else
-              current_transaction
             end
 
           super
@@ -64,7 +64,7 @@ module Appsignal
               transaction.set_queue_start((Time.parse(enqueued_at).to_f * 1_000).to_i)
             end
 
-            if current_transaction.nil_transaction?
+            unless has_wrapper_transaction
               # Only complete transaction if ActiveJob is not wrapped in
               # another supported integration, such as Sidekiq.
               Appsignal::Transaction.complete_current!

data/lib/appsignal/integrations/mongo_ruby_driver.rb

@@ -6,8 +6,9 @@ module Appsignal
     class MongoMonitorSubscriber
       # Called by Mongo::Monitor when query starts
       def started(event)
+        return unless Appsignal::Transaction.current?
+
         transaction = Appsignal::Transaction.current
-        return if transaction.nil_transaction?
         return if transaction.paused?
 
         # Format the command
@@ -36,8 +37,9 @@ module Appsignal
 
       # Finishes the event in the AppSignal extension
       def finish(result, event)
+        return unless Appsignal::Transaction.current?
+
         transaction = Appsignal::Transaction.current
-        return if transaction.nil_transaction?
         return if transaction.paused?
 
         # Get the query from the transaction store

data/lib/appsignal/integrations/sidekiq.rb

@@ -10,21 +10,24 @@ module Appsignal
     # @api private
     class SidekiqErrorHandler
       def call(exception, sidekiq_context)
-        transaction = Appsignal::Transaction.current
-
-        if transaction.nil_transaction?
-          # Sidekiq error outside of the middleware scope.
-          # Can be a job JSON parse error or some other error happening in
-          # Sidekiq.
-          transaction = Appsignal::Transaction.create(
-            SecureRandom.uuid, # Newly generated job id
-            Appsignal::Transaction::BACKGROUND_JOB,
-            Appsignal::Transaction::GenericRequest.new({})
-          )
-          transaction.set_action_if_nil("SidekiqInternal")
-          transaction.set_metadata("sidekiq_error", sidekiq_context[:context])
-          transaction.params = { :jobstr => sidekiq_context[:jobstr] }
-        end
+        transaction =
+          if Appsignal::Transaction.current?
+            Appsignal::Transaction.current
+          else
+            # Sidekiq error outside of the middleware scope.
+            # Can be a job JSON parse error or some other error happening in
+            # Sidekiq.
+            transaction =
+              Appsignal::Transaction.create(
+                SecureRandom.uuid, # Newly generated job id
+                Appsignal::Transaction::BACKGROUND_JOB,
+                Appsignal::Transaction::GenericRequest.new({})
+              )
+            transaction.set_action_if_nil("SidekiqInternal")
+            transaction.set_metadata("sidekiq_error", sidekiq_context[:context])
+            transaction.params = { :jobstr => sidekiq_context[:jobstr] }
+            transaction
+          end
 
         transaction.set_error(exception)
         Appsignal::Transaction.complete_current!

data/lib/appsignal/probes/helpers.rb

@@ -7,22 +7,35 @@ module Appsignal
         @gauge_delta_cache ||= {}
       end
 
-      # Calculate the delta of two values for a gauge metric
+      # Calculate the delta of two values for a gauge metric.
       #
-      # First call will store the data for the metric in the cache and the
-      # second call will return the delta of the gauge metric. This is used for
-      # absolute counter values which we want to track as gauges.
+      # When this method is called, the given value is stored in a cache
+      # under the given cache key.
+      #
+      # A block must be passed to this method. The first time the method
+      # is called for a given cache key, the block will not be yielded to.
+      # In subsequent calls, the delta between the previously stored value
+      # in the cache for that key and the value given in this invocation
+      # will be yielded to the block.
+      #
+      # This is used for absolute counter values which we want to track as
+      # gauges.
       #
       # @example
-      #   gauge_delta :my_cache_key, 10
-      #   gauge_delta :my_cache_key, 15
-      #   # Returns a value of `5`
+      #   gauge_delta :with_block, 10 do |delta|
+      #     puts "this block will not be yielded to"
+      #   end
+      #   gauge_delta :with_block, 15 do |delta|
+      #     # `delta` has a value of `5`
+      #     puts "this block will be yielded to with delta = #{delta}"
+      #   end
+      #
       def gauge_delta(cache_key, value)
         previous_value = gauge_delta_cache[cache_key]
         gauge_delta_cache[cache_key] = value
         return unless previous_value
 
-        value - previous_value
+        yield value - previous_value
       end
     end
   end

data/lib/appsignal/probes/mri.rb

@@ -8,59 +8,76 @@ module Appsignal
         defined?(::RubyVM) && ::RubyVM.respond_to?(:stat)
       end
 
-      def self.garbage_collection_profiler
-        @garbage_collection_profiler ||= Appsignal::GarbageCollectionProfiler.new
-      end
-
-      def initialize(appsignal = Appsignal)
+      def initialize(appsignal: Appsignal, gc_profiler: Appsignal::GarbageCollectionProfiler.new)
         Appsignal.logger.debug("Initializing VM probe")
         @appsignal = appsignal
+        @gc_profiler = gc_profiler
       end
 
       # @api private
       def call
         stat = RubyVM.stat
 
-        @appsignal.add_distribution_value(
+        set_gauge(
           "ruby_vm",
           stat[:class_serial],
           :metric => :class_serial
         )
 
-        @appsignal.add_distribution_value(
+        set_gauge(
           "ruby_vm",
           stat[:constant_cache] ? stat[:constant_cache].values.sum : stat[:global_constant_state],
           :metric => :global_constant_state
         )
 
-        @appsignal.set_gauge("thread_count", Thread.list.size)
-        @appsignal.set_gauge("gc_total_time", MriProbe.garbage_collection_profiler.total_time)
+        set_gauge("thread_count", Thread.list.size)
+        gauge_delta(:gc_time, @gc_profiler.total_time) do |gc_time|
+          set_gauge("gc_time", gc_time) if gc_time > 0
+        end
 
         gc_stats = GC.stat
-        allocated_objects =
-          gauge_delta(
-            :allocated_objects,
-            gc_stats[:total_allocated_objects] || gc_stats[:total_allocated_object]
-          )
-        if allocated_objects
-          @appsignal.set_gauge("allocated_objects", allocated_objects)
+        gauge_delta(
+          :allocated_objects,
+          gc_stats[:total_allocated_objects] || gc_stats[:total_allocated_object]
+        ) do |allocated_objects|
+          set_gauge("allocated_objects", allocated_objects)
         end
 
-        gc_count = gauge_delta(:gc_count, GC.count)
-        if gc_count
-          @appsignal.add_distribution_value("gc_count", gc_count, :metric => :gc_count)
+        gauge_delta(:gc_count, GC.count) do |gc_count|
+          set_gauge("gc_count", gc_count, :metric => :gc_count)
         end
-        minor_gc_count = gauge_delta(:minor_gc_count, gc_stats[:minor_gc_count])
-        if minor_gc_count
-          @appsignal.add_distribution_value("gc_count", minor_gc_count, :metric => :minor_gc_count)
+        gauge_delta(:minor_gc_count, gc_stats[:minor_gc_count]) do |minor_gc_count|
+          set_gauge("gc_count", minor_gc_count, :metric => :minor_gc_count)
         end
-        major_gc_count = gauge_delta(:major_gc_count, gc_stats[:major_gc_count])
-        if major_gc_count
-          @appsignal.add_distribution_value("gc_count", major_gc_count, :metric => :major_gc_count)
+        gauge_delta(:major_gc_count, gc_stats[:major_gc_count]) do |major_gc_count|
+          set_gauge("gc_count", major_gc_count, :metric => :major_gc_count)
         end
 
-        @appsignal.add_distribution_value("heap_slots", gc_stats[:heap_live_slots] || gc_stats[:heap_live_slot], :metric => :heap_live)
-        @appsignal.add_distribution_value("heap_slots", gc_stats[:heap_free_slots] || gc_stats[:heap_free_slot], :metric => :heap_free)
+        set_gauge("heap_slots", gc_stats[:heap_live_slots] || gc_stats[:heap_live_slot], :metric => :heap_live)
+        set_gauge("heap_slots", gc_stats[:heap_free_slots] || gc_stats[:heap_free_slot], :metric => :heap_free)
+      end
+
+      private
+
+      def set_gauge(metric, value, tags = {})
+        @appsignal.set_gauge(metric, value, { :hostname => hostname }.merge(tags))
+      end
+
+      def hostname
+        return @hostname if defined?(@hostname)
+
+        config = @appsignal.config
+        @hostname =
+          if config[:hostname]
+            config[:hostname]
+          else
+            # Auto detect hostname as fallback. May be inaccurate.
+            Socket.gethostname
+          end
+        Appsignal.logger.debug "MRI probe: Using hostname config " \
+          "option '#{@hostname.inspect}' as hostname"
+
+        @hostname
       end
     end
   end

data/lib/appsignal/probes/sidekiq.rb

@@ -44,15 +44,16 @@ module Appsignal
 
         gauge "worker_count", stats.workers_size
         gauge "process_count", stats.processes_size
-        jobs_processed = gauge_delta :jobs_processed, stats.processed
-        if jobs_processed
+        gauge_delta :jobs_processed, stats.processed do |jobs_processed|
           gauge "job_count", jobs_processed, :status => :processed
         end
-        jobs_failed = gauge_delta :jobs_failed, stats.failed
-        gauge "job_count", jobs_failed, :status => :failed if jobs_failed
+        gauge_delta :jobs_failed, stats.failed do |jobs_failed|
+          gauge "job_count", jobs_failed, :status => :failed
+        end
         gauge "job_count", stats.retry_size, :status => :retry_queue
-        jobs_dead = gauge_delta :jobs_dead, stats.dead_size
-        gauge "job_count", jobs_dead, :status => :died if jobs_dead
+        gauge_delta :jobs_dead, stats.dead_size do |jobs_dead|
+          gauge "job_count", jobs_dead, :status => :died
+        end
         gauge "job_count", stats.scheduled_size, :status => :scheduled
         gauge "job_count", stats.enqueued, :status => :enqueued
       end

data/lib/appsignal/rack/rails_instrumentation.rb

@@ -40,7 +40,11 @@ module Appsignal
           end
           transaction.set_http_or_background_queue_start
           transaction.set_metadata("path", request.path)
-          transaction.set_metadata("method", request.request_method)
+          begin
+            transaction.set_metadata("method", request.request_method)
+          rescue => error
+            Appsignal.logger.error("Unable to report HTTP request method: '#{error}'")
+          end
           Appsignal::Transaction.complete_current!
         end
       end

data/lib/appsignal/transaction.rb

@@ -35,10 +35,24 @@ module Appsignal
         end
       end
 
+      # Returns currently active transaction or a {NilTransaction} if none is
+      # active.
+      #
+      # @see .current?
+      # @return [Boolean]
       def current
         Thread.current[:appsignal_transaction] || NilTransaction.new
       end
 
+      # Returns if any transaction is currently active or not. A
+      # {NilTransaction} is not considered an active transaction.
+      #
+      # @see .current
+      # @return [Boolean]
+      def current?
+        current && !current.nil_transaction?
+      end
+
       def complete_current!
         current.complete
       rescue => e

data/lib/appsignal/version.rb

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

data/spec/lib/appsignal/probes/mri_spec.rb

@@ -1,13 +1,15 @@
 class AppsignalMock
-  attr_reader :distribution_values, :gauges
+  attr_reader :gauges
 
-  def initialize
-    @distribution_values = []
+  def initialize(hostname: nil)
+    @hostname = hostname
     @gauges = []
   end
 
-  def add_distribution_value(*args)
-    @distribution_values << args
+  def config
+    ConfigHelpers.project_fixture_config.tap do |conf|
+      conf[:hostname] = @hostname if @hostname
+    end
   end
 
   def set_gauge(*args) # rubocop:disable Naming/AccessorMethodName
@@ -16,8 +18,9 @@ class AppsignalMock
 end
 
 describe Appsignal::Probes::MriProbe do
-  let(:appsignal_mock) { AppsignalMock.new }
-  let(:probe) { described_class.new(appsignal_mock) }
+  let(:appsignal_mock) { AppsignalMock.new(:hostname => hostname) }
+  let(:gc_profiler_mock) { instance_double("Appsignal::GarbageCollectionProfiler") }
+  let(:probe) { described_class.new(:appsignal => appsignal_mock, :gc_profiler => gc_profiler_mock) }
 
   describe ".dependencies_present?" do
     if DependencyHelper.running_jruby? || DependencyHelper.running_ruby_2_0?
@@ -33,10 +36,15 @@ describe Appsignal::Probes::MriProbe do
 
   unless DependencyHelper.running_jruby? || DependencyHelper.running_ruby_2_0?
     describe "#call" do
+      let(:hostname) { nil }
+      before do
+        allow(gc_profiler_mock).to receive(:total_time)
+      end
+
       it "should track vm metrics" do
         probe.call
-        expect_distribution_value("ruby_vm", :class_serial)
-        expect_distribution_value("ruby_vm", :global_constant_state)
+        expect_gauge_value("ruby_vm", :tags => { :metric => :class_serial })
+        expect_gauge_value("ruby_vm", :tags => { :metric => :global_constant_state })
       end
 
       it "tracks thread counts" do
@@ -44,9 +52,22 @@ describe Appsignal::Probes::MriProbe do
         expect_gauge_value("thread_count")
       end
 
-      it "tracks GC total time" do
+      it "tracks GC time between measurements" do
+        expect(gc_profiler_mock).to receive(:total_time).and_return(10, 15)
         probe.call
-        expect_gauge_value("gc_total_time")
+        probe.call
+        expect_gauge_value("gc_time", 5)
+      end
+
+      context "when GC total time overflows" do
+        it "skips one report" do
+          expect(gc_profiler_mock).to receive(:total_time).and_return(10, 15, 0, 10)
+          probe.call # Normal call, create a cache
+          probe.call # Report delta value based on cached value
+          probe.call # The value overflows and reports no value. Then stores 0 in the cache
+          probe.call # Report new value based on cache of 0
+          expect_gauges([["gc_time", 5], ["gc_time", 10]])
+        end
       end
 
       it "tracks GC run count" do
@@ -57,9 +78,9 @@ describe Appsignal::Probes::MriProbe do
         )
         probe.call
         probe.call
-        expect_distribution_value("gc_count", :gc_count, 5)
-        expect_distribution_value("gc_count", :minor_gc_count, 6)
-        expect_distribution_value("gc_count", :major_gc_count, 7)
+        expect_gauge_value("gc_count", 5, :tags => { :metric => :gc_count })
+        expect_gauge_value("gc_count", 6, :tags => { :metric => :minor_gc_count })
+        expect_gauge_value("gc_count", 7, :tags => { :metric => :major_gc_count })
       end
 
       it "tracks object allocation" do
@@ -75,30 +96,43 @@ describe Appsignal::Probes::MriProbe do
 
       it "tracks heap slots" do
         probe.call
-        expect_distribution_value("heap_slots", :heap_live)
-        expect_distribution_value("heap_slots", :heap_free)
+        expect_gauge_value("heap_slots", :tags => { :metric => :heap_live })
+        expect_gauge_value("heap_slots", :tags => { :metric => :heap_free })
+      end
+
+      context "with custom hostname" do
+        let(:hostname) { "my hostname" }
+
+        it "reports custom hostname tag value" do
+          probe.call
+          expect_gauge_value("heap_slots", :tags => { :metric => :heap_live, :hostname => hostname })
+        end
       end
     end
   end
 
-  def expect_distribution_value(expected_key, metric, expected_value = nil)
-    expect(appsignal_mock.distribution_values).to satisfy do |distribution_values|
-      distribution_values.any? do |distribution_value|
-        key, value, metadata = distribution_value
+  def expect_gauge_value(expected_key, expected_value = nil, tags: {})
+    expected_tags = { :hostname => Socket.gethostname }.merge(tags)
+    expect(appsignal_mock.gauges).to satisfy do |gauges|
+      gauges.any? do |distribution_value|
+        key, value, tags = distribution_value
         next unless key == expected_key
         next unless expected_value ? expected_value == value : !value.nil?
-        next unless metadata == { :metric => metric }
+        next unless tags == expected_tags
 
         true
       end
     end
   end
 
-  def expect_gauge_value(expected_key, expected_value = nil)
-    expect(appsignal_mock.gauges).to satisfy do |gauges|
-      gauges.any? do |(key, value)|
-        expected_key == key && expected_value ? expected_value == value : !value.nil?
-      end
+  def expect_gauges(expected_metrics)
+    default_tags = { :hostname => Socket.gethostname }
+    keys = expected_metrics.map { |(key)| key }
+    metrics = expected_metrics.map do |metric|
+      key, value, tags = metric
+      [key, value, default_tags.merge(tags || {})]
     end
+    found_gauges = appsignal_mock.gauges.select { |(key)| keys.include? key }
+    expect(found_gauges).to eq(metrics)
   end
 end

data/spec/lib/appsignal/rack/rails_instrumentation_spec.rb

@@ -3,20 +3,37 @@ if DependencyHelper.rails_present?
   end
 
   describe Appsignal::Rack::RailsInstrumentation do
-    before :context do
+    let(:log) { StringIO.new }
+    before do
       start_agent
+      Appsignal.logger = test_logger(log)
     end
 
+    let(:params) do
+      {
+        "controller" => "blog_posts",
+        "action" => "show",
+        "id" => "1",
+        "my_custom_param" => "my custom secret",
+        "password" => "super secret"
+      }
+    end
+    let(:env_extra) { {} }
     let(:app) { double(:call => true) }
     let(:env) do
-      http_request_env_with_data("action_dispatch.request_id" => "1").tap do |request|
-        request["action_controller.instance"] = double(
+      http_request_env_with_data({
+        :params => params,
+        :with_queue_start => true,
+        "action_dispatch.request_id" => "1",
+        "action_dispatch.parameter_filter" => [:my_custom_param, :password],
+        "action_controller.instance" => double(
           :class => MockController,
           :action_name => "index"
         )
-      end
+      }.merge(env_extra))
     end
     let(:middleware) { Appsignal::Rack::RailsInstrumentation.new(app, {}) }
+    around { |example| keep_transactions { example.run } }
 
     describe "#call" do
       before do
@@ -46,30 +63,62 @@ if DependencyHelper.rails_present?
       after { middleware.call(env) }
     end
 
-    describe "#call_with_appsignal_monitoring", :error => false do
-      it "should create a transaction" do
-        expect(Appsignal::Transaction).to receive(:create).with(
-          "1",
-          Appsignal::Transaction::HTTP_REQUEST,
-          kind_of(ActionDispatch::Request),
-          :params_method => :filtered_parameters
-        ).and_return(
-          instance_double(
-            "Appsignal::Transaction",
-            :set_action => nil,
-            :set_action_if_nil => nil,
-            :set_http_or_background_queue_start => nil,
-            :set_metadata => nil
+    describe "#call_with_appsignal_monitoring" do
+      def run
+        middleware.call(env)
+      end
+
+      it "calls the wrapped app" do
+        run
+        expect(app).to have_received(:call).with(env)
+      end
+
+      it "creates one transaction with metadata" do
+        run
+
+        expect(created_transactions.length).to eq(1)
+        transaction_hash = last_transaction.to_h
+        expect(transaction_hash).to include(
+          "namespace" => Appsignal::Transaction::HTTP_REQUEST,
+          "action" => "MockController#index",
+          "metadata" => hash_including(
+            "method" => "GET",
+            "path" => "/blog"
+          )
+        )
+        expect(last_transaction.ext.queue_start).to eq(
+          fixed_time * 1_000.0
+        )
+      end
+
+      it "filter parameters in Rails" do
+        run
+
+        transaction_hash = last_transaction.to_h
+        expect(transaction_hash).to include(
+          "sample_data" => hash_including(
+            "params" => params.merge(
+              "my_custom_param" => "[FILTERED]",
+              "password" => "[FILTERED]"
+            )
           )
         )
       end
 
-      it "should call the app" do
-        expect(app).to receive(:call).with(env)
+      context "with an invalid HTTP request method" do
+        let(:env_extra) { { :request_method => "FOO", "REQUEST_METHOD" => "FOO" } }
+
+        it "does not store the HTTP request method" do
+          run
+
+          transaction_hash = last_transaction.to_h
+          expect(transaction_hash["metadata"]).to_not have_key("method")
+          expect(log_contents(log)).to contains_log(:error, "Unable to report HTTP request method: '")
+        end
       end
 
-      context "with an exception", :error => true do
-        let(:error) { ExampleException }
+      context "with an exception" do
+        let(:error) { ExampleException.new("ExampleException message") }
         let(:app) do
           double.tap do |d|
             allow(d).to receive(:call).and_raise(error)
@@ -77,21 +126,16 @@ if DependencyHelper.rails_present?
         end
 
         it "records the exception" do
-          expect_any_instance_of(Appsignal::Transaction).to receive(:set_error).with(error)
-        end
-      end
+          expect { run }.to raise_error(error)
 
-      it "should set metadata" do
-        expect_any_instance_of(Appsignal::Transaction).to receive(:set_metadata).twice
-      end
-
-      it "should set the action and queue start" do
-        expect_any_instance_of(Appsignal::Transaction).to receive(:set_action_if_nil).with("MockController#index")
-        expect_any_instance_of(Appsignal::Transaction).to receive(:set_http_or_background_queue_start)
+          transaction_hash = last_transaction.to_h
+          expect(transaction_hash["error"]).to include(
+            "name" => "ExampleException",
+            "message" => "ExampleException message",
+            "backtrace" => kind_of(String)
+          )
+        end
       end
-
-      after(:error => false) { middleware.call(env) }
-      after(:error => true) { expect { middleware.call(env) }.to raise_error(error) }
     end
 
     describe "#request_id" do

data/spec/lib/appsignal/transaction_spec.rb

@@ -85,7 +85,9 @@ describe Appsignal::Transaction do
     end
 
     describe ".current" do
-      subject { Appsignal::Transaction.current }
+      def current_transaction
+        Appsignal::Transaction.current
+      end
 
       context "when there is a current transaction" do
         let!(:transaction) do
@@ -93,13 +95,17 @@ describe Appsignal::Transaction do
         end
 
         it "reads :appsignal_transaction from the current Thread" do
-          expect(subject).to eq Thread.current[:appsignal_transaction]
-          expect(subject).to eq transaction
+          expect(current_transaction).to eq Thread.current[:appsignal_transaction]
+          expect(current_transaction).to eq transaction
         end
 
         it "is not a NilTransaction" do
-          expect(subject.nil_transaction?).to eq false
-          expect(subject).to be_a Appsignal::Transaction
+          expect(current_transaction.nil_transaction?).to eq false
+          expect(current_transaction).to be_a Appsignal::Transaction
+        end
+
+        it "returns true for current?" do
+          expect(Appsignal::Transaction.current?).to be(true)
         end
       end
 
@@ -109,8 +115,12 @@ describe Appsignal::Transaction do
         end
 
         it "returns a NilTransaction stub" do
-          expect(subject.nil_transaction?).to eq true
-          expect(subject).to be_a Appsignal::Transaction::NilTransaction
+          expect(current_transaction.nil_transaction?).to eq true
+          expect(current_transaction).to be_a Appsignal::Transaction::NilTransaction
+        end
+
+        it "returns false for current?" do
+          expect(Appsignal::Transaction.current?).to be(false)
         end
       end
     end

data/spec/lib/appsignal_spec.rb

@@ -511,7 +511,14 @@ describe Appsignal do
       before { allow(Appsignal::Transaction).to receive(:current).and_return(transaction) }
 
       context "with transaction" do
-        let(:transaction) { double }
+        let(:transaction) { http_request_transaction }
+        around do |example|
+          Appsignal.config = project_fixture_config
+          set_current_transaction transaction do
+            example.run
+          end
+        end
+
         it "should call add_breadcrumb on transaction" do
           expect(transaction).to receive(:add_breadcrumb)
             .with("Network", "http", "User made network request", { :response => 200 }, fixed_time)

data/spec/support/helpers/config_helpers.rb

@@ -14,6 +14,7 @@ module ConfigHelpers
       config_file
     )
   end
+  module_function :project_fixture_config, :project_fixture_path
 
   def start_agent(env = "production")
     Appsignal.config = project_fixture_config(env)

data/spec/support/helpers/env_helpers.rb

@@ -1,7 +1,8 @@
 module EnvHelpers
   def http_request_env_with_data(args = {})
+    with_queue_start = args.delete(:with_queue_start)
     path = args.delete(:path) || "/blog"
-    Rack::MockRequest.env_for(
+    request = Rack::MockRequest.env_for(
       path,
       :params => args[:params] || {
         "controller" => "blog_posts",
@@ -18,6 +19,13 @@ module EnvHelpers
       :db_runtime => 500,
       :metadata => { :key => "value" }
     ).merge(args)
+
+    # Set default queue value
+    if with_queue_start
+      request["HTTP_X_QUEUE_START"] = "t=#{(fixed_time * 1_000).to_i}" # in milliseconds
+    end
+
+    request
   end
 
   def background_env_with_data(args = {})

data/spec/support/helpers/transaction_helpers.rb

@@ -46,8 +46,14 @@ module TransactionHelpers
 
   # Set current transaction manually.
   # Cleared by {clear_current_transaction!}
+  #
+  # When a block is given, the current transaction is automatically unset after
+  # the block.
   def set_current_transaction(transaction) # rubocop:disable Naming/AccessorMethodName
     Thread.current[:appsignal_transaction] = transaction
+    yield if block_given?
+  ensure
+    clear_current_transaction! if block_given?
   end
 
   # Use when {Appsignal::Transaction.clear_current_transaction!} is stubbed to

data/spec/support/testing.rb

@@ -50,6 +50,17 @@ module Appsignal
 
   class Extension
     class Transaction
+      if Appsignal.extension_loaded?
+        attr_reader :queue_start
+        alias original_set_queue_start set_queue_start
+        # Temporary helper until the extension returns this information
+        # https://github.com/appsignal/appsignal-agent/issues/293
+        def set_queue_start(start) # rubocop:disable Naming/AccessorMethodName
+          @queue_start = start
+          original_set_queue_start(start)
+        end
+      end
+
       alias original_finish finish if method_defined? :finish
 
       # Override default {Extension::Transaction#finish} behavior to always

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.3
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -69,35 +69,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.20
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="