appsignal 2.9.4 → 2.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dc53bd1f7e43b84ca6dcdf5d53ff74ba0cd1d192e3ffc73e3ee1ea084af7bab
-  data.tar.gz: 01144a912c4d90661741faf032456b2fd7d8eee48eafb8a019183f0871d94d28
+  metadata.gz: 5f7674897cc830c3cf14180a7dfd1caf9aff2a9c3e0f456307f351e45db82204
+  data.tar.gz: fb3f59242548e38bf840912624fd9c90bf62515854ac4cacbc13a522dfcb41ae
 SHA512:
-  metadata.gz: a3acbb9a3fa50d0f7028efe4b272b9ed6d3c574cd3655abf400e35f21139804018f07c411c27be3b79001ba4495989880ab40e54c7772aae8095cd45b0eb8b55
-  data.tar.gz: 0b78b8193b152bc0508bd359008ee5e0657b119ded48df92351d508e67807e66698b9147a483d1c2e5da6b3f5137f23a472af7b6f795461d0effaa3eb97005a3
+  metadata.gz: 36fe1323ed38f8623266e53d414e1e0d74a8148c6b8ebb4718a3b73a56aa41157ae082c85c3ff669d44ab3f1c22927f20b6cb2e23a6d9a46b952f1a2f991b7c9
+  data.tar.gz: c35d2fe3f0067f165627cbcb1d2ed40f50dfa723014e0a6268c9d2b7ef6ed8854cd0e0c0d1573ebe5b36e8f676881d07d34715db485cf422e430833bc0c9ec09

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.9.5
+- Delay the first minutely probe for a bit, since it might take some
+  time for dependencies to initialize. PR #511
+
 ## 2.9.4
 - Log error backtraces in minutely probes as debug messages. PR #495
 - Don't add cluster behavior in Puma single mode. PR #504
@@ -33,6 +37,14 @@
 - Move instrumentation & metrics helpers to modules. PR #487
 - Add Puma minutely probe. PR #488
 - Log invalid EventFormatter registrations as errors. PR #491
+- Support container CPU host metrics.
+  Commit f2fca1ec5a850cd84fbc8cefe63af8f039ebb155
+- Support StatsD server in agent.
+  Commit f2fca1ec5a850cd84fbc8cefe63af8f039ebb155
+- Fix samples being reported for multiple namespaces.
+  Commit f2fca1ec5a850cd84fbc8cefe63af8f039ebb155
+- Report memory and swap usage in percent using the memory_usage and
+  swap_usage metrics. Commit f2fca1ec5a850cd84fbc8cefe63af8f039ebb155
 
 ## 2.8.4
 - Log memory usage of agent if high.

data/ext/base.rb

@@ -10,8 +10,8 @@ require File.expand_path("../../lib/appsignal/system.rb", __FILE__)
 EXT_PATH     = File.expand_path("..", __FILE__).freeze
 AGENT_CONFIG = YAML.load(File.read(File.join(EXT_PATH, "agent.yml"))).freeze
 
-PLATFORM     = Appsignal::System.agent_platform
-ARCH         = "#{RbConfig::CONFIG["host_cpu"]}-#{PLATFORM}".freeze
+AGENT_PLATFORM = Appsignal::System.agent_platform
+ARCH = "#{RbConfig::CONFIG["host_cpu"]}-#{AGENT_PLATFORM}".freeze
 CA_CERT_PATH = File.join(EXT_PATH, "../resources/cacert.pem").freeze
 
 def ext_path(path)
@@ -37,7 +37,7 @@ def report
           "time" => Time.now.utc,
           "package_path" => File.dirname(__dir__),
           "architecture" => rbconfig["host_cpu"],
-          "target" => PLATFORM,
+          "target" => AGENT_PLATFORM,
           "musl_override" => Appsignal::System.force_musl_build?,
           "dependencies" => {},
           "flags" => {}

data/ext/extconf.rb

@@ -25,7 +25,7 @@ def install
   is_linux_system = [
     Appsignal::System::LINUX_TARGET,
     Appsignal::System::MUSL_TARGET
-  ].include?(PLATFORM)
+  ].include?(AGENT_PLATFORM)
 
   require "mkmf"
   link_libraries if is_linux_system

data/lib/appsignal/hooks/sidekiq.rb

@@ -28,6 +28,8 @@ module Appsignal
       def initialize(config = {})
         @config = config
         @cache = {}
+        config_string = " with config: #{config}" unless config.empty?
+        Appsignal.logger.debug("Initializing Sidekiq probe#{config_string}")
         require "sidekiq/api"
       end
 
@@ -87,11 +89,15 @@ module Appsignal
         return @hostname if defined?(@hostname)
         if config.key?(:hostname)
           @hostname = config[:hostname]
+          Appsignal.logger.debug "Sidekiq probe: Using hostname config " \
+            "option #{@hostname.inspect} as hostname"
           return @hostname
         end
 
         host = nil
         ::Sidekiq.redis { |c| host = c.connection[:host] }
+        Appsignal.logger.debug "Sidekiq probe: Using Redis server hostname " \
+          "#{host.inspect} as hostname"
         @hostname = host
       end
     end

data/lib/appsignal/minutely.rb

@@ -137,6 +137,7 @@ module Appsignal
         stop
         initialize_probes
         @@thread = Thread.new do
+          sleep initial_wait_time
           loop do
             logger = Appsignal.logger
             logger.debug("Gathering minutely metrics with #{probes.count} probes")
@@ -149,7 +150,7 @@ module Appsignal
                 logger.debug ex.backtrace.join("\n")
               end
             end
-            sleep(Appsignal::Minutely.wait_time)
+            sleep wait_time
           end
         end
       end
@@ -167,6 +168,12 @@ module Appsignal
 
       private
 
+      def initial_wait_time
+        remaining_seconds = 60 - Time.now.sec
+        return remaining_seconds if remaining_seconds > 30
+        remaining_seconds + 60
+      end
+
       def initialize_probes
         probes.each do |name, probe|
           instance = probe.respond_to?(:new) ? probe.new : probe

data/lib/appsignal/version.rb

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

data/spec/lib/appsignal/config_spec.rb

@@ -202,14 +202,16 @@ describe Appsignal::Config do
   context "with a config file" do
     let(:config) { project_fixture_config("production") }
 
-    it "is not valid or active" do
-      expect(config.valid?).to be_truthy
-      expect(config.active?).to be_truthy
-    end
+    context "with valid config" do
+      it "is valid and active" do
+        expect(config.valid?).to be_truthy
+        expect(config.active?).to be_truthy
+      end
 
-    it "does not log an error" do
-      expect_any_instance_of(Logger).to_not receive(:error)
-      config
+      it "does not log an error" do
+        log = capture_logs { config }
+        expect(log).to_not contains_log(:error)
+      end
     end
 
     it "sets the file_config" do

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

@@ -671,6 +671,22 @@ describe Appsignal::Hooks::SidekiqProbe do
       expect(defined?(Sidekiq::API)).to be_truthy
     end
 
+    it "logs config on initialize" do
+      log = capture_logs { probe }
+      expect(log).to contains_log(:debug, "Initializing Sidekiq probe\n")
+    end
+
+    it "logs used hostname on call once" do
+      log = capture_logs { probe.call }
+      expect(log).to contains_log(
+        :debug,
+        %(Sidekiq probe: Using Redis server hostname "localhost" as hostname)
+      )
+      log = capture_logs { probe.call }
+      # Match more logs with incompelete message
+      expect(log).to_not contains_log(:debug, %(Sidekiq probe: ))
+    end
+
     it "collects custom metrics" do
       expect_gauge("worker_count", 24).twice
       expect_gauge("process_count", 25).twice
@@ -698,7 +714,16 @@ describe Appsignal::Hooks::SidekiqProbe do
 
       it "uses the redis hostname for the hostname tag" do
         allow(Appsignal).to receive(:set_gauge).and_call_original
-        probe.call
+        log = capture_logs { probe }
+        expect(log).to contains_log(
+          :debug,
+          %(Initializing Sidekiq probe with config: {:hostname=>"#{redis_hostname}"})
+        )
+        log = capture_logs { probe.call }
+        expect(log).to contains_log(
+          :debug,
+          "Sidekiq probe: Using hostname config option #{redis_hostname.inspect} as hostname"
+        )
         expect(Appsignal).to have_received(:set_gauge)
           .with(anything, anything, :hostname => redis_hostname).at_least(:once)
       end

data/spec/lib/appsignal/minutely_spec.rb

@@ -31,7 +31,14 @@ describe Appsignal::Minutely do
     before do
       Appsignal.logger = test_logger(log_stream)
       # Speed up test time
-      allow(Appsignal::Minutely).to receive(:wait_time).and_return(0.001)
+      expect(Appsignal::Minutely).to receive(:initial_wait_time)
+        .ordered
+        .once
+        .and_return(0.001)
+      expect(Appsignal::Minutely).to receive(:wait_time)
+        .ordered
+        .at_least(:once)
+        .and_return(0.001)
     end
 
     context "with an instance of a class" do
@@ -94,6 +101,9 @@ describe Appsignal::Minutely do
     end
 
     it "ensures only one minutely probes thread is active at a time" do
+      # Starting twice in this spec, so expecting it more than once
+      expect(Appsignal::Minutely).to receive(:initial_wait_time).at_least(:once).and_return(0.001)
+
       alive_thread_counter = proc { Thread.list.reject { |t| t.status == "dead" }.length }
       probe = Probe.new
       Appsignal::Minutely.probes.register :my_probe, probe
@@ -141,6 +151,10 @@ describe Appsignal::Minutely do
   end
 
   describe ".stop" do
+    before do
+      allow(Appsignal::Minutely).to receive(:initial_wait_time).and_return(0.001)
+    end
+
     it "stops the minutely thread" do
       Appsignal::Minutely.start
       thread = Appsignal::Minutely.class_variable_get(:@@thread)
@@ -163,8 +177,30 @@ describe Appsignal::Minutely do
 
   describe ".wait_time" do
     it "gets the time to the next minute" do
-      allow_any_instance_of(Time).to receive(:sec).and_return(20)
-      expect(Appsignal::Minutely.wait_time).to eq 40
+      time = Time.new(2019, 4, 9, 12, 0, 20)
+      Timecop.freeze time do
+        expect(Appsignal::Minutely.wait_time).to eq 40
+      end
+    end
+  end
+
+  describe ".initial_wait_time" do
+    context "when started in the last 30 seconds of a minute" do
+      it "waits for the number of seconds + 60" do
+        time = Time.new(2019, 4, 9, 12, 0, 31)
+        Timecop.freeze time do
+          expect(Appsignal::Minutely.send(:initial_wait_time)).to eql(29 + 60)
+        end
+      end
+    end
+
+    context "when started in the first 30 seconds of a minute" do
+      it "waits the remaining seconds in the minute" do
+        time = Time.new(2019, 4, 9, 12, 0, 29)
+        Timecop.freeze time do
+          expect(Appsignal::Minutely.send(:initial_wait_time)).to eql(31)
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 2.9.4
+  version: 2.9.5
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -379,7 +379,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com