appsignal 2.9.12.beta.0-java → 2.9.12-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f9787d878d116ac620ad4db0820b17216036be46
-  data.tar.gz: 58351ee113e236ef6d7c94e2faf3db5efac0f53c
+SHA256:
+  metadata.gz: d29de13365132668a4232e38801a320f0a65b02053aec562ffabc17737db7fbc
+  data.tar.gz: 5822eab9b38e092ab33bd14d63c11e0fa5bcb2ae4746e2f43c18be5707c4fe50
 SHA512:
-  metadata.gz: 917d08e6403df7ef295cbaff6f4056716d7acbba89a1699bb40e6aac4ed23e3bcde5bfad9188bc0361f11e78e2a534e56153ca0f1094c607ce190f33c27b0598
-  data.tar.gz: 566a5070e1b4188414b94bde9a2619bfbebf1fae88ac09f55749e7b15487cdaf140393fdf6c5217acf9e8b374d8300ac1a6ab844aedc8ece86dbbcd31cbf80a6
+  metadata.gz: 810f4daca2d6bccca1c454badb0ee61b3cc6b7521bf59f77e5683260f8825c53ee74e432088f75f7ba0e01343372755ad833037c7131295b2df807ec4f5c28af
+  data.tar.gz: 16e5e023a2ba9b4d0e618cf384b61be6ecb43d4d7a403d555c5e6af77b0963d98b7aa3263f07065d2d048a079d4b9b4d490edc31d7d987cc59a5d7b21fe0db33

data/CHANGELOG.md

@@ -1,8 +1,10 @@
 # Changelog
 
 ## 2.9.12
-- Bump agent to a3e0f83
+- Bump agent to a3e0f83 - commit 3d94dd42645922214fc2f5bc09cfa7c597323198
   - More reliable detection of whether agent is running on Docker.
+- Fix Sequel install hook version detection mismatch. PR #553
+- Improve support for older Sidekiq versions. PR #555
 
 ## 2.9.11
 - Bump agent to v-a718022

data/build_matrix.yml

@@ -49,7 +49,6 @@ matrix:
     minimal:
       - "no_dependencies"
       - "rails-5.2"
-      - "rails-6.2"
 
   ruby:
     - ruby: "2.0.0"
@@ -103,6 +102,10 @@ matrix:
       exclude:
         ruby:
           - "2.0.0"
+          - "2.1.8"
+          - "2.2.4"
+          - "2.3.8"
+          - "2.4.5"
     - gem: "resque"
       bundler: "1.17.3"
     - gem: "sequel"

data/gemfiles/rails-6.0.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 6.0.0.beta.1'
+gem 'rails', '~> 6.0.0'
 
 gemspec :path => '../'

data/lib/appsignal/hooks/sequel.rb

@@ -42,7 +42,7 @@ module Appsignal
 
       def install
         # Register the extension...
-        if ::Sequel::MAJOR >= 4 && ::Sequel::MINOR >= 35
+        if (::Sequel::MAJOR >= 4 && ::Sequel::MINOR >= 35) || ::Sequel::MAJOR >= 5
           ::Sequel::Database.register_extension(
             :appsignal_integration,
             Appsignal::Hooks::SequelLogConnectionExtension

data/lib/appsignal/hooks/sidekiq.rb

@@ -38,13 +38,29 @@ module Appsignal
       end
 
       def call
-        stats = ::Sidekiq::Stats.new
+        track_redis_info
+        track_stats
+        track_queues
+      end
+
+      private
+
+      attr_reader :cache
+
+      def track_redis_info
+        return unless ::Sidekiq.respond_to?(:redis_info)
         redis_info = ::Sidekiq.redis_info
-        gauge "worker_count", stats.workers_size
-        gauge "process_count", stats.processes_size
+
         gauge "connection_count", redis_info.fetch("connected_clients")
         gauge "memory_usage", redis_info.fetch("used_memory")
         gauge "memory_usage_rss", redis_info.fetch("used_memory_rss")
+      end
+
+      def track_stats
+        stats = ::Sidekiq::Stats.new
+
+        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
@@ -52,7 +68,9 @@ module Appsignal
         gauge_delta :jobs_dead, "job_count", stats.dead_size, :status => :died
         gauge "job_count", stats.scheduled_size, :status => :scheduled
         gauge "job_count", stats.enqueued, :status => :enqueued
+      end
 
+      def track_queues
         ::Sidekiq::Queue.all.each do |queue|
           gauge "queue_length", queue.size, :queue => queue.name
           # Convert latency from seconds to milliseconds
@@ -60,10 +78,6 @@ module Appsignal
         end
       end
 
-      private
-
-      attr_reader :cache
-
       # Track a gauge metric with the `sidekiq_` prefix
       def gauge(key, value, tags = {})
         tags[:hostname] = hostname if hostname

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "2.9.12.beta.0".freeze
+  VERSION = "2.9.12".freeze
 end

data/spec/lib/appsignal/hooks/sidekiq_spec.rb

@@ -732,6 +732,19 @@ describe Appsignal::Hooks::SidekiqProbe do
       probe.call
     end
 
+    context "when `redis_info` is not defined" do
+      before do
+        allow(Sidekiq).to receive(:respond_to?).with(:redis_info).and_return(false)
+      end
+
+      it "does not collect redis metrics" do
+        expect_gauge("connection_count", 2).never
+        expect_gauge("memory_usage", 1024).never
+        expect_gauge("memory_usage_rss", 512).never
+        probe.call
+      end
+    end
+
     context "when hostname is configured for probe" do
       let(:redis_hostname) { "my_redis_server" }
       let(:probe) { described_class.new(:hostname => redis_hostname) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.9.12.beta.0
+  version: 2.9.12
 platform: java
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -392,12 +392,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com