skylight 0.2.7 → 0.3.0.rc.3

data/lib/sql_lexer/version.rb

@@ -1,3 +1,3 @@
 module SqlLexer
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0.rc.3
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: 
@@ -29,9 +29,17 @@ email:
 - engineering@tilde.io
 executables:
 - skylight
-extensions: []
+extensions:
+- ext/extconf.rb
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- README.md
+- bin/skylight
+- ext/checksums.yml
+- ext/extconf.rb
+- ext/skylight.map
+- ext/skylight_native.c
 - lib/skylight.rb
 - lib/skylight/api.rb
 - lib/skylight/cli.rb
@@ -43,16 +51,12 @@ files:
 - lib/skylight/helpers.rb
 - lib/skylight/instrumenter.rb
 - lib/skylight/messages.rb
-- lib/skylight/messages/annotation.rb
-- lib/skylight/messages/base.rb
-- lib/skylight/messages/batch.rb
-- lib/skylight/messages/endpoint.rb
 - lib/skylight/messages/error.rb
-- lib/skylight/messages/event.rb
 - lib/skylight/messages/hello.rb
-- lib/skylight/messages/span.rb
 - lib/skylight/messages/trace.rb
+- lib/skylight/messages/trace_envelope.rb
 - lib/skylight/middleware.rb
+- lib/skylight/native.rb
 - lib/skylight/normalizers.rb
 - lib/skylight/normalizers/default.rb
 - lib/skylight/normalizers/moped.rb
@@ -81,10 +85,6 @@ files:
 - lib/skylight/vendor/active_support/notifications/fanout.rb
 - lib/skylight/vendor/active_support/notifications/instrumenter.rb
 - lib/skylight/vendor/active_support/per_thread_registry.rb
-- lib/skylight/vendor/beefcake.rb
-- lib/skylight/vendor/beefcake/buffer.rb
-- lib/skylight/vendor/beefcake/decode.rb
-- lib/skylight/vendor/beefcake/encode.rb
 - lib/skylight/vendor/cli/highline.rb
 - lib/skylight/vendor/cli/highline/color_scheme.rb
 - lib/skylight/vendor/cli/highline/compatibility.rb
@@ -139,9 +139,6 @@ files:
 - lib/sql_lexer.rb
 - lib/sql_lexer/lexer.rb
 - lib/sql_lexer/version.rb
-- CHANGELOG.md
-- README.md
-- bin/skylight
 homepage: http://www.skylight.io
 licenses: []
 metadata: {}
@@ -151,17 +148,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Skylight is a ruby application monitoring tool. Currently in closed beta.

data/lib/skylight/messages/annotation.rb

@@ -1,13 +0,0 @@
-module Skylight
-  module Messages
-    class Annotation
-      include Beefcake::Message
-
-      optional :key,    :string,    1
-      optional :int,    :int64,     2
-      optional :double, :double,    3
-      optional :string, :string,    4
-      repeated :nested, Annotation, 5
-    end
-  end
-end

data/lib/skylight/messages/base.rb

@@ -1,24 +0,0 @@
-module Skylight
-  module Messages
-    class Base
-      module ClassMethods
-        attr_accessor :message_id
-      end
-
-      def self.inherited(klass)
-        klass.class_eval do
-          include Beefcake::Message
-          extend  ClassMethods
-        end
-
-        klass.message_id = (@count ||= 0)
-        Messages.set(klass.message_id, klass)
-        @count += 1
-      end
-
-      def message_id
-        self.class.message_id
-      end
-    end
-  end
-end

data/lib/skylight/messages/batch.rb

@@ -1,12 +0,0 @@
-module Skylight
-  module Messages
-    class Batch
-      include Beefcake::Message
-
-      required :timestamp, :uint32,  1
-      repeated :endpoints, Endpoint, 2
-      optional :hostname,  :string,  3
-
-    end
-  end
-end

data/lib/skylight/messages/endpoint.rb

@@ -1,12 +0,0 @@
-module Skylight
-  module Messages
-    class Endpoint
-      include Beefcake::Message
-
-      required :name,   :string, 1
-      required :count,  :uint64, 2
-      repeated :traces, Trace,   3
-
-    end
-  end
-end

data/lib/skylight/messages/event.rb

@@ -1,12 +0,0 @@
-module Skylight
-  module Messages
-    class Event
-      include Beefcake::Message
-
-      required :category,    :string, 1
-      optional :title,       :string, 2
-      optional :description, :string, 3
-
-    end
-  end
-end

data/lib/skylight/messages/span.rb

@@ -1,166 +0,0 @@
-module Skylight
-  module Messages
-    class AnnotationBuilder
-      def self.build(object)
-        new(object).build
-      end
-
-      def initialize(object)
-        @object = object
-      end
-
-      def build
-        build_nested(@object)
-      end
-
-    private
-      def build_nested(object)
-        case object
-        when Hash
-          build_hash(object)
-        when Array
-          build_array(object)
-        end
-      end
-
-      def build_hash(object)
-        object.map do |key, value|
-          build_annotation(value, key)
-        end
-      end
-
-      def build_array(array)
-        array.map do |value|
-          build_annotation(value)
-        end
-      end
-
-      def build_annotation(value, key=nil)
-        Annotation.new.tap do |annotation|
-          annotation.key = key.to_s if key
-          annotation[classify(value)] = build_value(value)
-        end
-      end
-
-      def build_value(value)
-        nested?(value) ? build_nested(value) : value
-      end
-
-      def nested?(value)
-        value.is_a?(Array) || value.is_a?(Hash)
-      end
-
-      def classify(value)
-        case value
-        when String
-          :string
-        when Integer
-          :int
-        when Numeric
-          :double
-        when Hash, Array
-          :nested
-        else
-          raise Skylight::SerializeError.new("Annotation values must be Strings or Numeric. You passed #{value.inspect} in #{@object.inspect}")
-        end
-      end
-    end
-
-    class Span
-      include Beefcake::Message
-
-      required :event,       Event,      1
-      repeated :annotations, Annotation, 2
-      required :started_at,  :uint32,    3
-      optional :duration,    :uint32,    4
-      optional :children,    :uint32,    5
-
-      # Bit of a hack
-      attr_accessor :absolute_time
-
-      # Optimization
-      def initialize(attrs = nil)
-        super if attrs
-      end
-
-      class Builder
-
-        include Util::Logging
-
-        attr_reader \
-          :time,
-          :category,
-          :title,
-          :started_at,
-          :description,
-          :annotations
-
-        attr_accessor :children
-
-        def initialize(trace, time, started_at, cat, title, desc, annot)
-          @trace       = trace
-          @built       = false
-          @time        = time
-          @started_at  = started_at
-          @category    = cat.to_s
-          @children    = 0
-          @annotations = annot
-
-          self.title   = title
-          self.description = desc
-        end
-
-        def config
-          @trace.config
-        end
-
-        def endpoint=(name)
-          @trace.endpoint = name
-        end
-
-        def done
-          @trace.done(self) unless built?
-        rescue Exception => e
-          error e.message
-          t { e.backtrace.join("\n") }
-        end
-
-        def built?
-          @built
-        end
-
-        def build(duration)
-          @built = true
-          Span.new(
-            event: Event.new(
-              category: category,
-              title: title,
-              description: description),
-            annotations: nil,
-            started_at: @started_at,
-            duration: duration && duration > 0 ? duration : nil,
-            children: @children > 0 ? @children : nil)
-        end
-
-        def title=(val)
-          val = nil unless val.respond_to?(:to_str)
-          @title = val && val.to_str
-        end
-
-        def description=(val)
-          val = nil unless val.respond_to?(:to_str)
-          @description = val && val.to_str
-        end
-
-      private
-
-        def to_annotations(val)
-          return nil if !val || val.empty?
-
-          AnnotationBuilder.build(val)
-        end
-
-      end
-    end
-  end
-end

data/lib/skylight/vendor/beefcake.rb

@@ -1,292 +0,0 @@
-require 'skylight/vendor/beefcake/encode'
-require 'skylight/vendor/beefcake/decode'
-
-module Skylight
-  module Beefcake
-    module Message
-
-      class WrongTypeError < StandardError
-        def initialize(name, exp, got)
-          super("Wrong type `#{got}` given for (#{name}).  Expected #{exp}")
-        end
-      end
-
-
-      class InvalidValueError < StandardError
-        def initialize(name, val)
-          super("Invalid Value given for `#{name}`: #{val.inspect}")
-        end
-      end
-
-
-      class RequiredFieldNotSetError < StandardError
-        def initialize(name)
-          super("Field #{name} is required but nil")
-        end
-      end
-
-
-      class Field < Struct.new(:rule, :name, :type, :fn, :opts)
-        def <=>(o)
-          fn <=> o.fn
-        end
-      end
-
-
-      module Dsl
-        def self.extended(base)
-          initializer = Module.new
-          base.instance_variable_set(:@__initializer, initializer)
-          base.__write_initializer
-          base.send(:include, initializer)
-        end
-
-        def required(name, type, fn, opts={})
-          field(:required, name, type, fn, opts)
-        end
-
-        def repeated(name, type, fn, opts={})
-          field(:repeated, name, type, fn, opts)
-        end
-
-        def optional(name, type, fn, opts={})
-          field(:optional, name, type, fn, opts)
-        end
-
-        def field(rule, name, type, fn, opts)
-          field = Field.new(rule, name, type, fn, opts)
-          indexed_fields[fn] = field
-          fields << field
-          fields.sort!
-          __write_initializer
-          attr_accessor name
-        end
-
-        def fields
-          @fields ||= []
-        end
-
-        def indexed_fields
-          @indexed_fields ||= {}
-        end
-
-        def __write_initializer
-          lines = []
-
-          lines << "def initialize(attrs=nil)"
-          lines << "return unless attrs"
-          fields.each do |fld|
-            lines << "@#{fld.name} = attrs[:#{fld.name}]"
-          end
-
-          lines << "end"
-
-          @__initializer.module_eval(lines.join("\n"), __FILE__, __LINE__+1)
-        end
-      end
-
-      module Encode
-
-        def encode(buf = Buffer.new)
-          validate!
-
-          if ! buf.respond_to?(:<<)
-            raise ArgumentError, "buf doesn't respond to `<<`"
-          end
-
-          if ! buf.is_a?(Buffer)
-            buf = Buffer.new(buf)
-          end
-
-          # TODO: Error if any required fields at nil
-
-          fields.each do |fld|
-            if fld.opts[:packed]
-              bytes = encode!(Buffer.new, fld, 0)
-              buf.append_info(fld.fn, Buffer.wire_for(fld.type))
-              buf.append_uint64(bytes.length)
-              buf << bytes
-            else
-              encode!(buf, fld, fld.fn)
-            end
-          end
-
-          buf
-        end
-
-        def encode!(buf, fld, fn)
-          v = self[fld.name]
-
-          if v.is_a?(Array)
-            v.each do |val|
-              encode_field!(buf, fld.type, val, fn)
-            end
-          else
-            encode_field!(buf, fld.type, v, fn)
-          end
-
-          buf
-        end
-
-        def encode_field!(buf, type, val, fn)
-          return if val.nil?
-
-          case type
-          when Class # encodable
-            # TODO: raise error if type != val.class
-            buf.append(:string, val.encode, fn)
-          when Module # enum
-            if ! valid_enum?(type, val)
-              raise InvalidValueError.new(fld.name, val)
-            end
-
-            buf.append(:int32, val, fn)
-          else
-            buf.append(type, val, fn)
-          end
-        end
-
-        def valid_enum?(mod, val)
-          !!name_for(mod, val)
-        end
-
-        def name_for(mod, val)
-          mod.constants.each do |name|
-            if mod.const_get(name) == val
-              return name
-            end
-          end
-          nil
-        end
-
-        def validate!
-          fields.each do |fld|
-            if fld.rule == :required && self[fld.name].nil?
-              raise RequiredFieldNotSetError, fld.name
-            end
-          end
-        end
-      end
-
-
-      module Decode
-        # Use allocate instead of new for performance
-        def decode(buf, o=self.allocate)
-          if ! buf.is_a?(Buffer)
-            buf = Buffer.new(buf)
-          end
-
-          # TODO: test for incomplete buffer
-          while buf.length > 0
-            fn, wire = buf.read_info
-
-            fld = indexed_fields[fn]
-
-            # We don't have a field for with index fn.
-            # Ignore this data and move on.
-            if fld.nil?
-              buf.skip(wire)
-              next
-            end
-
-            exp = Buffer.wire_for(fld.type)
-            if wire != exp
-              raise WrongTypeError.new(fld.name, exp, wire)
-            end
-
-            if fld.rule == :repeated && fld.opts[:packed]
-              len = buf.read_uint64
-              tmp = Buffer.new(buf.read(len))
-              o[fld.name] ||= []
-              while tmp.length > 0
-                o[fld.name] << tmp.read(fld.type)
-              end
-            elsif fld.rule == :repeated
-              val = buf.read(fld.type)
-              (o[fld.name] ||= []) << val
-            else
-              val = buf.read(fld.type)
-              o[fld.name] = val
-            end
-          end
-
-          # Set defaults
-          fields.each do |f|
-            next if o[f.name] == false
-            o[f.name] ||= f.opts[:default]
-          end
-
-          o.validate!
-
-          o
-        end
-      end
-
-
-      def self.included(o)
-        o.extend Dsl
-        o.extend Decode
-        o.send(:include, Encode)
-      end
-
-      def fields
-        self.class.fields
-      end
-
-      def indexed_fields
-        self.class.indexed_fields
-      end
-
-      def [](k)
-        __send__(k)
-      end
-
-      def []=(k, v)
-        __send__("#{k}=", v)
-      end
-
-      def ==(o)
-        return false if (o == nil) || (o == false)
-        return false unless o.respond_to?(:[])
-        fields.all? do |fld|
-          if fld.rule == :repeated
-            Array(self[fld.name]) == Array(o[fld.name])
-          else
-            self[fld.name] == o[fld.name]
-          end
-        end
-      end
-
-      def inspect
-        set = fields.select {|fld| self[fld.name] != nil }
-
-        flds = set.map do |fld|
-          val = self[fld.name]
-
-          case fld.type
-          when Class
-            "#{fld.name}: #{val.inspect}"
-          when Module
-            title = name_for(fld.type, val) || "-NA-"
-            "#{fld.name}: #{title}(#{val.inspect})"
-          else
-            "#{fld.name}: #{val.inspect}"
-          end
-        end
-
-        "<#{self.class.name} #{flds.join(", ")}>"
-      end
-
-      def to_hash
-        fields.inject({}) do |h, fld|
-          if v = self[fld.name]
-            h[fld.name] = v
-          end
-          h
-        end
-      end
-
-    end
-
-  end
-end