honeycomb-beeline 2.6.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ae074f65cd2b6319b74e07b06148e9e2cd446bfd3fc7c2c686c9ab4702550a4
-  data.tar.gz: a7c934d59de13e4099636470fb9660520478bbe56c38c5eb42c69839cb6a6f4a
+  metadata.gz: ce57f1fcfd4e116392e16f4296760b7a707f780bab641149d148ddc31dda7ff2
+  data.tar.gz: 4d1013f4036fd56923f725a745a0e9387835775b7fd53d671fa270840b737047
 SHA512:
-  metadata.gz: 12c63d47f117a7fae5771b504ff58191627824618c7127257ca29f9c0e1de9cee3e140184bf3e04935846a2a9cef6768245ce6a89d540a1e48b8ddd1eb923704
-  data.tar.gz: 599d93dc3ca17e34b4828cf557aa98a4b697a26cfffa8957a4b25997c37d7967ab2753bcc01ced943db8e74a52f6dff0f93c0a51ee59d28b0fbc9ad1f144a30b
+  metadata.gz: 4d236e51b6cc86afbfa22f85c24f9633186b99b0e33cdbf6c842936ec060a24735e11bb8a778c55fe6bae82c461ffbf75e72e99ce190b2c2f2a6cb0f419b4074
+  data.tar.gz: c33e5df57ebb42e47915006c2cf62259c13743c9419a76f04b89ca8bbf58d2cc500106217e32b1863432d937686aea32637f8bde0f7824ea2bd6453a60b65268

data/.circleci/config.yml

@@ -13,7 +13,7 @@ commands:
       - checkout
       - restore_cache:
           keys:
-            - gems-v1-<< parameters.ruby-version >>-<< parameters.gemfile >>-{{ checksum "Gemfile.lock" }}
+            - gems-v1-<< parameters.ruby-version >>-<< parameters.gemfile >>-{{ checksum "honeycomb-beeline.gemspec" }}
             - gems-v1-<< parameters.ruby-version >>-<< parameters.gemfile >>
             - gems-v1-<< parameters.ruby-version >>
       - run: .circleci/bundler_version.sh
@@ -24,7 +24,7 @@ commands:
       - save_cache:
           paths:
             - ./vendor/bundle
-          key: gems-v1-<< parameters.ruby-version >>-<< parameters.gemfile >>-{{ checksum "Gemfile.lock" }}
+          key: gems-v1-<< parameters.ruby-version >>-<< parameters.gemfile >>-{{ checksum "honeycomb-beeline.gemspec" }}
       - run: << parameters.command >>
 
 jobs:
@@ -106,6 +106,30 @@ jobs:
           command: bundle exec rake test
       - store_test_results:
           path: test/reports
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - coverage
+  coverage_report:
+    parameters:
+      ruby-version:
+        type: string
+        default: "2.6"
+    docker:
+        - image: circleci/ruby:<< parameters.ruby-version >>
+    environment:
+      BUNDLE_GEMFILE: ./Gemfile
+    steps:
+      - ruby:
+          ruby-version: << parameters.ruby-version >>
+          gemfile: root
+          command: echo "Get the project environment and cached dependencies prior to retrieving the coverage results."
+      - attach_workspace:
+          at: ./
+      - run: ls -l ./coverage
+      - run: bundle exec rake coverage:report
+      - store_artifacts:
+          path: coverage
 
 workflows:
   nightly:
@@ -124,7 +148,7 @@ workflows:
             - lint
           matrix:
             parameters:
-              ruby-version: ["2.2", "2.3", "2.4", "2.5", "2.6", "2.7"]
+              ruby-version: ["2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "3.0"]
               gemfile:
                 - aws_2
                 - aws_3
@@ -170,6 +194,19 @@ workflows:
                 gemfile: rails_41
               - ruby-version: "2.7"
                 gemfile: rails_42
+              - ruby-version: "3.0"
+                gemfile: rails_41
+              - ruby-version: "3.0"
+                gemfile: rails_42
+              - ruby-version: "3.0"
+                gemfile: rails_5
+              - ruby-version: "3.0"
+                gemfile: rails_51
+              - ruby-version: "3.0"
+                gemfile: rails_52
+              - ruby-version: "3.0"
+                gemfile: sequel4
+
   beeline:
     jobs:
       - lint:
@@ -179,6 +216,10 @@ workflows:
       - test:
           <<: *test
           filters: *regular_filters
+      - coverage_report:
+          filters: *regular_filters
+          requires:
+            - test
       - build_artifacts:
           filters: &tag_filters
               tags:

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Let us know if something is not working as expected
+title: ''
+labels: 'type: bug'
+assignees: ''
+
+---
+
+<!---
+Thank you for taking the time to report bugs!
+
+We love code snippets and links to repositories that reproduce the issue, but understand if you don't have the time to add them. We'll do our best with the info you provide, and might ask follow-up questions.
+
+Please see our [OSS process document](https://github.com/honeycombio/home/blob/main/honeycomb-oss-lifecycle-and-practices.md#) to get an idea of how we operate.
+--->
+
+**Versions**
+
+- Ruby:
+- Beeline:
+
+**Steps to reproduce**
+
+1.
+
+**Additional context**

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,25 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'type: enhancement'
+assignees: ''
+
+---
+
+<!---
+Thank you for contributing an idea to this project!
+
+Please see our [OSS process document](https://github.com/honeycombio/home/blob/main/honeycomb-oss-lifecycle-and-practices.md#) to get an idea of how we operate.
+--->
+
+**Is your feature request related to a problem? Please describe.**
+
+
+**Describe the solution you'd like**
+
+
+**Describe alternatives you've considered**
+
+
+**Additional context**

data/.github/ISSUE_TEMPLATE/question-discussion.md

@@ -0,0 +1,14 @@
+---
+name: Question/Discussion
+about: General question about how things work or a discussion
+title: ''
+labels: 'type: discussion'
+assignees: ''
+
+---
+
+<!---
+Thank you for taking the time to say hello!
+
+Please see our [OSS process document](https://github.com/honeycombio/home/blob/main/honeycomb-oss-lifecycle-and-practices.md#) to get an idea of how we operate.
+--->

data/.github/ISSUE_TEMPLATE/security-vulnerability-report.md

@@ -0,0 +1,22 @@
+---
+name: Security vulnerability report
+about: Let us know if you discover a security vulnerability
+title: ''
+labels: 'type: security'
+assignees: ''
+
+---
+
+<!---
+Thank you for taking the time to report security vulnerabilities!
+
+Please see our [OSS process document](https://github.com/honeycombio/home/blob/main/honeycomb-oss-lifecycle-and-practices.md#) to get an idea of how we operate.
+--->
+**Versions**
+
+- Ruby:
+- Beeline:
+
+**Description**
+
+(Please include any relevant CVE advisory links)

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,20 @@
+<!--
+Thank you for contributing to the project! 💜
+Please make sure to:
+- Chat with us first if this is a big change
+  - Open a new issue (or comment on an existing one)
+  - We want to make sure you don't spend time implementing something we might have to say No to
+- Add unit tests
+- Mention any relevant issues in the PR description (e.g. "Fixes #123")
+
+Please see our [OSS process document](https://github.com/honeycombio/home/blob/main/honeycomb-oss-lifecycle-and-practices.md#) to get an idea of how we operate.
+-->
+
+## Which problem is this PR solving?
+
+-
+
+## Short description of the changes
+
+-
+

data/.github/dependabot.yml

@@ -8,7 +8,7 @@ updates:
   - package-ecosystem: "bundler" # See documentation for possible values
     directory: "/gemfiles/" # Location of package manifests
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     labels:
       - "type: dependencies"
     reviewers:

data/.github/workflows/apply-labels.yml

@@ -1,5 +1,5 @@
 name: Apply project labels
-on: [issues, pull_request, label]
+on: [issues, pull_request_target, label]
 jobs:
   apply-labels:
     runs-on: ubuntu-latest

data/.github/workflows/re-triage.yml

@@ -0,0 +1,12 @@
+name: Re-triage issues with new comments
+on:
+  issue_comment:
+    types: [created]
+jobs:
+  re-triage:
+    runs-on: ubuntu-latest
+    name: Re-triage issues with new comments
+    steps:
+      - uses: honeycombio/oss-management-actions/re-triage@v1
+        with:
+          ghprojects-token: ${{ secrets.GHPROJECTS_TOKEN }}

data/.github/workflows/stale.yml

@@ -0,0 +1,26 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    name: 'Close stale issues and PRs'
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+      - uses: actions/stale@v4
+        with:
+          start-date: '2021-09-01T00:00:00Z'
+          stale-issue-message: 'Marking this issue as stale because it has been open 14 days with no activity. Please add a comment if this is still an ongoing issue; otherwise this issue will be automatically closed in 7 days.'
+          stale-pr-message: 'Marking this PR as stale because it has been open 30 days with no activity. Please add a comment if this PR is still relevant; otherwise this PR will be automatically closed in 7 days.'
+          close-issue-message: 'Closing this issue due to inactivity. Please see our [Honeycomb OSS Lifecyle and Practices](https://github.com/honeycombio/home/blob/main/honeycomb-oss-lifecycle-and-practices.md).'
+          close-pr-message: 'Closing this PR due to inactivity. Please see our [Honeycomb OSS Lifecyle and Practices](https://github.com/honeycombio/home/blob/main/honeycomb-oss-lifecycle-and-practices.md).'
+          days-before-issue-stale: 14
+          days-before-pr-stale: 30
+          days-before-issue-close: 7
+          days-before-pr-close: 7
+          any-of-labels: 'status: info needed,status: revision needed'

data/.rubocop.yml

@@ -27,6 +27,7 @@ Metrics/MethodLength:
 
 Metrics/LineLength:
   Exclude:
+    - spec/honeycomb/integrations/active_support_spec.rb
     - spec/support/event_data_shared_examples.rb
 
 Metrics/ParameterLists:
@@ -37,6 +38,7 @@ Style/AccessModifierDeclarations:
     - lib/honeycomb/propagation/aws.rb
     - lib/honeycomb/propagation/w3c.rb
     - lib/honeycomb/propagation/honeycomb.rb
+    - lib/honeycomb/propagation/default.rb
 
 Style/FrozenStringLiteralComment:
   EnforcedStyle: always

data/Appraisals

@@ -2,6 +2,7 @@
 
 appraise "aws-2" do
   gem "aws-sdk", "~> 2"
+  gem "webrick"
 end
 
 appraise "aws-3" do

data/CHANGELOG.md

@@ -1,5 +1,50 @@
 # beeline-ruby changelog
 
+## 2.8.1 2022-01-12
+
+### Fixed
+
+- fix Beeline user-agent addition when creating a Libhoney client (#189) | [@robbkidd](https://github.com/robbkidd)
+
+### Maintenance
+
+- gh: add re-triage workflow (#185) | [@vreynolds](https://github.com/vreynolds)
+- set minimum version of rspec_junit_formatter (#188) | [@robbkidd](https://github.com/robbkidd)
+
+## 2.8.0 2021-12-22
+
+### Improvements
+
+- feat: accept both w3c and honeycomb propagation headers by default (#183) | [@robbkidd](https://github.com/robbkidd)
+
+### Maintenance
+
+- Update dependabot to monthly (#181) | [@vreynolds](https://github.com/vreynolds)
+- empower apply-labels action to apply labels (#179) | [@robbkidd](https://github.com/robbkidd)
+
+## 2.7.1 2021-10-22
+
+### Maintenance
+
+- Change maintenance badge to maintained (#174) | [@JamieDanielson](https://github.com/JamieDanielson)
+- Adds Stalebot (#175) | [@JamieDanielson](https://github.com/JamieDanielson)
+- gather up the matrix'd code coverage and save a report (#173) | [@robbkidd](https://github.com/robbkidd)
+- add Ruby 3.0 to CI matrix (#171) | [@robbkidd](https://github.com/robbkidd)
+- remove CodeCov from test suite (#172) | [@robbkidd](https://github.com/robbkidd)
+- Add NOTICE (#169) | [@cartermp](https://github.com/cartermp)
+
+## 2.7.0 2021-09-03
+
+### Improvements
+
+- add `error` and `error_detail` fields to spans from `ActiveSupport::Notification` events that contain an exception (#166) | [@leviwilson](https://github.com/leviwilson)
+
+### Maintenance
+
+- Add issue and PR templates (#165) | [@vreynolds](https://github.com/vreynolds)
+- Add OSS lifecycle badge (#164) | [@vreynolds](https://github.com/vreynolds)
+- Add community health files (#163) | [@vreynolds](https://github.com/vreynolds)
+
 ## 2.6.0 2021-07-23
 
 ### Added

data/CODE_OF_CONDUCT.md

@@ -1,74 +1,5 @@
-# Contributor Covenant Code of Conduct
+# Code of Conduct
 
-## Our Pledge
+This project has adopted the Honeycomb User Community Code of Conduct to clarify expected behavior in our community.
 
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at me@martinholman.co.nz. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+https://www.honeycomb.io/honeycomb-user-community-code-of-conduct/

data/CONTRIBUTING.md

@@ -0,0 +1,3 @@
+# Contributing Guide
+
+Please see our [general guide for OSS lifecycle and practices.](https://github.com/honeycombio/home/blob/main/honeycomb-oss-lifecycle-and-practices.md)

data/NOTICE

@@ -0,0 +1,13 @@
+Copyright (c) 2016-Present Honeycomb, Hound Technology, Inc. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/OSSMETADATA

@@ -0,0 +1 @@
+osslifecycle=maintained

data/README.md

@@ -1,8 +1,8 @@
 # Honeycomb Beeline for Ruby
 
+[![OSS Lifecycle](https://img.shields.io/osslifecycle/honeycombio/beeline-ruby?color=success)](https://github.com/honeycombio/home/blob/main/honeycomb-oss-lifecycle-and-practices.md)
 [![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)
-[![codecov](https://codecov.io/gh/honeycombio/beeline-ruby/branch/main/graph/badge.svg)](https://codecov.io/gh/honeycombio/beeline-ruby)
 
 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.
 - [Usage and Examples](https://docs.honeycomb.io/getting-data-in/beelines/ruby-beeline/)

data/RELEASING.md

@@ -0,0 +1,9 @@
+# Releasing
+
+- Update the version number in `lib/honeycomb/beeline/version`.
+- Update `CHANGELOG.md` with the changes since the last release.
+- Commit changes, push, and open a release preparation pull request for review.
+- Once the pull request is merged, fetch the updated `main` branch.
+- Apply a tag for the new version on the merged commit: vX.Y.Z, for example v1.1.2.
+- Push the new version tag up to the project repository to kick off build and artifact publishing to GitHub and the Gems registry.
+- Publish the draft release in GitHub.

data/Rakefile

@@ -14,3 +14,15 @@ task test: :spec
 task default: %i[rubocop test]
 
 !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"] && task(default: :appraisal)
+
+namespace :coverage do
+  desc "Collates all result sets generated by the different test runners"
+  task :report do
+    require "simplecov"
+
+    SimpleCov.collate Dir["coverage/**/.resultset.json"] do
+      add_group "Integrations", "lib/honeycomb/integrations"
+      add_group "Propagation", "lib/honeycomb/propagation"
+    end
+  end
+end

data/SECURITY.md

@@ -0,0 +1,3 @@
+# Reporting Security Issues
+
+If you discover a security vulnerability, please open an issue with label `type: security`.

data/SUPPORT.md

@@ -0,0 +1,3 @@
+# How to Get Help
+
+This project uses GitHub issues to track bugs, feature requests, and questions about using the project. Please search for existing issues before filing a new one.

data/honeycomb-beeline.gemspec

@@ -42,13 +42,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "bump"
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "codecov"
   spec.add_development_dependency "overcommit", "~> 0.46.0"
   spec.add_development_dependency "pry", "< 0.13.0"
   spec.add_development_dependency "pry-byebug", "~> 3.6.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rspec_junit_formatter"
+  spec.add_development_dependency "rspec_junit_formatter", ">= 0.5.1"
   spec.add_development_dependency "rubocop", "< 0.69"
   spec.add_development_dependency "rubocop-performance", "< 1.3.0"
   spec.add_development_dependency "simplecov"

data/lib/honeycomb/beeline/version.rb

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

data/lib/honeycomb/configuration.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "socket"
-require "honeycomb/propagation/honeycomb"
+require "honeycomb/propagation/default"
 
 module Honeycomb
   # Used to configure the Honeycomb client
@@ -32,15 +32,15 @@ module Honeycomb
     end
 
     def client
-      options = {}.tap do |o|
-        o[:writekey] = write_key
-        o[:dataset] = dataset
-        api_host && o[:api_host] = api_host
-      end
-
-      @client ||
-        (debug && Libhoney::LogClient.new) ||
-        Libhoney::Client.new(**options)
+      # memoized:
+      # either the user has supplied a pre-configured Libhoney client
+      @client ||=
+        # or we'll create one and return it from here on
+        if debug
+          Libhoney::LogClient.new
+        else
+          Libhoney::Client.new(**libhoney_client_options)
+        end
     end
 
     def after_initialize(client)
@@ -75,7 +75,7 @@ module Honeycomb
         @http_trace_parser_hook
       else
         # by default we try to parse incoming honeycomb traces
-        HoneycombPropagation::UnmarshalTraceContext.method(:parse_rack_env)
+        DefaultPropagation::UnmarshalTraceContext.method(:parse_rack_env)
       end
     end
 
@@ -89,5 +89,18 @@ module Honeycomb
         HoneycombPropagation::MarshalTraceContext.method(:parse_faraday_env)
       end
     end
+
+    private
+
+    def libhoney_client_options
+      {
+        writekey: write_key,
+        dataset: dataset,
+        user_agent_addition: Honeycomb::Beeline::USER_AGENT_SUFFIX,
+      }.tap do |options|
+        # only set the API host for the client if one has been given
+        options[:api_host] = api_host if api_host
+      end
+    end
   end
 end

data/lib/honeycomb/integrations/active_support.rb

@@ -51,6 +51,15 @@ module Honeycomb
             value = value.to_unsafe_hash if value.respond_to?(:to_unsafe_hash)
             span.add_field("#{name}.#{key}", value)
           end
+
+          # If the notification event has recorded an exception, add the
+          # Beeline's usual error fields to the span.
+          # * Uses the 2-element array on :exception in the event payload
+          #   to support Rails 4. If Rails 4 support is dropped, consider
+          #   the :exception_object added in Rails 5.
+          error, error_detail = payload[:exception]
+          span.add_field("error", error) if error
+          span.add_field("error_detail", error_detail) if error_detail
         end
       end
     end

data/lib/honeycomb/integrations/faraday.rb

@@ -5,9 +5,9 @@ require "faraday"
 module Honeycomb
   # Faraday middleware to create spans around outgoing http requests
   class Faraday < ::Faraday::Middleware
-    def initialize(app, client:)
+    def initialize(app, options)
       super(app)
-      @client = client
+      @client = options[:client]
     end
 
     def call(env)

data/lib/honeycomb/integrations/rack.rb

@@ -26,9 +26,9 @@ module Honeycomb
 
     attr_reader :app, :client
 
-    def initialize(app, client:)
+    def initialize(app, options)
       @app = app
-      @client = client
+      @client = options[:client]
     end
 
     def call(env)

data/lib/honeycomb/propagation/default.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "honeycomb/propagation/honeycomb"
+require "honeycomb/propagation/w3c"
+
+module Honeycomb
+  # Default behavior for handling trace propagation
+  module DefaultPropagation
+    # Parse incoming trace headers.
+    #
+    # Checks for and parses Honeycomb's trace header or, if not found,
+    # then checks for and parses W3C trace parent header.
+    module UnmarshalTraceContext
+      def parse_rack_env(env)
+        if env["HTTP_X_HONEYCOMB_TRACE"]
+          HoneycombPropagation::UnmarshalTraceContext.parse_rack_env env
+        elsif env["HTTP_TRACEPARENT"]
+          W3CPropagation::UnmarshalTraceContext.parse_rack_env env
+        else
+          [nil, nil, nil, nil]
+        end
+      end
+      module_function :parse_rack_env
+      public :parse_rack_env
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeycomb-beeline
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Martin Holman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-23 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
@@ -72,20 +72,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: codecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: overcommit
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +148,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -252,9 +238,16 @@ files:
 - ".circleci/setup-rubygems.sh"
 - ".editorconfig"
 - ".github/CODEOWNERS"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/ISSUE_TEMPLATE/question-discussion.md"
+- ".github/ISSUE_TEMPLATE/security-vulnerability-report.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/dependabot.yml"
 - ".github/workflows/add-to-project.yml"
 - ".github/workflows/apply-labels.yml"
+- ".github/workflows/re-triage.yml"
+- ".github/workflows/stale.yml"
 - ".gitignore"
 - ".overcommit.yml"
 - ".rspec"
@@ -264,12 +257,17 @@ files:
 - Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - CONTRIBUTORS.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
+- NOTICE
+- OSSMETADATA
 - README.md
+- RELEASING.md
 - Rakefile
+- SECURITY.md
+- SUPPORT.md
 - UPGRADING.md
 - bin/console
 - bin/setup
@@ -295,6 +293,7 @@ files:
 - lib/honeycomb/propagation.rb
 - lib/honeycomb/propagation/aws.rb
 - lib/honeycomb/propagation/context.rb
+- lib/honeycomb/propagation/default.rb
 - lib/honeycomb/propagation/honeycomb.rb
 - lib/honeycomb/propagation/w3c.rb
 - lib/honeycomb/rollup_fields.rb

data/Gemfile.lock

@@ -1,139 +0,0 @@
-PATH
-  remote: .
-  specs:
-    honeycomb-beeline (2.6.0)
-      libhoney (~> 1.14, >= 1.14.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    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.9.0)
-    byebug (10.0.2)
-    childprocess (0.9.0)
-      ffi (~> 1.0, >= 1.0.11)
-    codecov (0.2.8)
-      json
-      simplecov
-    coderay (1.1.2)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    excon (0.82.0)
-    ffi (1.12.2)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
-    hashdiff (1.0.1)
-    http (4.4.1)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.2)
-      http-parser (~> 1.2.0)
-    http-cookie (1.0.4)
-      domain_name (~> 0.5)
-    http-form_data (2.3.0)
-    http-parser (1.2.3)
-      ffi-compiler (>= 1.0, < 2.0)
-    iniparse (1.5.0)
-    jaro_winkler (1.5.4)
-    json (2.3.1)
-    libhoney (1.18.0)
-      addressable (~> 2.0)
-      excon
-      http (>= 2.0, < 5.0)
-    method_source (0.9.2)
-    overcommit (0.46.0)
-      childprocess (~> 0.6, >= 0.6.3)
-      iniparse (~> 1.4)
-    parallel (1.19.1)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    public_suffix (4.0.4)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    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.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rspec_junit_formatter (0.4.1)
-      rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.68.1)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
-    rubocop-performance (1.2.0)
-      rubocop (>= 0.68.0)
-    ruby-progressbar (1.10.1)
-    safe_yaml (1.0.5)
-    simplecov (0.18.5)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-    simplecov-console (0.7.2)
-      ansi
-      simplecov
-      terminal-table
-    simplecov-html (0.12.2)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (1.0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (1.5.0)
-    webmock (3.8.3)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  bump
-  bundler
-  codecov
-  honeycomb-beeline!
-  overcommit (~> 0.46.0)
-  pry (< 0.13.0)
-  pry-byebug (~> 3.6.0)
-  rake
-  rspec (~> 3.0)
-  rspec_junit_formatter
-  rubocop (< 0.69)
-  rubocop-performance (< 1.3.0)
-  simplecov
-  simplecov-console
-  webmock
-
-BUNDLED WITH
-   2.2.21