honeycomb-beeline 1.3.0 → 2.2.0

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
@@ -36,11 +36,16 @@ module Honeycomb
       parse_options(**options)
     end
 
-    def parse_options(parent_id: nil,
+    def parse_options(parent: nil,
+                      parent_id: nil,
                       is_root: parent_id.nil?,
                       sample_hook: nil,
                       presend_hook: nil,
                       **_options)
+      @parent = parent
+      # parent_id should be removed in the next major version bump. It has been
+      # replaced with passing the actual parent in. This is kept for backwards
+      # compatability
       @parent_id = parent_id
       @is_root = is_root
       @presend_hook = presend_hook
@@ -51,6 +56,7 @@ module Honeycomb
       self.class.new(trace: trace,
                      builder: builder,
                      context: context,
+                     parent: self,
                      parent_id: id,
                      sample_hook: sample_hook,
                      presend_hook: presend_hook).tap do |c|
@@ -73,9 +79,16 @@ module Honeycomb
       send_internal
     end
 
+    def remove_child(child)
+      children.delete child
+    end
+
     private
 
+    INVALID_SPAN_ID = ("00" * 8)
+
     attr_reader :event,
+                :parent,
                 :parent_id,
                 :children,
                 :builder,
@@ -92,14 +105,7 @@ module Honeycomb
     end
 
     def send_internal
-      add_field "duration_ms", duration_ms
-      add_field "trace.trace_id", trace.id
-      add_field "trace.span_id", id
-      add_field "meta.span_type", span_type
-      parent_id && add_field("trace.parent_id", parent_id)
-      add rollup_fields
-      add trace.fields
-      span_type == "root" && add(trace.rollup_fields)
+      add_additional_fields
       send_children
       sample = true
       if sample_hook.nil?
@@ -114,6 +120,19 @@ module Honeycomb
       end
       @sent = true
       context.span_sent(self)
+
+      parent && parent.remove_child(self)
+    end
+
+    def add_additional_fields
+      add_field "duration_ms", duration_ms
+      add_field "trace.trace_id", trace.id
+      add_field "trace.span_id", id
+      add_field "meta.span_type", span_type
+      parent_id && add_field("trace.parent_id", parent_id)
+      add rollup_fields
+      add trace.fields
+      span_type == "root" && add(trace.rollup_fields)
     end
 
     def send_children
@@ -139,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: 1.3.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Martin Holman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.14.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.14.2
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +72,20 @@ 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
@@ -80,20 +100,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.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +236,7 @@ files:
 - ".circleci/bundler_version.sh"
 - ".circleci/config.yml"
 - ".circleci/setup-rubygems.sh"
+- ".github/CODEOWNERS"
 - ".gitignore"
 - ".overcommit.yml"
 - ".rspec"
@@ -238,6 +273,9 @@ files:
 - lib/honeycomb/integrations/sinatra.rb
 - lib/honeycomb/integrations/warden.rb
 - lib/honeycomb/propagation.rb
+- lib/honeycomb/propagation/aws.rb
+- lib/honeycomb/propagation/honeycomb.rb
+- lib/honeycomb/propagation/w3c.rb
 - lib/honeycomb/rollup_fields.rb
 - lib/honeycomb/span.rb
 - lib/honeycomb/trace.rb