appsignal 3.0.25-java → 3.1.0-java

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.25".freeze
+  VERSION = "3.1.0".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/event_formatter/elastic_search/search_formatter_spec.rb

@@ -2,7 +2,7 @@ describe Appsignal::EventFormatter::ElasticSearch::SearchFormatter do
   let(:klass)     { Appsignal::EventFormatter::ElasticSearch::SearchFormatter }
   let(:formatter) { klass.new }
 
-  it "should register query.moped" do
+  it "should register search.elasticsearch" do
     expect(
       Appsignal::EventFormatter.registered?("search.elasticsearch", klass)
     ).to be_truthy

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

@@ -1,5 +1,23 @@
+class AppsignalMock
+  attr_reader :distribution_values, :gauges
+
+  def initialize
+    @distribution_values = []
+    @gauges = []
+  end
+
+  def add_distribution_value(*args)
+    @distribution_values << args
+  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 }
+  let(:probe) { described_class.new(appsignal_mock) }
 
   describe ".dependencies_present?" do
     if DependencyHelper.running_jruby? || DependencyHelper.running_ruby_2_0?
@@ -16,18 +34,71 @@ describe Appsignal::Probes::MriProbe do
   unless DependencyHelper.running_jruby? || DependencyHelper.running_ruby_2_0?
     describe "#call" do
       it "should track vm metrics" do
-        expect_distribution_value(:class_serial)
-        expect_distribution_value(:global_constant_state)
+        probe.call
+        expect_distribution_value("ruby_vm", :class_serial)
+        expect_distribution_value("ruby_vm", :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_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)
+      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_distribution_value("heap_slots", :heap_live)
+        expect_distribution_value("heap_slots", :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 }
 
-    def expect_distribution_value(metric)
-      expect(Appsignal).to receive(:add_distribution_value)
-        .with("ruby_vm", kind_of(Numeric), :metric => metric)
-        .and_call_original
-        .once
+        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
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.0.25
+  version: 3.1.0
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -177,6 +177,8 @@ files:
 - gemfiles/grape.gemfile
 - gemfiles/no_dependencies.gemfile
 - gemfiles/padrino.gemfile
+- gemfiles/psych-3.gemfile
+- gemfiles/psych-4.gemfile
 - gemfiles/que.gemfile
 - gemfiles/que_beta.gemfile
 - gemfiles/rails-3.2.gemfile
@@ -213,7 +215,6 @@ files:
 - lib/appsignal/event_formatter/elastic_search/search_formatter.rb
 - lib/appsignal/event_formatter/faraday/request_formatter.rb
 - lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter.rb
-- lib/appsignal/event_formatter/moped/query_formatter.rb
 - lib/appsignal/event_formatter/sequel/sql_formatter.rb
 - lib/appsignal/extension.rb
 - lib/appsignal/extension/jruby.rb
@@ -268,6 +269,7 @@ files:
 - lib/appsignal/marker.rb
 - lib/appsignal/minutely.rb
 - lib/appsignal/probes.rb
+- lib/appsignal/probes/helpers.rb
 - lib/appsignal/probes/mri.rb
 - lib/appsignal/probes/sidekiq.rb
 - lib/appsignal/rack/generic_instrumentation.rb
@@ -312,7 +314,6 @@ files:
 - spec/lib/appsignal/event_formatter/elastic_search/search_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/faraday/request_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter_spec.rb
-- spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/sequel/sql_formatter_spec.rb
 - spec/lib/appsignal/event_formatter_spec.rb
 - spec/lib/appsignal/extension/jruby_spec.rb
@@ -440,7 +441,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.6
+rubygems_version: 3.3.12
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
@@ -465,7 +466,6 @@ test_files:
 - spec/lib/appsignal/event_formatter/elastic_search/search_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/faraday/request_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter_spec.rb
-- spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/sequel/sql_formatter_spec.rb
 - spec/lib/appsignal/event_formatter_spec.rb
 - spec/lib/appsignal/extension/jruby_spec.rb

data/lib/appsignal/event_formatter/moped/query_formatter.rb

@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-module Appsignal
-  class EventFormatter
-    # @api private
-    module Moped
-      class QueryFormatter
-        def format(payload)
-          return unless payload[:ops]
-          return if payload[:ops].empty?
-
-          op = payload[:ops].first
-          case op.class.to_s
-          when "Moped::Protocol::Command"
-            [
-              "Command", {
-                :database => op.full_collection_name,
-                :selector => sanitize(op.selector, true, :mongodb)
-              }.inspect
-            ]
-          when "Moped::Protocol::Query"
-            [
-              "Query", {
-                :database => op.full_collection_name,
-                :selector => sanitize(op.selector, false, :mongodb),
-                :flags    => op.flags,
-                :limit    => op.limit,
-                :skip     => op.skip,
-                :fields   => op.fields
-              }.inspect
-            ]
-          when "Moped::Protocol::Delete"
-            [
-              "Delete", {
-                :database => op.full_collection_name,
-                :selector => sanitize(op.selector, false, :mongodb),
-                :flags    => op.flags
-              }.inspect
-            ]
-          when "Moped::Protocol::Insert"
-            [
-              "Insert", {
-                :database   => op.full_collection_name,
-                :documents  => sanitize(op.documents, true, :mongodb),
-                :count      => op.documents.count,
-                :flags      => op.flags
-              }.inspect
-            ]
-          when "Moped::Protocol::Update"
-            [
-              "Update",
-              {
-                :database => op.full_collection_name,
-                :selector => sanitize(op.selector, false, :mongodb),
-                :update   => sanitize(op.update, true, :mongodb),
-                :flags    => op.flags
-              }.inspect
-            ]
-          when "Moped::Protocol::KillCursors"
-            [
-              "KillCursors",
-              { :number_of_cursor_ids => op.number_of_cursor_ids }.inspect
-            ]
-          else
-            [
-              op.class.to_s.sub("Moped::Protocol::", ""),
-              { :database => op.full_collection_name }.inspect
-            ]
-          end
-        end
-
-        private
-
-        def sanitize(params, only_top_level, key_sanitizer)
-          Appsignal::Utils::QueryParamsSanitizer.sanitize \
-            params, only_top_level, key_sanitizer
-        end
-      end
-    end
-  end
-end
-
-Appsignal::EventFormatter.register(
-  "query.moped",
-  Appsignal::EventFormatter::Moped::QueryFormatter
-)

data/spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb

@@ -1,118 +0,0 @@
-describe Appsignal::EventFormatter::Moped::QueryFormatter do
-  let(:klass) { Appsignal::EventFormatter::Moped::QueryFormatter }
-  let(:formatter) { klass.new }
-
-  it "should register query.moped" do
-    expect(Appsignal::EventFormatter.registered?("query.moped", klass)).to be_truthy
-  end
-
-  describe "#format" do
-    let(:payload) { { :ops => [op] } }
-    subject { formatter.format(payload) }
-
-    context "without ops in the payload" do
-      let(:payload) { {} }
-
-      it { is_expected.to be_nil }
-    end
-
-    context "when ops is nil in the payload" do
-      let(:payload) { { :ops => nil } }
-
-      it { is_expected.to be_nil }
-    end
-
-    context "Moped::Protocol::Command" do
-      let(:op) do
-        double(
-          :full_collection_name => "database.collection",
-          :selector             => { "query" => { "_id" => "abc" } },
-          :class                => double(:to_s => "Moped::Protocol::Command")
-        )
-      end
-
-      it { is_expected.to eq ["Command", '{:database=>"database.collection", :selector=>{"query"=>"?"}}'] }
-    end
-
-    context "Moped::Protocol::Query" do
-      let(:op) do
-        double(
-          :full_collection_name => "database.collection",
-          :selector             => { "_id" => "abc" },
-          :flags                => [],
-          :limit                => 0,
-          :skip                 => 0,
-          :fields               => nil,
-          :class                => double(:to_s => "Moped::Protocol::Query")
-        )
-      end
-
-      it { is_expected.to eq ["Query", '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :flags=>[], :limit=>0, :skip=>0, :fields=>nil}'] }
-    end
-
-    context "Moped::Protocol::Delete" do
-      let(:op) do
-        double(
-          :full_collection_name => "database.collection",
-          :selector             => { "_id" => "abc" },
-          :flags                => [],
-          :class                => double(:to_s => "Moped::Protocol::Delete")
-        )
-      end
-
-      it { is_expected.to eq ["Delete", '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :flags=>[]}'] }
-    end
-
-    context "Moped::Protocol::Insert" do
-      let(:op) do
-        double(
-          :full_collection_name => "database.collection",
-          :flags                => [],
-          :documents            => [
-            { "_id" => "abc", "events" => { "foo" => [{ "bar" => "baz" }] } },
-            { "_id" => "def", "events" => { "foo" => [{ "baz" => "bar" }] } }
-          ],
-          :class                => double(:to_s => "Moped::Protocol::Insert")
-        )
-      end
-
-      it { is_expected.to eq ["Insert", '{:database=>"database.collection", :documents=>[{"_id"=>"?", "events"=>"?"}], :count=>2, :flags=>[]}'] }
-    end
-
-    context "Moped::Protocol::Update" do
-      let(:op) do
-        double(
-          :full_collection_name => "database.collection",
-          :selector             => { "_id" => "abc" },
-          :update               => { "user.name" => "James Bond" },
-          :flags                => [],
-          :class                => double(:to_s => "Moped::Protocol::Update")
-        )
-      end
-
-      it { is_expected.to eq ["Update", '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :update=>{"user.?"=>"?"}, :flags=>[]}'] }
-    end
-
-    context "Moped::Protocol::KillCursors" do
-      let(:op) do
-        double(
-          :number_of_cursor_ids => 2,
-          :class                => double(:to_s => "Moped::Protocol::KillCursors")
-        )
-      end
-
-      it { is_expected.to eq ["KillCursors", "{:number_of_cursor_ids=>2}"] }
-    end
-
-    context "Moped::Protocol::Other" do
-      let(:op) do
-        double(
-          :full_collection_name => "database.collection",
-          :class                => double(:to_s => "Moped::Protocol::Other")
-        )
-      end
-
-      it { is_expected.to eq ["Other", '{:database=>"database.collection"}'] }
-    end
-  end
-end