appsignal 3.0.26-java → 3.1.1-java

data/CHANGELOG.md

@@ -1,5 +1,41 @@
 # AppSignal for Ruby gem Changelog
 
+## 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
+
+- [7032dc4b](https://github.com/appsignal/appsignal-ruby/commit/7032dc4b45c150c58a7a97c44b17e1092934c1ec) patch - Use `Dir.pwd` to determine the current directory in the Capistrano 3 integration. It previously relied on `ENV["pwd"]` which returned `nil` in some scenarios.
+
 ## 3.0.26
 
 ### Removed

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/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,92 @@
 # appsignal-agent repository.
 # Modifications to this file will be overwritten with the next agent release.
 ---
-version: f57e6cb
+version: d573c9b
 mirrors:
 - https://appsignal-agent-releases.global.ssl.fastly.net
 - https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: dd1ae8d7897edf3112741381226e3622e91553dede6eeae48ca07aae84ac050d
+      checksum: a9a86594e50f22e7f7fd93a050e334048248a6dc971015e66c26150c4a689345
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: a523a85f76bdb37ffcacbf14279c3c7fed0378fbcfd20886ab66ee7602766e72
+      checksum: 04a69d0b608aa0e834c96c75a3bb226e7ca252fd2c74e439fdd43bf297d6bde2
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: dd1ae8d7897edf3112741381226e3622e91553dede6eeae48ca07aae84ac050d
+      checksum: a9a86594e50f22e7f7fd93a050e334048248a6dc971015e66c26150c4a689345
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: a523a85f76bdb37ffcacbf14279c3c7fed0378fbcfd20886ab66ee7602766e72
+      checksum: 04a69d0b608aa0e834c96c75a3bb226e7ca252fd2c74e439fdd43bf297d6bde2
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   aarch64-darwin:
     static:
-      checksum: cd5175979ec293d0471c71de1fdd00817bea75f800603a1b87931b19471495f3
+      checksum: 92f7f71b685985b310a9f3693a96a5db6b9133b0af807d000b90248e097063c7
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 77503ee5debad5f503719d5fe653f30c3b3bb6624694f48ef03352f575af97c0
+      checksum: ffb54af4c35dd281a4735b57d8e537b8b08e87e08841e5d344caff325948a9e8
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm64-darwin:
     static:
-      checksum: cd5175979ec293d0471c71de1fdd00817bea75f800603a1b87931b19471495f3
+      checksum: 92f7f71b685985b310a9f3693a96a5db6b9133b0af807d000b90248e097063c7
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 77503ee5debad5f503719d5fe653f30c3b3bb6624694f48ef03352f575af97c0
+      checksum: ffb54af4c35dd281a4735b57d8e537b8b08e87e08841e5d344caff325948a9e8
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm-darwin:
     static:
-      checksum: cd5175979ec293d0471c71de1fdd00817bea75f800603a1b87931b19471495f3
+      checksum: 92f7f71b685985b310a9f3693a96a5db6b9133b0af807d000b90248e097063c7
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 77503ee5debad5f503719d5fe653f30c3b3bb6624694f48ef03352f575af97c0
+      checksum: ffb54af4c35dd281a4735b57d8e537b8b08e87e08841e5d344caff325948a9e8
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   aarch64-linux:
     static:
-      checksum: ae899aba4fa260c1aa1d21cc8f2bf379a2b52596ef2979e9b9b70f0cd54872d4
+      checksum: 79f1e7f9c34ab36c06d5c3d676173ee7c1219af2f51dc77865897598dc01349a
       filename: appsignal-aarch64-linux-all-static.tar.gz
     dynamic:
-      checksum: 848ab3df66cac4122133145738a380d3e4763e0bcb324cb0d7c0423741751d80
+      checksum: cfd8e98238e2c7cdb10c0e136c47ab8e2dacab0a14d8ccf0e4c6c14946e325f1
       filename: appsignal-aarch64-linux-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: 3934810379bade5096a5f055450ddd38f60c1bb2fbc05bebcea92f8f7250a81e
+      checksum: 835c6f823a2c6e9f8fa12704bf0953e3610dc9836355b57d2d6981e6ae412fb4
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 2bd5207d0930f9ce262adcb955582c2a022de8872022a0ddd1ea15391339eb55
+      checksum: febc5d80a7b0fd9644e2d68d068d28c66359bbef9473f01e9f71fb07fd73bcb8
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: 3934810379bade5096a5f055450ddd38f60c1bb2fbc05bebcea92f8f7250a81e
+      checksum: 835c6f823a2c6e9f8fa12704bf0953e3610dc9836355b57d2d6981e6ae412fb4
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 2bd5207d0930f9ce262adcb955582c2a022de8872022a0ddd1ea15391339eb55
+      checksum: febc5d80a7b0fd9644e2d68d068d28c66359bbef9473f01e9f71fb07fd73bcb8
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86_64-linux:
     static:
-      checksum: 956288a49717ea61ec303ef4ab52e7bfafea6e575a8bb9839df24b947d22d988
+      checksum: 6eb6f0df2f8c62a29769bf7f21cefaec92a24ee0ab363acc5bd4f9c2d1241c53
       filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: abf290aa7ad7be1af54889c9dd70cf2f71902359cfc5f5ce64b53b8421914a51
+      checksum: ce710ff2edea2fc7b3b6bafd10af849e95f513abf5d775b9a8361ffed45b70c3
       filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: 5f96744692b6b079bd2b97ac6d8d5900123f108a27237664c88a49782b7ba433
+      checksum: b16d46074527da5700e10e5a8b176aeb46b7bbb19431653029eda04437bef918
       filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: c0a06de99d88a2e045b60d53319e1bbb8633127667fbe9f09e52f2bbaf6fb54d
+      checksum: 261b79ab790e6a12a748d4649a4389e96d5cf7d1f981c3b56ed331f164d1627b
       filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: 23ea3fdcc5ae7dfdc85214c872ef928ed702c029b05c059db614583f689b9304
+      checksum: e7bfc1dc355ce1237aaee6fdf967c78ecca533db41b09c2b10716e7f8593dbe0
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 683cc20296ef05257c4209b3c5d86ef32b76be6ea75a1d1ec76db0163e729a38
+      checksum: 97af9419cf00e22ea544a2365785a6b5df2a990f17e7735b3bbec1a690b68f0b
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: 23ea3fdcc5ae7dfdc85214c872ef928ed702c029b05c059db614583f689b9304
+      checksum: e7bfc1dc355ce1237aaee6fdf967c78ecca533db41b09c2b10716e7f8593dbe0
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 683cc20296ef05257c4209b3c5d86ef32b76be6ea75a1d1ec76db0163e729a38
+      checksum: 97af9419cf00e22ea544a2365785a6b5df2a990f17e7735b3bbec1a690b68f0b
       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/gemfiles/sequel.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'sequel', '< 4.35'
+gem 'sequel'
 if RUBY_PLATFORM == "java"
   gem 'jdbc-sqlite3'
 else

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/integrations/capistrano/appsignal.cap

@@ -5,7 +5,7 @@ namespace :appsignal do
     revision = fetch(:appsignal_revision, fetch(:current_revision))
 
     appsignal_config = Appsignal::Config.new(
-      ENV["PWD"],
+      Dir.pwd,
       appsignal_env,
       {},
       Logger.new(StringIO.new)

data/lib/appsignal/probes/helpers.rb

@@ -0,0 +1,29 @@
+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
+      #
+      # 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.
+      #
+      # @example
+      #   gauge_delta :my_cache_key, 10
+      #   gauge_delta :my_cache_key, 15
+      #   # Returns a value of `5`
+      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
+      end
+    end
+  end
+end

data/lib/appsignal/probes/mri.rb

@@ -1,25 +1,85 @@
 module Appsignal
   module Probes
     class MriProbe
+      include Helpers
+
       # @api private
       def self.dependencies_present?
         defined?(::RubyVM) && ::RubyVM.respond_to?(:stat)
       end
 
-      def initialize
+      def self.garbage_collection_profiler
+        @garbage_collection_profiler ||= Appsignal::GarbageCollectionProfiler.new
+      end
+
+      def initialize(appsignal = Appsignal)
         Appsignal.logger.debug("Initializing VM probe")
+        @appsignal = appsignal
       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)
+        set_gauge("gc_total_time", MriProbe.garbage_collection_profiler.total_time)
+
+        gc_stats = GC.stat
+        allocated_objects =
+          gauge_delta(
+            :allocated_objects,
+            gc_stats[:total_allocated_objects] || gc_stats[:total_allocated_object]
           )
+        set_gauge("allocated_objects", allocated_objects) if allocated_objects
+
+        gc_count = gauge_delta(:gc_count, GC.count)
+        set_gauge("gc_count", gc_count, :metric => :gc_count) if gc_count
+        minor_gc_count = gauge_delta(:minor_gc_count, gc_stats[:minor_gc_count])
+        if 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
+          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,15 @@ 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
+        jobs_processed = gauge_delta :jobs_processed, stats.processed
+        if 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 "job_count", stats.retry_size, :status => :retry_queue
-        gauge_delta :jobs_dead, "job_count", stats.dead_size, :status => :died
+        jobs_dead = gauge_delta :jobs_dead, stats.dead_size
+        gauge "job_count", jobs_dead, :status => :died if jobs_dead
         gauge "job_count", stats.scheduled_size, :status => :scheduled
         gauge "job_count", stats.enqueued, :status => :enqueued
       end
@@ -65,25 +71,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.26".freeze
+  VERSION = "3.1.1".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/capistrano3_spec.rb

@@ -42,7 +42,11 @@ if DependencyHelper.capistrano3_present?
     describe "appsignal:deploy task" do
       before do
         ENV["USER"] = "batman"
-        ENV["PWD"] = project_fixture_path
+      end
+      around do |example|
+        Dir.chdir project_fixture_path do
+          example.run
+        end
       end
 
       context "config" do

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

@@ -1,5 +1,25 @@
+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(:probe) { described_class.new(appsignal_mock) }
 
   describe ".dependencies_present?" do
     if DependencyHelper.running_jruby? || DependencyHelper.running_ruby_2_0?
@@ -15,19 +35,76 @@ describe Appsignal::Probes::MriProbe do
 
   unless DependencyHelper.running_jruby? || DependencyHelper.running_ruby_2_0?
     describe "#call" do
+      let(:hostname) { nil }
+
       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
+        probe.call
+        expect_gauge_value("gc_total_time")
+      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_distribution_value(metric)
-      expect(Appsignal).to receive(:add_distribution_value)
-        .with("ruby_vm", kind_of(Numeric), :metric => metric)
-        .and_call_original
-        .once
+  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
 end

data/spec/lib/appsignal/span_spec.rb

@@ -15,7 +15,8 @@ describe Appsignal::Span do
       expect(root.to_h["span_id"].length).to eq 8
       expect(root.to_h["parent_span_id"]).to be_empty
       expect(root.to_h["name"]).to be_empty
-      expect(root.to_h["start_time"]).to be > 1_600_000_000
+      expect(root.to_h["start_time_seconds"]).to be > 1_600_000_000
+      expect(root.to_h["start_time_nanoseconds"]).to be_kind_of(Numeric)
       expect(root.to_h["closed"]).to be false
     end
   end
@@ -29,7 +30,8 @@ describe Appsignal::Span do
       expect(child.to_h["span_id"].length).to eq 8
       expect(child.to_h["parent_span_id"]).to eq root.to_h["span_id"]
       expect(child.to_h["name"]).to be_empty
-      expect(child.to_h["start_time"]).to be > 1_600_000_000
+      expect(root.to_h["start_time_seconds"]).to be > 1_600_000_000
+      expect(root.to_h["start_time_nanoseconds"]).to be_kind_of(Numeric)
       expect(child.to_h["closed"]).to be false
     end
   end

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)