finagle-thrift 1.3.1 → 1.4.1

data/lib/finagle-thrift/thrift/tracing_constants.rb

@@ -15,4 +15,8 @@ require 'tracing_types'
 
     SERVER_RECV = %q"sr"
 
+    SERVER_ADDR = %q"sa"
+
+    CLIENT_ADDR = %q"ca"
+
 end

data/lib/finagle-thrift/thrift/tracing_types.rb

@@ -131,6 +131,44 @@ module FinagleThrift
       ::Thrift::Struct.generate_accessors self
     end
 
+    # This struct serializes com.twitter.finagle.Context
+    class RequestContext
+      include ::Thrift::Struct, ::Thrift::Struct_Union
+      KEY = 1
+      VALUE = 2
+
+      FIELDS = {
+        KEY => {:type => ::Thrift::Types::STRING, :name => 'key', :binary => true},
+        VALUE => {:type => ::Thrift::Types::STRING, :name => 'value', :binary => true}
+      }
+
+      def struct_fields; FIELDS; end
+
+      def validate
+      end
+
+      ::Thrift::Struct.generate_accessors self
+    end
+
+    # Serializes an individual delegation.
+    class Delegation
+      include ::Thrift::Struct, ::Thrift::Struct_Union
+      SRC = 1
+      DST = 2
+
+      FIELDS = {
+        SRC => {:type => ::Thrift::Types::STRING, :name => 'src'},
+        DST => {:type => ::Thrift::Types::STRING, :name => 'dst'}
+      }
+
+      def struct_fields; FIELDS; end
+
+      def validate
+      end
+
+      ::Thrift::Struct.generate_accessors self
+    end
+
     # RequestHeader defines headers for the request. These carry the span data, and
     # a flag indicating whether the request is to be debugged.
     class RequestHeader
@@ -141,6 +179,9 @@ module FinagleThrift
       SAMPLED = 5
       CLIENT_ID = 6
       FLAGS = 7
+      CONTEXTS = 8
+      DEST = 9
+      DELEGATIONS = 10
 
       FIELDS = {
         TRACE_ID => {:type => ::Thrift::Types::I64, :name => 'trace_id'},
@@ -148,7 +189,10 @@ module FinagleThrift
         PARENT_SPAN_ID => {:type => ::Thrift::Types::I64, :name => 'parent_span_id', :optional => true},
         SAMPLED => {:type => ::Thrift::Types::BOOL, :name => 'sampled', :optional => true},
         CLIENT_ID => {:type => ::Thrift::Types::STRUCT, :name => 'client_id', :class => FinagleThrift::ClientId, :optional => true},
-        FLAGS => {:type => ::Thrift::Types::I64, :name => 'flags', :optional => true}
+        FLAGS => {:type => ::Thrift::Types::I64, :name => 'flags', :optional => true},
+        CONTEXTS => {:type => ::Thrift::Types::LIST, :name => 'contexts', :element => {:type => ::Thrift::Types::STRUCT, :class => FinagleThrift::RequestContext}},
+        DEST => {:type => ::Thrift::Types::STRING, :name => 'dest', :optional => true},
+        DELEGATIONS => {:type => ::Thrift::Types::LIST, :name => 'delegations', :element => {:type => ::Thrift::Types::STRUCT, :class => FinagleThrift::Delegation}, :optional => true}
       }
 
       def struct_fields; FIELDS; end
@@ -165,9 +209,11 @@ module FinagleThrift
     class ResponseHeader
       include ::Thrift::Struct, ::Thrift::Struct_Union
       SPANS = 1
+      CONTEXTS = 2
 
       FIELDS = {
-        SPANS => {:type => ::Thrift::Types::LIST, :name => 'spans', :element => {:type => ::Thrift::Types::STRUCT, :class => FinagleThrift::Span}}
+        SPANS => {:type => ::Thrift::Types::LIST, :name => 'spans', :element => {:type => ::Thrift::Types::STRUCT, :class => FinagleThrift::Span}},
+        CONTEXTS => {:type => ::Thrift::Types::LIST, :name => 'contexts', :element => {:type => ::Thrift::Types::STRUCT, :class => FinagleThrift::RequestContext}}
       }
 
       def struct_fields; FIELDS; end

data/lib/finagle-thrift/trace.rb

@@ -2,6 +2,7 @@ module Trace
   extend self
   DEFAULT_SAMPLE_RATE = 0.001
   TRACE_ID_UPPER_BOUND = 2 ** 64
+  TRACE_STACK = :trace_stack
 
   def id
     if stack.empty?
@@ -33,7 +34,7 @@ module Trace
         saved_stack = stack.dup
         yield
       ensure
-        @stack = saved_stack
+        stack = saved_stack
       end
     end
   end
@@ -85,11 +86,11 @@ module Trace
       "TraceId(trace_id = #{@trace_id.to_s}, parent_id = #{@parent_id.to_s}, span_id = #{@span_id.to_s}, sampled = #{@sampled.to_s}, flags = #{@flags.to_s})"
     end
   end
-  
+
   # there are a total of 64 flags that can be passed down with the various tracing headers
   # at the time of writing only one is used (debug).
   #
-  # Note that using the 64th bit in Ruby requires some sign conversion since Thrift i64s are signed 
+  # Note that using the 64th bit in Ruby requires some sign conversion since Thrift i64s are signed
   # but Ruby won't do the right thing if you try to set 1 << 64
   class Flags
     # no flags set
@@ -146,8 +147,14 @@ module Trace
 
   private
 
+  # "stack" acts as a thread local variable and cannot be shared between
+  # threads.
+  def stack=(stack)
+    Thread.current[TRACE_STACK] = stack
+  end
+
   def stack
-    @stack ||= []
+    Thread.current[TRACE_STACK] ||= []
   end
 
   def tracer

data/lib/finagle-thrift/tracer.rb

@@ -181,8 +181,14 @@ module Trace
       DOUBLE = "DOUBLE"
       STRING = "STRING"
 
-      def self.to_thrift(v)
-        FinagleThrift::AnnotationType::VALUE_MAP.index(v)
+      if {}.respond_to?(:key)
+        def self.to_thrift(v)
+          FinagleThrift::AnnotationType::VALUE_MAP.key(v)
+        end
+      else
+        def self.to_thrift(v)
+          FinagleThrift::AnnotationType::VALUE_MAP.index(v)
+        end
       end
     end
 
@@ -245,4 +251,4 @@ module Trace
     end
   end
 
-end
+end

data/lib/finagle-thrift/version.rb

@@ -1,3 +1,4 @@
 module FinagleThrift
-  VERSION = "1.3.1"
+  VERSION = "1.4.1"
 end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: finagle-thrift
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 5
   prerelease: 
   segments: 
   - 1
-  - 3
+  - 4
   - 1
-  version: 1.3.1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-13 00:00:00 Z
+date: 2015-06-19 00:00:00 -07:00
+default_executable: 
 dependencies: []
 
 description: A Ruby client library for integrating into finagle's thrift tracing protocol
@@ -36,9 +37,10 @@ files:
 - lib/finagle-thrift/tracer.rb
 - lib/finagle-thrift/version.rb
 - lib/finagle-thrift.rb
+has_rdoc: true
 homepage: 
-licenses: []
-
+licenses: 
+- Apache License Version 2.0
 post_install_message: 
 rdoc_options: []
 
@@ -67,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: ""