honeycomb-beeline 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33a6704df45d16dde8f8b96b17e45c555a135af451d6db7f9c0e71d42ead12c5
-  data.tar.gz: 290c100a7dc4ceeda3db9e87f5f75d95bce5234dcecc7d42be29b0c79d18bdf2
+  metadata.gz: a6af6ff636f882a61957e48a0fe6fb50794d82b237f75009f5f2cc1308dbdafb
+  data.tar.gz: cb2e735d0bb798150f7232739a9aced2dc372ce8dde81414925cf61b4259be3b
 SHA512:
-  metadata.gz: ea45bf6ae6776d2f85ff462f55f35c05f1eba40b8b2436870528c2a1036dd21cfe3bbc5b74ac8997fb8c82556fc1abb076cba7e6351afff2e13ae1344c50f502
-  data.tar.gz: ecb6939066d27472c37b3752dc83b28ac45cbc45ee2610aabd6c612e8bb88c32785e64c8e67bf42125803097c4b27645043133889b24782e5b7eb2322d97ce5c
+  metadata.gz: 0fb178a760b813ff7f26aa4a60650b7d9a1556041366fc65162b3132ec8926126aa066056329f49eaacbafacf5e33b559e740464a7957c48e54ecb071433536a
+  data.tar.gz: 29c941bffdcdc5766de32665b87ad6d705f57f17c86dbdb75581519f480c2d47bfdba57a5640531b7ab95bf28730c33fd0f65b168e18295b3a9848bc5e954ba6

data/{bundler_version.sh → .circleci/bundler_version.sh}

@@ -3,7 +3,6 @@
 set -ux
 
 if [[ "$BUNDLE_GEMFILE" =~ (rails_41.gemfile|rails_42.gemfile)$ ]]; then
-  gem uninstall -v '>= 2' -i $(rvm gemdir) -ax bundler
-  gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler
+  gem uninstall -v '>= 2' -ax bundler
   gem install bundler -v '< 2'
 fi

data/.circleci/config.yml

@@ -0,0 +1,448 @@
+version: 2.1
+
+# required as all of the jobs need to have a tag filter for some reason
+tag_filters: &tag_filters
+  filters:
+      tags:
+        only: /.*/
+
+executors:
+  ruby-two-three:
+    docker:
+      - image: circleci/ruby:2.3
+  ruby-two-four:
+    docker:
+      - image: circleci/ruby:2.4
+  ruby-two-five:
+    docker:
+      - image: circleci/ruby:2.5
+  ruby-two-six:
+    docker:
+      - image: circleci/ruby:2.6
+
+commands:
+  ruby:
+    parameters:
+      gemfile:
+        type: string
+        default: Gemfile
+      command:
+        type: string
+        default: bundle exec rake test
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - gems-v1-{{ checksum "Gemfile.lock" }}
+            - gems-v1-
+      - run: gem update bundler
+      - run: BUNDLE_GEMFILE=<< parameters.gemfile >> ./.circleci/bundler_version.sh
+      - run: BUNDLE_GEMFILE=<< parameters.gemfile >> bundle install --jobs=4 --retry=3 --path vendor/bundle
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: gems-v1-{{ checksum "Gemfile.lock" }}
+      - run: BUNDLE_GEMFILE=<< parameters.gemfile >> << parameters.command >>
+
+gemfiles:
+  faraday: &faraday
+    steps:
+      - ruby:
+          gemfile: gemfiles/faraday.gemfile
+  sequel-four: &sequel-four
+    steps:
+      - ruby:
+          gemfile: gemfiles/sequel4.gemfile
+  sequel-five: &sequel-five
+    steps:
+      - ruby:
+          gemfile: gemfiles/sequel5.gemfile
+  sinatra: &sinatra
+    steps:
+      - ruby:
+          gemfile: gemfiles/sinatra.gemfile
+  rack: &rack
+    steps:
+      - ruby:
+          gemfile: gemfiles/rack.gemfile
+  rails-four-one: &rails-four-one
+    steps:
+      - ruby:
+          gemfile: gemfiles/rails_41.gemfile
+  rails-four-two: &rails-four-two
+    steps:
+      - ruby:
+          gemfile: gemfiles/rails_42.gemfile
+  rails-five: &rails-five
+    steps:
+      - ruby:
+          gemfile: gemfiles/rails_5.gemfile
+  rails-five-one: &rails-five-one
+    steps:
+      - ruby:
+          gemfile: gemfiles/rails_51.gemfile
+  rails-five-two: &rails-five-two
+    steps:
+      - ruby:
+          gemfile: gemfiles/rails_52.gemfile
+  rails-six: &rails-six
+    steps:
+      - ruby:
+          gemfile: gemfiles/rails_6.gemfile
+
+jobs:
+  publish:
+    executor: ruby-two-six
+    steps:
+      - checkout
+      - run:
+          name: Setup Rubygems
+          command: bash .circleci/setup-rubygems.sh
+      - run: gem build honeycomb-beeline.gemspec
+      - run: gem push honeycomb-beeline-*.gem
+  lint:
+    executor: ruby-two-six
+    steps:
+      - ruby:
+          command: bundle exec rake rubocop
+  faraday-ruby-two-three:
+    <<: *faraday
+    executor: ruby-two-three
+  faraday-ruby-two-four:
+    <<: *faraday
+    executor: ruby-two-four
+  faraday-ruby-two-five:
+    <<: *faraday
+    executor: ruby-two-five
+  faraday-ruby-two-six:
+    <<: *faraday
+    executor: ruby-two-six
+  sequel-four-ruby-two-three:
+    <<: *sequel-four
+    executor: ruby-two-three
+  sequel-four-ruby-two-four:
+    <<: *sequel-four
+    executor: ruby-two-four
+  sequel-four-ruby-two-five:
+    <<: *sequel-four
+    executor: ruby-two-five
+  sequel-four-ruby-two-six:
+    <<: *sequel-four
+    executor: ruby-two-six
+  sequel-five-ruby-two-three:
+    <<: *sequel-five
+    executor: ruby-two-three
+  sequel-five-ruby-two-four:
+    <<: *sequel-five
+    executor: ruby-two-four
+  sequel-five-ruby-two-five:
+    <<: *sequel-five
+    executor: ruby-two-five
+  sequel-five-ruby-two-six:
+    <<: *sequel-five
+    executor: ruby-two-six
+  sinatra-ruby-two-three:
+    <<: *sinatra
+    executor: ruby-two-three
+  sinatra-ruby-two-four:
+    <<: *sinatra
+    executor: ruby-two-four
+  sinatra-ruby-two-five:
+    <<: *sinatra
+    executor: ruby-two-five
+  sinatra-ruby-two-six:
+    <<: *sinatra
+    executor: ruby-two-six
+  rack-ruby-two-three:
+    <<: *rack
+    executor: ruby-two-three
+  rack-ruby-two-four:
+    <<: *rack
+    executor: ruby-two-four
+  rack-ruby-two-five:
+    <<: *rack
+    executor: ruby-two-five
+  rack-ruby-two-six:
+    <<: *rack
+    executor: ruby-two-six
+  rails-four-one-ruby-two-three:
+    <<: *rails-four-one
+    executor: ruby-two-three
+  rails-four-one-ruby-two-four:
+    <<: *rails-four-one
+    executor: ruby-two-four
+  rails-four-one-ruby-two-five:
+    <<: *rails-four-one
+    executor: ruby-two-five
+  rails-four-one-ruby-two-six:
+    <<: *rails-four-one
+    executor: ruby-two-six
+  rails-four-two-ruby-two-three:
+    <<: *rails-four-two
+    executor: ruby-two-three
+  rails-four-two-ruby-two-four:
+    <<: *rails-four-two
+    executor: ruby-two-four
+  rails-four-two-ruby-two-five:
+    <<: *rails-four-two
+    executor: ruby-two-five
+  rails-four-two-ruby-two-six:
+    <<: *rails-four-two
+    executor: ruby-two-six
+  rails-five-ruby-two-three:
+    <<: *rails-five
+    executor: ruby-two-three
+  rails-five-ruby-two-four:
+    <<: *rails-five
+    executor: ruby-two-four
+  rails-five-ruby-two-five:
+    <<: *rails-five
+    executor: ruby-two-five
+  rails-five-ruby-two-six:
+    <<: *rails-five
+    executor: ruby-two-six
+  rails-five-one-ruby-two-three:
+    <<: *rails-five-one
+    executor: ruby-two-three
+  rails-five-one-ruby-two-four:
+    <<: *rails-five-one
+    executor: ruby-two-four
+  rails-five-one-ruby-two-five:
+    <<: *rails-five-one
+    executor: ruby-two-five
+  rails-five-one-ruby-two-six:
+    <<: *rails-five-one
+    executor: ruby-two-six
+  rails-five-two-ruby-two-three:
+    <<: *rails-five-two
+    executor: ruby-two-three
+  rails-five-two-ruby-two-four:
+    <<: *rails-five-two
+    executor: ruby-two-four
+  rails-five-two-ruby-two-five:
+    <<: *rails-five-two
+    executor: ruby-two-five
+  rails-five-two-ruby-two-six:
+    <<: *rails-five-two
+    executor: ruby-two-six
+  rails-six-ruby-two-three:
+    <<: *rails-six
+    executor: ruby-two-three
+  rails-six-ruby-two-four:
+    <<: *rails-six
+    executor: ruby-two-four
+  rails-six-ruby-two-five:
+    <<: *rails-six
+    executor: ruby-two-five
+  rails-six-ruby-two-six:
+    <<: *rails-six
+    executor: ruby-two-six
+
+workflows:
+  version: 2
+  beeline:
+    jobs:
+      - lint: *tag_filters
+      - faraday-ruby-two-three:
+          <<: *tag_filters
+          requires:
+            - lint
+      - faraday-ruby-two-four:
+          <<: *tag_filters
+          requires:
+            - lint
+      - faraday-ruby-two-five:
+          <<: *tag_filters
+          requires:
+            - lint
+      - faraday-ruby-two-six:
+          <<: *tag_filters
+          requires:
+            - lint
+      - sequel-four-ruby-two-three:
+          <<: *tag_filters
+          requires:
+            - lint
+      - sequel-four-ruby-two-four:
+          <<: *tag_filters
+          requires:
+            - lint
+      - sequel-four-ruby-two-five:
+          <<: *tag_filters
+          requires:
+            - lint
+      - sequel-four-ruby-two-six:
+          <<: *tag_filters
+          requires:
+            - lint
+      - sequel-five-ruby-two-three:
+          <<: *tag_filters
+          requires:
+            - lint
+      - sequel-five-ruby-two-four:
+          <<: *tag_filters
+          requires:
+            - lint
+      - sequel-five-ruby-two-five:
+          <<: *tag_filters
+          requires:
+            - lint
+      - sequel-five-ruby-two-six:
+          <<: *tag_filters
+          requires:
+            - lint
+      - sinatra-ruby-two-three:
+          <<: *tag_filters
+          requires:
+            - lint
+      - sinatra-ruby-two-four:
+          <<: *tag_filters
+          requires:
+            - lint
+      - sinatra-ruby-two-five:
+          <<: *tag_filters
+          requires:
+            - lint
+      - sinatra-ruby-two-six:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rack-ruby-two-three:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rack-ruby-two-four:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rack-ruby-two-five:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rack-ruby-two-six:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-four-one-ruby-two-three:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-four-two-ruby-two-three:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-four-two-ruby-two-four:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-four-two-ruby-two-five:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-four-two-ruby-two-six:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-five-ruby-two-three:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-five-ruby-two-four:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-five-ruby-two-five:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-five-ruby-two-six:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-five-one-ruby-two-three:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-five-one-ruby-two-four:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-five-one-ruby-two-five:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-five-one-ruby-two-six:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-five-two-ruby-two-three:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-five-two-ruby-two-four:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-five-two-ruby-two-five:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-five-two-ruby-two-six:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-six-ruby-two-five:
+          <<: *tag_filters
+          requires:
+            - lint
+      - rails-six-ruby-two-six:
+          <<: *tag_filters
+          requires:
+            - lint
+      - publish:
+          filters:
+            tags:
+              only: /^v.*/
+            branches:
+              ignore: /.*/
+          requires:
+            - lint
+            - faraday-ruby-two-three
+            - faraday-ruby-two-four
+            - faraday-ruby-two-five
+            - faraday-ruby-two-six
+            - sequel-four-ruby-two-three
+            - sequel-four-ruby-two-four
+            - sequel-four-ruby-two-five
+            - sequel-four-ruby-two-six
+            - sequel-five-ruby-two-three
+            - sequel-five-ruby-two-four
+            - sequel-five-ruby-two-five
+            - sequel-five-ruby-two-six
+            - sinatra-ruby-two-three
+            - sinatra-ruby-two-four
+            - sinatra-ruby-two-five
+            - sinatra-ruby-two-six
+            - rack-ruby-two-three
+            - rack-ruby-two-four
+            - rack-ruby-two-five
+            - rack-ruby-two-six
+            - rails-four-one-ruby-two-three
+            - rails-four-two-ruby-two-three
+            - rails-four-two-ruby-two-four
+            - rails-four-two-ruby-two-five
+            - rails-four-two-ruby-two-six
+            - rails-five-ruby-two-three
+            - rails-five-ruby-two-four
+            - rails-five-ruby-two-five
+            - rails-five-ruby-two-six
+            - rails-five-one-ruby-two-three
+            - rails-five-one-ruby-two-four
+            - rails-five-one-ruby-two-five
+            - rails-five-one-ruby-two-six
+            - rails-five-two-ruby-two-three
+            - rails-five-two-ruby-two-four
+            - rails-five-two-ruby-two-five
+            - rails-five-two-ruby-two-six
+            - rails-six-ruby-two-five
+            - rails-six-ruby-two-six

data/.circleci/setup-rubygems.sh

@@ -0,0 +1,3 @@
+mkdir ~/.gem
+echo -e "---\r\n:rubygems_api_key: $GEM_HOST_API_KEY" > ~/.gem/credentials
+chmod 0600 /home/circleci/.gem/credentials

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    honeycomb-beeline (1.1.0)
+    honeycomb-beeline (1.1.1)
       libhoney (~> 1.8)
 
 GEM

data/README.md

@@ -1,6 +1,6 @@
 # Honeycomb Beeline for Ruby
 
-[![Build Status](https://travis-ci.org/honeycombio/beeline-ruby.svg?branch=master)](https://travis-ci.org/honeycombio/beeline-ruby)
+[![Build Status](https://circleci.com/gh/honeycombio/beeline-ruby.svg?style=svg)](https://circleci.com/gh/honeycombio/beeline-ruby)
 [![Gem Version](https://badge.fury.io/rb/honeycomb-beeline.svg)](https://badge.fury.io/rb/honeycomb-beeline)
 
 This package makes it easy to instrument your Ruby web app to send useful events to [Honeycomb](https://www.honeycomb.io), a service for debugging your software in production.

data/lib/honeycomb/beeline/version.rb

@@ -3,7 +3,7 @@
 module Honeycomb
   module Beeline
     NAME = "honeycomb-beeline".freeze
-    VERSION = "1.1.0".freeze
+    VERSION = "1.1.1".freeze
     USER_AGENT_SUFFIX = "#{NAME}/#{VERSION}".freeze
   end
 end

data/lib/honeycomb/integrations/rails.rb

@@ -12,8 +12,14 @@ module Honeycomb
       yield "meta.package_version", ::Rails::VERSION::STRING
 
       ::ActionDispatch::Request.new(env).tap do |request|
-        yield "request.controller", request.params[:controller]
-        yield "request.action", request.params[:action]
+        # calling request.params will blow up if raw_post is nil
+        # the only known cause of this is when using the
+        # [twirp](https://github.com/twitchtv/twirp-ruby) rack app mounted in
+        # the rails app
+        if request.raw_post
+          yield "request.controller", request.params[:controller]
+          yield "request.action", request.params[:action]
+        end
 
         break unless request.respond_to? :routes
         break unless request.routes.respond_to? :router

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeycomb-beeline
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Martin Holman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
@@ -199,12 +199,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/bundler_version.sh"
+- ".circleci/config.yml"
+- ".circleci/setup-rubygems.sh"
 - ".gitignore"
 - ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - Appraisals
 - CODE_OF_CONDUCT.md
 - CONTRIBUTORS.md
@@ -216,7 +218,6 @@ files:
 - UPGRADING.md
 - bin/console
 - bin/setup
-- bundler_version.sh
 - honeycomb-beeline.gemspec
 - lib/generators/honeycomb/honeycomb_generator.rb
 - lib/honeycomb-beeline.rb
@@ -260,8 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Instrument your Ruby apps with Honeycomb

data/.travis.yml

@@ -1,57 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-gemfile:
-  - gemfiles/faraday.gemfile
-  - gemfiles/sequel4.gemfile
-  - gemfiles/sequel5.gemfile
-  - gemfiles/sinatra.gemfile
-  - gemfiles/rack.gemfile
-  - gemfiles/rails_41.gemfile
-  - gemfiles/rails_42.gemfile
-  - gemfiles/rails_5.gemfile
-  - gemfiles/rails_51.gemfile
-  - gemfiles/rails_52.gemfile
-  - gemfiles/rails_6.gemfile
-script: bundle exec rake test
-before_install:
-  - gem update bundler
-  - ./bundler_version.sh
-matrix:
-  exclude:
-    - rvm: 2.4
-      gemfile: gemfiles/rails_41.gemfile
-    - rvm: 2.5
-      gemfile: gemfiles/rails_41.gemfile
-    - rvm: 2.6
-      gemfile: gemfiles/rails_41.gemfile
-    - rvm: 2.3
-      gemfile: gemfiles/rails_6.gemfile
-    - rvm: 2.4
-      gemfile: gemfiles/rails_6.gemfile
-stages:
-  - lint
-  - test
-  - deploy
-jobs:
-  include:
-    - stage: lint
-      script: bundle exec rake rubocop
-      rvm: 2.6
-      gemfile: Gemfile
-    - stage: deploy
-      script: skip
-      rvm: 2.6
-      gemfile: Gemfile
-      deploy:
-        provider: rubygems
-        api_key:
-          secure: V7GDCgz1myfe4c9EoQcGHGzLVtDaJo+/Iis6i+s5gUvKsITVmoMnTEEwuSXROGAdabyjzkTSxMEC2dOK/7Hlc9z4ryb+LxZSMcQfbACv6rOqvGG+PQ++SZULm3qhfTTHwpq41GspVPPindpcaEcVoOGZm6vhuFx9GZQivFNlUvU2TMFT3/+joMsNP0HoI2KfOKy2ACBrjhsE2ooCTON7dlZzCoGwnm9euODrNUBR7/2PnFxBkUaPlRdRMsmvVfxyAgw4eC9LpZgw9Y2dmjhMPXAnOxe3/kQpJ6Z0wN7sp495PYNHGT3DZxQyo84lZcFsgRJa0aLgpXkZGOBa5L7+ZOrNQ0l06kSsrkOCXCjX/lWvaVzncOYXbq5NOPfuQzP3XTXkBJ7816EqNePo1OwBix7SEJOI45/YvEoJfn7J07zdRFzqaq3mjTEu1B92dO8kzvfFUSkbRUkLDpTg6Ra0LjRvPkqeuErcIzzHCLg8RB6Bd88LlLdhhqiN8kRoNUfjlyViyQXy3DYNFfXLV8up+4jJe4wK+p7qtVqpD3yGH7LRKn/911puy1AtzprQ8dUqHEby29f0J6jLrd9oNTI7haWTC+pO5xY2+YfkeOMQq7QKSuWoiMRCGExd4rBGsV/JD3FRq2O2vu/0xXKL+aep7UgEUMHkXOb0EwL/nTm6Bd0=
-        gem: honeycomb-beeline
-        on:
-          tags: true
-          repo: honeycombio/beeline-ruby