honeycomb-beeline 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa203ac2df453da5a0e29891b24e4a29e354fb903f7cd5dcc9ad628412675955
-  data.tar.gz: 36d850c39cd38114abc078ac433afd8e1ec7f3e7bc6f6b2d58500e6c75cb09a9
+  metadata.gz: 2dd1c8587f1aaa8ca239aa4a526f1be4aea49814f3c92134a9dd59ecdb79f4dc
+  data.tar.gz: cc1e21f4d0e2d5e65d58502196fd74eb862d5890b577f789875b4427c66c2d0f
 SHA512:
-  metadata.gz: '0820b6a9fc82ab51d583184eb34a4abdfff98f61d8d1c2807c3dffe884c3cc815499c718f90920c79e92e20d6166b990a39c47bb4e0eb17ff4da161e4f802f38'
-  data.tar.gz: 8a17134f59e43879990446dc9ec53a07fdf49567c77b04c2339586eb35c472924e6d36743ee2515adfaffd88db05835f28a5f1cdf7b2776bbdd2fc169ba660cb
+  metadata.gz: 53765870c5c3d5b2eda2992e472f270412548a0f5f71e5ed36fa005129d9ae831bbb1ad19903797c558909fc9d2e93e42002d0d15fba05756fa4a785064f1eb9
+  data.tar.gz: c3be19aed350b937ff3ec4d9789861f609afc490f16670c370d9a60f263eea4759198ce4a93ec3802cd42948abc87745f1a8b06cd0c56c4f1fcfe8b6a25a31a4

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

@@ -26,6 +26,7 @@ Metrics/MethodLength:
     - lib/generators/honeycomb/honeycomb_generator.rb
 
 Metrics/LineLength:
+  Max: 100
   Exclude:
     - spec/honeycomb/integrations/active_support_spec.rb
     - spec/support/event_data_shared_examples.rb
@@ -71,3 +72,6 @@ Style/AsciiComments:
 
 Style/Alias:
   EnforcedStyle: prefer_alias_method
+
+Style/IfUnlessModifier:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # beeline-ruby changelog
 
+## 2.9.0 2022-03-23
+
+### Enhancements
+
+- Add Environment and Services support (#196) | [@MikeGoldsmith](https://github.com/MikeGoldsmith)
+
+## 2.8.2 2022-02-02
+
+### Maintenance
+
+- Remove the upperbound on libhoney version (#191) | [@MikeGoldsmith](https://github.com/MikeGoldsmith)
+
+## 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

data/honeycomb-beeline.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "libhoney", ">= 1.14.2", "~> 1.14"
+  spec.add_dependency "libhoney", ">= 1.14.2"
 
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "bump"
@@ -47,7 +47,7 @@ Gem::Specification.new do |spec|
   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/generators/honeycomb/honeycomb_generator.rb

@@ -11,7 +11,7 @@ class HoneycombGenerator < Rails::Generators::Base
 
   argument :write_key, required: true, desc: "required"
 
-  class_option :dataset, type: :string, default: "rails"
+  class_option :service_name, type: :string, default: "rails"
 
   gem "honeycomb-beeline"
 
@@ -22,7 +22,7 @@ class HoneycombGenerator < Rails::Generators::Base
       <<-RUBY.strip_heredoc
         Honeycomb.configure do |config|
           config.write_key = #{write_key.inspect}
-          config.dataset = #{options['dataset'].inspect}
+          config.service_name = #{options['service_name'].inspect}
           config.presend_hook do |fields|
             if fields["name"] == "redis" && fields.has_key?("redis.command")
               # remove potential PII from the redis command

data/lib/honeycomb/beeline/version.rb

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

data/lib/honeycomb/client.rb

@@ -30,8 +30,11 @@ module Honeycomb
 
       # maybe make `service_name` a required parameter
       @libhoney.add_field "service_name", configuration.service_name
+      @libhoney.add_field "service.name", configuration.service_name
       @context = Context.new
 
+      @context.classic = classic_write_key?(configuration.write_key)
+
       @additional_trace_options = {
         presend_hook: configuration.presend_hook,
         sample_hook: configuration.sample_hook,
@@ -125,5 +128,9 @@ module Honeycomb
       span.add_field("error_backtrace_limit", error_backtrace_limit)
       span.add_field("error_backtrace_total_length", exception.backtrace.length)
     end
+
+    def classic_write_key?(write_key)
+      write_key.nil? || write_key.length == 32
+    end
   end
 end

data/lib/honeycomb/configuration.rb

@@ -2,16 +2,16 @@
 
 require "socket"
 require "honeycomb/propagation/default"
+require "honeycomb/propagation/default_modern"
 
 module Honeycomb
   # Used to configure the Honeycomb client
   class Configuration
     attr_accessor :write_key,
-                  :dataset,
                   :api_host,
                   :debug
 
-    attr_writer :service_name, :client, :host_name
+    attr_writer :service_name, :client, :host_name, :dataset
     attr_reader :error_backtrace_limit
 
     def initialize
@@ -23,8 +23,31 @@ module Honeycomb
       @client = nil
     end
 
+    def classic?
+      @write_key.nil? || @write_key.length == 32
+    end
+
     def service_name
-      @service_name || dataset
+      return @service_name if service_name_given?
+      return @dataset if classic?
+
+      "unknown_service:" + $PROGRAM_NAME.split("/").last
+    end
+
+    def dataset
+      return @dataset if classic?
+      return "unknown_service" if service_name.nil?
+
+      stripped_service_name = service_name.strip
+
+      warn("found extra whitespace in service name") if stripped_service_name != service_name
+
+      if stripped_service_name.empty? || stripped_service_name.start_with?("unknown_service")
+        # don't use process name in dataset
+        "unknown_service"
+      else
+        stripped_service_name
+      end
     end
 
     def error_backtrace_limit=(val)
@@ -32,15 +55,16 @@ 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
+          validate_options
+          Libhoney::Client.new(**libhoney_client_options)
+        end
     end
 
     def after_initialize(client)
@@ -73,9 +97,11 @@ module Honeycomb
         @http_trace_parser_hook = hook
       elsif @http_trace_parser_hook
         @http_trace_parser_hook
+      elsif classic?
+        DefaultPropagation::UnmarshalTraceContext.method(:parse_rack_env)
       else
         # by default we try to parse incoming honeycomb traces
-        DefaultPropagation::UnmarshalTraceContext.method(:parse_rack_env)
+        DefaultModernPropagation::UnmarshalTraceContext.method(:parse_rack_env)
       end
     end
 
@@ -84,10 +110,51 @@ module Honeycomb
         @http_trace_propagation_hook = hook
       elsif @http_trace_propagation_hook
         @http_trace_propagation_hook
+      elsif classic?
+        HoneycombPropagation::MarshalTraceContext.method(:parse_faraday_env)
       else
         # by default we send outgoing honeycomb trace headers
-        HoneycombPropagation::MarshalTraceContext.method(:parse_faraday_env)
+        HoneycombModernPropagation::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
+
+    def validate_options
+      warn("missing write_key") if write_key.nil? || write_key.empty?
+      if classic?
+        validate_options_classic
+      else
+        warn("service_name is unknown, will set to " + service_name) \
+          if service_name.start_with?("unknown_service")
+        warn("dataset will be ignored, sending data to " + service_name) \
+          if dataset_given?
+      end
+    end
+
+    def validate_options_classic
+      warn("empty service_name option") unless service_name_given?
+      warn("empty dataset option") unless dataset_given?
+    end
+
+    def service_name_given?
+      # check the instance variables, not the accessor method
+      @service_name && !@service_name.empty?
+    end
+
+    def dataset_given?
+      @dataset && !@dataset.empty?
+    end
   end
 end

data/lib/honeycomb/context.rb

@@ -3,6 +3,7 @@
 module Honeycomb
   # Stores the current span and trace context
   class Context
+    attr_writer :classic
     def current_trace
       return if current_span.nil?
 
@@ -23,6 +24,10 @@ module Honeycomb
       spans.pop
     end
 
+    def classic?
+      @classic
+    end
+
     private
 
     def spans

data/lib/honeycomb/propagation/default_modern.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "honeycomb/propagation/honeycomb_modern"
+require "honeycomb/propagation/w3c"
+
+module Honeycomb
+  # Default behavior for handling trace propagation
+  module DefaultModernPropagation
+    # 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"]
+          HoneycombModernPropagation::UnmarshalTraceContext.parse_rack_env env
+        elsif env["HTTP_TRACEPARENT"]
+          W3CPropagation::UnmarshalTraceContext.parse_rack_env env
+        else
+          [nil, nil, nil, nil]
+        end
+      end
+      # rubocop:disable Style/AccessModifierDeclarations
+      module_function :parse_rack_env
+      public :parse_rack_env
+      # rubocop:enable Style/AccessModifierDeclarations
+    end
+  end
+end

data/lib/honeycomb/propagation/honeycomb_modern.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require "base64"
+require "json"
+require "uri"
+
+module Honeycomb
+  # Parsing and propagation for honeycomb trace headers
+  module HoneycombModernPropagation
+    # Parse trace headers
+    module UnmarshalTraceContext
+      def parse_rack_env(env)
+        parse env["HTTP_X_HONEYCOMB_TRACE"]
+      end
+
+      def parse(serialized_trace)
+        unless serialized_trace.nil?
+          version, payload = serialized_trace.split(";", 2)
+
+          if version == "1"
+            trace_id, parent_span_id, trace_fields = parse_v1(payload)
+
+            if !trace_id.nil? && !parent_span_id.nil?
+              return [trace_id, parent_span_id, trace_fields, nil]
+            end
+          end
+        end
+
+        [nil, nil, nil, nil]
+      end
+
+      def parse_v1(payload)
+        trace_id, parent_span_id, trace_fields = nil
+        payload.split(",").each do |entry|
+          key, value = entry.split("=", 2)
+          case key.downcase
+          when "trace_id"
+            trace_id = value
+          when "parent_id"
+            parent_span_id = value
+          when "context"
+            Base64.decode64(value).tap do |json|
+              begin
+                trace_fields = JSON.parse json
+              rescue JSON::ParserError
+                trace_fields = {}
+              end
+            end
+          end
+        end
+
+        [trace_id, parent_span_id, trace_fields, nil]
+      end
+
+      module_function :parse_rack_env, :parse, :parse_v1
+      public :parse_rack_env, :parse
+    end
+
+    # Serialize trace headers
+    module MarshalTraceContext
+      def to_trace_header
+        context = Base64.urlsafe_encode64(JSON.generate(trace.fields)).strip
+        data_to_propogate = [
+          "trace_id=#{trace.id}",
+          "parent_id=#{id}",
+          "context=#{context}",
+        ]
+        "1;#{data_to_propogate.join(',')}"
+      end
+
+      def self.parse_faraday_env(_env, propagation_context)
+        {
+          "X-Honeycomb-Trace" => to_trace_header(propagation_context),
+        }
+      end
+
+      def self.to_trace_header(propagation_context)
+        fields = propagation_context.trace_fields
+        context = Base64.urlsafe_encode64(JSON.generate(fields)).strip
+        data_to_propogate = [
+          "trace_id=#{propagation_context.trace_id}",
+          "parent_id=#{propagation_context.parent_id}",
+          "context=#{context}",
+        ]
+        "1;#{data_to_propogate.join(',')}"
+      end
+    end
+  end
+end

data/lib/honeycomb/propagation/w3c.rb

@@ -31,12 +31,8 @@ module Honeycomb
       def parse_v1(payload)
         trace_id, parent_span_id, trace_flags = payload.split("-", 3)
 
-        if trace_flags.nil?
-          # if trace_flags is nil, it means a field is missing
-          return [nil, nil]
-        end
-
-        if trace_id == INVALID_TRACE_ID || parent_span_id == INVALID_SPAN_ID
+        # if trace_flags is nil, it means a field is missing
+        if trace_flags.nil? || trace_id == INVALID_TRACE_ID || parent_span_id == INVALID_SPAN_ID
           return [nil, nil]
         end
 

data/lib/honeycomb/trace.rb

@@ -9,7 +9,6 @@ require "honeycomb/rollup_fields"
 module Honeycomb
   # Represents a Honeycomb trace, which groups spans together
   class Trace
-    include PropagationParser
     include RollupFields
     extend Forwardable
 
@@ -19,9 +18,14 @@ module Honeycomb
 
     def initialize(builder:, context:, serialized_trace: nil, **options)
       trace_id, parent_span_id, trace_fields, dataset =
-        internal_parse(serialized_trace: serialized_trace, **options)
+        internal_parse(context: context, serialized_trace: serialized_trace, **options)
+
+      # if dataset is not nil,
+      # set trace's builder.dataset = dataset from trace header
+      if context.classic?
+        dataset && builder.dataset = dataset
+      end
 
-      dataset && builder.dataset = dataset
       @id = trace_id || generate_trace_id
       @fields = trace_fields || {}
       @root_span = Span.new(trace: self,
@@ -47,15 +51,17 @@ module Honeycomb
       end
     end
 
-    def internal_parse(serialized_trace: nil, parser_hook: nil, **_options)
+    def internal_parse(context:, serialized_trace: nil, parser_hook: nil, **_options)
       # previously we passed in the header directly as a string for us to parse
       # now we get passed the rack env to use as an argument to the provided
       # parser_hook. This preserves the current behaviour and allows us to
       # move forward with the new behaviour without breaking changes
       if serialized_trace.is_a?(Hash) && parser_hook
         parser_hook.call(serialized_trace)
+      elsif context.classic?
+        HoneycombPropagation::UnmarshalTraceContext.parse serialized_trace
       else
-        parse serialized_trace
+        HoneycombModernPropagation::UnmarshalTraceContext.parse serialized_trace
       end
     end
   end

metadata

@@ -1,22 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: honeycomb-beeline
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Martin Holman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.14.2
@@ -24,9 +21,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.14.2
@@ -148,14 +142,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
@@ -246,6 +240,7 @@ files:
 - ".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"
@@ -293,7 +288,9 @@ files:
 - lib/honeycomb/propagation/aws.rb
 - lib/honeycomb/propagation/context.rb
 - lib/honeycomb/propagation/default.rb
+- lib/honeycomb/propagation/default_modern.rb
 - lib/honeycomb/propagation/honeycomb.rb
+- lib/honeycomb/propagation/honeycomb_modern.rb
 - lib/honeycomb/propagation/w3c.rb
 - lib/honeycomb/rollup_fields.rb
 - lib/honeycomb/span.rb