appsignal 3.9.2-java → 3.10.0-java

data/build_matrix.yml

@@ -1,158 +1,79 @@
-semaphore: # Default `.semaphore/semaphore.yml` contents
-  version: v1.0
-  name: AppSignal Ruby Build and Tests
+github:
+  name: Ruby gem CI
+  "on":
+    push:
+      branches: ["main", "develop"]
+    pull_request:
+      types: [opened, reopened, synchronize]
+    schedule:
+      - cron: "0 0 * * 1-5"
 
-  agent:
-    machine:
-      type: e1-standard-2
-      os_image: ubuntu2004
+  concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: ${{ !contains(github.ref, 'main')}}
 
-  # Cancel all running and queued workflows before this one
-  auto_cancel:
-    running:
-      # Ignore main AND develop branch as we want it to build all workflows
-      when: "branch != 'main' AND branch != 'develop'"
+  jobs:
+    lint-git:
+      name: "Git linter (Lintje)"
+      runs-on: ubuntu-latest
+      if: ${{ github.event_name != 'schedule' }}
+      steps:
+        - uses: actions/checkout@v4
+          with:
+            fetch-depth: 0 # Fetch depth is required
+        - name: "Run Git linter"
+          uses: lintje/action@v0.11
 
-  global_job_config:
-    env_vars:
-      - name: RUNNING_IN_CI
-        value: "true"
-      - name: _BUNDLER_CACHE
-        value: "v3"
-      - name: _GEMS_CACHE
-        value: "v3"
-    prologue:
-      commands:
-        - checkout
-        - rm -f $HOME/.rbenv/plugins/rbenv-gem-rehash/etc/rbenv.d/exec/~gem-rehash.bash
-        - |
-          if [ -n "$RUBY_VERSION" ]; then
-            if ! (sem-version ruby "$RUBY_VERSION"); then
-              ruby_key="rbenv-ruby-$RUBY_VERSION"
-              echo "Attempting to build Ruby $RUBY_VERSION from source"
-              git -C "$HOME/.rbenv/plugins/ruby-build" pull
-              cache restore "$ruby_key"
-              sem-version ruby "$RUBY_VERSION"
-              if ! cache has_key "$ruby_key"; then
-                cache store "$ruby_key" "$HOME/.rbenv/versions/$RUBY_VERSION"
-              fi
-            fi
-            ./support/check_versions
-          else
-            echo Skipping Ruby install
-          fi
+    lint-style:
+      name: "Ruby style linter (RuboCop)"
+      runs-on: ubuntu-latest
+      steps:
+        - uses: actions/checkout@v4
+        - uses: ruby/setup-ruby@v1
+          with:
+            ruby-version: "3.3"
+            bundler-cache: true
+        - name: "Run RuboCop"
+          run: bundle exec rubocop
 
-  blocks:
-    - name: Validation
-      dependencies: []
-      task:
-        prologue:
-          commands:
-            - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec)
-            - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec)
-            - ./support/bundler_wrapper install --jobs=3 --retry=3
-        jobs:
-        - name: Validate CI setup
-          env_vars:
-            - name: RUBY_VERSION
-              value: 3.2.2
-            - name: GEMSET
-              value: no_dependencies
-            - name: BUNDLE_GEMFILE
-              value: Gemfile
-          commands:
-            - ./support/bundler_wrapper exec rake build_matrix:semaphore:validate
-        epilogue:
-          on_pass:
-            commands:
-              - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec) .bundle
-              - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec) $HOME/.gem
-    - name: Ruby linters
-      dependencies: []
-      task:
-        prologue:
-          commands:
-            - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec)
-            - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec)
-            - ./support/bundler_wrapper install --jobs=3 --retry=3
-        jobs:
-        - name: RuboCop
-          env_vars:
-            - name: RUBY_VERSION
-              value: 3.2.2
-            - name: GEMSET
-              value: no_dependencies
-            - name: BUNDLE_GEMFILE
-              value: Gemfile
-          commands:
-            - ./support/bundler_wrapper exec rubocop
-        epilogue:
-          on_pass:
-            commands:
-              - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec) .bundle
-              - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec) $HOME/.gem
-    - name: Other linters
-      dependencies: []
-      task:
-        jobs:
-        - name: Git Lint (Lintje)
-          commands:
-            - script/lint_git
-    - name: Integration tests
-      dependencies:
-      - Validation
-      task:
-        prologue:
-          commands:
-            - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-diagnose-$(checksum Gemfile)
-            - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-diagnose-$(checksum Gemfile)
-            - ./support/bundler_wrapper install --jobs=3 --retry=3
-            - ./support/bundler_wrapper exec rake extension:install
-            - "[ -e ext/install.report ] && cat ext/install.report || echo 'No ext/install.report file found'"
-            - "[ -f ext/mkmf.log ] && cat ext/mkmf.log || echo 'No ext/mkmf.log file found'"
-            - git submodule init
-            - git submodule update
-        jobs:
-        - name: Diagnose
-          env_vars:
-            - name: RUBY_VERSION
-              value: 3.0.2
-            - name: LANGUAGE
-              value: ruby
-          commands:
-            - spec/integration/diagnose/bin/test
-        epilogue:
-          on_pass:
-            commands:
-              - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-diagnose-$(checksum Gemfile) .bundle
-              - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-diagnose-$(checksum Gemfile) $HOME/.gem
+    validation:
+      name: "Validation of CI"
+      runs-on: ubuntu-latest
+      steps:
+        - uses: actions/checkout@v4
+        - uses: ruby/setup-ruby@v1
+          with:
+            ruby-version: "3.3"
+            bundler-cache: true
+        - run: rake build_matrix:github:validate
 
-matrix:
-  env_vars: # Shared for all jobs in the build matrix
-    - name: BUNDLE_PATH
-      value: "../.bundle/"
-    - name: RAILS_ENV
-      value: "test"
-    - name: JRUBY_OPTS
-      value: ""
-    - name: COV
-      value: "1"
-  prologue: # Shared for all jobs in the build matrix
-    commands:
-      - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec)
-      - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec)
-      - ./support/install_deps
-      - bundle config set clean 'true'
-      - ./support/bundler_wrapper install --jobs=3 --retry=3
-  epilogue: # Shared for all jobs in the build matrix
-    on_pass:
-      commands:
-        - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec) .bundle
-        - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec) $HOME/.gem
+    integration_tests:
+      name: "Diagnose integration tests"
+      runs-on: ubuntu-latest
+      steps:
+        - uses: actions/checkout@v4
+          with:
+            submodules: true
+        - uses: ruby/setup-ruby@v1
+          with:
+            ruby-version: "3.3"
+            bundler-cache: true
+        - name: "Install gem extension"
+          run: rake extension:install
+        - name: "Bundle install"
+          run: bundle install
+          working-directory: "spec/integration/diagnose"
+        - name: "Run diagnose integration tests"
+          run: bundle exec rspec
+          working-directory: "spec/integration/diagnose"
+          env:
+            LANGUAGE: ruby
 
-  defaults:
-    rubygems: "latest"
-    bundler: "latest"
+matrix:
+  env: # Shared for all jobs in the build matrix
+    RAILS_ENV: "test"
+    JRUBY_OPTS: ""
+    COV: "1"
 
   gemsets: # By default all gems are tested
     none:
@@ -165,12 +86,12 @@ matrix:
       - "rails-7.1"
 
   ruby:
-    - ruby: "2.7.8"
-    - ruby: "3.0.5"
-    - ruby: "3.1.3"
-    - ruby: "3.2.1"
     - ruby: "3.3.1"
-    - ruby: "jruby-9.4.1.0"
+    - ruby: "3.2.1"
+    - ruby: "3.1.3"
+    - ruby: "3.0.5"
+    - ruby: "2.7.8"
+    - ruby: "jruby-9.4.7.0"
       gems: "minimal"
   gems:
     - gem: "no_dependencies"
@@ -179,70 +100,77 @@ matrix:
     - gem: "dry-monitor"
       only:
         ruby:
-          - "3.0.5"
-          - "3.1.3"
-          - "3.2.1"
           - "3.3.1"
+          - "3.2.1"
+          - "3.1.3"
+          - "3.0.5"
     - gem: "grape"
-    - gem: "hanami"
+    - gem: "hanami-2.0"
       only:
         ruby:
-          - "3.0.5"
-          - "3.1.3"
+          - "3.3.1"
           - "3.2.1"
+          - "3.1.3"
+          - "3.0.5"
+    - gem: "hanami-2.1"
+      only:
+        ruby:
           - "3.3.1"
+          - "3.2.1"
+          - "3.1.3"
+          - "3.0.5"
     - gem: "http5"
     - gem: "padrino"
     - gem: "psych-3"
       only:
         ruby:
-          - "2.7.8"
-          - "3.0.5"
-          - "3.1.3"
-          - "3.2.1"
           - "3.3.1"
+          - "3.2.1"
+          - "3.1.3"
+          - "3.0.5"
+          - "2.7.8"
     - gem: "psych-4"
       only:
         ruby:
-          - "2.7.8"
-          - "3.0.5"
-          - "3.1.3"
-          - "3.2.1"
           - "3.3.1"
+          - "3.2.1"
+          - "3.1.3"
+          - "3.0.5"
+          - "2.7.8"
     - gem: "que"
     - gem: "que_beta"
     - gem: "rails-6.0"
       only:
         ruby:
-          - "2.7.8"
           - "3.0.5"
-          - "jruby-9.4.1.0"
+          - "2.7.8"
+          - "jruby-9.4.7.0"
     - gem: "rails-6.1"
       only:
         ruby:
-          - "2.7.8"
-          - "3.0.5"
-          - "3.1.3"
-          - "3.2.1"
           - "3.3.1"
-          - "jruby-9.4.1.0"
+          - "3.2.1"
+          - "3.1.3"
+          - "3.0.5"
+          - "2.7.8"
+          - "jruby-9.4.7.0"
     - gem: "rails-7.0"
       only:
         ruby:
-          - "2.7.8"
-          - "3.0.5"
-          - "3.1.3"
-          - "3.2.1"
           - "3.3.1"
-          - "jruby-9.4.1.0"
+          - "3.2.1"
+          - "3.1.3"
+          - "3.0.5"
+          - "2.7.8"
+          - "jruby-9.4.7.0"
     - gem: "rails-7.1"
       only:
         ruby:
-          - "3.0.5"
-          - "3.1.3"
-          - "3.2.1"
           - "3.3.1"
-          - "jruby-9.4.1.0"
+          - "3.2.1"
+          - "3.1.3"
+          - "3.0.5"
+          - "jruby-9.4.7.0"
     - gem: "sequel"
     - gem: "sinatra"
     - gem: "webmachine1"

data/ext/base.rb

@@ -8,7 +8,7 @@ require "json"
 require "rubygems/package"
 require File.expand_path("../lib/appsignal/version.rb", __dir__)
 require File.expand_path("../lib/appsignal/system.rb", __dir__)
-require_relative "./agent"
+require_relative "agent"
 
 EXT_PATH = File.expand_path(__dir__).freeze
 

data/gemfiles/hanami-2.1.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem "hanami", "~> 2.1.0"
+gem "hanami-router", "~> 2.1.0"
+gem "hanami-controller", "~> 2.1.0"
+
+gemspec :path => '../'

data/gemfiles/webmachine1.gemfile

@@ -1,6 +1,7 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'webmachine', '~> 1.6'
-gem 'webrick'
+gem "i18n", "~> 0.0" # Lock to pre 1.x version as it's not compatible
+gem "webmachine", "~> 1.6"
+gem "webrick"
 
-gemspec :path => '../'
+gemspec :path => "../"

data/lib/appsignal/cli/diagnose.rb

@@ -200,7 +200,7 @@ module Appsignal
             initial_config
           )
           Appsignal.config.write_to_environment
-          Appsignal.start_logger
+          Appsignal._start_logger
           Appsignal.internal_logger.info("Starting AppSignal diagnose")
         end
 

data/lib/appsignal/config.rb

@@ -23,6 +23,7 @@ module Appsignal
       :enable_gvl_global_timer => true,
       :enable_gvl_waiting_threads => true,
       :enable_rails_error_reporter => true,
+      :enable_rake_performance_instrumentation => false,
       :endpoint => "https://push.appsignal.com",
       :files_world_accessible => true,
       :filter_metadata => [],
@@ -83,6 +84,8 @@ module Appsignal
       "APPSIGNAL_ENABLE_GVL_GLOBAL_TIMER" => :enable_gvl_global_timer,
       "APPSIGNAL_ENABLE_GVL_WAITING_THREADS" => :enable_gvl_waiting_threads,
       "APPSIGNAL_ENABLE_RAILS_ERROR_REPORTER" => :enable_rails_error_reporter,
+      "APPSIGNAL_ENABLE_RAKE_PERFORMANCE_INSTRUMENTATION" =>
+        :enable_rake_performance_instrumentation,
       "APPSIGNAL_FILES_WORLD_ACCESSIBLE" => :files_world_accessible,
       "APPSIGNAL_FILTER_METADATA" => :filter_metadata,
       "APPSIGNAL_FILTER_PARAMETERS" => :filter_parameters,
@@ -150,6 +153,7 @@ module Appsignal
       APPSIGNAL_ENABLE_GVL_GLOBAL_TIMER
       APPSIGNAL_ENABLE_GVL_WAITING_THREADS
       APPSIGNAL_ENABLE_RAILS_ERROR_REPORTER
+      APPSIGNAL_ENABLE_RAKE_PERFORMANCE_INSTRUMENTATION
       APPSIGNAL_FILES_WORLD_ACCESSIBLE
       APPSIGNAL_INSTRUMENT_HTTP_RB
       APPSIGNAL_INSTRUMENT_NET_HTTP
@@ -233,7 +237,7 @@ module Appsignal
     #   variables config.
     # @param logger [Logger] The logger to use for the AppSignal gem. This is
     #   used by the configuration class only. Default:
-    #   {Appsignal.internal_logger}. See also {Appsignal.start_logger}.
+    #   {Appsignal.internal_logger}. See also {Appsignal.start}.
     # @param config_file [String] Custom config file location. Default
     #   `config/appsignal.yml`.
     #

data/lib/appsignal/demo.rb

@@ -29,7 +29,6 @@ module Appsignal
       #   - returns `false` if Appsignal is not active.
       def transmit
         Appsignal.start
-        Appsignal.start_logger
         return false unless Appsignal.active?
 
         create_example_error_request

data/lib/appsignal/environment.rb

@@ -3,6 +3,8 @@
 module Appsignal
   # @api private
   class Environment
+    ERROR_ON_YIELD = :APPSIGNAL_ERROR_ON_YIELD
+
     # Add environment metadata.
     #
     # The key and value of the environment metadata must be a String, even if
@@ -46,9 +48,11 @@ module Appsignal
           Appsignal.internal_logger.error \
             "Unable to report on environment metadata #{key.inspect}:\n" \
               "#{e.class}: #{e}"
-          return
+          ERROR_ON_YIELD
         end
 
+      return if yielded_value == ERROR_ON_YIELD
+
       value =
         case yielded_value
         when TrueClass, FalseClass
@@ -117,7 +121,12 @@ module Appsignal
     def self.report_supported_gems
       return unless defined?(Bundler) # Do nothing if Bundler is not present
 
-      bundle_gem_specs = ::Bundler.rubygems.all_specs
+      bundle_gem_specs =
+        if ::Bundler.rubygems.respond_to?(:installed_specs)
+          ::Bundler.rubygems.installed_specs
+        else
+          ::Bundler.rubygems.all_specs
+        end
       SUPPORTED_GEMS.each do |gem_name|
         gem_spec = bundle_gem_specs.find { |spec| spec.name == gem_name }
         next unless gem_spec

data/lib/appsignal/extension/jruby.rb

@@ -9,7 +9,7 @@ module Appsignal
     # Only loaded if the system is detected as JRuby.
     #
     # @api private
-    module Jruby # rubocop:disable Metrics/ModuleLength
+    module Jruby
       extend FFI::Library
 
       # JRuby extension String helpers.