appsignal 2.9.18.beta.1 → 2.10.6.beta.1

data/CHANGELOG.md

@@ -1,6 +1,53 @@
 # Changelog
 
-## 2.9.18 (Beta)
+## 2.10.6
+- Check if queued payloads are for correct app and not expired
+
+## 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
+
+## 2.10.2
+- Fix wait_for test suite helper. PR #581
+- Fix exception handling of config file issues. PR #582
+  - The improvement introduced in #517 didn't fetch the class name correctly
+    causing an error on most scenarios.
+
+## 2.10.1
+- Update to more recent bundled SSL CA certificates. PR #577
+- Remove TLS version lock from transmitter used by diagnose command, preventing
+  it from sending the report. Was locked to TLS v1, now uses the Ruby default.
+  PR #580
+
+## 2.10.0
+- Rescue errors while parsing `appsignal.yml` file. It will prints a warning
+  instead. PR #517
+- Refactoring: Reduce class variable usage. PR #520
+- Bump log level about starting new transactions while a transaction is already
+  active from debug to a warning. PR #525
+- Refactoring: Add internal AppSignal test helpers and other test suite
+  refactorings. PR #536, #537, #538, #539
+- Fix internal Rakefile loading on Ruby 1.9.3. PR #541
+- Add a `--no-color` option to the `appsignal install` command. PR #550
+- Add output coloring to `appsignal diagnose` warnings. PR #551
+- Add validation for empty Push API key. Empty Push API key values will no
+  longer start AppSignal. PR #569
+- Deprecate the JSExceptionCatcher middleware in favor of our new front-end
+  JavaScript integration (https://docs.appsignal.com/front-end/). PR #572
+
+## 2.9.18
 - Bump agent to v-c348132
   - Improve transmitter logging on timeout
   - Improve queued payloads transmitter. Should prevent payloads being sent

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
@@ -143,9 +183,23 @@ namespace :build do
     end
   end
 
+  def define_build_task(task_name, base_gemspec, &block)
+    Gem::PackageTask.new(base_gemspec, &block)
+  rescue StandardError => error
+    puts "Warning: An error occurred defining `build:#{task_name}:gem` Rake task."
+    puts "This task will not be availble."
+    if ENV["DEBUG"]
+      puts "#{error}: #{error.message}"
+      puts error.backtrace
+    else
+      puts "For more information, run the same command with `DEBUG=true`."
+    end
+    puts
+  end
+
   namespace :ruby do
     # Extension default set in `appsignal.gemspec`
-    Gem::PackageTask.new(base_gemspec) { |_pkg| }
+    define_build_task(:ruby, base_gemspec) { |_pkg| }
   end
 
   namespace :jruby do
@@ -157,7 +211,7 @@ namespace :build do
       s.add_dependency "ffi"
     end
 
-    Gem::PackageTask.new(spec) { |_pkg| }
+    define_build_task(:jruby, spec) { |_pkg| }
   end
 
   desc "Build all gem versions"
@@ -304,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.4"
-        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,24 +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.4"
-    - ruby: "jruby-19mode"
+    - ruby: "2.6.5"
+    - ruby: "2.7.0"
+    - ruby: "jruby-9.1.17.0"
       gems: "minimal"
   gems:
     - gem: "no_dependencies"
@@ -79,37 +124,40 @@ matrix:
     - gem: "que_beta"
       exclude:
         ruby:
-          - "2.0.0"
+          - "2.0.0-p648"
     - gem: "rails-3.2"
       bundler: "1.17.3"
       exclude:
         ruby:
-          - "2.6.4"
+          - "2.6.5"
+          - "2.7.0"
     - gem: "rails-4.2"
       bundler: "1.17.3"
       exclude:
         ruby:
-          - "2.6.4"
+          - "2.6.5"
+          - "2.7.0"
     - 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/ext/agent.yml

@@ -1,70 +1,70 @@
 ---
-version: c348132
+version: 96b684b
 mirrors:
 - https://appsignal-agent-releases.global.ssl.fastly.net
 - https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: cb287c8e2072fe5b8cf14449bd6892989c392d0c651ce339895ae0302cb69785
+      checksum: 6278d03abdcacde207e210374601b0a98eabace8cbc9fb74dffea3c18fc8a252
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: af1ed2e9d29859ffbfc8e6903e4c51764dee94d7b4877ca8d30270b6f133a10f
+      checksum: b0ad069bbff68acde7ef19de47938fa786771bae4821c757718f1894b9654a93
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: cb287c8e2072fe5b8cf14449bd6892989c392d0c651ce339895ae0302cb69785
+      checksum: 6278d03abdcacde207e210374601b0a98eabace8cbc9fb74dffea3c18fc8a252
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: af1ed2e9d29859ffbfc8e6903e4c51764dee94d7b4877ca8d30270b6f133a10f
+      checksum: b0ad069bbff68acde7ef19de47938fa786771bae4821c757718f1894b9654a93
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: 2c3bcd102592bf38fbdb27e7c70502dccbe54a0dc2739a9d54aaa694fcfb41fb
+      checksum: f3e79a575241a50d7968fe4743c4f4e5aebb840e0b8664d055383caf696d5d38
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 1c037b8370b755d706340e25d3e4b2f4acb279dd03873cc53bcf0a6ec0832653
+      checksum: 0df11c9fe85c9c94336dfb4df788032c78eda1ea648f98e8c1e4e213258816e1
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: 2c3bcd102592bf38fbdb27e7c70502dccbe54a0dc2739a9d54aaa694fcfb41fb
+      checksum: f3e79a575241a50d7968fe4743c4f4e5aebb840e0b8664d055383caf696d5d38
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 1c037b8370b755d706340e25d3e4b2f4acb279dd03873cc53bcf0a6ec0832653
+      checksum: 0df11c9fe85c9c94336dfb4df788032c78eda1ea648f98e8c1e4e213258816e1
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   i686-linux-musl:
     static:
-      checksum: 0add9eed4452feda7fc5e1bbd0acdff32c353e4ea0b5d527959df57deb1bdcb2
+      checksum: 07ab5749b532f1cc6cb45a3334fd950f6d15edacbe6d1bfe25af75b24df73cd1
       filename: appsignal-i686-linux-musl-all-static.tar.gz
   x86-linux-musl:
     static:
-      checksum: 0add9eed4452feda7fc5e1bbd0acdff32c353e4ea0b5d527959df57deb1bdcb2
+      checksum: 07ab5749b532f1cc6cb45a3334fd950f6d15edacbe6d1bfe25af75b24df73cd1
       filename: appsignal-i686-linux-musl-all-static.tar.gz
   x86_64-linux:
     static:
-      checksum: d11221c127c00128da16b419c503281407e429c0ea6f5bfe1691640b8e995e4e
+      checksum: d0e8f48973bca7d783d654404617bb5ab4f47756deb6805c4876bfcda83981cd
       filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: 6869ab461fde55487d55805c396d55f36cb881998556f44236035b949939b0af
+      checksum: aff7569b04416cd40440d228c5b9881b860e1ecf597bc996ac02c2735f49d993
       filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: 7ce44dc23c578933ca37a79d244bc367fdc2438408c2a61558adb92bcfebb1fa
+      checksum: 2e3db648d0883f2a7e72f1207ec0976b97d144cafe0a3e755df2d91ca93d113f
       filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: 78d98f468e3a12cc09baff9e68bc4d9cd3b79f4a3bbe744036bff685415546a4
+      checksum: 5da62f954d761af47da16f34ab675b46fedd7b91b485574bf895b43896f61ce0
       filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: df5f8b61e6ecca40f349cf5c83d5f37f031850d367793dee90dc56f13974431d
+      checksum: 8dc226834ef39bac43dbc4a5c6a812c50c34669b0607036dd9494ac587e72d6a
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 30d0303e97386014640c5b8194b777a5741e08ab5497ba58a7d8229bd4890fc5
+      checksum: 0edfbaa450c89dba5750b306043efc00b82851dce2b75fa6ee62de07d30b4a3b
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: df5f8b61e6ecca40f349cf5c83d5f37f031850d367793dee90dc56f13974431d
+      checksum: 8dc226834ef39bac43dbc4a5c6a812c50c34669b0607036dd9494ac587e72d6a
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 30d0303e97386014640c5b8194b777a5741e08ab5497ba58a7d8229bd4890fc5
+      checksum: 0edfbaa450c89dba5750b306043efc00b82851dce2b75fa6ee62de07d30b4a3b
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz