cassie 1.0.0.beta.29 → 1.0.0.beta.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c90b951d56530cc2918328a804cf6d8c5763f5b
-  data.tar.gz: 6c780aee83ce4a01b70050e3f843de9dc9c144d2
+  metadata.gz: faffda9455104b05f68acd9313cbc3ba48ba0f47
+  data.tar.gz: 24bc30a2b15426d1ff225f23284b0683fc8de7b8
 SHA512:
-  metadata.gz: 086fad192b6335fa9bef4dbb7e3969f6f96036cfb2003f9223548c87ba2e60e597d443f6063e6a9572a1a3d6dbb7cbe4836cf264d56cc48da56ac11ca6c92c4c
-  data.tar.gz: b22ebc36e2c20273bb9bcfd464970bb4750c97307493b1be8ab8db65f7bc6a7b62500e7080144bbcf2096071ba83a5de27eb063fb1f77fbc87f91ef1cec882ab
+  metadata.gz: 5e7efbf49fbf44bb0f76694fc8d8fb600463fc3886872ba68d9806626cc96ff430c668fad6fcbe430dd14344d9d0055eb6dc82677c409d36e6435ac71f71fca0
+  data.tar.gz: 1c023dc9ef689426606452abdd438649635ad3078437f77b401b16d52a422affcd0072e8977b3f6efd378d9f29e54526b8bdc96199d2504aad51288a9ed09fe6

data/lib/cassie/connection_handler/cluster/instrumentation.rb

@@ -0,0 +1,15 @@
+module Cassie::ConnectionHandler::Cluster
+  module Instrumentation
+
+    protected
+
+    def initialize_cluster
+      Cassie.instrumenter.instrument("cassie.cluster.connect") do |payload|
+        super.tap do |cluster|
+          payload[:hosts] = cluster.hosts
+          payload[:name] = cluster.name
+        end
+      end
+    end
+  end
+end

data/lib/cassie/connection_handler/cluster.rb

@@ -1,5 +1,3 @@
-require 'benchmark'
-
 module Cassie::ConnectionHandler
   # ## Cassie::ConnectionHandler::Cluster
   #
@@ -8,22 +6,24 @@ module Cassie::ConnectionHandler
   # Include in any class or module that responds to `configuration` with
   # a cassandra cluster options hash.
   module Cluster
+    require_relative 'cluster/instrumentation'
+    extend ActiveSupport::Concern
+
+    included do
+      include Instrumentation
+    end
 
     def cluster
       # Cassandra::cluster parses suppored
       # options from the passed hash, no need
       # to validate/transform ourselves yet
-      @cluster ||= begin
-        _cluster = nil
-        config = configuration.try(:symbolize_keys)
+      @cluster ||= initialize_cluster
+    end
 
-        sec = Benchmark.realtime do
-          _cluster = Cassandra.cluster(config)
-        end
+    protected
 
-        logger.info "(#{(sec*1000).round(2)}ms) Connected to Cassandra cluster #{config[:hosts]}"
-        _cluster
-      end
+    def initialize_cluster
+      Cassandra.cluster(configuration.try(:symbolize_keys))
     end
   end
 end

data/lib/cassie/connection_handler/logging/cluster_connect_event.rb

@@ -0,0 +1,31 @@
+module Cassie::ConnectionHandler::Logging
+  class ClusterConnectEvent < ActiveSupport::Notifications::Event
+
+    def hosts
+      payload[:hosts] || []
+    end
+
+    def ips
+      hosts.map{ |h| h.ip.to_s }
+    end
+
+    def message
+      {
+        event: "cassie.cluster.connect",
+        duration: duration.round(1),
+        hosts: ips,
+        name: payload[:name]
+      }.extend(Inspector)
+    end
+
+    module Inspector
+      def inspect
+        "(#{fetch(:duration).round(1)}ms) Connected to Cassandra cluster. #{fetch(:name)}: #{fetch(:hosts)}"
+      end
+
+      def to_s
+        inspect
+      end
+    end
+  end
+end

data/lib/cassie/connection_handler/logging/cluster_connect_subscriber.rb

@@ -0,0 +1,19 @@
+require_relative 'cluster_connect_event'
+
+module Cassie::ConnectionHandler::Logging
+  class ClusterConnectSubscriber
+
+    def call(*args)
+      # don't log if instrumentation failed
+      unless args.last[:exception]
+        logger.info(ClusterConnectEvent.new(*args).message)
+      end
+    end
+
+    def logger
+      Cassie::Statements.logger
+    end
+
+    ActiveSupport::Notifications.subscribe('cassie.cluster.connect', new)
+  end
+end

data/lib/cassie/connection_handler/logging/session_connect_event.rb

@@ -0,0 +1,26 @@
+module Cassie::ConnectionHandler::Logging
+  class SessionConnectEvent < ActiveSupport::Notifications::Event
+
+    def keyspace
+      payload[:keyspace] || "[none]"
+    end
+
+    def message
+      {
+        event: "cassie.session.connect",
+        duration: duration.round(1),
+        keyspace: keyspace
+      }.extend(Inspector)
+    end
+
+    module Inspector
+      def inspect
+        "(#{fetch(:duration).round(1)}ms) Session opened to Cassandra cluster. Keyspace: #{fetch(:keyspace)}"
+      end
+
+      def to_s
+        inspect
+      end
+    end
+  end
+end

data/lib/cassie/connection_handler/logging/session_connect_subscriber.rb

@@ -0,0 +1,19 @@
+require_relative 'session_connect_event'
+
+module Cassie::ConnectionHandler::Logging
+  class SessionConnectSubscriber
+
+    def call(*args)
+      # don't log if instrumentation failed
+      unless args.last[:exception]
+        logger.info(SessionConnectEvent.new(*args).message)
+      end
+    end
+
+    def logger
+      Cassie::Statements.logger
+    end
+
+    ActiveSupport::Notifications.subscribe('cassie.session.connect', new)
+  end
+end

data/lib/cassie/connection_handler/logging.rb

@@ -0,0 +1,7 @@
+module Cassie::ConnectionHandler
+  module Logging
+    require_relative 'logging/cluster_connect_subscriber'
+    require_relative 'logging/session_connect_subscriber'
+
+  end
+end

data/lib/cassie/connection_handler/sessions/instrumentation.rb

@@ -0,0 +1,12 @@
+module Cassie::ConnectionHandler::Sessions
+  module Instrumentation
+
+    protected
+
+    def initialize_session(*args)
+      Cassie.instrumenter.instrument("cassie.session.connect") do |payload|
+        super(*args)
+      end
+    end
+  end
+end

data/lib/cassie/connection_handler/sessions.rb

@@ -1,27 +1,24 @@
-require 'benchmark'
-
 module Cassie::ConnectionHandler
   module Sessions
+    require_relative 'sessions/instrumentation'
+    extend ActiveSupport::Concern
+
+    included do
+      include Instrumentation
+    end
 
     def sessions
       @sessions ||= {}
     end
 
-    def session(_keyspace=self.keyspace)
-      sessions[_keyspace] || connect(_keyspace)
+    def session(keyspace=self.keyspace)
+      sessions[keyspace] || initialize_session(keyspace)
     end
 
     protected
 
-    def connect(_keyspace)
-      _session = nil
-
-      sec = Benchmark.realtime do
-        _session = cluster.connect(_keyspace)
-      end
-
-      logger.info "(#{(sec*1000).round(2)}ms) Session opened to Cassandra[#{_keyspace}]"
-      @sessions[_keyspace] = _session
+    def initialize_session(keyspace)
+      @sessions[keyspace] = cluster.connect(keyspace)
     end
   end
 end

data/lib/cassie/connection_handler.rb

@@ -6,6 +6,7 @@ module Cassie
   module ConnectionHandler
     require_relative 'connection_handler/cluster'
     require_relative 'connection_handler/sessions'
+    require_relative 'connection_handler/logging'
 
     include Cluster
     include Sessions

data/lib/cassie/{statements/instrumenting.rb → instrumentation.rb}

@@ -1,5 +1,4 @@
-module Cassie::Statements
-
+module Cassie
   def self.instrumenter
     @instrumenter ||= ActiveSupport::Notifications
   end

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

@@ -2,17 +2,13 @@ module Cassie::Statements::Execution
   module Instrumentation
 
     def execute
-      instrumenter.instrument("cassie.cql.execution") do |payload|
+      Cassie.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
-
-    def instrumenter
-      Cassie::Statements.instrumenter
-    end
   end
 end
 

data/lib/cassie/statements/execution/partition_linking/cursoring_policy.rb

@@ -2,12 +2,12 @@ require_relative 'simple_policy'
 
 module Cassie::Statements::Execution::PartitionLinking
   class CursoringPolicy < SimplePolicy
-    
+
     def combine_rows(rows_a, rows_b)
       return super unless peeking_execution.since_cursor
       rows_b
     end
-    
+
     def adjust_limit
       return super unless peeking_execution.since_cursor
       # leave the limit to return all results
@@ -17,18 +17,18 @@ module Cassie::Statements::Execution::PartitionLinking
     def seek_partition?
       return super unless peeking_execution.since_cursor
       raise "linking partitions only supported for descending orderings. Open an issue if you need this!" if ascending?
-      
+
       # linking while cursoring with since
       # should return latest results
       current_key != last_key
     end
-    
+
     def previous_key(current_key)
       return super unless peeking_execution.since_cursor
-      
+
       # linking while cursoring with since
       # should return results from latest partition
-      last_key 
+      last_key
     end
   end
 end

data/lib/cassie/statements/execution/results/instrumentation.rb

@@ -4,15 +4,11 @@ module Cassie::Statements::Results
     protected
 
     def records
-      instrumenter.instrument("cassie.deserialize") do |payload|
+      Cassie.instrumenter.instrument("cassie.deserialize") do |payload|
         records = super
         payload[:count] = records.count if records.respond_to?(:count)
         records
       end
     end
-
-    def instrumenter
-      Cassie::Statements.instrumenter
-    end
   end
 end

data/lib/cassie/statements.rb

@@ -3,7 +3,6 @@ module Cassie
     require_relative 'statements/core'
     require_relative 'statements/query'
     require_relative 'statements/modification'
-    require_relative 'statements/instrumenting'
     require_relative 'statements/logging'
   end
 end

data/lib/cassie/version.rb

@@ -1,3 +1,3 @@
 module Cassie
-  VERSION = "1.0.0.beta.29"
+  VERSION = "1.0.0.beta.30"
 end

data/lib/cassie.rb

@@ -14,6 +14,7 @@ require 'cassandra'
 module Cassie
   require_relative 'cassie/support'
   require_relative 'cassie/logger'
+  require_relative 'cassie/instrumentation'
   require_relative 'cassie/configuration'
   require_relative 'cassie/connection_handler'
   require_relative 'cassie/connection'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassie
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.29
+  version: 1.0.0.beta.30
 platform: ruby
 authors:
 - Evan Prothro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -100,8 +100,16 @@ files:
 - lib/cassie/connection_handler.rb
 - lib/cassie/connection_handler/README.md
 - lib/cassie/connection_handler/cluster.rb
+- lib/cassie/connection_handler/cluster/instrumentation.rb
+- lib/cassie/connection_handler/logging.rb
+- lib/cassie/connection_handler/logging/cluster_connect_event.rb
+- lib/cassie/connection_handler/logging/cluster_connect_subscriber.rb
+- lib/cassie/connection_handler/logging/session_connect_event.rb
+- lib/cassie/connection_handler/logging/session_connect_subscriber.rb
 - lib/cassie/connection_handler/sessions.rb
+- lib/cassie/connection_handler/sessions/instrumentation.rb
 - lib/cassie/definition.rb
+- lib/cassie/instrumentation.rb
 - lib/cassie/logger.rb
 - lib/cassie/migration.rb
 - lib/cassie/migration/README.md
@@ -144,7 +152,6 @@ files:
 - lib/cassie/statements/execution/results/query_result.rb
 - lib/cassie/statements/execution/results/querying.rb
 - lib/cassie/statements/execution/results/result.rb
-- lib/cassie/statements/instrumenting.rb
 - lib/cassie/statements/logging.rb
 - lib/cassie/statements/logging/deserialize_event.rb
 - lib/cassie/statements/logging/deserialize_subscriber.rb