cassie 1.0.0.beta.7 → 1.0.0.beta.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bbb50f81c0b640ebea73e406a3bbeb7b5136b4d
-  data.tar.gz: 692eab44def99331fb152f9a71aed257c80ae1a9
+  metadata.gz: 49c8a1b3bd425573a87262ce9039546092ae8cdd
+  data.tar.gz: 21be67660a39aaad7c1dad0bc7e64a90400668bc
 SHA512:
-  metadata.gz: eb4ceb81237d249ed4d7ca3fb81d7e957a82a535e35998f8636da779c60153f381213f77d648ed248859f4bb333743f0b6e3cfd422a286b27b337221d6714c0e
-  data.tar.gz: 4a278a5c82d8e893a487c58f8b641cb2bb40808f0812b187ede5575f06e4c8c6df53a4681a6d45957233dbf4c5027bb3eeeb7a26c263c5087bed35d43fb80955
+  metadata.gz: ae12ca81c7063c1f149624b722830d0a1d3cb4c420fa3ecf71d26895b154b866dc84711d4361642994c5eb99351730df26cb3f896b02c4316c2ad93d79dc8f9c
+  data.tar.gz: cb1543b03d2e7a85f8cd1f3e18566b1920681f603bdc239d212b11d74dcc7dbcfacf2737d26e356fc50afb722f0b0bff1a9eaca572ccae9f677691a5570e4deb

data/lib/cassie/queries/instrumentation/execution.rb

@@ -0,0 +1,15 @@
+module Cassie::Queries::Instrumentation
+  module Execution
+
+    def execute
+      instrumenter.instrument("cassie.cql.execution") do |payload|
+        execution_val = super #execution populates #result
+
+        payload[:execution_info] = result.execution_info if result.respond_to?(:execution_info)
+        execution_val
+      end
+    end
+  end
+end
+
+

data/lib/cassie/queries/instrumentation/loading.rb

@@ -0,0 +1,15 @@
+module Cassie::Queries::Instrumentation
+  module Loading
+
+    protected
+
+    def build_resources(rows)
+      instrumenter.instrument("cassie.cql.execution.loading") do |payload|
+        payload[:count] = rows.count if rows.respond_to?(:count)
+        super
+      end
+    end
+  end
+end
+
+

data/lib/cassie/queries/instrumentation.rb

@@ -1,18 +1,12 @@
+require_relative 'instrumentation/execution'
+require_relative 'instrumentation/loading'
+
 module Cassie::Queries
   module Instrumentation
     extend ::ActiveSupport::Concern
 
-    def execute
-      instrument { super }
-    end
-
-    def instrument #:nodoc:
-      instrumenter.instrument("cql.execute") do |payload|
-        execution_val = yield # execution populates #result
-
-        payload[:execution_info] = result.execution_info if result.respond_to?(:execution_info)
-        execution_val
-      end
+    included do
+      include Execution
     end
 
     protected

data/lib/cassie/queries/logging/cql_execution_event.rb

@@ -10,6 +10,7 @@ module Cassie::Queries::Logging
 
     def message
       {
+        event: "cassie.cql.execution",
         duration: duration.round(1),
         query: statement,
         consistency: consistency.upcase

data/lib/cassie/queries/logging/cql_execution_loading_event.rb

@@ -0,0 +1,36 @@
+module Cassie::Queries::Logging
+  class CqlExecutionLoadingEvent < ActiveSupport::Notifications::Event
+
+    def count
+      payload[:count]
+    end
+
+    def message
+      {
+        event: "cassie.cql.execution.loading",
+        duration: duration.round(1),
+        count: count
+      }.extend(Inspector)
+    end
+
+    module Inspector
+      def inspect
+        indent(1, color("(#{fetch(:duration).round(1)}ms) #{fetch(:count)} #{'resource'.pluralize(fetch(:count))} built from query result"))
+      end
+
+      def to_s
+        inspect
+      end
+
+      protected
+
+      def color(message)
+        "\e[1m\e[37m#{message}\e[0m\e[22m"
+      end
+
+      def indent(count=1, str)
+        "  " * count + str
+      end
+    end
+  end
+end

data/lib/cassie/queries/logging/subscription.rb

@@ -1,22 +1,24 @@
 require_relative 'cql_execution_event'
+require_relative 'cql_execution_loading_event'
 
 module Cassie::Queries::Logging
   module Subscription
     extend ::ActiveSupport::Concern
 
     included do
-      ActiveSupport::Notifications.subscribe('cql.execute') do |*args|
-        # args:
-        # name    # => String, name of the event (such as 'render' from above)
-        # start   # => Time, when the instrumented block started execution
-        # finish  # => Time, when the instrumented block ended execution
-        # id      # => String, unique ID for this notification
-        # payload # => Hash, the payload
-        #             [:exception] => if raised during event
+      ActiveSupport::Notifications.subscribe('cassie.cql.execution') do |*args|
+        # don't log if instrumentation failed
         unless args.last[:exception]
           logger.debug(CqlExecutionEvent.new(*args).message)
         end
       end
+
+      ActiveSupport::Notifications.subscribe('cassie.cql.execution.loading') do |*args|
+        # don't log if instrumentation failed
+        unless args.last[:exception]
+          logger.debug(CqlExecutionLoadingEvent.new(*args).message)
+        end
+      end
     end
   end
 end

data/lib/cassie/queries/statement/execution.rb

@@ -5,6 +5,8 @@ module Cassie::Queries::Statement
     extend ActiveSupport::Concern
 
     included do
+      attr_reader :result
+
       include Consistency
     end
 

data/lib/cassie/queries/statement/fetching.rb

@@ -11,6 +11,9 @@ module Cassie::Queries::Statement
     included do
       include Loading
       include Batches
+      #TODO: should this be loaded from instrumentation
+      # by using notifications when fetching is loaded?
+      include Cassie::Queries::Instrumentation::Loading
     end
 
     # Returns array of rows or empty array

data/lib/cassie/queries/statement.rb

@@ -29,8 +29,6 @@ module Cassie::Queries
       include Updating
       include Inserting
 
-      attr_reader :result
-
       class << self
         attr_accessor :table
         attr_accessor :type

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassie
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.7
+  version: 1.0.0.beta.8
 platform: ruby
 authors:
 - Evan Prothro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -126,8 +126,11 @@ files:
 - lib/cassie/logger.rb
 - lib/cassie/queries/README.md
 - lib/cassie/queries/instrumentation.rb
+- lib/cassie/queries/instrumentation/execution.rb
+- lib/cassie/queries/instrumentation/loading.rb
 - lib/cassie/queries/logging.rb
 - lib/cassie/queries/logging/cql_execution_event.rb
+- lib/cassie/queries/logging/cql_execution_loading_event.rb
 - lib/cassie/queries/logging/subscription.rb
 - lib/cassie/queries/statement.rb
 - lib/cassie/queries/statement/assignment.rb