dry-monitor 0.1.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ca2399eb8989f99e9840024b317599e731b2e357
-  data.tar.gz: 01e127fab50b60edcc4ac61846907341fd826e23
+SHA256:
+  metadata.gz: d81f64e41a8aefe7efc798b025228ea7c29d7b6228bbf6992f31b3aa2a7ae38d
+  data.tar.gz: b4eb4c4928bb5aacc9f160f7caba9047b2bcac5e77934407697a6f910f5808b0
 SHA512:
-  metadata.gz: 5175053c85e8ae01f9892a3e17fe3e2c54820379cfabde8624893ff35833d7aa9c34bc3c1bf741cab7be77fd519fd6c8bc825997934b58506a3769e63d3bc669
-  data.tar.gz: f01dc548ac3b1f02f72d6b5c7ed875b3100e86af9d6168be33b6910c1170979675cd4634e393dc41c53bc404ec947d2e3c38a11b3ae6d0e132b91298d62900fb
+  metadata.gz: 174dbc6c5c059a6a22ddb37b38c211690735de3e9efa97b2826e1f3190123f7a21af54f75ca72d226a18c8671eaa6856b406336217d23326ffc9561a3ed0716a
+  data.tar.gz: e249416fc29c6296d6c6cbe3488e5899a877224cdcc247f06cbd1fc2789c4fa4514575e884b26793947cc92f645816f765e50ccc2f8d31df4f783523f0b8220e

data/CHANGELOG.md

@@ -1,45 +1,120 @@
-# v0.1.2 2018-01-04
+<!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
+
+## 0.4.0 
+
 
 ### Fixed
 
-* Rack logger no longer prevents arbitrary payload in `:error` events (solnic)
+- Compatibility with MRI 3.0 (@alex-damian-negru)
+
+
+[Compare v0.3.2...master](https://github.com/dry-rb/dry-monitor/compare/v0.3.2...master)
+
+## 0.3.2 2020-04-09
+
+
+### Fixed
+
+- Ensure `Dry::Monitor::Rack::Middleware` is compatible with `Rack::Builder#use` (@jodosha)
+
+### Changed
+
+- Performance improvements (@davydovanton)
+
+[Compare v0.3.1...v0.3.2](https://github.com/dry-rb/dry-monitor/compare/v0.3.1...v0.3.2)
+
+## 0.3.1 2019-06-18
 
-# v0.1.1 2018-01-03
 
 ### Fixed
 
-* Query params containing arrays of primitives (e.g. `?ids[]=1&ids[]=2`) no longer crash the logger (timriley)
+- Uninitialized constant `Dry::Monitor::Notifications::EMPTY_HASH` when no payload given (@mensfeld)
+
+
+[Compare v0.3.0...v0.3.1](https://github.com/dry-rb/dry-monitor/compare/v0.3.0...v0.3.1)
+
+## 0.3.0 2019-01-29
 
-# v0.1.0 2018-01-02
 
 ### Fixed
 
-* Query params are logged correctly via rack middleware (solnic)
+- cannot load such file -- rack/utils (mensfeld)
 
 ### Changed
 
-* Uses `dry-events` for notifications (solnic)
+- Make `rack` logger into a plugin (mensfeld)
+- Make `sql` logger into a plugin (mensfeld)
+
+[Compare v0.2.0...v0.3.0](https://github.com/dry-rb/dry-monitor/compare/v0.2.0...v0.3.0)
+
+## 0.2.0 2018-01-21
 
-# v0.0.3 2017-08-28
 
 ### Changed
 
-* Update default theme setting for compatibility with latest version of rouge (alexandru-calinoiu)
-* Require latest version of rouge gem (timriley)
+- Make `rouge` an optional dependency (davydovanton & mensfeld)
+
+[Compare v0.1.2...v0.2.0](https://github.com/dry-rb/dry-monitor/compare/v0.1.2...v0.2.0)
+
+## 0.1.2 2018-01-04
+
+
+### Fixed
+
+- Rack logger no longer prevents arbitrary payload in `:error` events (solnic)
+
+
+[Compare v0.1.1...v0.1.2](https://github.com/dry-rb/dry-monitor/compare/v0.1.1...v0.1.2)
+
+## 0.1.1 2018-01-03
+
+
+### Fixed
+
+- Query params containing arrays of primitives (e.g. `?ids[]=1&ids[]=2`) no longer crash the logger (timriley)
+
+
+[Compare v0.1.0...v0.1.1](https://github.com/dry-rb/dry-monitor/compare/v0.1.0...v0.1.1)
+
+## 0.1.0 2018-01-02
+
+
+### Fixed
+
+- Query params are logged correctly via rack middleware (solnic)
+
+### Changed
+
+- Uses `dry-events` for notifications (solnic)
+
+[Compare v0.0.3...v0.1.0](https://github.com/dry-rb/dry-monitor/compare/v0.0.3...v0.1.0)
+
+## 0.0.3 2017-08-28
+
+
+### Changed
+
+- Update default theme setting for compatibility with latest version of rouge (alexandru-calinoiu)
+- Require latest version of rouge gem (timriley)
+
+[Compare v0.0.2...v0.0.3](https://github.com/dry-rb/dry-monitor/compare/v0.0.2...v0.0.3)
+
+## 0.0.2 2017-02-02
 
-# v0.0.2 2017-02-02
 
 ### Added
 
-* `Dry::Monitor::Rack::Middleware#on` shortcut (solnic)
-* `Dry::Monitor::Rack::Middleware#instrument` shortcut (solnic)
-* `Dry::Monitor::SQL::Logger` can be configured with a custom message template (solnic)
+- `Dry::Monitor::Rack::Middleware#on` shortcut (solnic)
+- `Dry::Monitor::Rack::Middleware#instrument` shortcut (solnic)
+- `Dry::Monitor::SQL::Logger` can be configured with a custom message template (solnic)
 
 ### Changed
 
-* `Dry::Monitor::Rack::Logger#{subscribe=>attach}` and now it accepts a rack middleware instance (solnic)
-* `Dry::Monitor::Rack::Logger` appends new lines when logging `:rack.request.stop` events (solnic)
+- `Dry::Monitor::Rack::Logger#{subscribe=>attach}` and now it accepts a rack middleware instance (solnic)
+- `Dry::Monitor::Rack::Logger` appends new lines when logging `:rack.request.stop` events (solnic)
+
+[Compare v0.0.1...v0.0.2](https://github.com/dry-rb/dry-monitor/compare/v0.0.1...v0.0.2)
 
-# v0.0.1 2017-02-01
+## 0.0.1 2017-02-01
 
 First public release

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Ruby Object Mapper
+Copyright (c) 2015-2021 dry-rb team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -1,25 +1,28 @@
 [gem]: https://rubygems.org/gems/dry-monitor
-[travis]: https://travis-ci.org/dry-rb/dry-monitor
-[gemnasium]: https://gemnasium.com/dry-rb/dry-monitor
-[codeclimate]: https://codeclimate.com/github/dry-rb/dry-monitor
-[coveralls]: https://coveralls.io/r/dry-rb/dry-monitor
+[actions]: https://github.com/dry-rb/dry-monitor/actions
+[codacy]: https://www.codacy.com/gh/dry-rb/dry-monitor
+[chat]: https://dry-rb.zulipchat.com
 [inchpages]: http://inch-ci.org/github/dry-rb/dry-monitor
 
-# dry-monitor [![Join the chat at https://gitter.im/dry-rb/chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dry-rb/chat)
+# dry-monitor [![Join the chat at https://dry-rb.zulipchat.com](https://img.shields.io/badge/dry--rb-join%20chat-%23346b7a.svg)][chat]
 
 [![Gem Version](https://badge.fury.io/rb/dry-monitor.svg)][gem]
-[![Build Status](https://travis-ci.org/dry-rb/dry-monitor.svg?branch=master)][travis]
-[![Dependency Status](https://gemnasium.com/dry-rb/dry-monitor.svg)][gemnasium]
-[![Code Climate](https://codeclimate.com/github/dry-rb/dry-monitor/badges/gpa.svg)][codeclimate]
-[![Test Coverage](https://codeclimate.com/github/dry-rb/dry-monitor/badges/coverage.svg)][codeclimate]
+[![CI Status](https://github.com/dry-rb/dry-monitor/workflows/ci/badge.svg)][actions]
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/984c4274e56d423a818e7a1bf5e963d0)][codacy]
+[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/984c4274e56d423a818e7a1bf5e963d0)][codacy]
 [![Inline docs](http://inch-ci.org/github/dry-rb/dry-monitor.svg?branch=master)][inchpages]
 
-Monitoring and instrumentation APIs.
+## Links
 
-## Synopsis
+* [User documentation](http://dry-rb.org/gems/dry-monitor)
+* [API documentation](http://rubydoc.info/gems/dry-monitor)
 
-``` ruby
-```
+## Supported Ruby versions
+
+This library officially supports the following Ruby versions:
+
+* MRI >= `2.5`
+* jruby >= `9.2`
 
 ## License
 

data/dry-monitor.gemspec

@@ -1,26 +1,39 @@
-# coding: utf-8
-require File.expand_path('../lib/dry/monitor/version', __FILE__)
+# frozen_string_literal: true
+# this file is managed by dry-rb/devtools project
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'dry/monitor/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'dry-monitor'
-  spec.version       = Dry::Monitor::VERSION
-  spec.authors       = ['Piotr Solnica']
-  spec.email         = ['piotr.solnica@gmail.com']
-  spec.summary       = 'Monitoring and instrumentation APIs'
-  spec.homepage      = 'https://github.com/dry-rb/dry-monitor'
+  spec.authors       = ["Piotr Solnica"]
+  spec.email         = ["piotr.solnica@gmail.com"]
   spec.license       = 'MIT'
+  spec.version       = Dry::Monitor::VERSION.dup
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.summary       = "Monitoring and instrumentation APIs"
+  spec.description   = spec.summary
+  spec.homepage      = 'https://dry-rb.org/gems/dry-monitor'
+  spec.files         = Dir["CHANGELOG.md", "LICENSE", "README.md", "dry-monitor.gemspec", "lib/**/*"]
+  spec.bindir        = 'bin'
+  spec.executables   = []
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rouge', '~> 2.0', '>= 2.2.1'
-  spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
-  spec.add_runtime_dependency 'dry-configurable', '~> 0.5'
-  spec.add_runtime_dependency 'dry-events', '~> 0.1'
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+  spec.metadata['changelog_uri']     = 'https://github.com/dry-rb/dry-monitor/blob/master/CHANGELOG.md'
+  spec.metadata['source_code_uri']   = 'https://github.com/dry-rb/dry-monitor'
+  spec.metadata['bug_tracker_uri']   = 'https://github.com/dry-rb/dry-monitor/issues'
+
+  spec.required_ruby_version = ">= 2.5.0"
+
+  # to update dependencies edit project.yml
+  spec.add_runtime_dependency "dry-configurable", "~> 0.5"
+  spec.add_runtime_dependency "dry-core", "~> 0.5", ">= 0.5"
+  spec.add_runtime_dependency "dry-events", "~> 0.2"
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rouge", "~> 2.0", ">= 2.2.1"
+  spec.add_development_dependency "rspec"
 end

data/lib/dry-monitor.rb

@@ -1 +1,3 @@
-require 'dry/monitor'
+# frozen_string_literal: true
+
+require "dry/monitor"

data/lib/dry/monitor.rb

@@ -1,5 +1,20 @@
-require 'dry/monitor/logger'
-require 'dry/monitor/notifications'
-require 'dry/monitor/rack/middleware'
-require 'dry/monitor/rack/logger'
-require 'dry/monitor/sql/logger'
+# frozen_string_literal: true
+
+require "dry/monitor/logger"
+require "dry/monitor/notifications"
+require "dry/core/extensions"
+
+module Dry
+  module Monitor
+    extend Dry::Core::Extensions
+
+    register_extension(:rack) do
+      require "rack/utils"
+      require "dry/monitor/rack/logger"
+    end
+
+    register_extension(:sql) do
+      require "dry/monitor/sql/logger"
+    end
+  end
+end

data/lib/dry/monitor/constants.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "dry/core/constants"
+
+module Dry
+  module Monitor
+    include Dry::Core::Constants
+  end
+end

data/lib/dry/monitor/logger.rb

@@ -1,13 +1,17 @@
-require 'logger'
+# frozen_string_literal: true
+
+require "logger"
 
 module Dry
   module Monitor
     class Logger < ::Logger
+      DEFAULT_FORMATTER = proc do |_severity, _datetime, _progname, msg|
+        "#{msg}\n"
+      end
+
       def initialize(*args)
         super
-        self.formatter = proc do |severity, datetime, progname, msg|
-          "#{msg}\n"
-        end
+        self.formatter = DEFAULT_FORMATTER
       end
     end
   end

data/lib/dry/monitor/notifications.rb

@@ -1,28 +1,28 @@
-require 'dry/events/publisher'
+# frozen_string_literal: true
+
+require "dry/events/publisher"
+require "dry/monitor/constants"
 
 module Dry
   module Monitor
     class Clock
-      def measure(&block)
+      def measure
         start = current
-        result = block.()
-        stop = current
-        [result, ((stop - start) * 1000).round(2)]
+        result = yield
+        [result, current - start]
       end
 
       def current
-        Time.now
+        Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
       end
     end
 
     CLOCK = Clock.new
 
     class Notifications
-      include Events::Publisher['Dry::Monitor::Notifications']
-
-      attr_reader :id
+      include Events::Publisher["Dry::Monitor::Notifications"]
 
-      attr_reader :clock
+      attr_reader :id, :clock
 
       def initialize(id)
         @id = id
@@ -38,9 +38,7 @@ module Dry
       end
 
       def instrument(event_id, payload = EMPTY_HASH, &block)
-        if block
-          result, time = clock.measure(&block)
-        end
+        result, time = @clock.measure(&block) if block_given?
 
         process(event_id, payload) do |event, listener|
           if time

data/lib/dry/monitor/rack/logger.rb

@@ -1,4 +1,7 @@
-require 'dry/configurable'
+# frozen_string_literal: true
+
+require "dry/configurable"
+require "dry/monitor/rack/middleware"
 
 module Dry
   module Monitor
@@ -8,19 +11,17 @@ module Dry
 
         setting :filtered_params, %w[_csrf password]
 
-        REQUEST_METHOD = 'REQUEST_METHOD'.freeze
-        PATH_INFO = 'PATH_INFO'.freeze
-        REMOTE_ADDR = 'REMOTE_ADDR'.freeze
-        QUERY_STRING = 'QUERY_STRING'.freeze
-
-        START_MSG = %(Started %s "%s" for %s at %s).freeze
-        STOP_MSG = %(Finished %s "%s" for %s in %sms [Status: %s]\n).freeze
-        QUERY_MSG = %(  Query parameters %s).freeze
-        FILTERED = '[FILTERED]'.freeze
+        REQUEST_METHOD = "REQUEST_METHOD"
+        PATH_INFO = "PATH_INFO"
+        REMOTE_ADDR = "REMOTE_ADDR"
+        QUERY_STRING = "QUERY_STRING"
 
-        attr_reader :logger
+        START_MSG = %(Started %s "%s" for %s at %s)
+        STOP_MSG = %(Finished %s "%s" for %s in %sms [Status: %s]\n)
+        QUERY_MSG = %(  Query parameters )
+        FILTERED = "[FILTERED]"
 
-        attr_reader :config
+        attr_reader :logger, :config
 
         def initialize(logger, config = self.class.config)
           @logger = logger
@@ -28,47 +29,39 @@ module Dry
         end
 
         def attach(rack_monitor)
-          rack_monitor.on(:start) do |env:|
-            log_start_request(env)
-          end
-
-          rack_monitor.on(:stop) do |env:, status:, time:|
-            log_stop_request(env, status, time)
-          end
-
-          rack_monitor.on(:error) do |event|
-            log_exception(event[:exception])
-          end
+          rack_monitor.on(:start) { |params| log_start_request(params[:env]) }
+          rack_monitor.on(:stop) { |params| log_stop_request(**params) }
+          rack_monitor.on(:error) { |event| log_exception(event[:exception]) }
         end
 
-        def log_exception(e)
-          logger.error e.message
-          logger.error filter_backtrace(e.backtrace).join("\n")
+        def log_exception(err)
+          logger.error err.message
+          logger.error filter_backtrace(err.backtrace).join("\n")
         end
 
         def log_start_request(request)
-          info START_MSG % [
-                 request[REQUEST_METHOD],
-                 request[PATH_INFO],
-                 request[REMOTE_ADDR],
-                 Time.now
-               ]
+          logger.info START_MSG % [
+            request[REQUEST_METHOD],
+            request[PATH_INFO],
+            request[REMOTE_ADDR],
+            Time.now
+          ]
           log_request_params(request)
         end
 
-        def log_stop_request(request, status, time)
-          info STOP_MSG % [
-                 request[REQUEST_METHOD],
-                 request[PATH_INFO],
-                 request[REMOTE_ADDR],
-                 time,
-                 status
-               ]
+        def log_stop_request(env:, status:, time:)
+          logger.info STOP_MSG % [
+            env[REQUEST_METHOD],
+            env[PATH_INFO],
+            env[REMOTE_ADDR],
+            time,
+            status
+          ]
         end
 
         def log_request_params(request)
           with_http_params(request[QUERY_STRING]) do |params|
-            info QUERY_MSG % [params.inspect]
+            logger.info QUERY_MSG + params.inspect
           end
         end
 
@@ -79,28 +72,26 @@ module Dry
         def with_http_params(params)
           params = ::Rack::Utils.parse_nested_query(params)
 
-          if params.size > 0
-            yield(filter_params(params))
-          end
+          yield(filter_params(params)) unless params.empty?
         end
 
         def filter_backtrace(backtrace)
           # TODO: what do we want to do with this?
-          backtrace.reject { |l| l.include?('gems') }
+          backtrace.reject { |l| l.include?("gems") }
         end
 
         def filter_params(params)
-          params.each_with_object({}) do |(k, v), h|
+          params.each do |k, v|
             if config.filtered_params.include?(k)
-              h.update(k => FILTERED)
+              params[k] = FILTERED
             elsif v.is_a?(Hash)
-              h.update(k => filter_params(v))
+              filter_params(v)
             elsif v.is_a?(Array)
-              h.update(k => v.map { |m| m.is_a?(Hash) ? filter_params(m) : m })
-            else
-              h[k] = v
+              v.map! { |m| m.is_a?(Hash) ? filter_params(m) : m }
             end
           end
+
+          params
         end
       end
     end

data/lib/dry/monitor/rack/middleware.rb

@@ -1,5 +1,6 @@
-require 'rack/utils'
-require 'dry/monitor/notifications'
+# frozen_string_literal: true
+
+require "dry/monitor/notifications"
 
 module Dry
   module Monitor
@@ -13,15 +14,13 @@ module Dry
         Notifications.register_event(REQUEST_STOP)
         Notifications.register_event(REQUEST_ERROR)
 
-        attr_reader :app
-
-        attr_reader :notifications
+        attr_reader :app, :notifications
 
         def initialize(*args)
           @notifications, @app = *args
         end
 
-        def new(app)
+        def new(app, *_args, &_block)
           self.class.new(notifications, app)
         end
 

data/lib/dry/monitor/sql/colorizers/default.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Dry
+  module Monitor
+    module SQL
+      module Colorizers
+        class Default
+          def initialize(_theme); end
+
+          def call(string)
+            string
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dry/monitor/sql/colorizers/rouge.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "rouge/util"
+require "rouge/token"
+require "rouge/theme"
+require "rouge/themes/gruvbox"
+require "rouge/formatter"
+require "rouge/formatters/terminal256"
+require "rouge/lexer"
+require "rouge/regex_lexer"
+require "rouge/lexers/sql"
+
+module Dry
+  module Monitor
+    module SQL
+      module Colorizers
+        class Rouge
+          attr_reader :formatter, :lexer
+
+          def initialize(theme)
+            @formatter = ::Rouge::Formatters::Terminal256.new(theme || ::Rouge::Themes::Gruvbox.new)
+            @lexer = ::Rouge::Lexers::SQL.new
+          end
+
+          def call(string)
+            formatter.format(lexer.lex(string))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dry/monitor/sql/logger.rb

@@ -1,6 +1,8 @@
-require 'dry-configurable'
-require 'rouge'
-require 'dry/monitor/notifications'
+# frozen_string_literal: true
+
+require "dry-configurable"
+require "dry/core/extensions"
+require "dry/monitor/notifications"
 
 module Dry
   module Monitor
@@ -8,40 +10,52 @@ module Dry
 
     module SQL
       class Logger
+        extend Dry::Core::Extensions
         extend Dry::Configurable
 
-        setting :theme, Rouge::Themes::Gruvbox.new
-        setting :colorize, true
-        setting :message_template, %(  Loaded %s in %sms %s).freeze
+        register_extension(:default_colorizer) do
+          require_relative "./colorizers/default"
+
+          module DefaultColorizer
+            def colorizer
+              @colorizer ||= Colorizers::Default.new(config.theme)
+            end
+          end
+
+          Logger.include(DefaultColorizer)
+        end
+
+        register_extension(:rouge_colorizer) do
+          require_relative "./colorizers/rouge"
+
+          module RougeColorizer
+            def colorizer
+              @colorizer ||= Colorizers::Rouge.new(config.theme)
+            end
+          end
+
+          Logger.include(RougeColorizer)
+        end
+
+        setting :theme, nil
+        setting :message_template, %(  Loaded %s in %sms %s)
+
+        attr_reader :config, :logger, :template
 
-        attr_reader :config
-        attr_reader :logger
-        attr_reader :formatter
-        attr_reader :lexer
-        attr_reader :template
+        load_extensions(:default_colorizer)
 
         def initialize(logger, config = self.class.config)
           @logger = logger
           @config = config
-          @formatter = Rouge::Formatters::Terminal256.new(config.theme)
-          @lexer = Rouge::Lexers::SQL.new
           @template = config.message_template
         end
 
         def subscribe(notifications)
-          notifications.subscribe(:sql) do |time:, name:, query:|
-            log_query(time, name, query)
-          end
-        end
-
-        def log_query(time, name, query)
-          logger.info template % [name.inspect, time, colorize(query)]
+          notifications.subscribe(:sql) { |params| log_query(**params) }
         end
 
-        private
-
-        def colorize(string)
-          config.colorize ? formatter.format(lexer.lex(string)) : string
+        def log_query(time:, name:, query:)
+          logger.info template % [name.inspect, time, colorizer.call(query)]
         end
       end
     end

data/lib/dry/monitor/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Dry
   module Monitor
-    VERSION = '0.1.2'.freeze
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,54 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: dry-monitor
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rouge
+  name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: dry-equalizer
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: dry-configurable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '0.5'
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
@@ -58,20 +41,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: dry-events
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +86,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,44 +120,36 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: Monitoring and instrumentation APIs
 email:
 - piotr.solnica@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - dry-monitor.gemspec
 - lib/dry-monitor.rb
 - lib/dry/monitor.rb
+- lib/dry/monitor/constants.rb
 - lib/dry/monitor/logger.rb
 - lib/dry/monitor/notifications.rb
 - lib/dry/monitor/rack/logger.rb
 - lib/dry/monitor/rack/middleware.rb
+- lib/dry/monitor/sql/colorizers/default.rb
+- lib/dry/monitor/sql/colorizers/rouge.rb
 - lib/dry/monitor/sql/logger.rb
 - lib/dry/monitor/version.rb
-- rakelib/rubocop.rake
-- spec/integration/instrumentation_spec.rb
-- spec/integration/logger_spec.rb
-- spec/integration/rack_middleware_spec.rb
-- spec/integration/sql_logger_spec.rb
-- spec/spec_helper.rb
-- spec/test_logs/.gitkeep
-homepage: https://github.com/dry-rb/dry-monitor
+homepage: https://dry-rb.org/gems/dry-monitor
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/dry-rb/dry-monitor/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/dry-rb/dry-monitor
+  bug_tracker_uri: https://github.com/dry-rb/dry-monitor/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -160,22 +158,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Monitoring and instrumentation APIs
-test_files:
-- spec/integration/instrumentation_spec.rb
-- spec/integration/logger_spec.rb
-- spec/integration/rack_middleware_spec.rb
-- spec/integration/sql_logger_spec.rb
-- spec/spec_helper.rb
-- spec/test_logs/.gitkeep
+test_files: []

data/.gitignore

@@ -1,9 +0,0 @@
-.DS_Store
-coverage
-/.bundle
-vendor/bundle
-bin/
-tmp/
-.idea/
-Gemfile.lock
-spec/test_logs/*.log

data/.rspec

@@ -1,3 +0,0 @@
---color
---require spec_helper
---order random

data/.rubocop.yml

@@ -1,16 +0,0 @@
-# Generated by `rubocop --auto-gen-config`
-inherit_from: .rubocop_todo.yml
-
-Metrics/LineLength:
-  Max: 100
-
-Style/Documentation:
-  Enabled: false
-
-Lint/HandleExceptions:
-  Exclude:
-    - rakelib/*.rake
-
-Style/FileName:
-  Exclude:
-    - lib/dry-logic.rb

data/.rubocop_todo.yml

@@ -1,7 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2015-10-30 01:32:46 +0000 using RuboCop version 0.34.2.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.

data/.travis.yml

@@ -1,22 +0,0 @@
-language: ruby
-cache: bundler
-bundler_args: --without benchmarks console tools
-script: "bundle exec rake ci"
-before_install: gem update --system
-after_success:
-  - '[ "${TRAVIS_JOB_NUMBER#*.}" = "1" ] && [ "$TRAVIS_BRANCH" = "master" ] && bundle exec codeclimate-test-reporter'
-rvm:
-  - 2.5.0
-  - 2.4.3
-  - 2.3.6
-  - jruby-9.1.9.0
-env:
-  global:
-    - COVERAGE='true'
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/19098b4253a72c9796db
-    on_success: change
-    on_failure: always
-    on_start: false

data/CONTRIBUTING.md

@@ -1,29 +0,0 @@
-# Issue Guidelines
-
-## Reporting bugs
-
-If you found a bug, report an issue and describe what's the expected behavior versus what actually happens. If the bug causes a crash, attach a full backtrace. If possible, a reproduction script showing the problem is highly appreciated.
-
-## Reporting feature requests
-
-Report a feature request **only after discussing it first on [discuss.dry-rb.org](https://discuss.dry-rb.org)** where it was accepted. Please provide a concise description of the feature, don't link to a discussion thread, and instead summarize what was discussed.
-
-## Reporting questions, support requests, ideas, concerns etc.
-
-**PLEASE DON'T** - use [discuss.dry-rb.org](http://discuss.dry-rb.org) instead.
-
-# Pull Request Guidelines
-
-A Pull Request will only be accepted if it addresses a specific issue that was reported previously, or fixes typos, mistakes in documentation etc.
-
-Other requirements:
-
-1) Do not open a pull request if you can't provide tests along with it. If you have problems writing tests, ask for help in the related issue.
-2) Follow the style conventions of the surrounding code. In most cases, this is standard ruby style.
-3) Add API documentation if it's a new feature
-4) Update API documentation if it changes an existing feature
-5) Bonus points for sending a PR to [github.com/dry-rb/dry-rb.org](github.com/dry-rb/dry-rb.org) which updates user documentation and guides
-
-# Asking for help
-
-If these guidelines aren't helpful, and you're stuck, please post a message on [discuss.dry-rb.org](https://discuss.dry-rb.org).

data/Gemfile

@@ -1,15 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-gem 'dry-events', git: 'https://github.com/dry-rb/dry-events.git', branch: 'master'
-
-group :test do
-  gem 'rack'
-  gem 'simplecov', platform: :mri, require: false
-  gem 'codeclimate-test-reporter', require: false
-end
-
-group :tools do
-  gem 'byebug', platform: :mri
-end

data/Rakefile

@@ -1,15 +0,0 @@
-#!/usr/bin/env rake
-require 'bundler/gem_tasks'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-task default: :spec
-
-desc 'Run all specs in spec directory'
-RSpec::Core::RakeTask.new(:spec)
-
-desc "Run CI tasks"
-task ci: [:spec]

data/rakelib/rubocop.rake

@@ -1,18 +0,0 @@
-begin
-  require 'rubocop/rake_task'
-
-  Rake::Task[:default].enhance [:rubocop]
-
-  RuboCop::RakeTask.new do |task|
-    task.options << '--display-cop-names'
-  end
-
-  namespace :rubocop do
-    desc 'Generate a configuration file acting as a TODO list.'
-    task :auto_gen_config do
-      exec 'bundle exec rubocop --auto-gen-config'
-    end
-  end
-
-rescue LoadError
-end

data/spec/integration/instrumentation_spec.rb

@@ -1,37 +0,0 @@
-RSpec.describe 'Subscribing to instrumentation events' do
-  subject(:notifications) { Dry::Monitor::Notifications.new(:app) }
-
-  before do
-    Dry::Monitor::Notifications.register_event(:sql, { name: 'rom[sql]' })
-  end
-
-  describe '#instrument' do
-    it 'allows subscribing via block' do
-      captured = []
-      payload = { query: 'SELECT 1 FROM users' }
-
-      notifications.subscribe(:sql) do |event|
-        captured << [event.id, event[:query]]
-      end
-
-      notifications.instrument(:sql, payload)
-
-      expect(captured).to eql([[:sql, 'SELECT 1 FROM users']])
-    end
-
-    it 'allows instrumenting via block' do
-      captured = []
-      payload = { query: 'SELECT 1 FROM users' }
-
-      notifications.subscribe(:sql) do |event|
-        captured << [event.id, event[:query]]
-      end
-
-      notifications.instrument(:sql, payload) do
-        payload
-      end
-
-      expect(captured).to eql([[:sql, 'SELECT 1 FROM users']])
-    end
-  end
-end

data/spec/integration/logger_spec.rb

@@ -1,11 +0,0 @@
-RSpec.describe Dry::Monitor::Logger do
-  subject(:logger) do
-    Dry::Monitor::Logger.new($stdout)
-  end
-
-  describe '#info' do
-    it 'outputs with configured formatter' do
-      expect { logger.info('test') }.to output("test\n").to_stdout
-    end
-  end
-end

data/spec/integration/rack_middleware_spec.rb

@@ -1,98 +0,0 @@
-RSpec.describe Dry::Monitor::Rack::Middleware do
-  subject(:middleware) { Dry::Monitor::Rack::Middleware.new(notifications).new(rack_app) }
-
-  let(:notifications) do
-    Dry::Monitor::Notifications.new(:test)
-  end
-
-  let(:rack_app) do
-    double(:rack_app)
-  end
-
-  let(:log_file_path) do
-    SPEC_ROOT.join('test_logs/middleware.log')
-  end
-
-  let(:rack_logger) do
-    Dry::Monitor::Rack::Logger.new(Dry::Monitor::Logger.new(log_file_path))
-  end
-
-  let(:env) do
-    { 'REQUEST_METHOD' => 'GET',
-      'PATH_INFO' => '/hello-world',
-      'REMOTE_ADDR' => '0.0.0.0',
-      'QUERY_STRING' => query_params }
-  end
-
-  let(:query_params) do
-    %w[
-        _csrf=123456
-        password=secret
-        user[password]=secret
-        others[][password]=secret1
-        others[][password]=secret2
-        foo=bar
-        one=1
-        ids[]=1
-        ids[]=2
-      ].join('&')
-  end
-
-  describe '#call' do
-    before do
-      File.open(log_file_path, 'w').close
-      rack_logger.attach(middleware)
-    end
-
-    it 'triggers start/stop events for with a rack request' do
-      expect(rack_app).to receive(:call).with(env).and_return([200, :total_success])
-
-      status, response = middleware.call(env)
-
-      expect(status).to be(200)
-      expect(response).to be(:total_success)
-
-      log_file_content = File.read(log_file_path)
-
-      expect(log_file_content).to include('Started GET "/hello-world"')
-      expect(log_file_content).to include('Finished GET "/hello-world"')
-      expect(log_file_content).to include('Query parameters {"_csrf"=>"[FILTERED]", "password"=>"[FILTERED]", "user"=>{"password"=>"[FILTERED]"}, "others"=>[{"password"=>"[FILTERED]"}, {"password"=>"[FILTERED]"}], "foo"=>"bar", "one"=>"1", "ids"=>["1", "2"]}')
-    end
-  end
-
-  describe '#on' do
-    it 'subscribe a listener to a specific request event' do
-      captured = []
-
-      middleware.on(:error) do |event|
-        captured << event[:exception]
-        captured << event[:env]
-      end
-
-      exception = 'oops'
-      env = { 'REQUEST_METHOD' => 'GET' }
-
-      middleware.instrument(:error, exception: exception, env: env)
-
-      expect(captured).to eql([exception, env])
-    end
-  end
-
-  describe 'rack logger' do
-    before do
-      File.open(log_file_path, 'w').close
-      rack_logger.attach(middleware)
-    end
-
-    it 'logs exceptions' do
-      exception = double(:exception, message: 'oops', backtrace: ['/some/path.rb'])
-
-      middleware.instrument(:error, exception: exception, env: env)
-
-      log_file_content = File.read(log_file_path)
-
-      expect(log_file_content).to include('oops')
-      expect(log_file_content).to include('/some/path.rb')
-    end
-  end
-end

data/spec/integration/sql_logger_spec.rb

@@ -1,57 +0,0 @@
-RSpec.describe Dry::Monitor::SQL::Logger do
-  subject(:logger) { sql_logger.new(Dry::Monitor::Logger.new(log_file_path)) }
-
-  let(:notifications) do
-    Dry::Monitor::Notifications.new(:test)
-  end
-
-  let(:log_file_path) do
-    SPEC_ROOT.join('test_logs/sql.log')
-  end
-
-  let(:log_file_content) { File.read(log_file_path) }
-
-  shared_context '#subscribe' do
-    let(:query) do
-      'SELECT id, name FROM users'
-    end
-
-    before do
-      File.open(log_file_path, 'w').close
-
-      logger.subscribe(notifications)
-
-      notifications.instrument(:sql, name: 'users', query: query) do
-        sleep 0.0025
-      end
-    end
-
-    it 'writes sql query info' do
-      expect(log_file_content).to include('Loaded "users" in')
-    end
-  end
-
-  context 'without colors' do
-    let(:sql_logger) do
-      Class.new(Dry::Monitor::SQL::Logger) do
-        configure do |config|
-          config.colorize = false
-        end
-      end
-    end
-
-    include_context '#subscribe' do
-      it 'writes sql query in logs' do
-        expect(log_file_content).to include(query)
-      end
-    end
-  end
-
-  context 'without colors' do
-    let(:sql_logger) do
-      Dry::Monitor::SQL::Logger
-    end
-
-    include_context '#subscribe'
-  end
-end

data/spec/spec_helper.rb

@@ -1,21 +0,0 @@
-if RUBY_ENGINE == 'ruby' && ENV['CI'] == 'true'
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter '/spec/'
-  end
-end
-
-begin
-  require 'byebug'
-rescue LoadError; end
-
-require 'dry-monitor'
-
-SPEC_ROOT = Pathname(__dir__)
-
-Dir[SPEC_ROOT.join('shared/**/*.rb')].each(&method(:require))
-Dir[SPEC_ROOT.join('support/**/*.rb')].each(&method(:require))
-
-RSpec.configure do |config|
-  config.disable_monkey_patching!
-end