rack-honeycomb 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d71737f6f10436e9df8ccf2589fa626b720baf0eca15dd764496daa6028d3be1
-  data.tar.gz: 132781010ca1cf718553c968961bf10f3ec683b891b53fb800c5539148d357c7
+  metadata.gz: 2df72a49bca0dd5e2665baf5761f34a21f1140e718f26c1df5f72994e332b77b
+  data.tar.gz: 6a3743e0c01dc73c1b503a6e0103c77fb0c7aacaef83c1a9c1b01449aec393c1
 SHA512:
-  metadata.gz: e698f60be56541bd891ad9b2e00c897553fd2851127524e9726394ca28d1af80c6929cb01a6ba40286e8fc326d5df21009ace359f7ee718139e42368630738db
-  data.tar.gz: 7aa9fd274977bd1dc31985eb66f37f28ac433aa6d3632f192b8640f897203c3ea80b260a217f6bd562b85cb80eaa830fc54450cdfb36a895fae8b4debca147b9
+  metadata.gz: f81063f7b9acc8e374408a8ef8c18c8b6b20ddf78ba7ab0faf2e2c0abd5716b8931968aac459abd77e4dfc92330d596e18759045808a1f96fd7174a025fee277
+  data.tar.gz: f7579b4e2074b46164345c437814889a2cb7b30cffceb9a43a36cc22e4c8eb5795741e034f72a1e3d7a32420f6ac905eb73597a2b584c81b77b7f9329d80cb6c

data/lib/rack/honeycomb/middleware.rb

@@ -77,7 +77,7 @@ module Rack
         add_request_fields(ev, env)
 
         start = Time.now
-        status, headers, body = adding_span_metadata_if_available(ev, env) do
+        status, headers, body = with_tracing_if_available(ev, env) do
           @app.call(env)
         end
 
@@ -186,8 +186,8 @@ module Rack
         # anything inside the Rack handler.
         env.each_pair do |k, v|
           if k.is_a?(String) && k.match(ENV_REGEX)
-            namespaced_k = "#{APP_FIELD_NAMESPACE}.#{k.sub(ENV_REGEX, '')}"
-            event.add_field(namespaced_k, v)
+            field_name = k.sub(ENV_REGEX, '')
+            add_app_field(event, field_name, v)
             env.delete(k)
           end
         end
@@ -197,18 +197,45 @@ module Rack
         event.add_field('response.status_code', status)
       end
 
-      def adding_span_metadata_if_available(event, env)
-        return yield unless defined?(::Honeycomb.with_trace_id)
-
-        ::Honeycomb.with_trace_id do |trace_id|
-          event.add_field 'trace.trace_id', trace_id
-          span_id = trace_id # so this shows up as a root span
-          event.add_field 'trace.span_id', span_id
-          ::Honeycomb.with_span_id(span_id) do
-            yield
+      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? :with_trace_id
+          ::Honeycomb.with_trace_id do |trace_id|
+            event.add_field "trace.trace_id", trace_id
+            # so this shows up as a root span
+            event.add_field "trace.span_id", trace_id
+            ::Honeycomb.with_span_id(trace_id) do
+              yield
+            end
+          end
+        # beeline version > 0.5.0
+        elsif ::Honeycomb.respond_to? :trace_from_encoded_context
+          encoded_context = trace_context_from_header(env)
+          ::Honeycomb.trace_from_encoded_context(encoded_context) do
+            ::Honeycomb.span_for_existing_event(
+              event,
+              name: nil, # this is only added if it is present, we set the name in #add_request_fields
+              type: EVENT_TYPE,
+            ) do
+              yield
+            end
           end
+        # fallback if we don't detect any known beeline tracing methods
+        else
+          yield
         end
       end
+
+      def trace_context_from_header(env)
+        env['HTTP_X_HONEYCOMB_TRACE']
+      end
+
+      def add_app_field(event, k, v)
+        event.add_field "#{APP_FIELD_NAMESPACE}.#{k}", v
+      end
     end
 
     class << self

data/lib/rack/honeycomb/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Honeycomb
-    VERSION="0.3.0"
+    VERSION="0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-honeycomb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - The Honeycomb.io Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump