mnemosyne-ruby 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb2326f2e2297d704b1c3d859a2ee58069b3bacdde6048e81497608627d648c3
-  data.tar.gz: fefd390b87f1f4c24ae2e4ad4cfc3c395680dfad02a1ade58cc3452546783878
+  metadata.gz: ac987a42c8acad894e9ba6f4a7a8f82978a070a814f1934740e972d872319483
+  data.tar.gz: fc1fce9f2aa11e6f01dc826a70d5130791191d4d6750a8f65239a70bd3c33c6a
 SHA512:
-  metadata.gz: 3cbf49d3f0dd1266547b457111e4a04dc486aa427bbe8014bdac9c346d5a6449468c699d3db7f142241eeda8336da11c5c278cf44c278e5220273f14b4f9619b
-  data.tar.gz: 0402611e591f645b4a3398d6e052caa23d6b54aab2e8f52812c05145c62bd44cc4c644f4b9cea0830adb92afd6f30a8a33639529eb46d3d7cf53245dc44bf058
+  metadata.gz: 3089578f4a14216d8f50d0aac9f2af6ef177051181629ee8f5956b5874f9396dca9723670bc5eb776b7a8cb0f24567c3a48714be5bf3b972166d9bda5371f41f
+  data.tar.gz: bc4c72f330ba74aec138fb31dcaa4acb9c53f426cda98c34abae7780fd30c076d0d39ce6f804497b7d40a5bc5dac659df798c57ecb7f692084c56ae087d2aca3

data/.travis.yml

@@ -3,6 +3,10 @@ cache: bundler
 sudo: required
 services:
   - rabbitmq
+addons:
+  apt:
+    packages:
+      - rabbitmq-server
 rvm:
   - 2.6.3
   - 2.5.5

data/CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [1.7.1] - 2019-06-15
+### Fixed
+- Reworked Faraday probe to not override connection middleware stack
+
 ## [1.7.0] - 2019-05-21
 ### Added
 - Restify probe: Attach HTTP response status (#12, #13)
@@ -78,7 +82,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.0...HEAD
+[unreleased]: https://github.com/:mnemosyne-mon/mnemosyne-ruby/compare/v1.7.1...HEAD
+[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
 [1.6.1]: https://github.com/mnemosyne-mon/mnemosyne-ruby/compare/v1.6.0...v1.6.1

data/lib/mnemosyne/middleware/faraday.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'faraday'
+
+module Mnemosyne
+  module Middleware
+    class Faraday < ::Faraday::Middleware
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        trace = ::Mnemosyne::Instrumenter.current_trace
+
+        return @app.call(env) unless trace
+
+        span = ::Mnemosyne::Span.new 'external.http.faraday', \
+          meta: {url: env[:url].to_s, method: env[:method]}
+
+        span.start!
+
+        env[:request_headers].merge!({
+          'X-Mnemosyne-Transaction' => trace.transaction,
+          'X-Mnemosyne-Origin' => span.uuid,
+        }.reject {|_, v| v.nil? })
+
+        @app.call(env).on_complete do |env|
+          span.meta[:status] = env[:status]
+
+          trace << span.finish!
+        end
+      end
+    end
+  end
+end

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

@@ -6,41 +6,27 @@ module Mnemosyne
       module Base
         class Probe < ::Mnemosyne::Probe
           def setup
-            ::Faraday.default_connection_options = {
-              builder: ::Faraday::RackBuilder.new do |faraday|
-                faraday.use Probe::Middleware
-                faraday.request :url_encoded
-                faraday.adapter ::Faraday.default_adapter
-              end
-            }
-          end
-
-          class Middleware
-            def initialize(app)
-              @app = app
-            end
-
-            def call(env)
-              trace = ::Mnemosyne::Instrumenter.current_trace
-
-              return @app.call(env) unless trace
+            require 'mnemosyne/middleware/faraday'
 
-              span = ::Mnemosyne::Span.new 'external.http.faraday', \
-                meta: {url: env[:url].to_s, method: env[:method]}
+            ::Faraday::Middleware.register_middleware \
+              mnemosyne: ::Mnemosyne::Middleware::Faraday
 
-              span.start!
-
-              env[:request_headers].merge!({
-                'X-Mnemosyne-Transaction' => trace.transaction,
-                'X-Mnemosyne-Origin' => span.uuid,
-              }.reject {|_, v| v.nil? })
-
-              @app.call(env).on_complete do |env|
-                span.meta[:status] = env[:status]
+            ::Faraday::RackBuilder.prepend Extension
+          end
+        end
 
-                trace << span.finish!
+        module Extension
+          def lock!
+            if !@handlers.include?('Mnemosyne::Middleware::Faraday')
+              if respond_to?(:is_adapter?, true) &&
+                  (idx = @handlers.find_index {|h| is_adapter?(h) })
+                insert(idx, ::Mnemosyne::Middleware::Faraday)
+              else
+                use(::Mnemosyne::Middleware::Faraday)
               end
             end
+
+            super
           end
         end
       end

data/lib/mnemosyne/version.rb

@@ -4,7 +4,7 @@ module Mnemosyne
   module VERSION
     MAJOR = 1
     MINOR = 7
-    PATCH = 0
+    PATCH = 1
     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.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2019-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -82,6 +82,7 @@ files:
 - lib/mnemosyne/instrumenter.rb
 - lib/mnemosyne/logging.rb
 - lib/mnemosyne/middleware/acfs.rb
+- lib/mnemosyne/middleware/faraday.rb
 - lib/mnemosyne/middleware/rack.rb
 - lib/mnemosyne/middleware/sidekiq.rb
 - lib/mnemosyne/probe.rb