mnemosyne-ruby 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac987a42c8acad894e9ba6f4a7a8f82978a070a814f1934740e972d872319483
-  data.tar.gz: fc1fce9f2aa11e6f01dc826a70d5130791191d4d6750a8f65239a70bd3c33c6a
+  metadata.gz: 460256725e443fc1e4d8524178e22e80827a2b53632d67ae9755d4d85ee5ea71
+  data.tar.gz: c645fc66b6a7097858f25271417265c1a1c1b51d4bebcf5d1912ca8a579fde10
 SHA512:
-  metadata.gz: 3089578f4a14216d8f50d0aac9f2af6ef177051181629ee8f5956b5874f9396dca9723670bc5eb776b7a8cb0f24567c3a48714be5bf3b972166d9bda5371f41f
-  data.tar.gz: bc4c72f330ba74aec138fb31dcaa4acb9c53f426cda98c34abae7780fd30c076d0d39ce6f804497b7d40a5bc5dac659df798c57ecb7f692084c56ae087d2aca3
+  metadata.gz: 64bb20e6b63437b403e24141a5e46612b4e2f73727d0f1b18713a0e629666ac3e047655083d3bd57d7cd69d8dd0521abbceba5991f91980c7a05da9f5b4477e9
+  data.tar.gz: c264ae5bbabb2a7123723cc6855290023c59312885f9ca8c763c46e7c1a98b765230f5e31022ec685dd114afce14a55ff450890a9420ea8a5b4740882e719362

data/.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

data/.travis.yml

@@ -8,32 +8,27 @@ addons:
     packages:
       - rabbitmq-server
 rvm:
-  - 2.6.3
-  - 2.5.5
-  - 2.4.6
+  - 2.6.5
+  - 2.5.7
+  - 2.4.9
   - 2.3.8
 gemfile:
+  - gemfiles/rails_60.gemfile
   - gemfiles/rails_52.gemfile
   - gemfiles/rails_51.gemfile
   - gemfiles/rails_50.gemfile
   - gemfiles/rails_42.gemfile
+
 before_install:
   - echo yes | rvm gemset delete global
   - gem install bundler -v'~>1.0'
 script:
   - bundle exec rake rubocop
   - bundle exec rake spec
-jobs:
-  include:
-    - stage: Release
-      rvm: 2.6.3
-      install: skip
-      script: skip
-      deploy:
-        provider: rubygems
-        api_key:
-          secure: s7hUPxL4RULQ398GXk6Ko/y3QtUy7bZMTzcC4sL9Opsw76IRhOY0n+c6r+S8wHH3n+cRxiLpUyXRAsLMhjd67Rn+qaBoVbEfyzZKt1EAYyskFdPf40Jlq3FjOjRjAJW+hLDYloLXqqgLIrx/ybOv0YOfKyGKmk6eBNCx9S5GPJzt15WAM4Lz+TxNuR82YhsDybcGtTtLJ1WCF5FeQ297l2OESgvikRoADhIIM3HVk6Msyqw7RwFlpoIFGPRhXZD7UmML981rxK4Gxkh5xKGJiInjzL8lYOgT3KIfSLwtp9JoDbtpKbzdIQfA8Z35aRzpLjofPFxxYsKjwmCfdKxvJf5E5hTlenrILqSIovuknHb9oNOp0aCdp52N4+B8BZl7n1muQzr1AKy/ogtkTAgmlPs5tW+qx2h6E5MU0wfy6sS0AqKtVcGaZ1u85llifY2TvYriHReBIf8vddOe6LLbDcPnaTrTnAdsk/Bx9n+Zd8A2l3vzam9RbwTjlr7ZezIY67RRknfScEO+qCt9cfdAKf57ZdpiAecDFEr9V/CdAPEBevxaoiTwzFrjO+N9BY57eGHJsPda8NwNsrBraGBgcgKOXWeg9MowfU+wWpUSbeAJDZ2zZabGRKJkXpbRNNnf3webPSaXfb9qeWrCHXXbuI8JO+PQmx6OX8IHGjqyE1E=
-        gem: mnemosyne-ruby
-        on:
-          tags: true
-          repo: mnemosyne-mon/mnemosyne-ruby
+
+matrix:
+  exclude:
+  - rvm: 2.4.9
+    gemfile: gemfiles/rails_60.gemfile
+  - rvm: 2.3.8
+    gemfile: gemfiles/rails_60.gemfile

data/Appraisals

@@ -1,3 +1,7 @@
+appraise 'rails-60' do
+  gem 'rails', '~> 6.0.0', require: false
+  gem 'sqlite3', '~> 1.4', require: false
+end
 
 appraise 'rails-52' do
   gem 'rails', '~> 5.2.0', require: false

data/CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [1.8.0] - 2019-10-25
+### Added
+- Improve compatibility with Rails 6.0
+
 ## [1.7.1] - 2019-06-15
 ### Fixed
 - Reworked Faraday probe to not override connection middleware stack
@@ -82,7 +86,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Added
 - Add platform identifier
 
-[unreleased]: https://github.com/:mnemosyne-mon/mnemosyne-ruby/compare/v1.7.1...HEAD
+[Unreleased]: https://github.com/mnemosyne-mon/mnemosyne-ruby/compare/v1.8.0...HEAD
+[1.8.0]: https://github.com/mnemosyne-mon/mnemosyne-ruby/compare/v1.7.1...v1.8.0
 [1.7.1]: https://github.com/mnemosyne-mon/mnemosyne-ruby/compare/v1.7.0...v1.7.1
 [1.7.0]: https://github.com/mnemosyne-mon/mnemosyne-ruby/compare/v1.6.2...v1.7.0
 [1.6.2]: https://github.com/mnemosyne-mon/mnemosyne-ruby/compare/v1.6.1...v1.6.2

data/gemfiles/rails_42.gemfile

@@ -6,7 +6,7 @@ gem "appraisal"
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.6"
 gem "rubocop", "~> 0.67.1"
-gem "timecop", "~> 0.8.0"
+gem "timecop", "~> 0.9.1"
 gem "pry", require: false
 gem "pry-byebug", require: false
 gem "faraday", require: false

data/gemfiles/rails_50.gemfile

@@ -6,7 +6,7 @@ gem "appraisal"
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.6"
 gem "rubocop", "~> 0.67.1"
-gem "timecop", "~> 0.8.0"
+gem "timecop", "~> 0.9.1"
 gem "pry", require: false
 gem "pry-byebug", require: false
 gem "faraday", require: false

data/gemfiles/rails_51.gemfile

@@ -6,7 +6,7 @@ gem "appraisal"
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.6"
 gem "rubocop", "~> 0.67.1"
-gem "timecop", "~> 0.8.0"
+gem "timecop", "~> 0.9.1"
 gem "pry", require: false
 gem "pry-byebug", require: false
 gem "faraday", require: false

data/gemfiles/rails_52.gemfile

@@ -6,7 +6,7 @@ gem "appraisal"
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.6"
 gem "rubocop", "~> 0.67.1"
-gem "timecop", "~> 0.8.0"
+gem "timecop", "~> 0.9.1"
 gem "pry", require: false
 gem "pry-byebug", require: false
 gem "faraday", require: false

data/gemfiles/rails_60.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rake", "~> 12.0"
+gem "rspec", "~> 3.6"
+gem "rubocop", "~> 0.67.1"
+gem "timecop", "~> 0.9.1"
+gem "pry", require: false
+gem "pry-byebug", require: false
+gem "faraday", require: false
+gem "msgr", require: false
+gem "rails", "~> 6.0.0", require: false
+gem "restify", require: false
+gem "sidekiq", require: false
+gem "sqlite3", "~> 1.4", require: false
+gem "webmock", require: false
+
+gemspec path: "../"

data/lib/mnemosyne/configuration.rb

@@ -57,7 +57,7 @@ module Mnemosyne
       'amqps' => 5671
     }.freeze
 
-    def make_amqp_uri(amqp) # rubocop:disable AbcSize
+    def make_amqp_uri(amqp)
       uri = URI('')
 
       uri.scheme = amqp[:scheme]

data/lib/mnemosyne/global.rb

@@ -12,6 +12,7 @@ module Mnemosyne
 
     def attach_error(err)
       return unless (trace = ::Mnemosyne::Instrumenter.current_trace)
+
       trace.attach_error(err)
     end
   end

data/lib/mnemosyne/instrumenter.rb

@@ -27,6 +27,7 @@ module Mnemosyne
     def trace(name, **kwargs)
       if (trace = current_trace)
         return yield trace if block_given?
+
         return trace
       end
 
@@ -86,11 +87,13 @@ module Mnemosyne
 
       def trace(*args)
         return unless (instrumenter = instance)
+
         instrumenter.trace(*args)
       end
 
       def current_trace
         return unless (instrumenter = instance)
+
         instrumenter.current_trace
       end
     end

data/lib/mnemosyne/middleware/faraday.rb

@@ -21,7 +21,7 @@ module Mnemosyne
 
         env[:request_headers].merge!({
           'X-Mnemosyne-Transaction' => trace.transaction,
-          'X-Mnemosyne-Origin' => span.uuid,
+          'X-Mnemosyne-Origin' => span.uuid
         }.reject {|_, v| v.nil? })
 
         @app.call(env).on_complete do |env|

data/lib/mnemosyne/middleware/rack.rb

@@ -28,6 +28,7 @@ module Mnemosyne
 
         def close
           return if @closed
+
           @closed = true
 
           begin

data/lib/mnemosyne/probes/faraday/base.rb

@@ -17,9 +17,9 @@ module Mnemosyne
 
         module Extension
           def lock!
-            if !@handlers.include?('Mnemosyne::Middleware::Faraday')
+            unless @handlers.include?('Mnemosyne::Middleware::Faraday')
               if respond_to?(:is_adapter?, true) &&
-                  (idx = @handlers.find_index {|h| is_adapter?(h) })
+                 (idx = @handlers.find_index {|h| is_adapter?(h) })
                 insert(idx, ::Mnemosyne::Middleware::Faraday)
               else
                 use(::Mnemosyne::Middleware::Faraday)

data/lib/mnemosyne/railtie.rb

@@ -5,7 +5,7 @@ require 'rails'
 module Mnemosyne
   class Railtie < ::Rails::Railtie
     initializer 'mnemosyne.initialize' do |app|
-      config = app.config_for('mnemosyne')
+      config = app.config_for('mnemosyne').stringify_keys
 
       ::Mnemosyne::Logging.logger = Rails.logger
 

data/lib/mnemosyne/registry.rb

@@ -51,6 +51,7 @@ module Mnemosyne
     def required(path)
       return unless activated?
       return unless (set = monitor.delete(path))
+
       set.each(&method(:activate))
     end
 

data/lib/mnemosyne/trace.rb

@@ -57,12 +57,13 @@ module Mnemosyne
     end
 
     Error = Struct.new(:error) do
-      BT_REGEXP = /^((?:[a-zA-Z]:)?[^:]+):(\d+)(?::in `([^']+)')?$/
+      BT_REGEXP = /^((?:[a-zA-Z]:)?[^:]+):(\d+)(?::in `([^']+)')?$/.freeze
 
       def serialize
         {
           type: error.class.name,
           text: error.message.to_s,
+          cause: serialize_cause,
           stacktrace: serialize_backtrace
         }.compact
       end
@@ -78,6 +79,10 @@ module Mnemosyne
           {file: md[1], line: md[2], call: md[3], raw: md[0]}
         end
       end
+
+      def serialize_cause
+        self.class.new(error.cause).serialize if error.cause
+      end
     end
   end
 end

data/lib/mnemosyne/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mnemosyne-ruby
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-15 00:00:00.000000000 Z
+date: 2019-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -59,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -73,6 +74,7 @@ files:
 - gemfiles/rails_50.gemfile
 - gemfiles/rails_51.gemfile
 - gemfiles/rails_52.gemfile
+- gemfiles/rails_60.gemfile
 - lib/mnemosyne-ruby.rb
 - lib/mnemosyne.rb
 - lib/mnemosyne/client.rb
@@ -134,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Ruby/Rails client for Mnemosyne APM