appsignal 3.1.0-java → 3.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5b5a232369f0d030bf17e1397dc12e7f5b9cce53b2469468a65cde362ef7903
-  data.tar.gz: eb490806ae18a93d7ec24eb071c63b22c1f599b62fbd82e5a47d0f00ebeee50c
+  metadata.gz: be534a2bce153240d9a00c15ee4f177cec58a0a40df738ddd66e7afba50a1d0c
+  data.tar.gz: 0d9c3820cfe794ccabbcc1cda65fafec925cda36690b4caa179170e07a38a25c
 SHA512:
-  metadata.gz: a3f0c5ed5ab18b10c70145c748b674c33b0e70ec67715b800f05da4b2f829268ef1d7d9aa3173afa55927c746d11cebc6bd2571438ead0074a141b0fa168b32a
-  data.tar.gz: 130d790bd57b4e39ee9011e56a11c60ff72dda6e266aa7335ceea0f63e1e41093c815a9c4286c5db2129198acf169c9d65a6b025eb15e4b930ac905e62439d8c
+  metadata.gz: 4dd0efe8930f19068dbf54ab0709f3bed422ac67bd2974b348f5d6eddcb054da09df59fb992a41802ddb0e7ed0de986a6b67f484779409d7b227c32451f3b6f0
+  data.tar.gz: 0167fd0f1bfa054e46f20ab12680529913da7b5b702fc119cbdb43e78e2e8cf3f459e7b4236413f394e51a0ed935e597806b8836b20d702ede7d0f26780f2590

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # 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

data/lib/appsignal/probes/mri.rb

@@ -21,20 +21,20 @@ module Appsignal
       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)
+        set_gauge("gc_total_time", MriProbe.garbage_collection_profiler.total_time)
 
         gc_stats = GC.stat
         allocated_objects =
@@ -42,25 +42,44 @@ module Appsignal
             :allocated_objects,
             gc_stats[:total_allocated_objects] || gc_stats[:total_allocated_object]
           )
-        if allocated_objects
-          @appsignal.set_gauge("allocated_objects", allocated_objects)
-        end
+        set_gauge("allocated_objects", allocated_objects) if allocated_objects
 
         gc_count = gauge_delta(:gc_count, GC.count)
-        if gc_count
-          @appsignal.add_distribution_value("gc_count", gc_count, :metric => :gc_count)
-        end
+        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
-          @appsignal.add_distribution_value("gc_count", minor_gc_count, :metric => :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)
+          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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "3.1.0".freeze
+  VERSION = "3.1.1".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,7 +18,7 @@ class AppsignalMock
 end
 
 describe Appsignal::Probes::MriProbe do
-  let(:appsignal_mock) { AppsignalMock.new }
+  let(:appsignal_mock) { AppsignalMock.new(:hostname => hostname) }
   let(:probe) { described_class.new(appsignal_mock) }
 
   describe ".dependencies_present?" do
@@ -33,10 +35,12 @@ 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
         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
@@ -57,9 +61,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,29 +79,31 @@ 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
-    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
-        next unless key == expected_key
-        next unless expected_value ? expected_value == value : !value.nil?
-        next unless metadata == { :metric => metric }
+      context "with custom hostname" do
+        let(:hostname) { "my hostname" }
 
-        true
+        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)
+  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 |(key, value)|
-        expected_key == key && expected_value ? expected_value == value : !value.nil?
+      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

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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: java
 authors:
 - Robert Beekman