mnemosyne-ruby 1.1.0.rc1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99dce4e5dc6cc2a267e8189e7d02bec8bc06beae
-  data.tar.gz: 0b5f1bf920009d85c5147ee52a2fdbf6fe313ce9
+  metadata.gz: d3041b1bd2093674c509a9d037f7fa864a06e669
+  data.tar.gz: 66714af6d59848f008438c18f2ac3429bdd54f23
 SHA512:
-  metadata.gz: 77e0cd8aad0ccc076168d44f433a9dee967d7d426807fd5d8870892888523ddbe046fa5d9f3e980050abb1a3d844f7fe7d82a101a470ad160e25089925ed047b
-  data.tar.gz: da9ad5a98a9cfded7a8358dd18f62132e238b501d82264d6b9ed04d748206814613fa1c0973cf7b484cc080a50b38e6269ff8e7d60b055910dc4500f82891be3
+  metadata.gz: 0bdb13b855926133b2250c82d607c35d397b744c4f2704deb9e27305067e79a212f66c2ef37f5556e1cbcde0d58c3618203c3fba063d18b7e87cffc851c60d88
+  data.tar.gz: bcf5d485d708c55b286788c9c8302694bec75cee1b2f2bf30da30d785bc92cd520266586809deb2b9a51df42330572a792cb73c2955524a4ed63a787fec7e7e4

data/.travis.yml

@@ -4,9 +4,6 @@ rvm:
   - '2.4.0'
   - '2.3.3'
   - '2.2.6'
-  - '2.1.10'
-before_script:
-  - export JRUBY_OPTS="--2.0"
 before_install:
   - gem update --system
   - gem install bundler

data/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 1.1.0
 
+* Add metadata to rack instrumentation
 * Add msgr server & client instrumentation
 * Add sidekiq client instrumentation
 * Add sidekiq server instrumentation

data/README.md

@@ -12,6 +12,7 @@ Currently supported probes:
 * Mnemosyne: Custom traces
 * Responders: render time
 * Restify: Remote calls including tracing middleware
+* Sidekiq: Client and server tracing
 * Rack: Middleware for request tracing
 
 ## Installation

data/lib/mnemosyne/client.rb

@@ -42,7 +42,7 @@ module Mnemosyne
 
       exchange.publish JSON.dump(message),
         persistent: true,
-        routing_key: 'mnemosyne.trace',
+        routing_key: "mnemosyne.trace.#{@config.platform}",
         content_type: 'application/json'
     end
 

data/lib/mnemosyne/configuration.rb

@@ -28,6 +28,18 @@ module Mnemosyne
       @amqp        = AMQ::Settings.configure(server).freeze
       @server      = make_amqp_uri(@amqp).to_s.freeze
 
+      raise ArgumentError.new 'Platform is required' if platform.blank?
+
+      if @platform =~ /[^a-zA-Z0-9\-]/
+        raise ArgumentError.new \
+          'Platform may only contain alphanumeric characters'
+      end
+
+      unless @platform =~ /\A[a-zA-Z0-9]+(\-[a-zA-Z0-9]+)*\z/
+        raise ArgumentError.new \
+          'Platform must start and end with a alphanumeric characters'
+      end
+
       raise ArgumentError.new('Application is required') if application.blank?
       raise ArgumentError.new('Hostname is required') if hostname.blank?
     end

data/lib/mnemosyne/middleware/rack.rb

@@ -54,15 +54,28 @@ module Mnemosyne
         @app = app
       end
 
-      def call(env)
+      def call(env) # rubocop:disable AbcSize
         origin      = env.fetch('HTTP_X_MNEMOSYNE_ORIGIN', false)
         transaction = env.fetch('HTTP_X_MNEMOSYNE_TRANSACTION') do
           ::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
+          origin: origin,
+          meta: meta
 
         if trace
           trace.start!

data/lib/mnemosyne/probes/msgr/consumer.rb

@@ -16,10 +16,11 @@ module Mnemosyne
           def dispatch(message) # rubocop:disable AbcSize
             route = message.route
             metadata = message.metadata
+            headers = metadata.headers || {}
             delivery_info = message.delivery_info
 
-            origin      = metadata.headers.delete('mnemosyne.origin')
-            transaction = metadata.headers.delete('mnemosyne.transaction') do
+            origin      = headers.delete('mnemosyne.origin')
+            transaction = headers.delete('mnemosyne.transaction') do
               ::SecureRandom.uuid
             end
 

data/lib/mnemosyne/version.rb

@@ -5,7 +5,7 @@ module Mnemosyne
     MAJOR = 1
     MINOR = 1
     PATCH = 0
-    STAGE = :rc1
+    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.1.0.rc1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -176,9 +176,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11