microservice_dsl 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68f80331aa78c068cd49a0857cfdab759b92e526
-  data.tar.gz: b8151235152bd251750c315ef3956e370bb438a1
+  metadata.gz: c45725c06da19dc6140ba5b5507826478500b34a
+  data.tar.gz: 39b1d5d1d571de40fd9df0213580a7d2d503cdf9
 SHA512:
-  metadata.gz: 2d3b0ce97cd1f75f76d90a783dd5c4636c81f929d5a6e4d5428078dff37c6e93e2e18e013df40365192a1b95cade93337eef1552e35422d93dec56ac63b38838
-  data.tar.gz: 0093d08eab116fa76adc104c3faeb9df18843e2e94d8072a541a25b431a6bb94e6f2e08df9cadd01b8dfcd9f7b52b516971c0b8d90d2c2b9a7201bea46b63110
+  metadata.gz: 48ef9fb2e1f4991c46f353cb383ed8a4828be63504c7a3d602d8039436fdd5052dd0b767e01cab6adced13a246b9f706780a90cd5427c8f5e1c86170084e5903
+  data.tar.gz: 29d423a6e8d5ec79c56ab4032f8851b217f6c9e66a93054f52c3a647b4273ff93d18b9e8066df0b09b424d149bcb5c0b8525e55c9c69153cec1c35485171fe6a

data/lib/microservice_dsl/instrument.rb

@@ -0,0 +1,13 @@
+module MicroserviceDSL
+  module Instrument
+    def self.instrument(name, title = nil, body = nil, &block)
+      if defined?(Appsignal)
+        Appsignal.instrument(name, title, body) do
+          block.call
+        end
+      else
+        block.call
+      end
+    end
+  end
+end

data/lib/microservice_dsl/version.rb

@@ -1,3 +1,3 @@
 module MicroserviceDSL
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end

data/lib/microservice_dsl.rb

@@ -12,7 +12,7 @@ module Kernel
 
     url = ENV["#{microservice.upcase}_URL"] || "http://#{microservice}.#{ENV['MS_DOMAIN'] || Rails.env}:#{ENV["MS_#{microservice.upcase}_PORT"] || '3000'}"
     url << "/#{args[:path]}" if args[:path]
-    body = (args[:body].is_a? String) ? args[:body] : args[:body].to_json if args[:body]
+    body = args[:body].is_a? String ? args[:body] : args[:body].to_json if args[:body]
     headers = MicroserviceDSL.default_headers.merge(args[:headers] || {}).merge(MicroserviceDSL.hop_header => MicroserviceDSL.hop_string)
     method = args[:method] || :get
     timeout = ENV['MS_DEFAULT_TIMEOUT'].try(:to_f) || 0
@@ -42,7 +42,9 @@ module Kernel
 
   def call_microservice(microservice, args = {})
     request = prepare_microservice_request microservice, args
-    response = request.run
+    MicroserviceDSL::Instrument.instrument('run.microservice_dsl', 'Call microservice', request.url) do
+      response = request.run
+    end
     [response.body, response.headers['content-type'], response.code]
   end
 end
@@ -62,9 +64,9 @@ module MicroserviceDSL
 
   def self.caching?
     if ENV['MS_CACHE_URL']
-      return true
+      true
     else
-      return false
+      false
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: microservice_dsl
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Vincenzo Ferrara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -126,6 +126,7 @@ files:
 - bin/console
 - bin/setup
 - lib/microservice_dsl.rb
+- lib/microservice_dsl/instrument.rb
 - lib/microservice_dsl/middleware.rb
 - lib/microservice_dsl/railtie.rb
 - lib/microservice_dsl/version.rb
@@ -150,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Little DSL for interact in a microservice environment