lhc 6.6.0.zipkin.pre.03 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2bc1327e52311ae1c2731d5f722ed845dc8a105
-  data.tar.gz: f155c109b398297e20f66c12d0fece66d100ca71
+  metadata.gz: e8592e613a6a21d6dfc84973f2ab064d9e441246
+  data.tar.gz: 73b9069f8c0793e5775c95e754c9160f70fc158a
 SHA512:
-  metadata.gz: 0c81778de17035048ae754a841abff3bb1f438b9692344448bf297600e288e338eab5cd990f32733b9ec3dcf0e0637885041b6c6d2ce36222c02658407203d37
-  data.tar.gz: fe7d4392740d6f7e952e6f2c041ff2fb5edb969e9ded6fe6cc3d7190072bcd7efefb5295c9d21dda98fad434201bfb596b49aa5dd95fb50ef42e3c0323e0c9e2
+  metadata.gz: 9fc936bc72038bfb6833307dc9594d7f3e9721f406df6ed9eac1036ea6b45afa3e149d8b333ca1b29c067308ad2c3762e77333c9a3abb9e12b6e77610ff1f82e
+  data.tar.gz: ec2dda75db78848b877bd5bcfcc2f88aedb6694aeda1c70eec419c7df6f52dfe684397a30a60aebaf157769916b0ed34c309ca43e0215dfd2cdb9cdbf70b5f43

data/lib/lhc.rb

@@ -112,8 +112,6 @@ module LHC
     'lhc/response'
   autoload :Rollbar,
     'lhc/interceptors/rollbar'
-  autoload :ZipkinDistributedTracing,
-    'lhc/interceptors/zipkin_distributed_tracing'
 
   require 'lhc/railtie' if defined?(Rails)
 end

data/lib/lhc/request.rb

@@ -8,7 +8,7 @@ class LHC::Request
 
   TYPHOEUS_OPTIONS ||= [:params, :method, :body, :headers, :follow_location]
 
-  attr_accessor :response, :options, :raw, :format, :error_handler, :errors_ignored, :interceptor_environment
+  attr_accessor :response, :options, :raw, :format, :error_handler, :errors_ignored
 
   def initialize(options, self_executing = true)
     self.errors_ignored = options.fetch(:ignored_errors, [])
@@ -19,7 +19,6 @@ class LHC::Request
     self.iprocessor = LHC::InterceptorProcessor.new(self)
     self.raw = create_request
     self.format = options.delete('format') || LHC::Formats::JSON.new
-    self.interceptor_environment ||= {}
     iprocessor.intercept(:before_request, self)
     raw.run if self_executing && !response
   end

data/lib/lhc/version.rb

@@ -1,3 +1,3 @@
 module LHC
-  VERSION ||= "6.6.0.zipkin.pre.03"
+  VERSION ||= "6.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 6.6.0.zipkin.pre.03
+  version: 6.6.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhc/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -207,7 +207,6 @@ files:
 - lib/lhc/interceptors/monitoring.rb
 - lib/lhc/interceptors/prometheus.rb
 - lib/lhc/interceptors/rollbar.rb
-- lib/lhc/interceptors/zipkin_distributed_tracing.rb
 - lib/lhc/railtie.rb
 - lib/lhc/request.rb
 - lib/lhc/response.rb
@@ -295,7 +294,6 @@ files:
 - spec/interceptors/response_competition_spec.rb
 - spec/interceptors/return_response_spec.rb
 - spec/interceptors/rollbar/main_spec.rb
-- spec/interceptors/zipkin/distributed_tracing_spec.rb
 - spec/rails_helper.rb
 - spec/request/encoding_spec.rb
 - spec/request/error_handling_spec.rb
@@ -320,7 +318,6 @@ files:
 - spec/support/fixtures/json/localina_content_ad.json
 - spec/support/load_json.rb
 - spec/support/reset_config.rb
-- spec/support/zipkin.rb
 - spec/timeouts/no_signal_spec.rb
 - spec/timeouts/timings_spec.rb
 homepage: https://github.com/local-ch/lhc
@@ -338,9 +335,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - Ruby >= 2.0.0
 rubyforge_project: 
@@ -426,7 +423,6 @@ test_files:
 - spec/interceptors/response_competition_spec.rb
 - spec/interceptors/return_response_spec.rb
 - spec/interceptors/rollbar/main_spec.rb
-- spec/interceptors/zipkin/distributed_tracing_spec.rb
 - spec/rails_helper.rb
 - spec/request/encoding_spec.rb
 - spec/request/error_handling_spec.rb
@@ -451,6 +447,5 @@ test_files:
 - spec/support/fixtures/json/localina_content_ad.json
 - spec/support/load_json.rb
 - spec/support/reset_config.rb
-- spec/support/zipkin.rb
 - spec/timeouts/no_signal_spec.rb
 - spec/timeouts/timings_spec.rb

data/lib/lhc/interceptors/zipkin_distributed_tracing.rb

@@ -1,68 +0,0 @@
-require 'uri'
-
-class LHC::ZipkinDistributedTracing < LHC::Interceptor
-
-  def before_request(request)
-    return unless defined?(ZipkinTracer::TraceContainer) && ZipkinTracer::TraceContainer.current && defined?(Trace)
-    trace_id = ZipkinTracer::TraceGenerator.new.next_trace_id
-    ZipkinTracer::TraceContainer.with_trace_id(trace_id) do
-      b3_headers.each do |method, header|
-        request.headers[header] = trace_id.send(method).to_s
-      end
-      trace!(request, trace_id) if ::Trace.tracer && trace_id.sampled?
-    end
-  end
-
-  def after_response(response)
-    if span = response.request.interceptor_environment[:zipkin_span]
-      record_response_tags(span, response)
-    end
-    span.record(Trace::Annotation::CLIENT_RECV, local_endpoint)
-    Trace.tracer.end_span(span)
-  end
-  private
-
-  SERVER_ADDRESS_SPECIAL_VALUE = '1'.freeze
-
-  def b3_headers
-    {
-      trace_id: 'X-B3-TraceId',
-      parent_id: 'X-B3-ParentSpanId',
-      span_id: 'X-B3-SpanId',
-      sampled: 'X-B3-Sampled',
-      flags: 'X-B3-Flags'
-    }
-  end
-
-  def trace!(request, trace_id)
-    url_string = request.raw.url
-    url = URI(url_string)
-    service_name = url.host
-    span = Trace.tracer.start_span(trace_id, request.method.to_s.downcase)
-    # annotate with method (GET/POST/etc.) and uri path
-    span.record_tag(Trace::BinaryAnnotation::PATH, url.path, Trace::BinaryAnnotation::Type::STRING, local_endpoint)
-    span.record_tag(Trace::BinaryAnnotation::SERVER_ADDRESS, SERVER_ADDRESS_SPECIAL_VALUE, Trace::BinaryAnnotation::Type::BOOL, remote_endpoint(url, service_name))
-    span.record(Trace::Annotation::CLIENT_SEND, local_endpoint)
-    # store the span in the datum hash so it can be used in the response_call
-    request.interceptor_environment[:zipkin_span] = span
-  rescue ArgumentError, URI::Error => e
-    # Ignore URI errors, don't trace if there is no URI
-  end
-
-  def local_endpoint
-    Trace.default_endpoint # The rack middleware set this up for us.
-  end
-
-  def remote_endpoint(url, service_name)
-    Trace::Endpoint.remote_endpoint(url, service_name, local_endpoint.ip_format) # The endpoint we are calling.
-  end
-
-  def record_response_tags(span, response)
-    status = response.code.to_s
-    span.record_tag(Trace::BinaryAnnotation::STATUS, status, Trace::BinaryAnnotation::Type::STRING, local_endpoint)
-    if !response.success?
-      span.record_tag(Trace::BinaryAnnotation::ERROR, status,
-        Trace::BinaryAnnotation::Type::STRING, local_endpoint)
-    end
-  end
-end

data/spec/interceptors/zipkin/distributed_tracing_spec.rb

@@ -1,29 +0,0 @@
-require 'rails_helper'
-
-describe LHC::ZipkinDistributedTracing do
-  before(:all) do
-    # defined in spec/support/zipkin.rb
-    ::ZipkinTracer::TraceContainer.setup_mock(
-      trace_id: 'trace_id',
-      parent_id: 'parent_id',
-      span_id: 'span_id',
-      sampled: 'sampled',
-      flags: 'flags'
-    )
-  end
-
-  before(:each) do
-    LHC.config.interceptors = [described_class]
-    LHC.config.endpoint(:local, 'http://local.ch')
-    stub_request(:get, 'http://local.ch').to_return(status: 200, body: 'The Website')
-  end
-
-  it 'adds the proper X-B3 headers' do
-    headers = LHC.get(:local).request.headers
-    expect(headers['X-B3-TraceId']).to eq('trace_id')
-    expect(headers['X-B3-ParentSpanId']).to eq('parent_id')
-    expect(headers['X-B3-SpanId']).to eq('span_id')
-    expect(headers['X-B3-Sampled']).to eq('sampled')
-    expect(headers['X-B3-Flags']).to eq('flags')
-  end
-end

data/spec/support/zipkin.rb

@@ -1,20 +0,0 @@
-module ZipkinTracer
-  class TraceContainer
-    attr_reader :trace_id, :parent_id, :span_id, :sampled, :flags
-    class << self
-      attr_accessor :current
-
-      def setup_mock(trace_id:, parent_id:, span_id:, sampled:, flags:)
-        @current = new(trace_id: trace_id, parent_id: parent_id, span_id: span_id, sampled: sampled, flags: flags)
-      end
-    end
-
-    def initialize(trace_id:, parent_id:, span_id:, sampled:, flags:)
-      @trace_id = trace_id
-      @parent_id = parent_id
-      @span_id = span_id
-      @sampled = sampled
-      @flags = flags
-    end
-  end
-end