honeycomb-beeline 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dc063924a92fcf2aa2ce4bbdcd3ab6bb79666a4d6266e957129f57bb131ee77
-  data.tar.gz: 30111f935a4503b82321d30fbf752ff7462951c40c6249357543167d24890130
+  metadata.gz: 7f19c4aff5f79d28bb532e24562c1070a1e4f6b2ee86d627e114a4fad388539f
+  data.tar.gz: f4a64e080f22e85e32e3e75b8655c8bd7e126ef67d6b928a69089df3ee57f4cf
 SHA512:
-  metadata.gz: 300c4652b990b2365eb4194702c16012c027beb7b13d396b0129d7ebe8a82a6bf848ab221d0158967f0e2c9d4bbc20d91715dae88f96b7d4f63714cdc03099f0
-  data.tar.gz: 546ffeb8520ce66beb3d57223aac4e5131f9b0b0286c90618b11983e8a2821a1e8303ed9faf09a3022564956918a2dad688d8bce6bfa4e185c0e4a253fc72666
+  metadata.gz: 8d6289b4ad7b7e1e82520925f59096761be2adff0c028a503676b692039138d3c0501df71b9a2fe6b2687fe592cc5abdcc6447476553bf0ca73eb630e7f9a43f
+  data.tar.gz: cf4f69a76786874d9e1e0cc2ef016365412613e9113913b863d0c7240e0cc034e8aa528ffc17cf54c95886ebc1cf6010a986a419ea59cfd4c82a45c3ec054224

data/.circleci/config.yml

@@ -69,7 +69,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - main
     jobs:
       - lint
       - test: &test
@@ -77,7 +77,7 @@ workflows:
             - lint
           matrix:
             parameters:
-              ruby-version: ["2.3", "2.4", "2.5", "2.6", "2.7"]
+              ruby-version: ["2.2", "2.3", "2.4", "2.5", "2.6", "2.7"]
               gemfile:
                 - gemfiles/aws_2.gemfile
                 - gemfiles/aws_3.gemfile
@@ -96,6 +96,12 @@ workflows:
                 - gemfiles/redis_3.gemfile
                 - gemfiles/redis_4.gemfile
             exclude:
+              - ruby-version: "2.2"
+                gemfile: gemfiles/faraday_1.gemfile
+              - ruby-version: "2.2"
+                gemfile: gemfiles/rails_52.gemfile
+              - ruby-version: "2.2"
+                gemfile: gemfiles/rails_6.gemfile
               - ruby-version: "2.3"
                 gemfile: gemfiles/rails_6.gemfile
               - ruby-version: "2.4"

data/.github/CODEOWNERS

@@ -0,0 +1,5 @@
+# Code owners file.
+# This file controls who is tagged for review for any given pull request.
+
+# For anything not explicitly taken by someone else:
+* @honeycombio/integrations-team @martin308

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    honeycomb-beeline (2.1.1)
+    honeycomb-beeline (2.1.2)
       libhoney (~> 1.14, >= 1.14.2)
 
 GEM
@@ -16,7 +16,7 @@ GEM
       thor (>= 0.14.0)
     ast (2.4.0)
     bump (0.9.0)
-    byebug (11.1.3)
+    byebug (10.0.2)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.2)
@@ -43,7 +43,7 @@ GEM
       ffi-compiler (>= 1.0, < 2.0)
     iniparse (1.5.0)
     jaro_winkler (1.5.4)
-    libhoney (1.14.4)
+    libhoney (1.14.5)
       addressable (~> 2.0)
       http (>= 2.0, < 5.0)
     method_source (0.9.2)
@@ -56,8 +56,8 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
-      byebug (~> 11.0)
+    pry-byebug (3.6.0)
+      byebug (~> 10.0)
       pry (~> 0.10)
     public_suffix (4.0.4)
     rainbow (3.0.0)
@@ -116,7 +116,7 @@ DEPENDENCIES
   honeycomb-beeline!
   overcommit (~> 0.46.0)
   pry (< 0.13.0)
-  pry-byebug (~> 3.7.0)
+  pry-byebug (~> 3.6.0)
   rake
   rspec (~> 3.0)
   rubocop (< 0.69)

data/honeycomb-beeline.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "overcommit", "~> 0.46.0"
   spec.add_development_dependency "pry", "< 0.13.0"
-  spec.add_development_dependency "pry-byebug", "~> 3.7.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 "rubocop", "< 0.69"

data/lib/honeycomb/beeline/version.rb

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

data/lib/honeycomb/client.rb

@@ -54,24 +54,24 @@ module Honeycomb
         context.current_span.create_child
       end
 
+      current_span = context.current_span
+
       fields.each do |key, value|
-        context.current_span.add_field(key, value)
+        current_span.add_field(key, value)
       end
 
-      context.current_span.add_field("name", name)
-
-      if block_given?
-        begin
-          yield context.current_span
-        rescue StandardError => e
-          context.current_span.add_field("error", e.class.name)
-          context.current_span.add_field("error_detail", e.message)
-          raise e
-        ensure
-          context.current_span.send
-        end
-      else
-        context.current_span
+      current_span.add_field("name", name)
+
+      return current_span unless block_given?
+
+      begin
+        yield current_span
+      rescue StandardError => e
+        current_span.add_field("error", e.class.name)
+        current_span.add_field("error_detail", e.message)
+        raise e
+      ensure
+        current_span.send
       end
     end
 

data/lib/honeycomb/span.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "securerandom"
 require "forwardable"
+require "securerandom"
 require "honeycomb/propagation"
 require "honeycomb/deterministic_sampler"
 require "honeycomb/rollup_fields"
@@ -24,7 +24,7 @@ module Honeycomb
                    builder:,
                    context:,
                    **options)
-      @id = SecureRandom.uuid
+      @id = generate_span_id
       @context = context
       @context.current_span = self
       @builder = builder
@@ -85,6 +85,8 @@ module Honeycomb
 
     private
 
+    INVALID_SPAN_ID = ("00" * 8)
+
     attr_reader :event,
                 :parent,
                 :parent_id,
@@ -156,5 +158,12 @@ module Honeycomb
         "mid"
       end
     end
+
+    def generate_span_id
+      loop do
+        id = SecureRandom.hex(8)
+        return id unless id == INVALID_SPAN_ID
+      end
+    end
   end
 end

data/lib/honeycomb/trace.rb

@@ -21,7 +21,7 @@ module Honeycomb
       trace_id, parent_span_id, trace_fields, dataset =
         parse serialized_trace
       dataset && builder.dataset = dataset
-      @id = trace_id || SecureRandom.uuid
+      @id = trace_id || generate_trace_id
       @fields = trace_fields || {}
       @root_span = Span.new(trace: self,
                             parent_id: parent_span_id,
@@ -34,5 +34,16 @@ module Honeycomb
     def add_field(key, value)
       @fields[key] = value
     end
+
+    private
+
+    INVALID_TRACE_ID = ("00" * 16)
+
+    def generate_trace_id
+      loop do
+        id = SecureRandom.hex(16)
+        return id unless id == INVALID_TRACE_ID
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeycomb-beeline
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Martin Holman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +222,7 @@ files:
 - ".circleci/bundler_version.sh"
 - ".circleci/config.yml"
 - ".circleci/setup-rubygems.sh"
+- ".github/CODEOWNERS"
 - ".gitignore"
 - ".overcommit.yml"
 - ".rspec"