honeycomb-beeline 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2f8be462c8910f16abb2dadf83da771cbfcb11dd2cf6525455bdd23af17dfd0
-  data.tar.gz: 84bfc86f929938d8d079c7d615357ef1ca08e8dfe9be2d266c4cb57b2a9b1fec
+  metadata.gz: deebe936665edd1d51d0526c7089c0bfa29e666722f8ccff89bf731ce3fd5def
+  data.tar.gz: 9f4534f0b56c15c113a9c72d9e7b237a243c6ab6208af1bda1f1c79b02b1c7c8
 SHA512:
-  metadata.gz: 0aadcfaec026873e03f75012e0303c927a102dd4de060e04f4132c329a6e2e86312614e8e18486e9f4bafbb4c6acc1790b495f1c9bbd557361b02905df4ea48f
-  data.tar.gz: 6dcefe527d6b7d529c312a19d3e2c6f387e5cdd42342ddc3b49747de4dc96c95f575651750151c1ab60abb2463b8c7b5fecb5c816a8bae72ecf12e91288cd60f
+  metadata.gz: f9a2f7c6a0c3bc6b92a82672aaeaf2a24a02c703d9830670448acaac6838b7286c91d33af3d9a20049891bde140f1aac1c6f7b615b92b7aa37a0f1f69ab3bddd
+  data.tar.gz: 65f892432bc418c44d3bb482b8892a5cc0dccbf0a24ff8f051c78de4769e7e61a5d0efdb6b39b015beb759da0be9354eefb3420133d8670477c7b36f63c3ea1f

data/.circleci/config.yml

@@ -1,28 +1,9 @@
 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:
+      ruby-version:
+        type: string
       gemfile:
         type: string
         default: Gemfile
@@ -33,86 +14,21 @@ commands:
       - checkout
       - restore_cache:
           keys:
-            - gems-v1-{{ checksum "Gemfile.lock" }}
-            - gems-v1-
+            - gems-v1-<< parameters.ruby-version >>-{{ checksum "Gemfile.lock" }}
+            - gems-v1-<< parameters.ruby-version >>
       - 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" }}
+          key: gems-v1-<< parameters.ruby-version >>-{{ checksum "Gemfile.lock" }}
       - run: BUNDLE_GEMFILE=<< parameters.gemfile >> << parameters.command >>
 
-gemfiles:
-  aws-two: &aws-two
-    steps:
-      - ruby:
-          gemfile: gemfiles/aws_2.gemfile
-  aws-three: &aws-three
-    steps:
-      - ruby:
-          gemfile: gemfiles/aws_3.gemfile
-  faraday-zero: &faraday-zero
-    steps:
-      - ruby:
-          gemfile: gemfiles/faraday_0.gemfile
-  faraday-one: &faraday-one
-    steps:
-      - ruby:
-          gemfile: gemfiles/faraday_1.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
-  redis-three: &redis-three
-    steps:
-      - ruby:
-          gemfile: gemfiles/redis_3.gemfile
-  redis-four: &redis-four
-    steps:
-      - ruby:
-          gemfile: gemfiles/redis_4.gemfile
-
 jobs:
   publish:
-    executor: ruby-two-six
+    docker:
+        - image: circleci/ruby:2.6
     steps:
       - checkout
       - run:
@@ -121,508 +37,96 @@ jobs:
       - run: gem build honeycomb-beeline.gemspec
       - run: gem push honeycomb-beeline-*.gem
   lint:
-    executor: ruby-two-six
+    parameters:
+      ruby-version:
+        type: string
+        default: "2.6"
+    docker:
+        - image: circleci/ruby:<< parameters.ruby-version >>
     steps:
       - ruby:
+          ruby-version: << parameters.ruby-version >>
           command: bundle exec rake rubocop
-  aws-two-ruby-two-three:
-    <<: *aws-two
-    executor: ruby-two-three
-  aws-two-ruby-two-four:
-    <<: *aws-two
-    executor: ruby-two-four
-  aws-two-ruby-two-five:
-    <<: *aws-two
-    executor: ruby-two-five
-  aws-two-ruby-two-six:
-    <<: *aws-two
-    executor: ruby-two-six
-  aws-three-ruby-two-three:
-    <<: *aws-three
-    executor: ruby-two-three
-  aws-three-ruby-two-four:
-    <<: *aws-three
-    executor: ruby-two-four
-  aws-three-ruby-two-five:
-    <<: *aws-three
-    executor: ruby-two-five
-  aws-three-ruby-two-six:
-    <<: *aws-three
-    executor: ruby-two-six
-  faraday-zero-ruby-two-three:
-    <<: *faraday-zero
-    executor: ruby-two-three
-  faraday-zero-ruby-two-four:
-    <<: *faraday-zero
-    executor: ruby-two-four
-  faraday-zero-ruby-two-five:
-    <<: *faraday-zero
-    executor: ruby-two-five
-  faraday-zero-ruby-two-six:
-    <<: *faraday-zero
-    executor: ruby-two-six
-  faraday-one-ruby-two-three:
-    <<: *faraday-one
-    executor: ruby-two-three
-  faraday-one-ruby-two-four:
-    <<: *faraday-one
-    executor: ruby-two-four
-  faraday-one-ruby-two-five:
-    <<: *faraday-one
-    executor: ruby-two-five
-  faraday-one-ruby-two-six:
-    <<: *faraday-one
-    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
-  redis-three-ruby-two-three:
-    <<: *redis-three
-    executor: ruby-two-three
-  redis-three-ruby-two-four:
-    <<: *redis-three
-    executor: ruby-two-four
-  redis-three-ruby-two-five:
-    <<: *redis-three
-    executor: ruby-two-five
-  redis-three-ruby-two-six:
-    <<: *redis-three
-    executor: ruby-two-six
-  redis-four-ruby-two-three:
-    <<: *redis-four
-    executor: ruby-two-three
-  redis-four-ruby-two-four:
-    <<: *redis-four
-    executor: ruby-two-four
-  redis-four-ruby-two-five:
-    <<: *redis-four
-    executor: ruby-two-five
-  redis-four-ruby-two-six:
-    <<: *redis-four
-    executor: ruby-two-six
+  test:
+    parameters:
+      gemfile:
+        type: string
+      ruby-version:
+        type: string
+    docker:
+        - image: circleci/ruby:<< parameters.ruby-version >>
+    steps:
+      - ruby:
+          ruby-version: << parameters.ruby-version >>
+          gemfile: << parameters.gemfile >>
+          command: bundle exec rake test
 
 workflows:
-  version: 2
+  nightly:
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only:
+                - master
+    jobs:
+      - lint
+      - test: &test
+          requires:
+            - lint
+          matrix:
+            parameters:
+              ruby-version: ["2.3", "2.4", "2.5", "2.6", "2.7"]
+              gemfile:
+                - gemfiles/aws_2.gemfile
+                - gemfiles/aws_3.gemfile
+                - gemfiles/faraday_0.gemfile
+                - gemfiles/faraday_1.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
+                - gemfiles/redis_3.gemfile
+                - gemfiles/redis_4.gemfile
+            exclude:
+              - ruby-version: "2.3"
+                gemfile: gemfiles/rails_6.gemfile
+              - ruby-version: "2.4"
+                gemfile: gemfiles/rails_6.gemfile
+              - ruby-version: "2.4"
+                gemfile: gemfiles/rails_41.gemfile
+              - ruby-version: "2.5"
+                gemfile: gemfiles/rails_41.gemfile
+              - ruby-version: "2.6"
+                gemfile: gemfiles/rails_41.gemfile
+              - ruby-version: "2.7"
+                gemfile: gemfiles/rails_41.gemfile
+              - ruby-version: "2.7"
+                gemfile: gemfiles/rails_42.gemfile
   beeline:
     jobs:
-      - lint: *tag_filters
-      - aws-two-ruby-two-three:
-          <<: *tag_filters
-          requires:
-            - lint
-      - aws-two-ruby-two-four:
-          <<: *tag_filters
-          requires:
-            - lint
-      - aws-two-ruby-two-five:
-          <<: *tag_filters
-          requires:
-            - lint
-      - aws-two-ruby-two-six:
-          <<: *tag_filters
-          requires:
-            - lint
-      - aws-three-ruby-two-three:
-          <<: *tag_filters
-          requires:
-            - lint
-      - aws-three-ruby-two-four:
-          <<: *tag_filters
-          requires:
-            - lint
-      - aws-three-ruby-two-five:
-          <<: *tag_filters
-          requires:
-            - lint
-      - aws-three-ruby-two-six:
-          <<: *tag_filters
-          requires:
-            - lint
-      - faraday-zero-ruby-two-three:
-          <<: *tag_filters
-          requires:
-            - lint
-      - faraday-zero-ruby-two-four:
-          <<: *tag_filters
-          requires:
-            - lint
-      - faraday-zero-ruby-two-five:
-          <<: *tag_filters
-          requires:
-            - lint
-      - faraday-zero-ruby-two-six:
-          <<: *tag_filters
-          requires:
-            - lint
-      - faraday-one-ruby-two-three:
-          <<: *tag_filters
-          requires:
-            - lint
-      - faraday-one-ruby-two-four:
-          <<: *tag_filters
-          requires:
-            - lint
-      - faraday-one-ruby-two-five:
-          <<: *tag_filters
-          requires:
-            - lint
-      - faraday-one-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
-      - redis-three-ruby-two-three:
-          <<: *tag_filters
-          requires:
-            - lint
-      - redis-three-ruby-two-four:
-          <<: *tag_filters
-          requires:
-            - lint
-      - redis-three-ruby-two-five:
-          <<: *tag_filters
-          requires:
-            - lint
-      - redis-three-ruby-two-six:
-          <<: *tag_filters
-          requires:
-            - lint
-      - redis-four-ruby-two-three:
-          <<: *tag_filters
-          requires:
-            - lint
-      - redis-four-ruby-two-four:
-          <<: *tag_filters
-          requires:
-            - lint
-      - redis-four-ruby-two-five:
-          <<: *tag_filters
-          requires:
-            - lint
-      - redis-four-ruby-two-six:
-          <<: *tag_filters
-          requires:
-            - lint
+      - lint:
+          filters:
+              tags:
+                only: /.*/
+      - test:
+          <<: *test
+          filters:
+              tags:
+                only: /.*/
       - publish:
           filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore: /.*/
+              tags:
+                only: /^v.*/
+              branches:
+                ignore: /.*/
           requires:
             - lint
-            - aws-two-ruby-two-three
-            - aws-two-ruby-two-four
-            - aws-two-ruby-two-five
-            - aws-two-ruby-two-six
-            - aws-three-ruby-two-three
-            - aws-three-ruby-two-four
-            - aws-three-ruby-two-five
-            - aws-three-ruby-two-six
-            - faraday-zero-ruby-two-three
-            - faraday-zero-ruby-two-four
-            - faraday-zero-ruby-two-five
-            - faraday-zero-ruby-two-six
-            - faraday-one-ruby-two-three
-            - faraday-one-ruby-two-four
-            - faraday-one-ruby-two-five
-            - faraday-one-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
-            - redis-three-ruby-two-three
-            - redis-three-ruby-two-four
-            - redis-three-ruby-two-five
-            - redis-three-ruby-two-six
-            - redis-four-ruby-two-three
-            - redis-four-ruby-two-four
-            - redis-four-ruby-two-five
-            - redis-four-ruby-two-six
+            - test

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    honeycomb-beeline (2.0.0)
+    honeycomb-beeline (2.1.0)
       libhoney (~> 1.14, >= 1.14.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     ast (2.4.0)
-    bump (0.8.0)
-    byebug (11.0.1)
+    bump (0.9.0)
+    byebug (11.1.3)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.2)
@@ -26,12 +26,12 @@ GEM
     docile (1.3.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ffi (1.11.1)
+    ffi (1.12.2)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    hashdiff (0.4.0)
-    http (4.3.0)
+    hashdiff (1.0.1)
+    http (4.4.1)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
@@ -41,9 +41,8 @@ GEM
     http-form_data (2.3.0)
     http-parser (1.2.1)
       ffi-compiler (>= 1.0, < 2.0)
-    iniparse (1.4.4)
-    jaro_winkler (1.5.3)
-    json (2.2.0)
+    iniparse (1.5.0)
+    jaro_winkler (1.5.4)
     libhoney (1.14.4)
       addressable (~> 2.0)
       http (>= 2.0, < 5.0)
@@ -51,8 +50,8 @@ GEM
     overcommit (0.46.0)
       childprocess (~> 0.6, >= 0.6.3)
       iniparse (~> 1.4)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    parallel (1.19.1)
+    parser (2.7.1.2)
       ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -60,22 +59,22 @@ GEM
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (3.1.1)
+    public_suffix (4.0.4)
     rainbow (3.0.0)
     rake (13.0.1)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.1)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     rubocop (0.68.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -87,23 +86,22 @@ GEM
       rubocop (>= 0.68.0)
     ruby-progressbar (1.10.1)
     safe_yaml (1.0.5)
-    simplecov (0.16.1)
+    simplecov (0.18.5)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-console (0.5.0)
+      simplecov-html (~> 0.11)
+    simplecov-console (0.7.2)
       ansi
       simplecov
       terminal-table
-    simplecov-html (0.10.2)
+    simplecov-html (0.12.2)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.20.3)
+    thor (1.0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.7.7)
     unicode-display_width (1.5.0)
-    webmock (3.6.0)
+    webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -117,7 +115,8 @@ DEPENDENCIES
   bundler
   honeycomb-beeline!
   overcommit (~> 0.46.0)
-  pry-byebug
+  pry (< 0.13.0)
+  pry-byebug (~> 3.7.0)
   rake
   rspec (~> 3.0)
   rubocop (< 0.69)

data/honeycomb-beeline.gemspec

@@ -43,7 +43,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bump"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "overcommit", "~> 0.46.0"
-  spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency "pry", "< 0.13.0"
+  spec.add_development_dependency "pry-byebug", "~> 3.7.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "< 0.69"

data/lib/honeycomb/beeline/version.rb

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

data/lib/honeycomb/configuration.rb

@@ -33,7 +33,7 @@ module Honeycomb
 
       @client ||
         (debug && Libhoney::LogClient.new) ||
-        Libhoney::Client.new(options)
+        Libhoney::Client.new(**options)
     end
 
     def after_initialize(client)

data/lib/honeycomb/integrations/active_support.rb

@@ -65,7 +65,7 @@ module Honeycomb
       def finish(name, id, payload)
         return unless (span = spans[id].pop)
 
-        handlers[name].call(name, span, payload)
+        handler_for(name).call(name, span, payload)
 
         span.send
       end
@@ -77,6 +77,16 @@ module Honeycomb
       def spans
         Thread.current[key] ||= Hash.new { |h, id| h[id] = [] }
       end
+
+      def handler_for(name)
+        handlers.fetch(name) do
+          handlers[
+            handlers.keys.detect do |key|
+              key.is_a?(Regexp) && key =~ name
+            end
+          ]
+        end
+      end
     end
   end
 end

data/lib/honeycomb/integrations/rack.rb

@@ -13,7 +13,11 @@ module Honeycomb
       ["HTTP_VERSION", "request.http_version"],
       ["HTTP_HOST", "request.host"],
       ["REMOTE_ADDR", "request.remote_addr"],
+      ["HTTP_X_FORWARDED_FOR", "request.header.x_forwarded_for"],
+      ["HTTP_X_FORWARDED_PROTO", "request.header.x_forwarded_proto"],
+      ["HTTP_X_FORWARDED_PORT", "request.header.x_forwarded_port"],
       ["HTTP_ACCEPT", "request.header.accept"],
+      ["HTTP_ACCEPT_LANGUAGE", "request.header.accept_language"],
       ["CONTENT_TYPE", "request.header.content_type"],
       ["HTTP_USER_AGENT", "request.header.user_agent"],
       ["rack.url_scheme", "request.scheme"],
@@ -31,9 +35,9 @@ module Honeycomb
       hny = env["HTTP_X_HONEYCOMB_TRACE"]
       client.start_span(name: "http_request", serialized_trace: hny) do |span|
         add_field = lambda do |key, value|
-          next unless value && !value.empty?
-
-          span.add_field(key, value)
+          unless value.nil? || (value.respond_to?(:empty?) && value.empty?)
+            span.add_field(key, value)
+          end
         end
 
         extract_fields(env, RACK_FIELDS, &add_field)

data/lib/honeycomb/integrations/warden.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Honeycomb
-  # Methods for extracing common warden/devise fields from a rack env hash
+  # Methods for extracting common warden/devise fields from a rack env hash
   module Warden
     COMMON_USER_FIELDS = %i[
       email
@@ -24,7 +24,7 @@ module Honeycomb
         key.match(SCOPE_PATTERN)
       end
       warden_scopes = keys.map do |key|
-        key.gsub(SCOPE_PATTERN, "\1")
+        key.gsub(SCOPE_PATTERN, "\\1")
       end
       best_scope = warden_scopes.include?("user") ? "user" : warden_scopes.first
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeycomb-beeline
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Martin Holman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
@@ -86,20 +86,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.46.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement