escobar 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bed76fa019336ccd8f401df62b43d859f103e89
-  data.tar.gz: 2cb3b526239b70ca434128d71eb1c566bffa10a8
+  metadata.gz: c241487c5b5f18347663a1168065ca951ae26f97
+  data.tar.gz: da5f181b77a11d74c30feb811a663b3dbf9bdc9a
 SHA512:
-  metadata.gz: 731b0a552e481ad657f2dd53bd3b9f985fe419fa5aa3571fcf88bbc32c2fc53fdb1dcf2162f1347d1cbd484679ace5821510f3c987a9251c3011746f5fcf579b
-  data.tar.gz: a188f2251e311d1c34a9b67306321e57e45201eb62604646ef718b3e81d1317c13feb25b095875ec296fe1f4514f790440b4da72c1ef2aeab08b2a4a25a99284
+  metadata.gz: 308dfbaab7182068b8ebb41a38f9c863c1af02be926b56eb6b7d6326d27c8533574d9ef93c738ae1abb46589fef56133c52127eda058f3230ddef7aa5d3e83bc
+  data.tar.gz: ebc8e58566614a2f096e0b6c5d70661a5ad3962a1c03e2efb3511f3a50a3ba6cb48d522d46509c83cd946b92d2ba1cef03b7556bc18622b54de226dfc8027dcb

data/.rubocop.yml

@@ -116,3 +116,4 @@ Rails/Delegate:
 BlockLength:
   Exclude:
     - 'spec/**/*'
+    - '*.gemspec'

data/escobar.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "faraday", "~> 0.9.2"
   spec.add_dependency "netrc", "~> 0.11"
+  spec.add_dependency "zipkin-tracer", "~> 0.18"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "byebug"

data/lib/escobar/github/client.rb

@@ -116,7 +116,19 @@ module Escobar
       private
 
       def client
-        @client ||= Faraday.new(url: "https://api.github.com")
+        @client ||= Escobar.zipkin_enabled? ? zipkin_client : default_client
+      end
+
+      def zipkin_client
+        Faraday.new(url: "https://api.github.com") do |c|
+          c.use :instrumentation
+          c.use ZipkinTracer::FaradayHandler, "api.github.com"
+          c.adapter Faraday.default_adapter
+        end
+      end
+
+      def default_client
+        Faraday.new(url: "https://api.github.com")
       end
     end
   end

data/lib/escobar/heroku/client.rb

@@ -86,7 +86,19 @@ module Escobar
       end
 
       def client
-        @client ||= Faraday.new(url: "https://api.heroku.com")
+        @client ||= Escobar.zipkin_enabled? ? zipkin_client : default_client
+      end
+
+      def zipkin_client
+        Faraday.new(url: "https://api.heroku.com") do |c|
+          c.use :instrumentation
+          c.use ZipkinTracer::FaradayHandler, "api.heroku.com"
+          c.adapter Faraday.default_adapter
+        end
+      end
+
+      def default_client
+        Faraday.new(url: "https://api.heroku.com")
       end
     end
   end

data/lib/escobar/heroku/pipeline.rb

@@ -131,13 +131,33 @@ module Escobar
       end
 
       def kolkrabbi_client
-        @kolkrabbi ||= Faraday.new(url: "https://#{ENV['KOLKRABBI_HOSTNAME']}")
+        @kolkrabbi ||= if Escobar.zipkin_enabled?
+                         kolkrabbi_zipkin_client
+                       else
+                         kolkrabbi_default_client
+                       end
+      end
+
+      def kolkrabbi_zipkin_client
+        Faraday.new(url: "https://#{kolkrabbi_hostname}") do |c|
+          c.use :instrumentation
+          c.use ZipkinTracer::FaradayHandler, kolkrabbi_hostname
+          c.adapter Faraday.default_adapter
+        end
+      end
+
+      def kolkrabbi_default_client
+        Faraday.new(url: "https://#{kolkrabbi_hostname}")
       end
 
       def create_deployment_status(url, payload)
         github_client.create_deployment_status(url, payload)
       end
 
+      def kolkrabbi_hostname
+        ENV.fetch("KOLKRABBI_HOSTNAME", "kolkrabbi.heroku.com")
+      end
+
       private
 
       def remote_repository

data/lib/escobar/version.rb

@@ -1,3 +1,3 @@
 module Escobar
-  VERSION = "0.3.8".freeze
+  VERSION = "0.3.9".freeze
 end

data/lib/escobar.rb

@@ -44,6 +44,10 @@ module Escobar
   def self.github_api_token
     netrc["api.github.com"]["password"]
   end
+
+  def self.zipkin_enabled?
+    !ENV["ZIPKIN_SERVICE_NAME"].nil? && !ENV["ZIPKIN_API_HOST"].nil?
+  end
 end
 
 require_relative "./escobar/client"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escobar
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Corey Donohoe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: zipkin-tracer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement