appsignal 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b30d6aa0276c7bc900b235aa7837d44c11cca8cf4fc81be150c59962636dc42
-  data.tar.gz: 4ea9db25ed39f99052d8e83a83513a8f75363a028895f15e09e23a18774d633c
+  metadata.gz: 6c853a3c0cbc188f19a972dd0af7c8d1f14a40063ef08943f028d59fd6c6f09c
+  data.tar.gz: b07e52344f13961121c3427f14d5c87e503287c7e475a3bdffb08303d477c985
 SHA512:
-  metadata.gz: 6ac1d744af5f9674baec2985bbbe9ad46bb1c76a068a35b9902261e3d7ff40b0344796c62b90ce50f02ffaeb5b79b15bb4e238885834cbe9058b0791e340ab87
-  data.tar.gz: f91fcf688355c79d562fabda066473e3942aa1f174f3ce22485a43fe9aac6c530c2200b0f2be0af09a5b2568ca43e9a001d0a0293c5eaea6f989ff83027f709b
+  metadata.gz: 87e51924047c8a7e693c24a30acddbeb61b574a59cce900ab22437c061b63a56c3328f6782796f070ca0495e90dfd9a92eebf72eb65bf3e3c1d877d2b621c0b6
+  data.tar.gz: 3dbf154339dc4094a73f066440fa84d401aa868474042769529ff249d09721b18b11207ccc18099a9d99e1aae7c50da17b79b7c896dbe42b19419d6b097ce74b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.0.8
+
+- [5f94712d](https://github.com/appsignal/appsignal-ruby/commit/5f94712d3406898f58bea133b8bf3578d6fbbe22) patch - Add the `APPSIGNAL_BUILD_FOR_LINUX_ARM` flag to allow users to enable the experimental Linux ARM build for 64-bit hosts. Usage: `export APPSIGNAL_BUILD_FOR_LINUX_ARM=1 bundle install`. Please be aware this is an experimental build. Please report any issue you may encounter at our [support email](mailto:support@appsignal.com).
+
 ## 3.0.7
 
 - [27f9b178](https://github.com/appsignal/appsignal-ruby/commit/27f9b178c20006ee15e69bdf878f3a0c9975b1f4) patch - Bump agent to 6caf6d0. Replaces curl HTTP client and includes various other maintenance updates.

data/ext/agent.yml

@@ -1,62 +1,69 @@
 ---
-version: 3ecd06f
+version: 9f282f3
 mirrors:
 - https://appsignal-agent-releases.global.ssl.fastly.net
 - https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: 39839e64832d7964fad51d9acc95374654446ade04d06cbba4d052e4483a8516
+      checksum: c279d061ac04b53c8e2ea21b7714d4d54964495124ddc7e794ba998366f9c195
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 841b82677aaf553219f689b92b6dc6988278420e2e72dcab28a6c5915a0e4158
+      checksum: 52284dd2e073e5252363f18f8668cf17d82befe65bfa4376f8d4f61f6e08ece9
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: 39839e64832d7964fad51d9acc95374654446ade04d06cbba4d052e4483a8516
+      checksum: c279d061ac04b53c8e2ea21b7714d4d54964495124ddc7e794ba998366f9c195
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 841b82677aaf553219f689b92b6dc6988278420e2e72dcab28a6c5915a0e4158
+      checksum: 52284dd2e073e5252363f18f8668cf17d82befe65bfa4376f8d4f61f6e08ece9
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
+  aarch64-linux:
+    static:
+      checksum: 3054b6e3bcab8c8959d4e87eb6fd9fc7a5821e0986c8e733154c2b76251c9e70
+      filename: appsignal-aarch64-linux-all-static.tar.gz
+    dynamic:
+      checksum: 50f96493c1d81dbb0910581598e0d97a8567a3bc6b27a17dbb14d01c97bf7b7c
+      filename: appsignal-aarch64-linux-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: fdf923153992816c813f938f41feadafbf80d8fa10a785123ee23184945047a0
+      checksum: 30554989a59632cdaf8fdf5d15024b866d32930e91c080425955842e8078952b
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: d2b8635199a73a1769ee7495acac0cdc69c4f964fef9ec7749fde517d789e1dd
+      checksum: 437e24a97738995375c18559220fc30b6b9599cfc9339d5a410225e7fdfeb875
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: fdf923153992816c813f938f41feadafbf80d8fa10a785123ee23184945047a0
+      checksum: 30554989a59632cdaf8fdf5d15024b866d32930e91c080425955842e8078952b
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: d2b8635199a73a1769ee7495acac0cdc69c4f964fef9ec7749fde517d789e1dd
+      checksum: 437e24a97738995375c18559220fc30b6b9599cfc9339d5a410225e7fdfeb875
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86_64-linux:
     static:
-      checksum: d81383dedb228f484e1d1e28a76ddc017d788fa62270b6e3f5a55765a4fb89d9
+      checksum: f11fa7ec493c3668e965ef4cff077d44fe55101197a5eeaf50ccacf7314eba2b
       filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: f98948600345ee4726712937b13059fe7145d9b83273fc6efc6e0fd6a255381a
+      checksum: bc7991b388eb541eddc26d8272738b4d9befa594f4b73a222b425e0ee7b6157d
       filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: be2c414da7eb0837f23a8791b369e650aea26afbf9d3be9f530bc2de11fc888f
+      checksum: 0dae02e77e244275b69bb8332e79bdcb0e0fa3b6b6f84744780ce0baffa9784f
       filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: 3d04b9dcfbfe7696e028f9205dcae08e41bd87d162f7f37d04cc3d4a7442a9ec
+      checksum: a56f3e3cb6e30e638f91f14ba69ae1b5086bb566dedb6f0c630be24834a8fd4f
       filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: fcbfabaa51f9004ed697e9000bfc1a7d71f48f40c04f9c9588a5c8f09cddf0ea
+      checksum: d9146a04bbbb85dccf22c84cacfa924ee8b7e2ff8ed79402aba14ac4333e440f
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: ffc261d6d2a799e9bbf1cee3f9134da60cd72cd6b47a72e8c63a5a11e4d0b472
+      checksum: e231e106695160525e3f920e781c37f9d5875a3eacc18c38a0264c4b7f9c69bf
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: fcbfabaa51f9004ed697e9000bfc1a7d71f48f40c04f9c9588a5c8f09cddf0ea
+      checksum: d9146a04bbbb85dccf22c84cacfa924ee8b7e2ff8ed79402aba14ac4333e440f
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: ffc261d6d2a799e9bbf1cee3f9134da60cd72cd6b47a72e8c63a5a11e4d0b472
+      checksum: e231e106695160525e3f920e781c37f9d5875a3eacc18c38a0264c4b7f9c69bf
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/ext/base.rb

@@ -11,8 +11,9 @@ EXT_PATH     = File.expand_path("..", __FILE__).freeze
 AGENT_CONFIG = YAML.load(File.read(File.join(EXT_PATH, "agent.yml"))).freeze
 
 AGENT_PLATFORM = Appsignal::System.agent_platform
-ARCH = "#{RbConfig::CONFIG["host_cpu"]}-#{AGENT_PLATFORM}".freeze
-ARCH_CONFIG = AGENT_CONFIG["triples"][ARCH].freeze
+AGENT_ARCHITECTURE = Appsignal::System.agent_architecture
+TARGET_TRIPLE = "#{AGENT_ARCHITECTURE}-#{AGENT_PLATFORM}".freeze
+ARCH_CONFIG = AGENT_CONFIG["triples"][TARGET_TRIPLE].freeze
 CA_CERT_PATH = File.join(EXT_PATH, "../resources/cacert.pem").freeze
 
 def ext_path(path)
@@ -38,9 +39,10 @@ def report
         "build" => {
           "time" => Time.now.utc,
           "package_path" => File.dirname(EXT_PATH),
-          "architecture" => rbconfig["host_cpu"],
+          "architecture" => AGENT_ARCHITECTURE,
           "target" => AGENT_PLATFORM,
           "musl_override" => Appsignal::System.force_musl_build?,
+          "linux_arm_override" => Appsignal::System.force_linux_arm_build?,
           "dependencies" => {},
           "flags" => {}
         },
@@ -94,11 +96,11 @@ def installation_succeeded?
 end
 
 def check_architecture
-  if AGENT_CONFIG["triples"].key?(ARCH)
+  if AGENT_CONFIG["triples"].key?(TARGET_TRIPLE)
     true
   else
     abort_installation(
-      "AppSignal currently does not support your system architecture (#{ARCH})." \
+      "AppSignal currently does not support your system architecture (#{TARGET_TRIPLE})." \
         "Please let us know at support@appsignal.com, we aim to support everything our customers run."
     )
   end

data/lib/appsignal/cli/diagnose.rb

@@ -399,6 +399,7 @@ module Appsignal
           puts "    Architecture: #{report["architecture"]}"
           puts "    Target: #{report["target"]}"
           puts "    Musl override: #{report["musl_override"]}"
+          puts "    Linux ARM override: #{report["linux_arm_override"]}"
           puts "    Library type: #{report["library_type"]}"
           puts "    Source: #{report["source"]}" if report["source"] != "remote"
           puts "    Dependencies: #{report["dependencies"]}"
@@ -416,7 +417,7 @@ module Appsignal
           rbconfig = RbConfig::CONFIG
           puts "Host information"
           data_section :host do
-            puts_and_save :architecture, "Architecture", rbconfig["host_cpu"]
+            puts_and_save :architecture, "Architecture", Appsignal::System.agent_architecture
 
             os_label = os = rbconfig["host_os"]
             os_label = "#{os} (Microsoft Windows is not supported.)" if Gem.win_platform?

data/lib/appsignal/system.rb

@@ -8,6 +8,7 @@ module Appsignal
   # @api private
   module System
     LINUX_TARGET = "linux".freeze
+    LINUX_ARM_ARCHITECTURE = "aarch64".freeze
     MUSL_TARGET = "linux-musl".freeze
     FREEBSD_TARGET = "freebsd".freeze
     GEM_EXT_PATH = File.expand_path("../../../ext", __FILE__).freeze
@@ -18,15 +19,18 @@ module Appsignal
 
     # Detect agent and extension platform build
     #
-    # Used by `ext/extconf.rb` to select which build it should download and
+    # Used by `ext/*` to select which build it should download and
     # install.
     #
-    # Use `export APPSIGNAL_BUILD_FOR_MUSL=1` if the detection doesn't work
-    # and to force selection of the musl build.
+    # - Use `export APPSIGNAL_BUILD_FOR_MUSL=1` if the detection doesn't work
+    #   and to force selection of the musl build.
+    # - Use `export APPSIGNAL_BUILD_FOR_LINUX_ARM=1` to enable the experimental
+    #   Linux ARM build.
     #
     # @api private
     # @return [String]
     def self.agent_platform
+      return LINUX_TARGET if force_linux_arm_build?
       return MUSL_TARGET if force_musl_build?
 
       host_os = RbConfig::CONFIG["host_os"].downcase
@@ -53,6 +57,22 @@ module Appsignal
       local_os
     end
 
+    # Detect agent and extension architecture build
+    #
+    # Used by the `ext/*` tasks to select which architecture build it should download and install.
+    #
+    # - Use `export APPSIGNAL_BUILD_FOR_LINUX_ARM=1` to enable the experimental
+    #   Linux ARM build.
+    #
+    # @api private
+    # @return [String]
+    def self.agent_architecture
+      return LINUX_ARM_ARCHITECTURE if force_linux_arm_build?
+
+      # Fallback on the Ruby
+      RbConfig::CONFIG["host_cpu"]
+    end
+
     # Returns whether or not the musl build was forced by the user.
     #
     # @api private
@@ -60,6 +80,13 @@ module Appsignal
       %w[true 1].include?(ENV["APPSIGNAL_BUILD_FOR_MUSL"])
     end
 
+    # Returns whether or not the linux ARM build was selected by the user.
+    #
+    # @api private
+    def self.force_linux_arm_build?
+      %w[true 1].include?(ENV["APPSIGNAL_BUILD_FOR_LINUX_ARM"])
+    end
+
     # @api private
     def self.versionify(version)
       Gem::Version.new(version)

data/lib/appsignal/version.rb

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

data/spec/lib/appsignal/cli/diagnose_spec.rb

@@ -270,9 +270,10 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
           "build" => {
             "time" => kind_of(String),
             "package_path" => File.expand_path("../../../../../", __FILE__),
-            "architecture" => rbconfig["host_cpu"],
+            "architecture" => Appsignal::System.agent_architecture,
             "target" => Appsignal::System.agent_platform,
             "musl_override" => false,
+            "linux_arm_override" => false,
             "library_type" => jruby ? "dynamic" : "static",
             "source" => "remote",
             "dependencies" => kind_of(Hash),
@@ -301,9 +302,10 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
           "  Checksum: verified",
           "Build details",
           "  Install time: 20",
-          "  Architecture: #{rbconfig["host_cpu"]}",
+          "  Architecture: #{Appsignal::System.agent_architecture}",
           "  Target: #{Appsignal::System.agent_platform}",
           "  Musl override: false",
+          "  Linux ARM override: false",
           "  Library type: #{jruby ? "dynamic" : "static"}",
           "  Dependencies: {",
           "  Flags: {",

data/spec/lib/appsignal/system_spec.rb

@@ -43,6 +43,14 @@ describe Appsignal::System do
       end
     end
 
+    context "when using the APPSIGNAL_BUILD_FOR_LINUX_ARM env var" do
+      it "returns the linux build" do
+        ENV["APPSIGNAL_BUILD_FOR_LINUX_ARM"] = "1"
+        is_expected.to eq("linux")
+        ENV.delete("APPSIGNAL_BUILD_FOR_LINUX_ARM")
+      end
+    end
+
     context "when on a musl system" do
       let(:ldd_output) { "musl libc (x86_64)\nVersion 1.1.16" }
 
@@ -93,4 +101,26 @@ describe Appsignal::System do
       end
     end
   end
+
+  describe ".agent_architecture" do
+    let(:architecture) { "x86_64" }
+    let(:ldd_output) { "" }
+    before do
+      allow(RbConfig::CONFIG).to receive(:[])
+      allow(RbConfig::CONFIG).to receive(:[]).with("host_cpu").and_return(architecture)
+    end
+    subject { described_class.agent_architecture }
+
+    it "returns the host CPU value" do
+      is_expected.to eq(architecture)
+    end
+
+    context "when using the APPSIGNAL_BUILD_FOR_LINUX_ARM env var" do
+      it "returns ARM 64 bit" do
+        ENV["APPSIGNAL_BUILD_FOR_LINUX_ARM"] = "1"
+        is_expected.to eq("aarch64")
+        ENV.delete("APPSIGNAL_BUILD_FOR_LINUX_ARM")
+      end
+    end
+  end
 end

data/spec/lib/puma/appsignal_spec.rb

@@ -1,4 +1,6 @@
 RSpec.describe "Puma plugin" do
+  include WaitForHelper
+
   class MockPumaLauncher
     def events
       return @events if defined?(@events)
@@ -50,7 +52,7 @@ RSpec.describe "Puma plugin" do
     end
 
     def stop
-      @socket && @socket.close
+      defined?(@socket) && @socket && @socket.close
     ensure
       @socket = nil
     end
@@ -72,6 +74,9 @@ RSpec.describe "Puma plugin" do
   let(:hostname) { Socket.gethostname }
   let(:expected_default_tags) { { "hostname" => hostname } }
   let(:stats_data) { { :backlog => 1 } }
+  before :context do
+    Appsignal.stop
+  end
   before do
     module Puma
       def self.stats
@@ -117,10 +122,10 @@ RSpec.describe "Puma plugin" do
     Object.send(:remove_const, :AppsignalPumaPlugin)
   end
 
-  def run(plugin)
+  def run_plugin(plugin, &block)
     @client_thread = Thread.new { start_plugin(plugin) }
     @client_thread.abort_on_exception = true
-    sleep 0.03
+    wait_for(:puma_client_wait, &block)
   ensure
     stop_all
   end
@@ -206,16 +211,16 @@ RSpec.describe "Puma plugin" do
     end
 
     it "collects puma stats as guage metrics with the (summed) worker metrics" do
-      run(appsignal_plugin)
-
-      expect(logs).to_not include([:error, kind_of(String)])
-      expect_gauge(:workers, 2, "type" => "count")
-      expect_gauge(:workers, 2, "type" => "booted")
-      expect_gauge(:workers, 0, "type" => "old")
-      expect_gauge(:connection_backlog, 0)
-      expect_gauge(:pool_capacity, 10)
-      expect_gauge(:threads, 10, "type" => "running")
-      expect_gauge(:threads, 10, "type" => "max")
+      run_plugin(appsignal_plugin) do
+        expect(logs).to_not include([:error, kind_of(String)])
+        expect_gauge(:workers, 2, "type" => "count")
+        expect_gauge(:workers, 2, "type" => "booted")
+        expect_gauge(:workers, 0, "type" => "old")
+        expect_gauge(:connection_backlog, 0)
+        expect_gauge(:pool_capacity, 10)
+        expect_gauge(:threads, 10, "type" => "running")
+        expect_gauge(:threads, 10, "type" => "max")
+      end
     end
   end
 
@@ -230,13 +235,13 @@ RSpec.describe "Puma plugin" do
     end
 
     it "calls `puma_gauge` with the (summed) worker metrics" do
-      run(appsignal_plugin)
-
-      expect(logs).to_not include([:error, kind_of(String)])
-      expect_gauge(:connection_backlog, 0)
-      expect_gauge(:pool_capacity, 5)
-      expect_gauge(:threads, 5, "type" => "running")
-      expect_gauge(:threads, 5, "type" => "max")
+      run_plugin(appsignal_plugin) do
+        expect(logs).to_not include([:error, kind_of(String)])
+        expect_gauge(:connection_backlog, 0)
+        expect_gauge(:pool_capacity, 5)
+        expect_gauge(:threads, 5, "type" => "running")
+        expect_gauge(:threads, 5, "type" => "max")
+      end
     end
   end
 
@@ -246,10 +251,10 @@ RSpec.describe "Puma plugin" do
     after { ENV.delete("APPSIGNAL_HOSTNAME") }
 
     it "reports the APPSIGNAL_HOSTNAME as the hostname tag value" do
-      run(appsignal_plugin)
-
-      expect(logs).to_not include([:error, kind_of(String)])
-      expect_gauge(:connection_backlog, 1)
+      run_plugin(appsignal_plugin) do
+        expect(logs).to_not include([:error, kind_of(String)])
+        expect_gauge(:connection_backlog, 1)
+      end
     end
   end
 
@@ -259,11 +264,11 @@ RSpec.describe "Puma plugin" do
     end
 
     it "fetches metrics from Puma.stats instead" do
-      run(appsignal_plugin)
-
-      expect(logs).to_not include([:error, kind_of(String)])
-      expect(logs).to_not include([kind_of(Symbol), "AppSignal: No Puma stats to report."])
-      expect_gauge(:connection_backlog, 1)
+      run_plugin(appsignal_plugin) do
+        expect(logs).to_not include([:error, kind_of(String)])
+        expect(logs).to_not include([kind_of(Symbol), "AppSignal: No Puma stats to report."])
+        expect_gauge(:connection_backlog, 1)
+      end
     end
   end
 
@@ -274,22 +279,21 @@ RSpec.describe "Puma plugin" do
     end
 
     it "does not fetch metrics" do
-      run(appsignal_plugin)
-
-      expect(logs).to_not include([:error, kind_of(String)])
-      expect(logs).to include([:log, "AppSignal: No Puma stats to report."])
-      expect(messages).to be_empty
+      run_plugin(appsignal_plugin) do
+        expect(logs).to_not include([:error, kind_of(String)])
+        expect(logs).to include([:log, "AppSignal: No Puma stats to report."])
+        expect(messages).to be_empty
+      end
     end
   end
 
   context "without running StatsD server" do
     it "does nothing" do
-      Appsignal.stop
       stop_all
-      run(appsignal_plugin)
-
-      expect(logs).to_not include([:error, kind_of(String)])
-      expect(messages).to be_empty
+      run_plugin(appsignal_plugin) do
+        expect(logs).to_not include([:error, kind_of(String)])
+        expect(messages).to be_empty
+      end
     end
   end
 end

data/spec/support/helpers/wait_for_helper.rb

@@ -16,13 +16,25 @@ module WaitForHelper
   def wait_for(name)
     max_wait = 5_000
     i = 0
+    error = nil
     while i < max_wait
-      break if yield
-      i += 1
-      sleep 0.001
+      begin
+        result = yield
+        break if result
+      rescue Exception => e # rubocop:disable Lint/RescueException
+        # Capture error so we know if it exited with an error
+        error = e
+      ensure
+        i += 1
+        sleep 0.001
+      end
     end
 
     return unless i >= max_wait
-    raise "Waited 5 seconds for #{name} condition, but was not met."
+    error_message =
+      if error
+        "\nError: #{error.class}: #{error.message}\n#{error.backtrace.join("\n")}"
+      end
+    raise "Waited 5 seconds for #{name} condition, but was not met.#{error_message}"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack