appsignal 3.3.0-java → 3.3.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2384f72a5c1594de99771fc9fd8b8710a25f6abb50bd42255c6dedfb2d6cc6ef
-  data.tar.gz: 0e28bada60eaf3ffbaa776e5c14cf2ed204af935d1e6183a5efe00f5cc4dcea5
+  metadata.gz: c476ef9ec4fbb906a3c3013484975806c87fd7c1efbaef938ee49c9c1cb04081
+  data.tar.gz: 9b7eebe7a6a535445a6baed7ddffe8f779d373d6936fb7de4bb000c7a0bd3c3d
 SHA512:
-  metadata.gz: 7628df56fbf62dd4b9e7d0eda95261c24f47f886c54bf41acb0f48f8971578b1b8d45a857a9f3ab69049290aaebcb2a06d958b4949d9cc98d0a9b39b24b54cc4
-  data.tar.gz: e7be539740c14370c8b8b1ba48ae882599260b2d012bd2258821112a2c7901a266d1cf18159aa7bd175dcecb672f2772018016ffa062da5947e350de76241942
+  metadata.gz: 7cdd3926c3db35c5566e7d2fc1e80b7f948f26ebcb19d8fad3374db139d6962b016412a243b7ea1df8b8f47302923c321cf46676a98cd98c83e39d26f2a9d5bc
+  data.tar.gz: 44ea1982e6b2319c0a469d128cecaf1ab91bc21ebbaabd50d6a3c9eb082dbafea62145e204e419ca4f0180367788ae3bddb019f00411d7bb83f87f022de901b5

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,17 @@
 # AppSignal for Ruby gem Changelog
 
+## 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/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/version.rb

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

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.1
 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-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -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: