faraday-honeycomb 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9c9cf8d005f26ecd2f3e391a7695211718480900810d57c1c1656cc1ed5f240
-  data.tar.gz: a645970ff844448583057f69f41e758e7643ef3125895bf2936e5d8fa7837522
+  metadata.gz: 7ecbf9b6597a7e51ca8b037cfeee45ba7398f4f02d15f543d112e08d7e5e9af9
+  data.tar.gz: de07c482c1aceb902e31ec630e3f8c6151d5f1b823bb02814a6fcc714f248ec1
 SHA512:
-  metadata.gz: 283d54bd078a653f7e6b309099f9d3597815eef830bf0a1fc92a423fd3e3a9ca7bca44aa49d9fd5f65797ffdfb324cca4ef88f37f645f4b09b30dd7cdc9152d9
-  data.tar.gz: 2acf6c044ba3c1296ecda0562175453edeaee51ed5aa1ce679296d6335e69ddcc33f617b1636e077d6c62dea3958f4742f148efcf60a46c2fa064967e1053281
+  metadata.gz: afb49bdba467c9c31b2178851211f8bdf85f9adf6124b3af748bf09e98fa78c38a4c4e34efc96a8a5603c098868268dd0f411dd15df4d18ab2fa0a5cae3fbb9e
+  data.tar.gz: 67fb61b91eccfa01191ffbc74a463c1c3bd6d65e822e939d38562907c231783319bfa4b85cf70e1f5a0e8a4f80e93f6fad28d3e3db7501274e1f6f4ac25b78e7

data/lib/faraday/honeycomb/middleware.rb

@@ -38,7 +38,7 @@ module Faraday
         add_request_fields(event, env)
 
         start = Time.now
-        response = adding_span_metadata_if_available(event, env) do
+        response = with_tracing_if_available(event, env) do
           @app.call(env)
         end
 
@@ -66,8 +66,7 @@ module Faraday
       end
 
       def add_request_fields(event, env)
-        loud_method = env.method.upcase.to_s
-
+        loud_method = loud_method(env)
         event.add(
           'name' => "#{loud_method} #{env.url.host}#{env.url.path}",
           'request.method' => loud_method,
@@ -81,20 +80,44 @@ module Faraday
         event.add_field 'response.status_code', response.status
       end
 
-      def adding_span_metadata_if_available(event, env)
-        return yield unless defined?(::Honeycomb.trace_id)
-
-        trace_id = ::Honeycomb.trace_id
-
-        event.add_field 'trace.trace_id', trace_id if trace_id
-        span_id = SecureRandom.uuid
-        event.add_field 'trace.span_id', span_id
+      def loud_method(env)
+        env.method.upcase.to_s
+      end
 
-        ::Honeycomb.with_span_id(span_id) do |parent_span_id|
-          event.add_field 'trace.parent_id', parent_span_id
+      def with_tracing_if_available(event, env)
+        # return if we are not using the ruby beeline
+        return yield unless defined?(::Honeycomb)
+
+        # beeline version <= 0.5.0
+        if ::Honeycomb.respond_to? :trace_id
+          trace_id = ::Honeycomb.trace_id
+          event.add_field 'trace.trace_id', trace_id if trace_id
+          span_id = SecureRandom.uuid
+          event.add_field 'trace.span_id', span_id
+
+          ::Honeycomb.with_span_id(span_id) do |parent_span_id|
+            event.add_field 'trace.parent_id', parent_span_id
+            yield
+          end
+        # beeline version > 0.5.0
+        elsif ::Honeycomb.respond_to? :span_for_existing_event
+          ::Honeycomb.span_for_existing_event event, name: nil, type: 'http_client' do |span_id, trace_id|
+            add_trace_context_header(env, trace_id, span_id)
+            yield
+          end
+        # fallback if we don't detect any known beeline tracing methods
+        else
           yield
         end
       end
+
+      def add_trace_context_header(env, trace_id, span_id)
+        # beeline version > 0.5.0
+        if ::Honeycomb.respond_to? :encode_trace_context
+          encoded_context = ::Honeycomb.encode_trace_context(trace_id, span_id, **::Honeycomb.active_trace_context)
+          env.request_headers['X-Honeycomb-Trace'] = encoded_context
+        end
+      end
     end
   end
 end

data/lib/faraday/honeycomb/version.rb

@@ -1,7 +1,7 @@
 module Faraday
   module Honeycomb
     GEM_NAME = 'faraday-honeycomb'
-    VERSION = '0.2.3'
+    VERSION = '0.3.0'
 
     MIN_FARADAY_VERSION = '0.8'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-honeycomb
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Sam Stokes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
@@ -94,8 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      TO DO *is* a description
+description: "    TO DO *is* a description\n"
 email:
 - support@honeycomb.io
 executables: []
@@ -109,7 +108,7 @@ files:
 - lib/faraday/honeycomb/version.rb
 homepage: https://github.com/honeycombio/faraday-honeycomb
 licenses:
-- MIT
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []