honeycomb-beeline 2.7.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d073f7df59bebb1a80589c302eaace2c35c2d73a8a180a66aa787efcecb6b609
-  data.tar.gz: d70ea8442d815282ec2942bbe11503faa9e619e3c1ada7fdb42e0a68a6f655b2
+  metadata.gz: fa203ac2df453da5a0e29891b24e4a29e354fb903f7cd5dcc9ad628412675955
+  data.tar.gz: 36d850c39cd38114abc078ac433afd8e1ec7f3e7bc6f6b2d58500e6c75cb09a9
 SHA512:
-  metadata.gz: 6d71deb49303e135bb59d852b9513d5890fb3e10413d24ed5c041624b9b572753f422862e85213c02e3085afbceefe6ef016e2b2342239aa30d674088e8be2f2
-  data.tar.gz: c92e6cf3fa914ee0d81ef3fdfd6104d7aa51d0e3848754982d280a76baee4acbe193a5954747d4b56fc9e6e4fd58e55f58553dc6481ebad0cac5edf4d77bd8f5
+  metadata.gz: '0820b6a9fc82ab51d583184eb34a4abdfff98f61d8d1c2807c3dffe884c3cc815499c718f90920c79e92e20d6166b990a39c47bb4e0eb17ff4da161e4f802f38'
+  data.tar.gz: 8a17134f59e43879990446dc9ec53a07fdf49567c77b04c2339586eb35c472924e6d36743ee2515adfaffd88db05835f28a5f1cdf7b2776bbdd2fc169ba660cb

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/.rubocop.yml

@@ -38,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/CHANGELOG.md

@@ -1,5 +1,16 @@
 # beeline-ruby changelog
 
+## 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

data/lib/honeycomb/beeline/version.rb

@@ -3,7 +3,7 @@
 module Honeycomb
   module Beeline
     NAME = "honeycomb-beeline".freeze
-    VERSION = "2.7.1".freeze
+    VERSION = "2.8.0".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
@@ -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
 

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.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Martin Holman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
@@ -292,6 +292,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