optic-rails 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 742a1530b45eaca262ba37280f346065e5d56e5ca514fceb5fa64c1bee6b731f
-  data.tar.gz: c325342f0774b9d3ab8ab6365816a07d1b81aa3d8a673ad6a8f030810f87bd82
+  metadata.gz: 8ffe914a1df59184ac225cc960634735a71a437b770ae7ab9c22b4eca2fb6f46
+  data.tar.gz: 24912fa3c973cd9d879a480a5f7797c3250b4cfa88e64b112aa9bcff54471efc
 SHA512:
-  metadata.gz: f21fcbdc22b6edb52a4fb249afe3362479fe37e9771a7df4be3ece58b0764f4114e3ab343440dc7f26490f23a4feabde3dd7e3fbbcf59ed0bd662b0eb3ee0ae0
-  data.tar.gz: 9b9fff52ff66296abc2b9b79d964f24804c9dfec1431744939d339e8a01fe7de837ded9ddc739347fae107fa05a6011f1c516c84900f61f30af7e13065dda9d6
+  metadata.gz: 9e96164ddef86ce2cf6f2351f221eb1a0dcf8d03bcfdec9aa70d90b1b160ca6f18135376bf249bcecb9a433a17400596de7e0a47e8ac1afe40b4f29021c7a4df
+  data.tar.gz: 9750272605b12a86c50fa356f2f7e09cf72e3889bb2cf6cea91ed34bb6ab0834409bea1611316271de6987de0441d09491fb03a7dda6d0399b0d9a484899fefc

data/lib/optic/rails.rb

@@ -103,13 +103,20 @@ module Optic
       }
     end
 
+    def self.execute_sql_query(sql)
+      ActiveRecord::Base.connection_pool.with_connection do |connection|
+        connection.execute(sql)
+      end
+    end
+
     def self.get_metrics(pivot_name)
       pivot = pivot_name.constantize
 
       result = {
         entity_totals: [],
         pivot_name: pivot.name,
-        pivot_values: pivot.all.as_json, # TODO this is slow and possibly brings in sensitive info
+        # TODO filter columns, spread over multiple queries
+        pivot_values: execute_sql_query(pivot.unscoped.select("*").to_sql).to_a,
         pivoted_totals: []
         # TODO also return computed "spanning" tree of objects from the pivot's POV (using the dijkstra paths from below)
       }
@@ -121,7 +128,8 @@ module Optic
       edge_weights = lambda { |_| 1 }
 
       graph.vertices.each do |vertex|
-        result[:entity_totals] << { name: vertex.name, total: vertex.count }
+        count_query = vertex.unscoped.select("COUNT(*)").to_sql
+        result[:entity_totals] << { name: vertex.name, total: execute_sql_query(count_query).first["count"] }
 
         next if vertex == pivot # Skip pivoted metrics if this is the pivot
 
@@ -137,9 +145,9 @@ module Optic
           end
 
           joins = belongs_to_names.reverse.inject { |acc, elt| { elt => acc } }
-          query = vertex.unscoped.joins(joins).group(qualified_primary_key(pivot))
+          query = vertex.unscoped.joins(joins).group(qualified_primary_key(pivot)).select(qualified_primary_key(pivot), "COUNT(#{qualified_primary_key(vertex)})").to_sql
 
-          result[:pivoted_totals] << { entity_name: vertex.name, totals: query.count }
+          result[:pivoted_totals] << { entity_name: vertex.name, totals: Hash[execute_sql_query(query).map { |record| [record["id"], record["count"]] }] }
         else
           p "WARNING: No path from #{vertex.name} to #{pivot.name}"
         end

data/lib/optic/rails/railtie.rb

@@ -1,12 +1,14 @@
 require "action_cable_client"
 require "eventmachine"
+require "logger"
 
 module Optic
   module Rails
     class Railtie < ::Rails::Railtie
       initializer "optic_rails.launch_client_thread" do |app|
-        # TODO use tagged logger, make it clear which thread log messages are coming from
-        logger = ::Rails.logger
+        # TODO allow log output customization and verbose option
+        logger = Logger.new(STDOUT)
+        logger.level = Logger::WARN
 
         # Get configuration
         if !app.config.respond_to? :optic_api_key
@@ -30,14 +32,13 @@ module Optic
                 end
 
                 client.disconnected do
-                  logger.warn "Optic agent disconnected, killing client thread"
+                  logger.info "Optic agent disconnected, killing client thread"
                   EventMachine.stop
                 end
 
                 client.errored do |msg|
                   logger.warn "Optic agent error: #{msg}"
                   EventMachine.stop
-                  # TODO stop worker?
                 end
 
                 client.subscribed do
@@ -68,7 +69,7 @@ module Optic
                 end
               end
 
-              logger.warn "Stopping worker thread"
+              logger.info "Stopping worker thread"
             end
 
             begin
@@ -77,7 +78,7 @@ module Optic
               logger.error "Worker thread died with error: #{e}"
             end
 
-            logger.warn "Supervisor thread detected dead worker, sleeping"
+            logger.info "Supervisor thread detected dead worker, sleeping"
             sleep 5.0
             logger.debug "Supervisor thread done sleeping"
           end

data/lib/optic/rails/version.rb

@@ -1,5 +1,5 @@
 module Optic
   module Rails
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optic-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Anton Vaynshtok