appsignal 3.0.27-java → 3.1.2-java

data/CHANGELOG.md

@@ -1,5 +1,47 @@
 # AppSignal for Ruby gem Changelog
 
+## 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
+
+- [d10c3f32](https://github.com/appsignal/appsignal-ruby/commit/d10c3f32facbf399d7afe1d2ddbb5764fb57b008) minor - Add tracking of thread counts, garbage collection runs, heap slots and other garbage collection stats to the default MRI probe. These metrics will be shown in AppSignal.com in a new Ruby VM Magic Dashboard.
+
+### Changed
+
+- [114fe4f9](https://github.com/appsignal/appsignal-ruby/commit/114fe4f92e621bc2e771bb0fb608b5c6189f2933) patch - Bump agent to v-d573c9b
+  
+  - Display unsupported OpenTelemetry spans in limited form.
+  - Clean up payload storage before sending. Should fix issues with locally queued payloads blocking data from being sent.
+  - Add `appsignal_create_opentelemetry_span` function to create spans for further modification, rather than only import them.
+- [dd803449](https://github.com/appsignal/appsignal-ruby/commit/dd803449bd3990ba020c0bec4429166977071c02) patch - Report gauge delta value for allocated objects. This reports a more user friendly metric we can graph with a more stable continuous value in apps with stable memory allocation.
+- [547f925e](https://github.com/appsignal/appsignal-ruby/commit/547f925e392bb9f4f10ba95f371e42ddfe0de5de) patch - Report gauge delta value for Garbage Collection counts. This reports a more user friendly metric that doesn't always goes up until the app restarts or gets a new deploy.
+
+### Fixed
+
+- [e555a81a](https://github.com/appsignal/appsignal-ruby/commit/e555a81ab65cc951383f54d0e9a6c57d8cc2ac51) patch - Fix FFI function calls missing arguments for `appsignal_free_transaction` and `appsignal_free_data` extension functions. This fixes a high CPU issue when these function calls would be retried indefinitely.
+
 ## 3.0.27
 
 ### Fixed

data/Rakefile

@@ -77,11 +77,12 @@ namespace :build_matrix do
             "name" => "Ruby #{ruby_version} for #{gem["gem"]}",
             "env_vars" => env + ruby.fetch("env_vars", []),
             "commands" => [
-              "./support/bundler_wrapper exec rake test",
-              "./support/bundler_wrapper exec rake test:failure"
+              "./support/bundler_wrapper exec rake test"
             ]
           }
           if gem["gem"] == "no_dependencies"
+            # Only test the failure scenarios once per Ruby version
+            job["commands"] << "./support/bundler_wrapper exec rake test:failure"
             ruby_primary_block["task"]["jobs"] << job
           else
             ruby_secondary_block["task"]["jobs"] << job

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/build_matrix.yml

@@ -33,7 +33,16 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
           fi
         - |
           if [ -n "$RUBY_VERSION" ]; then
-            sem-version ruby $RUBY_VERSION
+            if ! (sem-version ruby "$RUBY_VERSION"); then
+              ruby_key="rbenv-ruby-$RUBY_VERSION"
+              echo "Attempting to build Ruby $RUBY_VERSION from source"
+              git -C "$HOME/.rbenv/plugins/ruby-build" pull
+              cache restore "$ruby_key"
+              sem-version ruby "$RUBY_VERSION"
+              if ! cache has_key "$ruby_key"; then
+                cache store "$ruby_key" "$HOME/.rbenv/versions/$RUBY_VERSION"
+              fi
+            fi
             ./support/check_versions
           else
             echo Skipping Ruby install
@@ -190,11 +199,14 @@ matrix:
     - ruby: "2.7.5"
     - ruby: "3.0.3"
     - ruby: "3.1.1"
+    - ruby: "3.2.0-preview1"
     - ruby: "jruby-9.2.19.0"
       gems: "minimal"
       env_vars:
         - name: "_C_VERSION"
           value: "8"
+    - ruby: "jruby-9.3.6.0"
+      gems: "minimal"
   gems:
     - gem: "no_dependencies"
     - gem: "capistrano2"
@@ -206,11 +218,13 @@ matrix:
         ruby:
           - "3.0.3"
           - "3.1.1"
+          - "3.2.0-preview1"
     - gem: "psych-4"
       only:
         ruby:
           - "3.0.3"
           - "3.1.1"
+          - "3.2.0-preview1"
     - gem: "que"
     - gem: "que_beta"
     - gem: "rails-3.2"
@@ -283,13 +297,16 @@ matrix:
           - "2.7.5"
           - "3.0.3"
           - "3.1.1"
+          - "3.2.0-preview1"
           - "jruby-9.2.19.0"
+          - "jruby-9.3.6.0"
     - gem: "rails-7.0"
       only:
         ruby:
           - "2.7.5"
           - "3.0.3"
           - "3.1.1"
+          - "3.2.0-preview1"
     - gem: "resque-1"
       bundler: "1.17.3"
       only:

data/ext/agent.yml

@@ -3,92 +3,99 @@
 # appsignal-agent repository.
 # Modifications to this file will be overwritten with the next agent release.
 ---
-version: be3107a
+version: '06391fb'
 mirrors:
 - https://appsignal-agent-releases.global.ssl.fastly.net
 - https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: 31b13af931f26832eb9b5f3283a0dcfc83e327a31570aef47704589de5bd54cc
+      checksum: 9bf41c183d94c80e980f57ea2e29d08bae97e8097b5284a2b91a5484bf866f8c
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: e9a8798df3774d3483d5c2b503f53fa797bcd1fe228c293448786773bad6518f
+      checksum: 4d3789e65cf00e446600e883d95d097323ebb3835703c67c8d09f434f09ab496
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: 31b13af931f26832eb9b5f3283a0dcfc83e327a31570aef47704589de5bd54cc
+      checksum: 9bf41c183d94c80e980f57ea2e29d08bae97e8097b5284a2b91a5484bf866f8c
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: e9a8798df3774d3483d5c2b503f53fa797bcd1fe228c293448786773bad6518f
+      checksum: 4d3789e65cf00e446600e883d95d097323ebb3835703c67c8d09f434f09ab496
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   aarch64-darwin:
     static:
-      checksum: 902649453b5cfe86dee86f053a7dbe7df35bc8bce0b9632bd5619a8c824f02af
+      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 8f334e011d9f624782c3a1766b6ffdf987fa58d5d8230ec7d65a1b0cbf43298d
+      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm64-darwin:
     static:
-      checksum: 902649453b5cfe86dee86f053a7dbe7df35bc8bce0b9632bd5619a8c824f02af
+      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 8f334e011d9f624782c3a1766b6ffdf987fa58d5d8230ec7d65a1b0cbf43298d
+      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm-darwin:
     static:
-      checksum: 902649453b5cfe86dee86f053a7dbe7df35bc8bce0b9632bd5619a8c824f02af
+      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 8f334e011d9f624782c3a1766b6ffdf987fa58d5d8230ec7d65a1b0cbf43298d
+      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   aarch64-linux:
     static:
-      checksum: 37819d1df9b516d39a3aaf54bcc434f7d77e0067d75a86fff8c89be24cf16c28
+      checksum: 0f2430e637eb77ce2093f021777087e87cb1e7be7c86a53771172696791c4879
       filename: appsignal-aarch64-linux-all-static.tar.gz
     dynamic:
-      checksum: d453b25ed0752b588aa6895ede513b3cdb1b62060343fff1ad9fb4ea79859888
+      checksum: 0e4f9305aeaaa2d7847e83be04227b865723a0591574108d78040b5921a677a7
       filename: appsignal-aarch64-linux-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: c372daebb69e9795c8dcd60f48cad2af66628e1e3c8211f00526bdc8c880fc97
+      checksum: 449ba623aaa1853c2d211bf1e2d3a14e5ae09225a62457cbdbcc0983a5713a52
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 77e98bbf097148017bd1fd5c6e497e14d30ffb96cb385c7e4ebbaac82d292572
+      checksum: dae994292d602eaf0910bd2ce53f0163e19767a4cbb8e5d0db99c0010d6df486
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: c372daebb69e9795c8dcd60f48cad2af66628e1e3c8211f00526bdc8c880fc97
+      checksum: 449ba623aaa1853c2d211bf1e2d3a14e5ae09225a62457cbdbcc0983a5713a52
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 77e98bbf097148017bd1fd5c6e497e14d30ffb96cb385c7e4ebbaac82d292572
+      checksum: dae994292d602eaf0910bd2ce53f0163e19767a4cbb8e5d0db99c0010d6df486
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86_64-linux:
     static:
-      checksum: 972a8b02061d747fbe35f3dd8d3d5b7c34bf7a6a38d0526d0ff55b9e70b67f13
+      checksum: 394796c0ddeb4881c9f2e6ce82f840e66bcb69e027324f6c04f6671067445fbb
       filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: 96d9303fbc12cd20f227f2e950e1807d56b7d68d1af2069c7d2c77fa2544c589
+      checksum: 9ca4762c464482b0a5a89898a839388597dd57a17a21527a67f3e3db0e540a03
       filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: 4821b9d4e9b4501a5002f731b633a64b3991272fb0e6e57a61ce1e2a0b33bcad
+      checksum: 673271c8c5fd55053d8a719bcd307f787db4ca4633baf8cf961c442bf1805614
       filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: e11b87a336ea1c51858f488b029335ccf37610a21c9327aecbbc62c3693a1869
+      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: 2b8ff925dd40daab892cf66ad3fefb72559cab57433907d8f70ae41722716832
+      checksum: cb45da91c51123859e5ef5cea850460c28d6e77dfa08b90375178d9017162ba8
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 174e1c7b58b9081383c438ba33d6981a0063ef6d740d6feec7d2ead4e607e769
+      checksum: 6a03e02c2526e05edaa7fa932b2e764318c63ec93d517c6c00f6b7541bfe71f3
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: 2b8ff925dd40daab892cf66ad3fefb72559cab57433907d8f70ae41722716832
+      checksum: cb45da91c51123859e5ef5cea850460c28d6e77dfa08b90375178d9017162ba8
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 174e1c7b58b9081383c438ba33d6981a0063ef6d740d6feec7d2ead4e607e769
+      checksum: 6a03e02c2526e05edaa7fa932b2e764318c63ec93d517c6c00f6b7541bfe71f3
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/gemfiles/grape.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'grape', '0.14.0'
+gem 'grape'
 gem 'activesupport', '~> 4.2'
 
 gemspec :path => '../'

data/lib/appsignal/extension/jruby.rb

@@ -83,7 +83,7 @@ module Appsignal
 
         # Transaction methods
         attach_function :appsignal_free_transaction,
-          [],
+          [:pointer],
           :void
         attach_function :appsignal_start_transaction,
           [:appsignal_string, :appsignal_string, :long],
@@ -191,7 +191,7 @@ module Appsignal
           :void
 
         # Data struct methods
-        attach_function :appsignal_free_data, [], :void
+        attach_function :appsignal_free_data, [:pointer], :void
         attach_function :appsignal_data_map_new, [], :pointer
         attach_function :appsignal_data_array_new, [], :pointer
         attach_function :appsignal_data_map_set_string,

data/lib/appsignal/probes/helpers.rb

@@ -0,0 +1,42 @@
+module Appsignal
+  module Probes
+    module Helpers
+      private
+
+      def gauge_delta_cache
+        @gauge_delta_cache ||= {}
+      end
+
+      # Calculate the delta of two values for a gauge metric.
+      #
+      # 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 :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
+
+        yield value - previous_value
+      end
+    end
+  end
+end

data/lib/appsignal/probes/mri.rb

@@ -1,25 +1,83 @@
 module Appsignal
   module Probes
     class MriProbe
+      include Helpers
+
       # @api private
       def self.dependencies_present?
         defined?(::RubyVM) && ::RubyVM.respond_to?(:stat)
       end
 
-      def initialize
+      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
-        [:class_serial, :global_constant_state].each do |metric|
-          Appsignal.add_distribution_value(
-            "ruby_vm",
-            stat[metric],
-            :metric => metric
-          )
+
+        set_gauge(
+          "ruby_vm",
+          stat[:class_serial],
+          :metric => :class_serial
+        )
+
+        set_gauge(
+          "ruby_vm",
+          stat[:constant_cache] ? stat[:constant_cache].values.sum : stat[:global_constant_state],
+          :metric => :global_constant_state
+        )
+
+        set_gauge("thread_count", Thread.list.size)
+        gauge_delta(:gc_total_time, @gc_profiler.total_time) do |total_time|
+          set_gauge("gc_total_time", total_time) if total_time > 0
+        end
+
+        gc_stats = GC.stat
+        gauge_delta(
+          :allocated_objects,
+          gc_stats[:total_allocated_objects] || gc_stats[:total_allocated_object]
+        ) do |allocated_objects|
+          set_gauge("allocated_objects", allocated_objects)
+        end
+
+        gauge_delta(:gc_count, GC.count) do |gc_count|
+          set_gauge("gc_count", gc_count, :metric => :gc_count)
+        end
+        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
+        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
+
+        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

@@ -1,6 +1,8 @@
 module Appsignal
   module Probes
     class SidekiqProbe
+      include Helpers
+
       # @api private
       attr_reader :config
 
@@ -42,11 +44,16 @@ module Appsignal
 
         gauge "worker_count", stats.workers_size
         gauge "process_count", stats.processes_size
-        gauge_delta :jobs_processed, "job_count", stats.processed,
-          :status => :processed
-        gauge_delta :jobs_failed, "job_count", stats.failed, :status => :failed
+        gauge_delta :jobs_processed, stats.processed do |jobs_processed|
+          gauge "job_count", jobs_processed, :status => :processed
+        end
+        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
-        gauge_delta :jobs_dead, "job_count", stats.dead_size, :status => :died
+        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
@@ -65,25 +72,6 @@ module Appsignal
         Appsignal.set_gauge "sidekiq_#{key}", value, tags
       end
 
-      # Track the delta of two values for a gauge metric
-      #
-      # First call will store the data for the metric and the second call will
-      # set a gauge metric with the difference. This is used for absolute
-      # counter values which we want to track as gauges.
-      #
-      # @example
-      #   gauge_delta :my_cache_key, "my_gauge", 10
-      #   gauge_delta :my_cache_key, "my_gauge", 15
-      #   # Creates a gauge with the value `5`
-      # @see #gauge
-      def gauge_delta(cache_key, key, value, tags = {})
-        previous_value = cache[cache_key]
-        cache[cache_key] = value
-        return unless previous_value
-        new_value = value - previous_value
-        gauge key, new_value, tags
-      end
-
       def hostname
         return @hostname if defined?(@hostname)
         if config.key?(:hostname)

data/lib/appsignal/probes.rb

@@ -3,5 +3,6 @@ module Appsignal
   end
 end
 
+require "appsignal/probes/helpers"
 require "appsignal/probes/mri"
 require "appsignal/probes/sidekiq"

data/lib/appsignal/version.rb

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

data/script/lint_git

@@ -2,9 +2,9 @@
 
 set -eu
 
-LINTJE_VERSION="0.6.1"
+LINTJE_VERSION="0.7.1"
 
-mkdir -p $HOME/bin
+mkdir -p "$HOME/bin"
 cache_key=v1-lintje-$LINTJE_VERSION
 cache restore $cache_key
 
@@ -15,8 +15,8 @@ else
   echo "Downloading Lintje $LINTJE_VERSION"
   curl -L \
     https://github.com/tombruijn/lintje/releases/download/v$LINTJE_VERSION/x86_64-unknown-linux-gnu.tar.gz | \
-    tar -xz --directory $HOME/bin
-  cache store $cache_key $HOME/bin/lintje
+    tar -xz --directory "$HOME/bin"
+  cache store $cache_key "$HOME/bin/lintje"
 fi
 
-$HOME/bin/lintje $SEMAPHORE_GIT_COMMIT_RANGE
+"$HOME/bin/lintje" "$SEMAPHORE_GIT_COMMIT_RANGE"

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

@@ -1,5 +1,26 @@
+class AppsignalMock
+  attr_reader :gauges
+
+  def initialize(hostname: nil)
+    @hostname = hostname
+    @gauges = []
+  end
+
+  def config
+    ConfigHelpers.project_fixture_config.tap do |conf|
+      conf[:hostname] = @hostname if @hostname
+    end
+  end
+
+  def set_gauge(*args) # rubocop:disable Naming/AccessorMethodName
+    @gauges << args
+  end
+end
+
 describe Appsignal::Probes::MriProbe do
-  let(:probe) { described_class.new }
+  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?
@@ -15,19 +36,103 @@ 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
-        expect_distribution_value(:class_serial)
-        expect_distribution_value(:global_constant_state)
+        probe.call
+        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
+        probe.call
+        expect_gauge_value("thread_count")
+      end
 
+      it "tracks GC total time" do
+        expect(gc_profiler_mock).to receive(:total_time).and_return(10, 15)
+        probe.call
         probe.call
+        expect_gauge_value("gc_total_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_total_time", 5], ["gc_total_time", 10]])
+        end
+      end
+
+      it "tracks GC run count" do
+        expect(GC).to receive(:count).and_return(10, 15)
+        expect(GC).to receive(:stat).and_return(
+          { :minor_gc_count => 10, :major_gc_count => 10 },
+          :minor_gc_count => 16, :major_gc_count => 17
+        )
+        probe.call
+        probe.call
+        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
+        expect(GC).to receive(:stat).and_return(
+          { :total_allocated_objects => 10 },
+          :total_allocated_objects => 15
+        )
+        # Only tracks delta value so the needs to be called twice
+        probe.call
+        probe.call
+        expect_gauge_value("allocated_objects", 5)
+      end
+
+      it "tracks heap slots" do
+        probe.call
+        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_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 tags == expected_tags
+
+        true
+      end
+    end
+  end
 
-    def expect_distribution_value(metric)
-      expect(Appsignal).to receive(:add_distribution_value)
-        .with("ruby_vm", kind_of(Numeric), :metric => metric)
-        .and_call_original
-        .once
+  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