zipkin_query 0.0.3 → 0.0.4

data/lib/thrift/thrift/gen-rb/zipkin_query_constants.rb

@@ -0,0 +1,11 @@
+#
+# Autogenerated by Thrift Compiler (0.9.1)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'zipkin_query_types'
+
+module Zipkin
+end

data/lib/thrift/thrift/gen-rb/zipkin_query_types.rb

@@ -0,0 +1,224 @@
+#
+# Autogenerated by Thrift Compiler (0.9.1)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'zipkin_core_types'
+require 'zipkin_dependencies_types'
+
+
+module Zipkin
+  module Order
+    TIMESTAMP_DESC = 0
+    TIMESTAMP_ASC = 1
+    DURATION_ASC = 2
+    DURATION_DESC = 3
+    NONE = 4
+    VALUE_MAP = {0 => "TIMESTAMP_DESC", 1 => "TIMESTAMP_ASC", 2 => "DURATION_ASC", 3 => "DURATION_DESC", 4 => "NONE"}
+    VALID_VALUES = Set.new([TIMESTAMP_DESC, TIMESTAMP_ASC, DURATION_ASC, DURATION_DESC, NONE]).freeze
+  end
+
+  module Adjust
+    NOTHING = 0
+    TIME_SKEW = 1
+    VALUE_MAP = {0 => "NOTHING", 1 => "TIME_SKEW"}
+    VALID_VALUES = Set.new([NOTHING, TIME_SKEW]).freeze
+  end
+
+  class Trace
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SPANS = 1
+
+    FIELDS = {
+      SPANS => {:type => ::Thrift::Types::LIST, :name => 'spans', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Zipkin::Span}}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class QueryException < ::Thrift::Exception
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    def initialize(message=nil)
+      super()
+      self.msg = message
+    end
+
+    def message; msg end
+
+    MSG = 1
+
+    FIELDS = {
+      MSG => {:type => ::Thrift::Types::STRING, :name => 'msg'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  # This sums up a single Trace to make it easy for a client to get an overview of what happened.
+  class TraceSummary
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    TRACE_ID = 1
+    START_TIMESTAMP = 2
+    END_TIMESTAMP = 3
+    DURATION_MICRO = 4
+    SERVICE_COUNTS = 5
+    ENDPOINTS = 6
+
+    FIELDS = {
+      TRACE_ID => {:type => ::Thrift::Types::I64, :name => 'trace_id'},
+      START_TIMESTAMP => {:type => ::Thrift::Types::I64, :name => 'start_timestamp'},
+      END_TIMESTAMP => {:type => ::Thrift::Types::I64, :name => 'end_timestamp'},
+      DURATION_MICRO => {:type => ::Thrift::Types::I32, :name => 'duration_micro'},
+      SERVICE_COUNTS => {:type => ::Thrift::Types::MAP, :name => 'service_counts', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::I32}},
+      ENDPOINTS => {:type => ::Thrift::Types::LIST, :name => 'endpoints', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Zipkin::Endpoint}}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  # A modified version of the Annotation struct that brings in more information
+  class TimelineAnnotation
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    TIMESTAMP = 1
+    VALUE = 2
+    HOST = 3
+    SPAN_ID = 4
+    PARENT_ID = 5
+    SERVICE_NAME = 6
+    SPAN_NAME = 7
+
+    FIELDS = {
+      TIMESTAMP => {:type => ::Thrift::Types::I64, :name => 'timestamp'},
+      VALUE => {:type => ::Thrift::Types::STRING, :name => 'value'},
+      HOST => {:type => ::Thrift::Types::STRUCT, :name => 'host', :class => ::Zipkin::Endpoint},
+      SPAN_ID => {:type => ::Thrift::Types::I64, :name => 'span_id'},
+      PARENT_ID => {:type => ::Thrift::Types::I64, :name => 'parent_id', :optional => true},
+      SERVICE_NAME => {:type => ::Thrift::Types::STRING, :name => 'service_name'},
+      SPAN_NAME => {:type => ::Thrift::Types::STRING, :name => 'span_name'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  # This sums up a single Trace to make it easy for a client to get an overview of what happened.
+  class TraceTimeline
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    TRACE_ID = 1
+    ROOT_MOST_SPAN_ID = 2
+    ANNOTATIONS = 6
+    BINARY_ANNOTATIONS = 7
+
+    FIELDS = {
+      TRACE_ID => {:type => ::Thrift::Types::I64, :name => 'trace_id'},
+      ROOT_MOST_SPAN_ID => {:type => ::Thrift::Types::I64, :name => 'root_most_span_id'},
+      ANNOTATIONS => {:type => ::Thrift::Types::LIST, :name => 'annotations', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Zipkin::TimelineAnnotation}},
+      BINARY_ANNOTATIONS => {:type => ::Thrift::Types::LIST, :name => 'binary_annotations', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Zipkin::BinaryAnnotation}}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  # Returns a combination of trace, summary and timeline.
+  class TraceCombo
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    TRACE = 1
+    SUMMARY = 2
+    TIMELINE = 3
+    SPAN_DEPTHS = 4
+
+    FIELDS = {
+      TRACE => {:type => ::Thrift::Types::STRUCT, :name => 'trace', :class => ::Zipkin::Trace},
+      SUMMARY => {:type => ::Thrift::Types::STRUCT, :name => 'summary', :class => ::Zipkin::TraceSummary, :optional => true},
+      TIMELINE => {:type => ::Thrift::Types::STRUCT, :name => 'timeline', :class => ::Zipkin::TraceTimeline, :optional => true},
+      SPAN_DEPTHS => {:type => ::Thrift::Types::MAP, :name => 'span_depths', :key => {:type => ::Thrift::Types::I64}, :value => {:type => ::Thrift::Types::I32}, :optional => true}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class QueryRequest
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SERVICE_NAME = 1
+    SPAN_NAME = 2
+    ANNOTATIONS = 3
+    BINARY_ANNOTATIONS = 4
+    END_TS = 5
+    LIMIT = 6
+    ORDER = 7
+    START_TS = 8
+
+    FIELDS = {
+      SERVICE_NAME => {:type => ::Thrift::Types::STRING, :name => 'service_name'},
+      SPAN_NAME => {:type => ::Thrift::Types::STRING, :name => 'span_name', :optional => true},
+      ANNOTATIONS => {:type => ::Thrift::Types::LIST, :name => 'annotations', :element => {:type => ::Thrift::Types::STRING}, :optional => true},
+      BINARY_ANNOTATIONS => {:type => ::Thrift::Types::LIST, :name => 'binary_annotations', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Zipkin::BinaryAnnotation}, :optional => true},
+      END_TS => {:type => ::Thrift::Types::I64, :name => 'end_ts'},
+      LIMIT => {:type => ::Thrift::Types::I32, :name => 'limit'},
+      ORDER => {:type => ::Thrift::Types::I32, :name => 'order', :enum_class => ::Zipkin::Order},
+      START_TS => {:type => ::Thrift::Types::I64, :name => 'start_ts'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+      unless @order.nil? || ::Zipkin::Order::VALID_VALUES.include?(@order)
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field order!')
+      end
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class QueryResponse
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    TRACE_IDS = 1
+    START_TS = 2
+    END_TS = 3
+
+    FIELDS = {
+      TRACE_IDS => {:type => ::Thrift::Types::LIST, :name => 'trace_ids', :element => {:type => ::Thrift::Types::I64}},
+      START_TS => {:type => ::Thrift::Types::I64, :name => 'start_ts'},
+      END_TS => {:type => ::Thrift::Types::I64, :name => 'end_ts'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+end

data/lib/zipkin_query/zipkin_query.rb

@@ -28,13 +28,13 @@ module Zipkin
         raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'getTraceIds failed: unknown result')
       end
 
-      def getTraceIdsBySpanName(service_name, span_name, end_ts, limit, order)
-        send_getTraceIdsBySpanName(service_name, span_name, end_ts, limit, order)
+      def getTraceIdsBySpanName(service_name, span_name, end_ts, limit, order, start_ts = 0)
+        send_getTraceIdsBySpanName(service_name, span_name, end_ts, limit, order, start_ts)
         return recv_getTraceIdsBySpanName()
       end
 
-      def send_getTraceIdsBySpanName(service_name, span_name, end_ts, limit, order)
-        send_message('getTraceIdsBySpanName', GetTraceIdsBySpanName_args, :service_name => service_name, :span_name => span_name, :end_ts => end_ts, :limit => limit, :order => order)
+      def send_getTraceIdsBySpanName(service_name, span_name, end_ts, limit, order, start_ts)
+        send_message('getTraceIdsBySpanName', GetTraceIdsBySpanName_args, :service_name => service_name, :span_name => span_name, :end_ts => end_ts, :limit => limit, :order => order, :start_ts => start_ts)
       end
 
       def recv_getTraceIdsBySpanName()
@@ -44,13 +44,13 @@ module Zipkin
         raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'getTraceIdsBySpanName failed: unknown result')
       end
 
-      def getTraceIdsByServiceName(service_name, end_ts, limit, order)
-        send_getTraceIdsByServiceName(service_name, end_ts, limit, order)
+      def getTraceIdsByServiceName(service_name, end_ts, limit, order, start_ts = 0)
+        send_getTraceIdsByServiceName(service_name, end_ts, limit, order, start_ts)
         return recv_getTraceIdsByServiceName()
       end
 
-      def send_getTraceIdsByServiceName(service_name, end_ts, limit, order)
-        send_message('getTraceIdsByServiceName', GetTraceIdsByServiceName_args, :service_name => service_name, :end_ts => end_ts, :limit => limit, :order => order)
+      def send_getTraceIdsByServiceName(service_name, end_ts, limit, order, start_ts)
+        send_message('getTraceIdsByServiceName', GetTraceIdsByServiceName_args, :service_name => service_name, :end_ts => end_ts, :limit => limit, :order => order, :start_ts => start_ts)
       end
 
       def recv_getTraceIdsByServiceName()
@@ -60,13 +60,13 @@ module Zipkin
         raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'getTraceIdsByServiceName failed: unknown result')
       end
 
-      def getTraceIdsByAnnotation(service_name, annotation, value, end_ts, limit, order)
-        send_getTraceIdsByAnnotation(service_name, annotation, value, end_ts, limit, order)
+      def getTraceIdsByAnnotation(service_name, annotation, value, end_ts, limit, order, start_ts = 0)
+        send_getTraceIdsByAnnotation(service_name, annotation, value, end_ts, limit, order, start_ts)
         return recv_getTraceIdsByAnnotation()
       end
 
-      def send_getTraceIdsByAnnotation(service_name, annotation, value, end_ts, limit, order)
-        send_message('getTraceIdsByAnnotation', GetTraceIdsByAnnotation_args, :service_name => service_name, :annotation => annotation, :value => value, :end_ts => end_ts, :limit => limit, :order => order)
+      def send_getTraceIdsByAnnotation(service_name, annotation, value, end_ts, limit, order, start_ts)
+        send_message('getTraceIdsByAnnotation', GetTraceIdsByAnnotation_args, :service_name => service_name, :annotation => annotation, :value => value, :end_ts => end_ts, :limit => limit, :order => order, :start_ts => start_ts)
       end
 
       def recv_getTraceIdsByAnnotation()
@@ -92,7 +92,7 @@ module Zipkin
         raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'tracesExist failed: unknown result')
       end
 
-      def getTracesByIds(trace_ids, adjust)
+      def getTracesByIds(trace_ids, adjust=[])
         send_getTracesByIds(trace_ids, adjust)
         return recv_getTracesByIds()
       end
@@ -124,9 +124,7 @@ module Zipkin
         raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'getTraceTimelinesByIds failed: unknown result')
       end
 
-      # set adjust = [1]
-      # more info to see zipkinQuery.thrift line 79
-      def getTraceSummariesByIds(trace_ids, adjust=[1])
+      def getTraceSummariesByIds(trace_ids, adjust)
         send_getTraceSummariesByIds(trace_ids, adjust)
         return recv_getTraceSummariesByIds()
       end
@@ -142,7 +140,7 @@ module Zipkin
         raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'getTraceSummariesByIds failed: unknown result')
       end
 
-      def getTraceCombosByIds(trace_ids, adjust=[1])
+      def getTraceCombosByIds(trace_ids, adjust)
         send_getTraceCombosByIds(trace_ids, adjust)
         return recv_getTraceCombosByIds()
       end
@@ -335,7 +333,7 @@ module Zipkin
         args = read_args(iprot, GetTraceIdsBySpanName_args)
         result = GetTraceIdsBySpanName_result.new()
         begin
-          result.success = @handler.getTraceIdsBySpanName(args.service_name, args.span_name, args.end_ts, args.limit, args.order)
+          result.success = @handler.getTraceIdsBySpanName(args.service_name, args.span_name, args.end_ts, args.limit, args.order, args.start_ts)
         rescue ::Zipkin::QueryException => qe
           result.qe = qe
         end
@@ -346,7 +344,7 @@ module Zipkin
         args = read_args(iprot, GetTraceIdsByServiceName_args)
         result = GetTraceIdsByServiceName_result.new()
         begin
-          result.success = @handler.getTraceIdsByServiceName(args.service_name, args.end_ts, args.limit, args.order)
+          result.success = @handler.getTraceIdsByServiceName(args.service_name, args.end_ts, args.limit, args.order, args.start_ts)
         rescue ::Zipkin::QueryException => qe
           result.qe = qe
         end
@@ -357,7 +355,7 @@ module Zipkin
         args = read_args(iprot, GetTraceIdsByAnnotation_args)
         result = GetTraceIdsByAnnotation_result.new()
         begin
-          result.success = @handler.getTraceIdsByAnnotation(args.service_name, args.annotation, args.value, args.end_ts, args.limit, args.order)
+          result.success = @handler.getTraceIdsByAnnotation(args.service_name, args.annotation, args.value, args.end_ts, args.limit, args.order, args.start_ts)
         rescue ::Zipkin::QueryException => qe
           result.qe = qe
         end
@@ -566,13 +564,15 @@ module Zipkin
       END_TS = 4
       LIMIT = 5
       ORDER = 6
+      START_TS = 7
 
       FIELDS = {
         SERVICE_NAME => {:type => ::Thrift::Types::STRING, :name => 'service_name'},
         SPAN_NAME => {:type => ::Thrift::Types::STRING, :name => 'span_name'},
         END_TS => {:type => ::Thrift::Types::I64, :name => 'end_ts'},
         LIMIT => {:type => ::Thrift::Types::I32, :name => 'limit'},
-        ORDER => {:type => ::Thrift::Types::I32, :name => 'order', :enum_class => ::Zipkin::Order}
+        ORDER => {:type => ::Thrift::Types::I32, :name => 'order', :enum_class => ::Zipkin::Order},
+        START_TS => {:type => ::Thrift::Types::I64, :name => 'start_ts'}
       }
 
       def struct_fields; FIELDS; end
@@ -610,12 +610,14 @@ module Zipkin
       END_TS = 3
       LIMIT = 4
       ORDER = 5
+      START_TS = 6
 
       FIELDS = {
         SERVICE_NAME => {:type => ::Thrift::Types::STRING, :name => 'service_name'},
         END_TS => {:type => ::Thrift::Types::I64, :name => 'end_ts'},
         LIMIT => {:type => ::Thrift::Types::I32, :name => 'limit'},
-        ORDER => {:type => ::Thrift::Types::I32, :name => 'order', :enum_class => ::Zipkin::Order}
+        ORDER => {:type => ::Thrift::Types::I32, :name => 'order', :enum_class => ::Zipkin::Order},
+        START_TS => {:type => ::Thrift::Types::I64, :name => 'start_ts'}
       }
 
       def struct_fields; FIELDS; end
@@ -655,6 +657,7 @@ module Zipkin
       END_TS = 5
       LIMIT = 6
       ORDER = 7
+      START_TS = 8
 
       FIELDS = {
         SERVICE_NAME => {:type => ::Thrift::Types::STRING, :name => 'service_name'},
@@ -662,7 +665,8 @@ module Zipkin
         VALUE => {:type => ::Thrift::Types::STRING, :name => 'value', :binary => true},
         END_TS => {:type => ::Thrift::Types::I64, :name => 'end_ts'},
         LIMIT => {:type => ::Thrift::Types::I32, :name => 'limit'},
-        ORDER => {:type => ::Thrift::Types::I32, :name => 'order', :enum_class => ::Zipkin::Order}
+        ORDER => {:type => ::Thrift::Types::I32, :name => 'order', :enum_class => ::Zipkin::Order},
+        START_TS => {:type => ::Thrift::Types::I64, :name => 'start_ts'}
       }
 
       def struct_fields; FIELDS; end

data/lib/zipkin_query/zipkin_query_types.rb

@@ -177,6 +177,7 @@ module Zipkin
     END_TS = 5
     LIMIT = 6
     ORDER = 7
+    START_TS = 8
 
     FIELDS = {
       SERVICE_NAME => {:type => ::Thrift::Types::STRING, :name => 'service_name'},
@@ -185,7 +186,8 @@ module Zipkin
       BINARY_ANNOTATIONS => {:type => ::Thrift::Types::LIST, :name => 'binary_annotations', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Zipkin::BinaryAnnotation}, :optional => true},
       END_TS => {:type => ::Thrift::Types::I64, :name => 'end_ts'},
       LIMIT => {:type => ::Thrift::Types::I32, :name => 'limit'},
-      ORDER => {:type => ::Thrift::Types::I32, :name => 'order', :enum_class => ::Zipkin::Order}
+      ORDER => {:type => ::Thrift::Types::I32, :name => 'order', :enum_class => ::Zipkin::Order},
+      START_TS => {:type => ::Thrift::Types::I64, :name => 'start_ts'}
     }
 
     def struct_fields; FIELDS; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin_query
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Zerd Liu
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift
@@ -46,6 +46,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/thrift/thrift/gen-rb/zipkin_core_constants.rb
+- lib/thrift/thrift/gen-rb/zipkin_core_types.rb
+- lib/thrift/thrift/gen-rb/zipkin_dependencies_constants.rb
+- lib/thrift/thrift/gen-rb/zipkin_dependencies_types.rb
+- lib/thrift/thrift/gen-rb/zipkin_query.rb
+- lib/thrift/thrift/gen-rb/zipkin_query_constants.rb
+- lib/thrift/thrift/gen-rb/zipkin_query_types.rb
 - lib/zipkin_query.rb
 - lib/zipkin_query/zipkin_core_constants.rb
 - lib/zipkin_query/zipkin_core_types.rb
@@ -73,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: A Zipkin query client.