appsignal 2.10.3 → 2.10.5

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 2.10.5
+- Improve Ruby 1.9 compatibility. PR #591
+- Add grape.skip_appsignal_error request env. PR #588
+  More information: https://docs.appsignal.com/ruby/integrations/grape.html
+- Fix compatibility with the `http_logger` gem. Fix `SystemStackError`. PR #597
+
+## 2.10.4
+- Fix `Appsignal::Transaction#set_http_or_background_action` helper (used by
+  `Appsignal.monitor_transaction`), to allow overwriting the action name of a
+  `Transaction` with `Appsignal.set_action`. PR #594
+- Move build to Semaphore. PR #587, #590 and #592
+
 ## 2.10.3
 - Only warn about reused transactions once. Repeated occurrences are logged as
   debug messages. PR #585

data/README.md

@@ -9,7 +9,7 @@ issues.
 - [Ruby code documentation][ruby-doc]
 - [Support][contact]
 
-[![Build Status](https://travis-ci.org/appsignal/appsignal-ruby.png?branch=master)](https://travis-ci.org/appsignal/appsignal-ruby)
+[![Build status](https://appsignal.semaphoreci.com/badges/appsignal-ruby/branches/master.svg)](https://appsignal.semaphoreci.com/projects/appsignal-ruby)
 [![Gem Version](https://badge.fury.io/rb/appsignal.svg)](http://badge.fury.io/rb/appsignal)
 [![Code Climate](https://codeclimate.com/github/appsignal/appsignal.png)](https://codeclimate.com/github/appsignal/appsignal)
 

data/Rakefile

@@ -17,50 +17,90 @@ VERSION_MANAGERS = {
   }
 }.freeze
 
+def env_map(key, value)
+  {
+    "name" => key,
+    "value" => value
+  }
+end
+
+def build_task(ruby_version, type = nil)
+  {
+    "name" => "Ruby #{ruby_version}#{type ? " - #{type}" : nil}",
+    "dependencies" => ["Validation"],
+    "task" => {
+      "prologue" => {
+        "commands" => [
+          "./support/bundler_wrapper exec rake extension:install"
+        ]
+      },
+      "jobs" => []
+    }
+  }
+end
+
 namespace :build_matrix do
-  namespace :travis do
+  namespace :semaphore do
     task :generate do
       yaml = YAML.load_file("build_matrix.yml")
       matrix = yaml["matrix"]
       defaults = matrix["defaults"]
+      semaphore = yaml["semaphore"]
 
       builds = []
       matrix["ruby"].each do |ruby|
         ruby_version = ruby["ruby"]
+        ruby_primary_block = build_task(ruby_version)
+        ruby_secondary_block = build_task(ruby_version, "Gems").tap do |t|
+          t["dependencies"] = ["Ruby #{ruby_version}"]
+        end
         gemset_for_ruby(ruby, matrix).each do |gem|
           next if excluded_for_ruby?(gem, ruby)
 
-          env = ""
+          env = [
+            env_map("RUBY_VERSION", ruby_version),
+            env_map("GEMSET", gem["gem"]),
+            env_map("BUNDLE_GEMFILE", "gemfiles/#{gem["gem"]}.gemfile")
+          ]
           rubygems = gem["rubygems"] || ruby["rubygems"] || defaults["rubygems"]
-          env = "_RUBYGEMS_VERSION=#{rubygems}" if rubygems
+          env << env_map("_RUBYGEMS_VERSION", rubygems) if rubygems
           bundler = gem["bundler"] || ruby["bundler"] || defaults["bundler"]
-          env += " _BUNDLER_VERSION=#{bundler}" if bundler
+          env << env_map("_BUNDLER_VERSION", bundler) if bundler
 
-          builds << {
-            "rvm" => ruby_version,
-            "gemfile" => "gemfiles/#{gem["gem"]}.gemfile",
-            "env" => env
+          job = {
+            "name" => "Ruby #{ruby_version} for #{gem["gem"]}",
+            "env_vars" => env,
+            "commands" => ["./support/bundler_wrapper exec rake test"]
           }
+          if gem["gem"] == "no_dependencies"
+            ruby_primary_block["task"]["jobs"] << job
+          else
+            ruby_secondary_block["task"]["jobs"] << job
+          end
+        end
+        builds << ruby_primary_block
+        if ruby_secondary_block["task"]["jobs"].count.nonzero?
+          builds << ruby_secondary_block
         end
       end
-      travis = yaml["travis"]
-      travis["matrix"]["include"] = travis["matrix"]["include"] + builds
+      semaphore["blocks"] += builds
 
       header = "# DO NOT EDIT\n" \
-        "# This is a generated file by the `rake build_matrix:travis:generate` task.\n" \
+        "# This is a generated file by the `rake build_matrix:semaphore:generate` task.\n" \
         "# See `build_matrix.yml` for the build matrix.\n" \
-        "# Generate this file with `rake build_matrix:travis:generate`.\n"
-      generated_yaml = header + YAML.dump(travis)
-      File.write(".travis.yml", generated_yaml)
-      puts "Generated `.travis.yml`"
-      puts "Build count: #{builds.length}"
+        "# Generate this file with `rake build_matrix:semaphore:generate`.\n"
+      generated_yaml = header + YAML.dump(semaphore)
+      File.write(".semaphore/semaphore.yml", generated_yaml)
+      puts "Generated `.semaphore/semaphore.yml`"
+      puts "Task count: #{builds.length}"
+      puts "Job count: #{builds.sum { |block| block["task"]["jobs"].count }}"
     end
 
     task :validate => :generate do
-      `git status | grep .travis.yml 2>&1`
+      `git status | grep .semaphore/semaphore.yml 2>&1`
       if $?.exitstatus.zero? # rubocop:disable Style/SpecialGlobalVars
-        puts "The `.travis.yml` is modified. The changes were not committed."
-        puts "Please run `rake build_matrix:travis:generate` and commit the changes."
+        puts "The `.semaphore/semaphore.yml` is modified. The changes were not committed."
+        puts "Please run `rake build_matrix:semaphore:generate` and commit the changes."
         exit 1
       end
     end
@@ -318,14 +358,19 @@ namespace :extension do
           appsignal.version \
           Makefile \
           mkmf.log
-      COMMAND
+    COMMAND
   end
 end
 
 begin
   require "rspec/core/rake_task"
   desc "Run the AppSignal gem test suite."
-  RSpec::Core::RakeTask.new :test
+  RSpec::Core::RakeTask.new :test do |t|
+    is_jruby = defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
+    unless is_jruby
+      t.rspec_opts = "--exclude-pattern=spec/lib/appsignal/extension/jruby_spec.rb"
+    end
+  end
 rescue LoadError # rubocop:disable Lint/HandleExceptions
   # When running rake install, there is no RSpec yet.
 end

data/appsignal.gemspec

@@ -39,9 +39,12 @@ Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength
 
   gem.add_development_dependency "rake", "~> 11"
   gem.add_development_dependency "rspec", "~> 3.8"
-  gem.add_development_dependency "pry"
   gem.add_development_dependency "timecop"
   gem.add_development_dependency "webmock"
-  gem.add_development_dependency "rubocop", "0.50.0"
   gem.add_development_dependency "yard", ">= 0.9.20"
+  is_modern_ruby = Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.0.0")
+  if is_modern_ruby
+    gem.add_development_dependency "pry"
+    gem.add_development_dependency "rubocop", "0.50.0"
+  end
 end

data/build_matrix.yml

@@ -1,42 +1,78 @@
-travis: # Default `.travis.yml` contents
-  sudo: false
+semaphore: # Default `.semaphore/semaphore.yml` contents
+  version: v1.0
+  name: AppSignal Ruby Build and Tests
 
-  branches:
-    only:
-      - "master"
-      - "develop"
+  agent:
+    machine:
+      type: e1-standard-2
+      os_image: ubuntu1804
 
-  language: ruby
-  cache:
-    directories:
-      - "$TRAVIS_BUILD_DIR/vendor/cache"
+  # Cancel all running and queued workflows before this one
+  auto_cancel:
+    running:
+      # Ignore master AND develop branch as we want it to build all workflows
+      when: "branch != 'master' AND branch != 'develop'"
 
-  env:
-    global:
-      - "BUNDLE_PATH=$TRAVIS_BUILD_DIR/vendor/cache"
-      - "RUNNING_IN_CI=true"
-      - "RAILS_ENV=test"
-      - "JRUBY_OPTS=''" # Workaround https://github.com/travis-ci/travis-ci/issues/6471
+  global_job_config:
+    env_vars:
+      - name: _BUNDLER_CACHE
+        value: "v2"
+      - name: _GEMS_CACHE
+        value: "v2"
+      - name: BUNDLE_PATH
+        value: "../.bundle/"
+      - name: RUNNING_IN_CI
+        value: "true"
+      - name: RAILS_ENV
+        value: "test"
+      - name: JRUBY_OPTS
+        value: ""
+      - name: COV
+        value: "1"
+    prologue:
+      commands:
+        - checkout
+        - sem-version ruby $RUBY_VERSION
+        - ./support/check_versions
+        - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE),$_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET,$_BUNDLER_CACHE-bundler-$RUBY_VERSION
+        - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE),$_GEMS_CACHE-gems-$RUBY_VERSION
+        - ./support/install_deps
+        - ./support/bundler_wrapper install --jobs=3 --retry=3
+    epilogue:
+      on_pass:
+        commands:
+          - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE) .bundle
+          - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE) $HOME/.gem
 
-  before_install:
-    - "./support/install_deps"
-  install: "./support/bundler_wrapper install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-$TRAVIS_BUILD_DIR/vendor/cache}"
-  before_script:
-    - "./support/bundler_wrapper exec rake extension:install"
-  script: "./support/bundler_wrapper exec rake test"
-  after_failure:
-    - "find ./ext -name install.report -exec cat {} \\;"
-    - "find ./ext -name mkmf.log -exec cat {} \\;"
-
-  matrix:
-    fast_finish: true
-    include: # Builds based on the matrix below are added to this list
-      - rvm: "2.6.5"
-        gemfile: "gemfiles/no_dependencies.gemfile"
-        before_script: "" # Unset default: No need to install the extension
-        script:
-          - "./support/bundler_wrapper exec rake build_matrix:travis:validate"
-          - "./support/bundler_wrapper exec rubocop"
+  blocks:
+    - name: Validation
+      dependencies: []
+      task:
+        jobs:
+        - name: Validate CI setup
+          env_vars:
+            - name: RUBY_VERSION
+              value: 2.6.5
+            - name: GEMSET
+              value: no_dependencies
+            - name: BUNDLE_GEMFILE
+              value: gemfiles/no_dependencies.gemfile
+          commands:
+            - ./support/bundler_wrapper exec rake build_matrix:semaphore:validate
+    - name: Linters
+      dependencies: []
+      task:
+        jobs:
+        - name: RuboCop
+          env_vars:
+            - name: RUBY_VERSION
+              value: 2.6.5
+            - name: GEMSET
+              value: no_dependencies
+            - name: BUNDLE_GEMFILE
+              value: gemfiles/no_dependencies.gemfile
+          commands:
+            - ./support/bundler_wrapper exec rubocop
 
 matrix:
   defaults:
@@ -49,25 +85,33 @@ matrix:
     minimal:
       - "no_dependencies"
       - "rails-5.2"
+      - "rails-6.0"
 
   ruby:
-    - ruby: "2.0.0"
+    - ruby: "1.9.3-p551"
       rubygems: "2.7.8"
-    - ruby: "2.1.8"
+      bundler: "1.17.3"
+      gems: "none"
+    - ruby: "2.0.0-p648"
       rubygems: "2.7.8"
+      bundler: "1.17.3"
+    - ruby: "2.1.10"
+      rubygems: "2.7.8"
+      bundler: "1.17.3"
       gems: "none"
-    - ruby: "2.2.4"
+    - ruby: "2.2.10"
       rubygems: "2.7.8"
+      bundler: "1.17.3"
       gems: "none"
     - ruby: "2.3.8"
       gems: "none"
-    - ruby: "2.4.5"
+    - ruby: "2.4.9"
       gems: "none"
-    - ruby: "2.5.3"
+    - ruby: "2.5.7"
       gems: "minimal"
     - ruby: "2.6.5"
     - ruby: "2.7.0"
-    - ruby: "jruby-19mode"
+    - ruby: "jruby-9.1.17.0"
       gems: "minimal"
   gems:
     - gem: "no_dependencies"
@@ -80,7 +124,7 @@ matrix:
     - gem: "que_beta"
       exclude:
         ruby:
-          - "2.0.0"
+          - "2.0.0-p648"
     - gem: "rails-3.2"
       bundler: "1.17.3"
       exclude:
@@ -96,23 +140,24 @@ matrix:
     - gem: "rails-5.0"
       exclude:
         ruby:
-          - "2.0.0"
+          - "2.0.0-p648"
     - gem: "rails-5.1"
       exclude:
         ruby:
-          - "2.0.0"
+          - "2.0.0-p648"
     - gem: "rails-5.2"
       exclude:
         ruby:
-          - "2.0.0"
+          - "2.0.0-p648"
     - gem: "rails-6.0"
       exclude:
         ruby:
-          - "2.0.0"
-          - "2.1.8"
-          - "2.2.4"
+          - "2.0.0-p648"
+          - "2.1.10"
+          - "2.2.10"
           - "2.3.8"
-          - "2.4.5"
+          - "2.4.9"
+          - "jruby-9.1.17.0"
     - gem: "resque"
       bundler: "1.17.3"
     - gem: "sequel"

data/gemfiles/capistrano2.gemfile

@@ -3,10 +3,5 @@ source 'https://rubygems.org'
 gem 'capistrano', '< 3.0'
 gem 'net-ssh', '2.9.2'
 gem 'rack', '~> 1.6'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/capistrano3.gemfile

@@ -4,10 +4,5 @@ gem 'capistrano', '~> 3.0'
 gem 'i18n', '~> 1.2.0'
 gem 'net-ssh', '2.9.2'
 gem 'rack', '~> 1.6'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/grape.gemfile

@@ -3,10 +3,5 @@ source 'https://rubygems.org'
 gem 'grape', '0.14.0'
 gem 'rack', '~> 1.6'
 gem 'activesupport', '~> 4.2'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/no_dependencies.gemfile

@@ -1,10 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'rack', '~> 1.6'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/padrino.gemfile

@@ -2,10 +2,5 @@ source 'https://rubygems.org'
 
 gem 'padrino', '~> 0.13.0'
 gem 'rack', '~> 1.6'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/que.gemfile

@@ -1,10 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'que'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/que_beta.gemfile

@@ -1,10 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'que', '1.0.0.beta3'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'