mnemosyne-ruby 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 577b1ff892814a13933e71023e510dbe5cc51b6c
-  data.tar.gz: dddfd0f83e7fc0bd58600a9f3acdc46462d8922c
+  metadata.gz: 619bd5e8b0c8d56d2d0dd8e2634997f65fd25312
+  data.tar.gz: 501700e283258d8642f1381f1a3a0194ab1e2b43
 SHA512:
-  metadata.gz: eaa317aac84fbb7358d7dd8b67047bf2128bc27d6d222243557d96878c84da071192a1ac7b2a974799b18f39741404e4fc81e6930bb0ecd08e21e254dcd7c5b7
-  data.tar.gz: 6f2373a6981ec4547ef3153202cfd4833df22f37cae9abdc04c54c9e7676d02583bf2b3afefa2fa67105837aefd8e41e9a2f44532aa10c9dcf941fb99b741493
+  metadata.gz: 972cc7a4654172aae0196180f011fbbea7dfb94b8e023d39467347122203fae099d64b4bf117c9407100b99a103c48bd73d9ca253b88ef06c5e7f5f288dcddc1
+  data.tar.gz: bd18c3daa03b4e70449c55943be7a62a0a0f16cd354022b52c6002b86d32f25436c5b6ddd22a9e71935337fc7f39977c97e83bbcfd3248cf51593b23bce66914

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.0.0
+
+* Use semantic versioning
+* Fix issue with acfs middleware on non-tracing contexts
+* Simplify restify probe to only extend base adapter
+* Remove FQDN lookup as it failed on missing RDNS
+
 ## 0.2.0
 
 * Rename gem to mnemosyne-ruby due to name conflict

data/README.md

@@ -19,7 +19,7 @@ Currently supported probes:
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mnemosyne-ruby', '0.2.0'
+gem 'mnemosyne-ruby', '~> 1.0'
 ```
 
 And then execute:

data/lib/mnemosyne/config.rb

@@ -37,7 +37,7 @@ module Mnemosyne
     private
 
     def default_hostname
-      Socket.gethostbyname(Socket.gethostname).first
+      Socket.gethostname
     end
 
     def make_amqp_uri(amqp)

data/lib/mnemosyne/middleware/acfs.rb

@@ -19,13 +19,11 @@ module Mnemosyne
 
           request.headers['X-Mnemosyne-Transaction'] = trace.transaction
           request.headers['X-Mnemosyne-Origin'] = span.uuid
-        end
 
-        request.on_complete do |response, nxt|
-          begin
+          request.on_complete do |response, nxt|
             span.finish!
             trace << span
-          ensure
+
             nxt.call(response)
           end
         end

data/lib/mnemosyne/middleware/restify.rb

@@ -3,46 +3,25 @@
 module Mnemosyne
   module Middleware
     module Restify
-      class Writer
-        def initialize(writer, trace, span)
-          @writer = writer
-          @trace = trace
-          @span = span
-        end
-
-        def fulfill(*args)
-          @span.finish!
-          @trace << @span
-
-          @writer.fulfill(*args)
-        end
-
-        def reject(*args)
-          @span.finish!
-          @trace << @span
-
-          @writer.reject(*args)
-        end
-      end
-
-      class << self
-        # rubocop:disable Metrics/MethodLength
-        def call(request, writer)
-          if (trace = ::Mnemosyne::Instrumenter.current_trace)
-            meta = {url: request.uri, method: request.method}
+      # rubocop:disable Metrics/MethodLength
+      def call(request)
+        if (trace = ::Mnemosyne::Instrumenter.current_trace)
+          meta = {url: request.uri, method: request.method}
 
-            span = ::Mnemosyne::Span.new('external.http.restify', meta: meta)
-            span.start!
+          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
+          request.headers['X-Mnemosyne-Transaction'] = trace.transaction
+          request.headers['X-Mnemosyne-Origin'] = span.uuid
 
-            hook = Writer.new(writer, trace, span)
+          super.then do |response|
+            span.finish!
+            trace << span
 
-            yield request, hook
-          else
-            yield request, writer
+            response
           end
+        else
+          super
         end
       end
     end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Mnemosyne
+  module Probes
+    module Restify
+      module Base
+        class Probe < ::Mnemosyne::Probe
+          def setup
+            require 'mnemosyne/middleware/restify'
+
+            ::Restify::Adapter::Base.prepend ::Mnemosyne::Middleware::Restify
+          end
+        end
+      end
+    end
+
+    register 'Restify::Adapter::Base',
+      'restify/adapter/base',
+      Restify::Base::Probe.new
+  end
+end

data/lib/mnemosyne/version.rb

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

data/lib/mnemosyne.rb

@@ -32,8 +32,7 @@ module Mnemosyne
     require 'mnemosyne/probes/grape/endpoint_run'
     require 'mnemosyne/probes/grape/endpoint_run_filters'
     require 'mnemosyne/probes/responder/respond'
-    require 'mnemosyne/probes/restify/em'
-    require 'mnemosyne/probes/restify/typhoeus'
+    require 'mnemosyne/probes/restify/base'
   end
 
   module Middleware

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mnemosyne-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -147,8 +147,7 @@ files:
 - lib/mnemosyne/probes/grape/endpoint_run_filters.rb
 - lib/mnemosyne/probes/mnemosyne/tracer.rb
 - lib/mnemosyne/probes/responder/respond.rb
-- lib/mnemosyne/probes/restify/em.rb
-- lib/mnemosyne/probes/restify/typhoeus.rb
+- lib/mnemosyne/probes/restify/base.rb
 - lib/mnemosyne/railtie.rb
 - lib/mnemosyne/span.rb
 - lib/mnemosyne/trace.rb
@@ -176,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby/Rails client for Mnemosynce

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

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Mnemosyne
-  module Probes
-    module Restify
-      module EM
-        class Probe < ::Mnemosyne::Probe
-          def setup
-            require 'mnemosyne/middleware/restify'
-
-            ::Restify::Adapter::EM::Connection.prepend Instrumentation
-          end
-
-          module Instrumentation
-            def call(request, writer, *args)
-              ::Mnemosyne::Middleware::Restify.call(request, writer) do |r, w|
-                super(r, w, *args)
-              end
-            end
-          end
-        end
-      end
-    end
-
-    register 'Restify::Adapter::EM::Connection',
-      'restify/adapter/em',
-      Restify::EM::Probe.new
-  end
-end

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

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Mnemosyne
-  module Probes
-    module Restify
-      module Typhoeus
-        class Probe < ::Mnemosyne::Probe
-          def setup
-            require 'mnemosyne/middleware/restify'
-
-            ::Restify::Adapter::Typhoeus.prepend Instrumentation
-          end
-
-          module Instrumentation
-            def queue(request, writer)
-              ::Mnemosyne::Middleware::Restify.call(request, writer) do |r, w|
-                super(r, w)
-              end
-            end
-          end
-        end
-      end
-    end
-
-    register 'Restify::Adapter::Typhoeus',
-      'restify/adapter/typhoeus',
-      Restify::Typhoeus::Probe.new
-  end
-end