mnemosyne-ruby 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9627e0a03b472040c3b65023a44f1e1cea612bf9
-  data.tar.gz: f76fea84c479995a59b4151b752af13e6a3a33c5
+  metadata.gz: fb0d5bc4abf9f3fbf32db3c4b38176059b4b3041
+  data.tar.gz: 3c088755475af2fb3317d770dbdffb053971257c
 SHA512:
-  metadata.gz: 3ad571be34543f3de3437a05c1c9413f8c90be17153af484f0f3b6627c032ec455a73463452278438b44c85bcb3c92aa14800c1c355b0c307fd2e06d53bbc513
-  data.tar.gz: 7ed59cb08efd1066173b08b32e2c0cf67c2e80cecbabd3a4fe504e1cb9e304f0f48472cada9cba9209f1f36052e3a7c0a11a2a919832d4b671e98987ebe9c429
+  metadata.gz: 83904f7bfc80eb52f9919df216d07302f6a134e517cd103c84c81450bf432f0ba6bf143f5a5b503357f5357f999f9a0285247050bad9a55a15ceda2e9d0c2129
+  data.tar.gz: 22d35f5acb70ac32b2dc7dac905116b0ea3c0aa06ac4d558764897e8c517bab5a12a9d174374bfa154ca974232e0c66f4fe6bdbea8f7e4267962b420164252a5

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.2.1
+
+* Improve AMQP connection recovery
+* Fix dynamic probe loading
+
 ## 1.2.0
 
 * Collect response metadata in rack instrumentation

data/lib/mnemosyne/client.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 require 'bunny'
 
 module Mnemosyne
   class Client
-    attr_reader :connection
+    include ::Mnemosyne::Logging
 
     def initialize(config)
       @config = config
@@ -11,11 +12,11 @@ module Mnemosyne
 
     def connection
       @connection ||= begin
-        @config.logger.info "[Mnemosyne] Connect to #{@config.server}..."
+        logger.info "[Mnemosyne] Connect to #{@config.server}..."
 
         connection = ::Bunny.new @config.amqp,
-          logger: @config.logger,
-          threaded: false
+          logger: logger,
+          heartbeat: :server
 
         connection.start
         connection

data/lib/mnemosyne/configuration.rb

@@ -11,7 +11,6 @@ module Mnemosyne
     attr_reader :platform
     attr_reader :amqp
     attr_reader :exchange
-    attr_reader :logger
     attr_reader :server
 
     def initialize(config) # rubocop:disable AbcSize
@@ -19,7 +18,6 @@ module Mnemosyne
       @application = config.fetch('application', nil).to_s.strip.freeze
       @enabled     = config.fetch('enabled', true)
       @exchange    = config.fetch('exchange', 'mnemosyne').to_s.freeze
-      @logger      = config.fetch('logger') { Logger.new(STDOUT) }
 
       hostname  = config.fetch('hostname') { default_hostname }
       @hostname = hostname.to_s.strip.freeze

data/lib/mnemosyne/instrumenter.rb

@@ -7,16 +7,15 @@ module Mnemosyne
     IDENT = :__mnemosyne_current_trace
     MUTEX = Mutex.new
 
-    attr_reader :logger
+    include ::Mnemosyne::Logging
 
-    def initialize(config:, client:, logger:)
+    def initialize(config:, client:)
       @client = client
       @config = config
-      @logger = logger
 
       ::Mnemosyne::Probes.activate!
 
-      logger.info 'Mnemosyne instrumenter started.'
+      logger.debug(Mnemosyne) { 'Instrumenter started' }
     end
 
     def current_trace
@@ -46,7 +45,7 @@ module Mnemosyne
     end
 
     def submit(trace)
-      logger.debug { "Submit trace #{trace.uuid}" }
+      logger.debug(Mnemosyne) { "Submit trace #{trace.uuid}" }
 
       @client.call trace
     end
@@ -67,17 +66,12 @@ module Mnemosyne
           return @instance if @instance
 
           client = Client.new(config)
-          logger = config.logger
 
-          @instance = new(config: config, client: client, logger: logger)
+          @instance = new(config: config, client: client)
         end
       rescue => err
-        message = "Unable to start instrumenter: #{err}"
-
-        if config && config.respond_to?(:logger)
-          config.logger.warn message
-        else
-          ::Kernel.warn message
+        ::Mnemosyne::Logging.logger.warn(Mnemosyne) do
+          "Unable to start instrumenter: #{err}"
         end
 
         raise
@@ -97,14 +91,6 @@ module Mnemosyne
         instrumenter.trace(*args)
       end
 
-      def logger
-        if (instrumenter = instance)
-          instrumenter.logger
-        else
-          @logger ||= Logger.new($stdout)
-        end
-      end
-
       def current_trace
         return unless (instrumenter = instance)
         instrumenter.current_trace

data/lib/mnemosyne/logging.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Mnemosyne
+  module Logging
+    def logger
+      ::Mnemosyne::Logging.logger
+    end
+
+    class << self
+      attr_writer :logger
+
+      def logger
+        @logger ||= ::Logger.new($stdout).tap do |logger|
+          logger.level = ::Logger::INFO
+        end
+      end
+    end
+  end
+end

data/lib/mnemosyne/probe.rb

@@ -2,6 +2,8 @@
 
 module Mnemosyne
   class Probe
+    include ::Mnemosyne::Logging
+
     def install
       setup
 
@@ -14,9 +16,7 @@ module Mnemosyne
         end
       end
 
-      ::Mnemosyne::Instrumenter.logger.debug do
-        "Installed probe #{self.class.name}"
-      end
+      logger.debug(Mnemosyne) { "Installed probe #{self.class.name}" }
     end
 
     def setup

data/lib/mnemosyne/probes.rb

@@ -11,6 +11,10 @@ module Mnemosyne
         registry.activate!
       end
 
+      def required(path)
+        registry.required(path)
+      end
+
       private
 
       def registry
@@ -27,7 +31,7 @@ module Kernel
     ret = require_without_mn(name)
 
     begin
-      ::Mnemosyne::Probes.registry.required(name)
+      ::Mnemosyne::Probes.required(name)
     rescue Exception # rubocop:disable RescueException, HandleExceptions
     end
 

data/lib/mnemosyne/railtie.rb

@@ -7,8 +7,9 @@ module Mnemosyne
     initializer 'mnemosyne.initialize' do |app|
       config = app.config_for('mnemosyne')
 
+      ::Mnemosyne::Logging.logger = Rails.logger
+
       config['application'] ||= app.class.name.underscore.titleize
-      config['logger']      ||= Rails.logger
 
       # If server is configured mnemosyne should be enabled by default
       config['enabled'] = config.key?('server') unless config.key?('enabled')
@@ -20,7 +21,7 @@ module Mnemosyne
 
         app.middleware.insert 0, ::Mnemosyne::Middleware::Rack
       else
-        config.logger.warn '[MNEMOSYNE] Instrumenter not enabled.'
+        Rails.logger.warn(Mnemosyne) { 'Instrumentation disabled' }
       end
     end
   end

data/lib/mnemosyne/registry.rb

@@ -53,6 +53,12 @@ module Mnemosyne
       activate(registration) if activated?
     end
 
+    def required(path)
+      return unless activated?
+      return unless (set = monitor.delete(path))
+      set.each(&method(:activate))
+    end
+
     private
 
     attr_reader :monitor
@@ -67,19 +73,16 @@ module Mnemosyne
 
     class Monitor
       def initialize
-        @requirements = {}
+        @requirements = Hash.new {|h, k| h[k] = Set.new }
       end
 
-      def <<(registration)
-        registration.require_paths.each do |path|
-          @requirements[path] ||= []
-          @requirements[path] << registration
-        end
+      def delete(path)
+        @requirements.delete(path)
       end
 
-      def delete(registration)
+      def <<(registration)
         registration.require_paths.each do |path|
-          @requirements[path].delete(registration)
+          @requirements[path] << registration
         end
       end
     end

data/lib/mnemosyne/version.rb

@@ -4,7 +4,7 @@ module Mnemosyne
   module VERSION
     MAJOR = 1
     MINOR = 2
-    PATCH = 0
+    PATCH = 1
     STAGE = nil
 
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')

data/lib/mnemosyne-ruby.rb

@@ -1 +1,4 @@
+# rubocop:disable FileName
+# frozen_string_literal: true
+
 require 'mnemosyne'

data/lib/mnemosyne.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'mnemosyne/version'
 
 require 'active_support'
@@ -6,6 +7,8 @@ require 'active_support/core_ext/object/blank'
 require 'active_support/notifications'
 
 module Mnemosyne
+  require 'mnemosyne/logging'
+
   require 'mnemosyne/global'
   extend Global
 

data/mnemosyne-ruby.gemspec

@@ -14,7 +14,9 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'http://github.com/jgraichen/mnemosyne-ruby'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
   spec.bindir        = 'bin'
   spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
   spec.require_paths = %w(lib)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mnemosyne-ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-04 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -131,6 +131,7 @@ files:
 - lib/mnemosyne/configuration.rb
 - lib/mnemosyne/global.rb
 - lib/mnemosyne/instrumenter.rb
+- lib/mnemosyne/logging.rb
 - lib/mnemosyne/middleware/acfs.rb
 - lib/mnemosyne/middleware/rack.rb
 - lib/mnemosyne/middleware/sidekiq.rb
@@ -180,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby/Rails client for Mnemosynce