mnemosyne-ruby 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3041b1bd2093674c509a9d037f7fa864a06e669
-  data.tar.gz: 66714af6d59848f008438c18f2ac3429bdd54f23
+  metadata.gz: 9627e0a03b472040c3b65023a44f1e1cea612bf9
+  data.tar.gz: f76fea84c479995a59b4151b752af13e6a3a33c5
 SHA512:
-  metadata.gz: 0bdb13b855926133b2250c82d607c35d397b744c4f2704deb9e27305067e79a212f66c2ef37f5556e1cbcde0d58c3618203c3fba063d18b7e87cffc851c60d88
-  data.tar.gz: bcf5d485d708c55b286788c9c8302694bec75cee1b2f2bf30da30d785bc92cd520266586809deb2b9a51df42330572a792cb73c2955524a4ed63a787fec7e7e4
+  metadata.gz: 3ad571be34543f3de3437a05c1c9413f8c90be17153af484f0f3b6627c032ec455a73463452278438b44c85bcb3c92aa14800c1c355b0c307fd2e06d53bbc513
+  data.tar.gz: 7ed59cb08efd1066173b08b32e2c0cf67c2e80cecbabd3a4fe504e1cb9e304f0f48472cada9cba9209f1f36052e3a7c0a11a2a919832d4b671e98987ebe9c429

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.0
+
+* Collect response metadata in rack instrumentation
+
 ## 1.1.0
 
 * Add metadata to rack instrumentation

data/Gemfile

@@ -13,4 +13,5 @@ end
 group :test do
   gem 'restify', require: false
   gem 'sidekiq', require: false
+  gem 'webmock', require: false
 end

data/lib/mnemosyne/middleware/rack.rb

@@ -60,27 +60,19 @@ module Mnemosyne
           ::SecureRandom.uuid
         end
 
-        meta = {
-          method: env['REQUEST_METHOD'],
-          path: env['REQUEST_PATH'],
-          query: env['QUERY_STRING'],
-          protocol: env['SERVER_PROTOCOL'],
-          headers: {
-            'Accept': env['HTTP_ACCEPT'],
-            'Host': env['HTTP_HOST'],
-            'User-Agent': env['HTTP_USER_AGENT']
-          }
-        }
-
         trace = ::Mnemosyne::Instrumenter.trace 'app.web.request.rack',
           transaction: transaction,
-          origin: origin,
-          meta: meta
+          origin: origin
 
         if trace
           trace.start!
 
+          scan_request(trace, env)
+
           response = @app.call env
+
+          scan_response(trace, response)
+
           response[2] = Proxy.new(response[2]) { trace.submit }
           response
         else
@@ -92,6 +84,30 @@ module Mnemosyne
       ensure
         trace.release if trace
       end
+
+      private
+
+      def scan_request(trace, env)
+        trace.meta[:method] = env['REQUEST_METHOD']
+        trace.meta[:path] = env['REQUEST_PATH']
+        trace.meta[:query] = env['QUERY_STRING']
+        trace.meta[:protocol] = env['SERVER_PROTOCOL']
+        trace.meta[:headers] = {
+          'Accept': env['HTTP_ACCEPT'],
+          'Host': env['HTTP_HOST'],
+          'User-Agent': env['HTTP_USER_AGENT']
+        }
+      end
+
+      def scan_response(trace, response)
+        status, headers, = response
+
+        trace.meta[:status] = status
+
+        return unless headers
+
+        trace.meta[:content_type] = headers['Content-Type']
+      end
     end
   end
 end

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

@@ -6,9 +6,32 @@ module Mnemosyne
       module Base
         class Probe < ::Mnemosyne::Probe
           def setup
-            require 'mnemosyne/middleware/restify'
+            ::Restify::Adapter::Base.prepend Instrumentation
+          end
+
+          module Instrumentation
+            def call(request)
+              if (trace = ::Mnemosyne::Instrumenter.current_trace)
+                meta = {url: request.uri.to_s, method: request.method}
+
+                span = ::Mnemosyne::Span.new 'external.http.restify', \
+                  meta: meta
+
+                span.start!
+
+                request.headers['X-Mnemosyne-Transaction'] = trace.transaction
+                request.headers['X-Mnemosyne-Origin'] = span.uuid
 
-            ::Restify::Adapter::Base.prepend ::Mnemosyne::Middleware::Restify
+                super.tap do |x|
+                  x.add_observer do |_, _response, _err|
+                    span.finish!
+                    trace << span
+                  end
+                end
+              else
+                super
+              end
+            end
           end
         end
       end

data/lib/mnemosyne/version.rb

@@ -3,7 +3,7 @@
 module Mnemosyne
   module VERSION
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
     STAGE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mnemosyne-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -133,7 +133,6 @@ files:
 - lib/mnemosyne/instrumenter.rb
 - lib/mnemosyne/middleware/acfs.rb
 - lib/mnemosyne/middleware/rack.rb
-- lib/mnemosyne/middleware/restify.rb
 - lib/mnemosyne/middleware/sidekiq.rb
 - lib/mnemosyne/probe.rb
 - lib/mnemosyne/probes.rb

data/lib/mnemosyne/middleware/restify.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Mnemosyne
-  module Middleware
-    module Restify
-      def call(request)
-        if (trace = ::Mnemosyne::Instrumenter.current_trace)
-          meta = {url: request.uri.to_s, method: request.method}
-
-          span = ::Mnemosyne::Span.new('external.http.restify', meta: meta)
-          span.start!
-
-          request.headers['X-Mnemosyne-Transaction'] = trace.transaction
-          request.headers['X-Mnemosyne-Origin'] = span.uuid
-
-          super.tap do |x|
-            x.add_observer do |_, _response, _err|
-              span.finish!
-              trace << span
-            end
-          end
-        else
-          super
-        end
-      end
-    end
-  end
-end