opentrace 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0785fe05f95bd64567435b2bb20ed18d4882a14ac765351a741cf322dc8d6ade'
-  data.tar.gz: b656ded61cf12de7b5657d69234d11fe52ffb7b9eb9aee2cc6568b33baeaa16a
+  metadata.gz: a52fdd745f23752d86ae494048fb8b6395374ec08f7ba6b9e3edccd0bea80036
+  data.tar.gz: b9b3aaab811c9997681a535a1b50d7c9ad0e567c872cb0075c509abd7567f339
 SHA512:
-  metadata.gz: ce7a3567bb634e3859218b7be7b57ede064ebdad47943855fc4758c764eea74a13608e2c5983e965e793f0f36786043146c00dfa65c8b5bcb85ebf4e499567d4
-  data.tar.gz: 9c01f33f3b5416e9fea909b2c3ac841742fdb6ed4b85feb156e8166585790a76d373e2e2714ea67afc9bb5d8ec2d24f040b4c53e6c7646389d55b3165f759427
+  metadata.gz: 7dc954766e198906d4c16448b49be2e0dc26aca08e5f8fa3031d3a6f6c6d9c98f6278e2febbc3f717680522b06807c756a80f3b84dbf69c1c8c20e8ca1c99b6b
+  data.tar.gz: 0f0a49079c6bef6317208325361dfa4edd07cc509043a7e10dbceadd67ecda35311e306c2e5fb64115bf4e6fab111e23fac05ccbe5bcddb5324aad7325d4a06c

data/lib/opentrace/http_tracker.rb

@@ -43,14 +43,34 @@ module OpenTrace
       # Guard 2: skip if this IS an OpenTrace dispatch call (prevent infinite recursion)
       return super if Fiber[:opentrace_http_tracking_disabled]
 
-      # Inject trace context into outgoing request headers
-      inject_trace_context(req) if OpenTrace.config.trace_propagation
+      # Trace context injection is bookkeeping — must never raise to the host.
+      begin
+        inject_trace_context(req) if OpenTrace.config.trace_propagation
+      rescue StandardError
+      end
 
-      collector = Fiber[:opentrace_collector]
       start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
-      response = super
+      begin
+        response = super
+      rescue IOError, SystemCallError, OpenSSL::SSL::SSLError, Timeout::Error, Net::ProtocolError => e
+        # Real network error from the host's HTTP call. Record it, then re-raise
+        # so the host app sees the error it's expecting to handle.
+        record_http_failure(req, e, start_time) rescue nil
+        raise
+      end
+
+      # Bookkeeping for a successful response. Any bug here (NoMethodError on
+      # a streaming body, a payload builder regression, etc.) must NOT bubble
+      # into host code — swallow and move on.
+      record_http_success(req, response, start_time) rescue nil
+
+      response
+    end
 
+    private
+
+    def record_http_success(req, response, start_time)
       duration_ms = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time) * 1000
       host = address
       port_str = (port == 443 || port == 80) ? "" : ":#{port}"
@@ -58,18 +78,11 @@ module OpenTrace
       safe_path = req.path.to_s.split("?").first
       url = "#{scheme}://#{host}#{port_str}#{safe_path}"
 
-      # Capture request body (if present and under size limit)
-      req_body = nil
-      if req.body && req.body.is_a?(String) && req.body.bytesize < MAX_BODY_CAPTURE_BYTES
-        req_body = req.body
-      end
-
-      # Capture response body (if under size limit)
-      resp_body = nil
-      if response.body && response.body.is_a?(String) && response.body.bytesize < MAX_BODY_CAPTURE_BYTES
-        resp_body = response.body
-      end
+      req_body = capturable_body(req.body)
+      resp_body = capturable_body(response.body)
+      resp_size = body_size(response)
 
+      collector = Fiber[:opentrace_collector]
       if collector
         collector.record_http(
           method: req.method,
@@ -90,22 +103,23 @@ module OpenTrace
           vendor: vendor,
           status: response.code.to_i,
           duration_ms: duration_ms,
-          request_headers: nil,  # skip headers for now to save memory
+          request_headers: nil,
           request_body: req_body,
           response_headers: nil,
           response_body: resp_body,
-          response_size: response.body&.bytesize,
+          response_size: resp_size,
           retry_attempt: 0,
           error_class: nil
         )
         buffer.record_timeline(type: :http, name: "#{req.method} #{host}", duration_ms: duration_ms)
       end
+    end
 
-      response
-    rescue IOError, SystemCallError, OpenSSL::SSL::SSLError, Timeout::Error, Net::ProtocolError => e
-      # Record the failed HTTP call, then re-raise
+    def record_http_failure(req, error, start_time)
       duration_ms = start_time ? (Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time) * 1000 : 0
+      req_body = req ? capturable_body(req.body) : nil
 
+      collector = Fiber[:opentrace_collector]
       if collector
         collector.record_http(
           method: req&.method,
@@ -113,7 +127,7 @@ module OpenTrace
           host: address,
           status: 0,
           duration_ms: duration_ms,
-          error: e.class.name
+          error: error.class.name
         )
       end
 
@@ -130,14 +144,25 @@ module OpenTrace
           request_body: req_body,
           response_body: nil,
           response_size: nil,
-          error_class: e.class.name
+          error_class: error.class.name
         )
       end
+    end
 
-      raise # ALWAYS re-raise — never swallow app errors
+    def capturable_body(body)
+      return nil unless body.is_a?(String)
+      return nil if body.bytesize >= MAX_BODY_CAPTURE_BYTES
+      body
     end
 
-    private
+    # Response body size when it can be determined without re-reading the stream.
+    # Streaming responses (Net::ReadAdapter) can't be re-read, so we fall back
+    # to Content-Length when present, otherwise nil.
+    def body_size(response)
+      return response.body.bytesize if response.body.is_a?(String)
+      len = response["Content-Length"]
+      len ? len.to_i : nil
+    end
 
     def inject_trace_context(req)
       trace_id = Fiber[:opentrace_trace_id]

data/lib/opentrace/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenTrace
-  VERSION = "0.17.0"
+  VERSION = "0.17.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opentrace
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - OpenTrace