appsignal 2.9.4-java → 2.9.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2303bfeb546ac1f1b6c03090be84755aec9ab6210fefbd5d165f16aa446db426
-  data.tar.gz: 90335983a5d7510dd60bc4c115c19fac30c2494aac990fff1a6f4e32b0cb8827
+  metadata.gz: effa13f4712da9135dbc3c18772b32247582744e1cf88ac17c9ef42606f7e48a
+  data.tar.gz: 462d6bcfa88907d7e22b1d9f462c07cbc6b730d4b71e9dfc56d4ae67906223cd
 SHA512:
-  metadata.gz: 3aa227832976b5ab3aaca606273c9feb27568867914bd61ea8956d74963fbb16461db5f61c21e0e24c11d229802e4ba605235ecc902162389672a17c953b6c77
-  data.tar.gz: fb51d1964fd3e388324263efe3af0aa6fa7a90bb2c0b8f9a3bb149fb854b377d774b3cc84ffc5aade6fadd87619d83a5a682d836fa348e9a1ce5d6f0fe477e00
+  metadata.gz: ba076205d8671f8fdaf2c9581ec23a0ff4c08f4b2b9bf26afe81e2481ede99cb17ae5b95b83db344fbc61df13f58213ad11c0b99aee4f5731be5155e5faa356c
+  data.tar.gz: 00b290c9140898b039d2d66e43386ed23d8248d27675f43178c489356e96cf6911d5d585c9432898d4685f0772f4556f28bcbe0a44418480ccb51859a3c62cf5

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: java
 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
@@ -393,7 +393,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