appsignal 3.3.0-java → 3.3.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2384f72a5c1594de99771fc9fd8b8710a25f6abb50bd42255c6dedfb2d6cc6ef
-  data.tar.gz: 0e28bada60eaf3ffbaa776e5c14cf2ed204af935d1e6183a5efe00f5cc4dcea5
+  metadata.gz: 57621f6b6eff53ef1a9c3575bf519d9b57f538eeab72df52f7afc45d9cb9e52a
+  data.tar.gz: 7a9c6cdfd0c9caba31cbe1e75512ebe30c95a765b7525c408e64829741338cc5
 SHA512:
-  metadata.gz: 7628df56fbf62dd4b9e7d0eda95261c24f47f886c54bf41acb0f48f8971578b1b8d45a857a9f3ab69049290aaebcb2a06d958b4949d9cc98d0a9b39b24b54cc4
-  data.tar.gz: e7be539740c14370c8b8b1ba48ae882599260b2d012bd2258821112a2c7901a266d1cf18159aa7bd175dcecb672f2772018016ffa062da5947e350de76241942
+  metadata.gz: b0493c3d08579b07bc3a6b2e2924182d93ef328d4acd090c30b025a2c5dd2ad5ea677e810df82e790bf2b69ea3aba6fd1c07c07690f0ec2ed664af3e8b48e78c
+  data.tar.gz: 705da620256f6da906384891e5c38c53a00b761d65957f2e6145beb7f18cbd7df0259193fa8489609838873718ac978e6648efb27e6107dbb4c6fcea28d04899

data/.semaphore/semaphore.yml

@@ -24,12 +24,6 @@ global_job_config:
     commands:
     - checkout
     - rm -f $HOME/.rbenv/plugins/rbenv-gem-rehash/etc/rbenv.d/exec/~gem-rehash.bash
-    - |
-      if [ -n "$_LIBYAML" ]; then
-        install-package --update libyaml-dev
-      else
-        echo Skipping libyaml-dev install
-      fi
     - |
       if [ -n "$_C_VERSION" ]; then
         sem-version c $_C_VERSION
@@ -349,9 +343,9 @@ blocks:
       - name: BUNDLE_GEMFILE
         value: gemfiles/no_dependencies.gemfile
       - name: _RUBYGEMS_VERSION
-        value: latest
+        value: 3.3.26
       - name: _BUNDLER_VERSION
-        value: latest
+        value: 2.3.26
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
@@ -1959,7 +1953,7 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-- name: Ruby 3.2.0-rc1
+- name: Ruby 3.2.0
   dependencies:
   - Validation
   task:
@@ -1975,14 +1969,14 @@ blocks:
       - "./support/bundler_wrapper exec rake extension:install"
     epilogue: *1
     jobs:
-    - name: Ruby 3.2.0-rc1 for no_dependencies
+    - name: Ruby 3.2.0 for no_dependencies
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: no_dependencies
       - name: BUNDLE_GEMFILE
@@ -1991,18 +1985,12 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - &6
-        name: _LIBYAML
-        value: '1'
-      - &7
-        name: RUBY_CFLAGS
-        value: "-std=gnu99"
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
-- name: Ruby 3.2.0-rc1 - Gems
+- name: Ruby 3.2.0 - Gems
   dependencies:
-  - Ruby 3.2.0-rc1
+  - Ruby 3.2.0
   task:
     prologue:
       commands:
@@ -2016,14 +2004,14 @@ blocks:
       - "./support/bundler_wrapper exec rake extension:install"
     epilogue: *1
     jobs:
-    - name: Ruby 3.2.0-rc1 for capistrano2
+    - name: Ruby 3.2.0 for capistrano2
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: capistrano2
       - name: BUNDLE_GEMFILE
@@ -2032,18 +2020,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
-      - *7
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-rc1 for capistrano3
+    - name: Ruby 3.2.0 for capistrano3
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: capistrano3
       - name: BUNDLE_GEMFILE
@@ -2052,18 +2038,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
-      - *7
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-rc1 for grape
+    - name: Ruby 3.2.0 for grape
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: grape
       - name: BUNDLE_GEMFILE
@@ -2072,18 +2056,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
-      - *7
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-rc1 for hanami
+    - name: Ruby 3.2.0 for hanami
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: hanami
       - name: BUNDLE_GEMFILE
@@ -2092,18 +2074,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
-      - *7
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-rc1 for http5
+    - name: Ruby 3.2.0 for http5
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: http5
       - name: BUNDLE_GEMFILE
@@ -2112,18 +2092,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
-      - *7
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-rc1 for padrino
+    - name: Ruby 3.2.0 for padrino
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: padrino
       - name: BUNDLE_GEMFILE
@@ -2132,18 +2110,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
-      - *7
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-rc1 for psych-3
+    - name: Ruby 3.2.0 for psych-3
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: psych-3
       - name: BUNDLE_GEMFILE
@@ -2152,18 +2128,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
-      - *7
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-rc1 for psych-4
+    - name: Ruby 3.2.0 for psych-4
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: psych-4
       - name: BUNDLE_GEMFILE
@@ -2172,18 +2146,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
-      - *7
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-rc1 for que
+    - name: Ruby 3.2.0 for que
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: que
       - name: BUNDLE_GEMFILE
@@ -2192,18 +2164,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
-      - *7
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-rc1 for que_beta
+    - name: Ruby 3.2.0 for que_beta
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: que_beta
       - name: BUNDLE_GEMFILE
@@ -2212,18 +2182,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
-      - *7
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-rc1 for rails-6.1
+    - name: Ruby 3.2.0 for rails-6.1
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: rails-6.1
       - name: BUNDLE_GEMFILE
@@ -2232,18 +2200,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
-      - *7
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-rc1 for rails-7.0
+    - name: Ruby 3.2.0 for rails-7.0
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: rails-7.0
       - name: BUNDLE_GEMFILE
@@ -2252,18 +2218,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
-      - *7
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-rc1 for resque-2
+    - name: Ruby 3.2.0 for resque-2
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: resque-2
       - name: BUNDLE_GEMFILE
@@ -2272,18 +2236,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
-      - *7
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-rc1 for sequel
+    - name: Ruby 3.2.0 for sequel
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: sequel
       - name: BUNDLE_GEMFILE
@@ -2292,18 +2254,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
-      - *7
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-rc1 for sinatra
+    - name: Ruby 3.2.0 for sinatra
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: sinatra
       - name: BUNDLE_GEMFILE
@@ -2312,18 +2272,16 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
-      - *7
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.0-rc1 for webmachine
+    - name: Ruby 3.2.0 for webmachine
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.2.0-rc1
+        value: 3.2.0
       - name: GEMSET
         value: webmachine
       - name: BUNDLE_GEMFILE
@@ -2332,8 +2290,6 @@ blocks:
         value: latest
       - name: _BUNDLER_VERSION
         value: latest
-      - *6
-      - *7
       commands:
       - "./support/bundler_wrapper exec rake test"
 - name: Ruby jruby-9.3.9.0

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.3.2
+
+### Changed
+
+- [d1b960f0](https://github.com/appsignal/appsignal-ruby/commit/d1b960f0350b55962621d740e6a92922b334ab49) patch - Reduce our dependency on YAML during installation. Instead of a YAML file with details about the extension download location, use a pure Ruby file. This is a partial fix for the installation issue involving psych version 5.
+
+### Fixed
+
+- [e1e598ae](https://github.com/appsignal/appsignal-ruby/commit/e1e598ae51512a51486446e5751e504d4fc90ef0) patch - Skip the `.gemrc` config during installation if it raises an error loading it. This can be caused when the psych gem version 5 is installed on Ruby < 3.2. Use the `HTTP_PROXY` environment variable instead to configure the HTTP proxy that should be used during installation.
+
+## 3.3.1
+
+### Added
+
+- [7f62ada8](https://github.com/appsignal/appsignal-ruby/commit/7f62ada8deb67a2b7d355ec0c1bc2ad1d1e2d8d1) patch - Track the Operating System release/distro in the diagnose report. This helps us with debugging what exact version of Linux an app is running on, for example.
+
+### Fixed
+
+- [1443e05f](https://github.com/appsignal/appsignal-ruby/commit/1443e05f0fa5bf6af69c40753b2d135f082871de) patch - Attempt to load C extension from lib/ directory. Fixes an issue where JRuby would fail to load
+  the extension from the ext/ directory, as the directory is cleaned after installation when using
+  RubyGems 3.4.0.
+
 ## 3.3.0
 
 ### Added

data/build_matrix.yml

@@ -25,12 +25,6 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
       commands:
         - checkout
         - rm -f $HOME/.rbenv/plugins/rbenv-gem-rehash/etc/rbenv.d/exec/~gem-rehash.bash
-        - |
-          if [ -n "$_LIBYAML" ]; then
-            install-package --update libyaml-dev
-          else
-            echo Skipping libyaml-dev install
-          fi
         - |
           if [ -n "$_C_VERSION" ]; then
             sem-version c $_C_VERSION
@@ -197,6 +191,8 @@ matrix:
       gems: "none"
     - ruby: "2.3.8"
       gems: "none"
+      rubygems: "3.3.26"
+      bundler: "2.3.26"
     - ruby: "2.4.10"
       gems: "none"
     - ruby: "2.5.8"
@@ -205,12 +201,7 @@ matrix:
     - ruby: "2.7.7"
     - ruby: "3.0.4"
     - ruby: "3.1.2"
-    - ruby: "3.2.0-rc1"
-      env_vars:
-        - name: "_LIBYAML"
-          value: "1"
-        - name: "RUBY_CFLAGS"
-          value: "-std=gnu99"
+    - ruby: "3.2.0"
     - ruby: "jruby-9.3.9.0"
       gems: "minimal"
     - ruby: "jruby-9.4.0.0"
@@ -225,7 +216,7 @@ matrix:
         ruby:
           - "3.0.4"
           - "3.1.2"
-          - "3.2.0-rc1"
+          - "3.2.0"
     - gem: "http5"
     - gem: "padrino"
     - gem: "psych-3"
@@ -233,13 +224,13 @@ matrix:
         ruby:
           - "3.0.4"
           - "3.1.2"
-          - "3.2.0-rc1"
+          - "3.2.0"
     - gem: "psych-4"
       only:
         ruby:
           - "3.0.4"
           - "3.1.2"
-          - "3.2.0-rc1"
+          - "3.2.0"
     - gem: "que"
     - gem: "que_beta"
     - gem: "rails-3.2"
@@ -312,7 +303,7 @@ matrix:
           - "2.7.7"
           - "3.0.4"
           - "3.1.2"
-          - "3.2.0-rc1"
+          - "3.2.0"
           - "jruby-9.4.0.0"
     - gem: "rails-7.0"
       only:
@@ -320,7 +311,7 @@ matrix:
           - "2.7.7"
           - "3.0.4"
           - "3.1.2"
-          - "3.2.0-rc1"
+          - "3.2.0"
           - "jruby-9.4.0.0"
     - gem: "resque-1"
       bundler: "1.17.3"

data/ext/agent.rb

@@ -0,0 +1,144 @@
+# DO NOT EDIT
+# This is a generated file by the `rake ship` family of tasks in the
+# appsignal-agent repository.
+# Modifications to this file will be overwritten with the next agent release.
+
+APPSIGNAL_AGENT_CONFIG = {
+  "version" => "c0e80b9",
+  "mirrors" => [
+    "https://appsignal-agent-releases.global.ssl.fastly.net",
+    "https://d135dj0rjqvssy.cloudfront.net"
+  ],
+  "triples" => {
+    "x86_64-darwin" => {
+      "static" => {
+        "checksum" => "c0e1fc966eff49dd942ed07b44f5c5db6be41676f4e35530c300bac8f99e03c4",
+        "filename" => "appsignal-x86_64-darwin-all-static.tar.gz"
+      },
+      "dynamic" => {
+        "checksum" => "38805c50262c9dbc5c4e7479d274b5e41d6df6e86e6c09d76b9f3f471dcf8787",
+        "filename" => "appsignal-x86_64-darwin-all-dynamic.tar.gz"
+      }
+    },
+    "universal-darwin" => {
+      "static" => {
+        "checksum" => "c0e1fc966eff49dd942ed07b44f5c5db6be41676f4e35530c300bac8f99e03c4",
+        "filename" => "appsignal-x86_64-darwin-all-static.tar.gz"
+      },
+      "dynamic" => {
+        "checksum" => "38805c50262c9dbc5c4e7479d274b5e41d6df6e86e6c09d76b9f3f471dcf8787",
+        "filename" => "appsignal-x86_64-darwin-all-dynamic.tar.gz"
+      }
+    },
+    "aarch64-darwin" => {
+      "static" => {
+        "checksum" => "37fcdf17250ce9e2149f28a8492074f5957691636ab542c7073b323a1b9dbdd8",
+        "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
+      },
+      "dynamic" => {
+        "checksum" => "0fe962abf0885888f38d1767b959ea25ea8c4b38813d7a23fbebe2aa62873341",
+        "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
+      }
+    },
+    "arm64-darwin" => {
+      "static" => {
+        "checksum" => "37fcdf17250ce9e2149f28a8492074f5957691636ab542c7073b323a1b9dbdd8",
+        "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
+      },
+      "dynamic" => {
+        "checksum" => "0fe962abf0885888f38d1767b959ea25ea8c4b38813d7a23fbebe2aa62873341",
+        "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
+      }
+    },
+    "arm-darwin" => {
+      "static" => {
+        "checksum" => "37fcdf17250ce9e2149f28a8492074f5957691636ab542c7073b323a1b9dbdd8",
+        "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
+      },
+      "dynamic" => {
+        "checksum" => "0fe962abf0885888f38d1767b959ea25ea8c4b38813d7a23fbebe2aa62873341",
+        "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
+      }
+    },
+    "aarch64-linux" => {
+      "static" => {
+        "checksum" => "ce9075ee5bc14ea786b734793b6bb6331567398cab6a21f2ceaa9062cfbdb373",
+        "filename" => "appsignal-aarch64-linux-all-static.tar.gz"
+      },
+      "dynamic" => {
+        "checksum" => "eb798538e0e32b19de0afba924c3cb8979a5e57433de4b1a12a6aeaf7233929b",
+        "filename" => "appsignal-aarch64-linux-all-dynamic.tar.gz"
+      }
+    },
+    "i686-linux" => {
+      "static" => {
+        "checksum" => "ea3d1a29cf1534293738f2bd27ae29b8addf8dbe34dde77dc4ae150e109e2e4f",
+        "filename" => "appsignal-i686-linux-all-static.tar.gz"
+      },
+      "dynamic" => {
+        "checksum" => "add159ec5bcf1b1a3362c08f9f765230d99c0431c567d845e31c51389792a51c",
+        "filename" => "appsignal-i686-linux-all-dynamic.tar.gz"
+      }
+    },
+    "x86-linux" => {
+      "static" => {
+        "checksum" => "ea3d1a29cf1534293738f2bd27ae29b8addf8dbe34dde77dc4ae150e109e2e4f",
+        "filename" => "appsignal-i686-linux-all-static.tar.gz"
+      },
+      "dynamic" => {
+        "checksum" => "add159ec5bcf1b1a3362c08f9f765230d99c0431c567d845e31c51389792a51c",
+        "filename" => "appsignal-i686-linux-all-dynamic.tar.gz"
+      }
+    },
+    "x86_64-linux" => {
+      "static" => {
+        "checksum" => "adeceb091c4ed277c29eda018ffc61fd064e5c486b2b0a239b26873168a7fdb0",
+        "filename" => "appsignal-x86_64-linux-all-static.tar.gz"
+      },
+      "dynamic" => {
+        "checksum" => "121abc5d34db302c130cf49ce1dad032025e6717efd63f5cf04ba0b55b5fc863",
+        "filename" => "appsignal-x86_64-linux-all-dynamic.tar.gz"
+      }
+    },
+    "x86_64-linux-musl" => {
+      "static" => {
+        "checksum" => "b57aec8c334b1d3646c80d87f20372287e4e2bdbd798c195e0e36ceeb2aac68a",
+        "filename" => "appsignal-x86_64-linux-musl-all-static.tar.gz"
+      },
+      "dynamic" => {
+        "checksum" => "67a918b1848f979afe01eb56ce1661fb5b5910d4c7d691fcf0e304203bd7bd7a",
+        "filename" => "appsignal-x86_64-linux-musl-all-dynamic.tar.gz"
+      }
+    },
+    "aarch64-linux-musl" => {
+      "static" => {
+        "checksum" => "fc780524942fc7aeaa4cabec64dfc104c82969df7e8b5cd0fa8eae24c1c9b304",
+        "filename" => "appsignal-aarch64-linux-musl-all-static.tar.gz"
+      },
+      "dynamic" => {
+        "checksum" => "92ed33ca9f402f9e822e5777b291f7a062545767ea92dea7eaa94db4f82d8130",
+        "filename" => "appsignal-aarch64-linux-musl-all-dynamic.tar.gz"
+      }
+    },
+    "x86_64-freebsd" => {
+      "static" => {
+        "checksum" => "574137de415487afe8d2cc29eac3b1fda2c8e1001474b8f25ebee0cbb32fb1ca",
+        "filename" => "appsignal-x86_64-freebsd-all-static.tar.gz"
+      },
+      "dynamic" => {
+        "checksum" => "9dcc3454c14e8a7a0d7250b35864b6f0f205d5c730ca510e7b77628e024a703f",
+        "filename" => "appsignal-x86_64-freebsd-all-dynamic.tar.gz"
+      }
+    },
+    "amd64-freebsd" => {
+      "static" => {
+        "checksum" => "574137de415487afe8d2cc29eac3b1fda2c8e1001474b8f25ebee0cbb32fb1ca",
+        "filename" => "appsignal-x86_64-freebsd-all-static.tar.gz"
+      },
+      "dynamic" => {
+        "checksum" => "9dcc3454c14e8a7a0d7250b35864b6f0f205d5c730ca510e7b77628e024a703f",
+        "filename" => "appsignal-x86_64-freebsd-all-dynamic.tar.gz"
+      }
+    }
+  }
+}.freeze

data/ext/base.rb

@@ -3,18 +3,17 @@ require "fileutils"
 require "open-uri"
 require "zlib"
 require "json"
-require "yaml"
 require "rubygems/package"
 require File.expand_path("../../lib/appsignal/version.rb", __FILE__)
 require File.expand_path("../../lib/appsignal/system.rb", __FILE__)
+require_relative "./agent"
 
-EXT_PATH     = File.expand_path("..", __FILE__).freeze
-AGENT_CONFIG = YAML.load(File.read(File.join(EXT_PATH, "agent.yml"))).freeze
+EXT_PATH = File.expand_path("..", __FILE__).freeze
 
 AGENT_PLATFORM = Appsignal::System.agent_platform
 AGENT_ARCHITECTURE = Appsignal::System.agent_architecture
 TARGET_TRIPLE = "#{AGENT_ARCHITECTURE}-#{AGENT_PLATFORM}".freeze
-ARCH_CONFIG = AGENT_CONFIG["triples"][TARGET_TRIPLE].freeze
+ARCH_CONFIG = APPSIGNAL_AGENT_CONFIG["triples"][TARGET_TRIPLE].freeze
 CA_CERT_PATH = File.join(EXT_PATH, "../resources/cacert.pem").freeze
 
 def ext_path(path)
@@ -34,8 +33,7 @@ def report
           "version" => "#{rbconfig["RUBY_PROGRAM_VERSION"]}-p#{rbconfig["PATCHLEVEL"]}"
         },
         "download" => {
-          "checksum" => "unverified",
-          "http_proxy" => http_proxy
+          "checksum" => "unverified"
         },
         "build" => {
           "time" => Time.now.utc,
@@ -55,7 +53,11 @@ def report
             d["libc"] = ldd_version if ldd_version
           end
         }
-      }
+      }.tap do |r|
+        proxy, error = http_proxy
+        r["download"]["http_proxy"] = proxy
+        r["download"]["http_proxy_error"] = error if error
+      end
     end
 end
 
@@ -97,7 +99,7 @@ def installation_succeeded?
 end
 
 def check_architecture
-  if AGENT_CONFIG["triples"].key?(TARGET_TRIPLE)
+  if APPSIGNAL_AGENT_CONFIG["triples"].key?(TARGET_TRIPLE)
     true
   else
     abort_installation(
@@ -113,26 +115,27 @@ def download_archive(type)
   unless ARCH_CONFIG.key?(type)
     abort_installation(
       "AppSignal currently does not support your system. " \
-        "Expected config for architecture '#{arch}' and package type '#{type}', but none found. " \
-        "For a full list of supported systems visit: " \
+        "Expected config for architecture '#{TARGET_TRIPLE}' and package type '#{type}', " \
+        "but none found. For a full list of supported systems visit: " \
         "https://docs.appsignal.com/support/operating-systems.html"
     )
     return
   end
 
-  version = AGENT_CONFIG["version"]
+  version = APPSIGNAL_AGENT_CONFIG["version"]
   filename = ARCH_CONFIG[type]["filename"]
   download_errors = []
 
-  AGENT_CONFIG["mirrors"].each do |mirror|
+  APPSIGNAL_AGENT_CONFIG["mirrors"].each do |mirror|
     download_url = [mirror, version, filename].join("/")
     report["download"]["download_url"] = download_url
 
     begin
+      proxy, _error = http_proxy
       args = [
         download_url,
         :ssl_ca_cert => CA_CERT_PATH,
-        :proxy => http_proxy
+        :proxy => proxy
       ]
       if URI.respond_to?(:open) # rubocop:disable Style/GuardClause
         return URI.open(*args)
@@ -187,14 +190,25 @@ def store_download_version_on_report
 end
 
 def http_proxy
-  proxy = try_http_proxy_value(Gem.configuration[:http_proxy])
-  return proxy if proxy
+  proxy, error =
+    begin
+      [try_http_proxy_value(Gem.configuration[:http_proxy]), nil]
+    rescue => error
+      # Ignore this setting if the `.gemrc` file can't be read. This raises an
+      # error on Rubies with psych 4 in the standard library, but also have
+      # psych 5 installed: Ruby < 3.2.
+      # https://github.com/appsignal/appsignal-ruby/issues/904
+      [nil, error]
+    end
+  return [proxy, error] if proxy
 
   proxy = try_http_proxy_value(ENV["http_proxy"])
-  return proxy if proxy
+  return [proxy, error] if proxy
 
   proxy = try_http_proxy_value(ENV["HTTP_PROXY"])
-  return proxy if proxy
+  return [proxy, error] if proxy
+
+  [nil, error]
 end
 
 def try_http_proxy_value(value)

data/lib/appsignal/cli/diagnose.rb

@@ -443,6 +443,9 @@ module Appsignal
             save :os, os
             puts_value "Operating System", os_label
 
+            distribution_file = "/etc/os-release"
+            save :os_distribution, File.exist?(distribution_file) ? File.read(distribution_file) : ""
+
             language_version = "#{rbconfig["RUBY_PROGRAM_VERSION"]}-p#{rbconfig["PATCHLEVEL"]}"
             save :language_version, language_version
             puts_format "Ruby version", language_version

data/lib/appsignal/extension/jruby.rb

@@ -50,7 +50,12 @@ module Appsignal
       end
 
       begin
-        ffi_lib File.join(File.dirname(__FILE__), "../../../ext/libappsignal.#{lib_extension}")
+        begin
+          # RubyGems will install the extension in the gem's lib directory.
+          ffi_lib File.join(File.dirname(__FILE__), "../../../lib/libappsignal.#{lib_extension}")
+        rescue LoadError
+          ffi_lib File.join(File.dirname(__FILE__), "../../../ext/libappsignal.#{lib_extension}")
+        end
         typedef AppsignalString.by_value, :appsignal_string
 
         attach_function :appsignal_start, [], :void

data/lib/appsignal/extension.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "yaml"
-
 begin
   if Appsignal::System.jruby?
     require "appsignal/extension/jruby"
@@ -24,9 +22,8 @@ module Appsignal
   class Extension
     class << self
       def agent_config
-        @agent_config ||= YAML.load(
-          File.read(File.join(File.dirname(__FILE__), "../../ext/agent.yml"))
-        )
+        require_relative "../../ext/agent"
+        ::APPSIGNAL_AGENT_CONFIG
       end
 
       def agent_version

data/lib/appsignal/version.rb

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

data/lib/appsignal.rb

@@ -2,6 +2,7 @@
 
 require "json"
 require "securerandom"
+require "stringio"
 
 require "appsignal/logger"
 require "appsignal/utils/deprecation_message"

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

@@ -636,9 +636,12 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
         run
         host_report = received_report["host"]
         host_report.delete("running_in_container") # Tested elsewhere
+        distribution_file = "/etc/os-release"
+        os_distribution = File.exist?(distribution_file) ? File.read(distribution_file) : ""
         expect(host_report).to eq(
           "architecture" => rbconfig["host_cpu"],
           "os" => rbconfig["host_os"],
+          "os_distribution" => os_distribution,
           "language_version" => language_version,
           "heroku" => false,
           "root" => false

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.2
 platform: java
 authors:
 - Robert Beekman
 - Thijs Cadier
 - Tom de Bruijn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-30 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -168,7 +168,7 @@ files:
 - bin/appsignal
 - build_matrix.yml
 - ext/Rakefile
-- ext/agent.yml
+- ext/agent.rb
 - ext/appsignal_extension.c
 - ext/base.rb
 - ext/extconf.rb
@@ -436,7 +436,7 @@ metadata:
   documentation_uri: https://docs.appsignal.com/ruby/
   homepage_uri: https://docs.appsignal.com/ruby/
   source_code_uri: https://github.com/appsignal/appsignal-ruby
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -452,8 +452,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.4.2
+signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
 test_files:

data/ext/agent.yml

@@ -1,101 +0,0 @@
-# DO NOT EDIT
-# This is a generated file by the `rake ship` family of tasks in the
-# appsignal-agent repository.
-# Modifications to this file will be overwritten with the next agent release.
----
-version: 9b62288
-mirrors:
-- https://appsignal-agent-releases.global.ssl.fastly.net
-- https://d135dj0rjqvssy.cloudfront.net
-triples:
-  x86_64-darwin:
-    static:
-      checksum: 5ff2ec4f16f5089e15188670b2c43866c76ab5db2ac07d72878a9816e63171ca
-      filename: appsignal-x86_64-darwin-all-static.tar.gz
-    dynamic:
-      checksum: c7b1ddd0efbd5fb5c48e7124ab13202c7b5fa2624354db66ebc2673d7196ce31
-      filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
-  universal-darwin:
-    static:
-      checksum: 5ff2ec4f16f5089e15188670b2c43866c76ab5db2ac07d72878a9816e63171ca
-      filename: appsignal-x86_64-darwin-all-static.tar.gz
-    dynamic:
-      checksum: c7b1ddd0efbd5fb5c48e7124ab13202c7b5fa2624354db66ebc2673d7196ce31
-      filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
-  aarch64-darwin:
-    static:
-      checksum: 9dfdfd6697b3eeeb80a30356fdc1d03a79b8601f18cedd1b2c1442e512d2ed6a
-      filename: appsignal-aarch64-darwin-all-static.tar.gz
-    dynamic:
-      checksum: 1fe7a4e2b9e424ccce17c5c7422c84e29531507f672f6cebdd42a3f74feee0b9
-      filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
-  arm64-darwin:
-    static:
-      checksum: 9dfdfd6697b3eeeb80a30356fdc1d03a79b8601f18cedd1b2c1442e512d2ed6a
-      filename: appsignal-aarch64-darwin-all-static.tar.gz
-    dynamic:
-      checksum: 1fe7a4e2b9e424ccce17c5c7422c84e29531507f672f6cebdd42a3f74feee0b9
-      filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
-  arm-darwin:
-    static:
-      checksum: 9dfdfd6697b3eeeb80a30356fdc1d03a79b8601f18cedd1b2c1442e512d2ed6a
-      filename: appsignal-aarch64-darwin-all-static.tar.gz
-    dynamic:
-      checksum: 1fe7a4e2b9e424ccce17c5c7422c84e29531507f672f6cebdd42a3f74feee0b9
-      filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
-  aarch64-linux:
-    static:
-      checksum: 0e5d89aeda1e883c912ff069bb76029a1e3cad69f493865d877ffaffa2b45142
-      filename: appsignal-aarch64-linux-all-static.tar.gz
-    dynamic:
-      checksum: 58b09bf6ca7761a4d68cd9de87a0bb45b3465ace90b62a88d9fe77f629c26d7d
-      filename: appsignal-aarch64-linux-all-dynamic.tar.gz
-  i686-linux:
-    static:
-      checksum: ff3cffb1204afd846ba0bb33c50b03f8ada8305527a5908ccfebed6fdcce0e61
-      filename: appsignal-i686-linux-all-static.tar.gz
-    dynamic:
-      checksum: '0895a85c3df276864807f7b2572c96ea8c8cd3cc770b7cf02656c6bd01981b59'
-      filename: appsignal-i686-linux-all-dynamic.tar.gz
-  x86-linux:
-    static:
-      checksum: ff3cffb1204afd846ba0bb33c50b03f8ada8305527a5908ccfebed6fdcce0e61
-      filename: appsignal-i686-linux-all-static.tar.gz
-    dynamic:
-      checksum: '0895a85c3df276864807f7b2572c96ea8c8cd3cc770b7cf02656c6bd01981b59'
-      filename: appsignal-i686-linux-all-dynamic.tar.gz
-  x86_64-linux:
-    static:
-      checksum: 0b6fe4b343461a1a906fc73edb44bc5b12c75214d21fc81ed26d3eb88588003e
-      filename: appsignal-x86_64-linux-all-static.tar.gz
-    dynamic:
-      checksum: 82117daf3e1c550526f74f4ec66c403bed22aa8600459b749858814589ed688b
-      filename: appsignal-x86_64-linux-all-dynamic.tar.gz
-  x86_64-linux-musl:
-    static:
-      checksum: b3f52d7a7a1f4ae8095dd5b1207270dc1797766820d925aca0d09133983c9163
-      filename: appsignal-x86_64-linux-musl-all-static.tar.gz
-    dynamic:
-      checksum: 5de9ddc90fc5beb308eadd5381ac0360692cb32e58dcaf0b0d7ecd3dabf44499
-      filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
-  aarch64-linux-musl:
-    static:
-      checksum: d306c50cc9f1bc8ea3339b4185b2a60a1c27f17d9067a529b1889d74c6c0a8d6
-      filename: appsignal-aarch64-linux-musl-all-static.tar.gz
-    dynamic:
-      checksum: e3015e05a807ef5027ea8929a917873bcdaf714138ab5d6d028e3c855b3a61d3
-      filename: appsignal-aarch64-linux-musl-all-dynamic.tar.gz
-  x86_64-freebsd:
-    static:
-      checksum: 135d2ff898f30b15721eca36569d1a0a5deaaee7b4787937d0888ed49f25019b
-      filename: appsignal-x86_64-freebsd-all-static.tar.gz
-    dynamic:
-      checksum: 873aea3c808b7de431881f2f4b4dae686b20b309e76e3eefbb71e399ebea5284
-      filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
-  amd64-freebsd:
-    static:
-      checksum: 135d2ff898f30b15721eca36569d1a0a5deaaee7b4787937d0888ed49f25019b
-      filename: appsignal-x86_64-freebsd-all-static.tar.gz
-    dynamic:
-      checksum: 873aea3c808b7de431881f2f4b4dae686b20b309e76e3eefbb71e399ebea5284
-      filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz