lhc 6.6.0.zipkin.pre.01 → 6.6.0.zipkin.pre.02

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b6394b6bd8236ce4d4e08466c9cd9e66fea9530
-  data.tar.gz: 7bb72782b609582d68d0dca748cd08f0245cebae
+  metadata.gz: 4dbb6e2b6d5d0ccc7f366aab3cd56b140135f36e
+  data.tar.gz: c5d5123bc892714980d032602151c94f5edd0cbe
 SHA512:
-  metadata.gz: 1b4b679cc13ea4b2434b43f5f1a4272f42584cad6b09c3b488d3c5ac6af997bd277742a2bcb2271e189247ede1a661745c4127cff286cfe82ce25e7b7b656631
-  data.tar.gz: a03ac4c46ea0ec3eca544d0ee5595cf13ca9188f12d920aef23fd6c41afc7c861efb70f844a477879bb3af4826876a3f6642b6a7f8a51dce9c19b3bd6c0744f9
+  metadata.gz: 2b5dae66477ba3410859897ba899e79a69a7285a4211caaa7e3cc641f46a50a4927c5cfb1304c38790145d290e7761058832ceb68c926a3e433424fd783c5ebb
+  data.tar.gz: 73b06b7821eae214634372fbd408227f5ce5882858a8e5484fb307b142f90ef9d18bcc78063b80ad4864fd4ab6f64b1ce36ab7d3275797235e920a8d011479be

data/lib/lhc/interceptors/zipkin_distributed_tracing.rb

@@ -1,12 +1,68 @@
+require 'uri'
+
 class LHC::ZipkinDistributedTracing < LHC::Interceptor
 
   def before_request(request)
-    return unless defined?(ZipkinTracer::TraceContainer)
-    container = ZipkinTracer::TraceContainer.current
-    request.headers['X-B3-TraceId'] = container.trace_id.to_s
-    request.headers['X-B3-ParentSpanId'] = container.parent_id.to_s if container.parent_id
-    request.headers['X-B3-SpanId'] = container.span_id.to_s
-    request.headers['X-B3-Sampled'] = container.sampled
-    request.headers['X-B3-Flags'] = container.flags
+    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/lib/lhc/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 6.6.0.zipkin.pre.01
+  version: 6.6.0.zipkin.pre.02
 platform: ruby
 authors:
 - https://github.com/local-ch/lhc/contributors