flare 0.3.1 → 0.4.0

data/lib/flare/trace_exporter.rb

@@ -12,6 +12,7 @@ require_relative "client_headers"
 require_relative "sampler"
 require_relative "trace_blob"
 require_relative "http_transport"
+require_relative "deadline"
 
 module Flare
   # Custom OTel exporter. For each batch FilteringSpanProcessor hands over:
@@ -33,6 +34,7 @@ module Flare
   class TraceExporter
     SUCCESS = OpenTelemetry::SDK::Trace::Export::SUCCESS
     FAILURE = OpenTelemetry::SDK::Trace::Export::FAILURE
+    TIMEOUT = OpenTelemetry::SDK::Trace::Export::TIMEOUT
 
     PUT_HEADERS = {
       "Content-Type"     => "application/json",
@@ -58,16 +60,22 @@ module Flare
     end
 
     def export(spans, timeout: nil)
+      deadline = Deadline.new(timeout)
       grouped = spans.group_by(&:trace_id)
       return SUCCESS if grouped.empty?
 
       overall = SUCCESS
       grouped.each do |trace_id, group|
-        result = ship(TraceBlob.build(trace_id: trace_id, spans: group))
+        return TIMEOUT if deadline.expired?
+
+        result = ship(TraceBlob.build(trace_id: trace_id, spans: group), deadline: deadline)
+        return TIMEOUT if result == TIMEOUT || deadline.expired?
         overall = FAILURE if result == FAILURE
       end
       overall
     rescue StandardError => e
+      return TIMEOUT if deadline&.expired? || e.is_a?(HttpTransport::DeadlineExceeded)
+
       @exception_count.increment
       @logger.warn("[Flare::TraceExporter] export raised: #{e.class}: #{e.message}")
       FAILURE
@@ -83,8 +91,9 @@ module Flare
 
     private
 
-    def ship(blob, retried: false)
+    def ship(blob, deadline:, retried: false)
       return FAILURE if blob.nil?
+      return TIMEOUT if deadline.expired?
 
       entry = @pool.checkout
       if entry.nil?
@@ -93,29 +102,55 @@ module Flare
       end
 
       body = gzip(JSON.generate(blob.to_h))
-      response = @transport.put(entry[:put_url], body, PUT_HEADERS)
+      response = transport_request(:put, entry[:put_url], body, PUT_HEADERS, timeout: deadline.remaining)
+      return TIMEOUT if deadline.expired?
 
       case response.code
       when "200", "204"
-        notify(entry[:key])
-        SUCCESS
+        notify(entry[:key], deadline: deadline)
       when "403"
         # Presigned URL probably expired; try once more with the next one.
-        retried ? record_put_failure(response) : ship(blob, retried: true)
+        retried ? record_put_failure(response) : ship(blob, deadline: deadline, retried: true)
       else
         record_put_failure(response)
       end
     end
 
-    def notify(key)
-      response = @transport.post(@notify_url, JSON.generate(key: key), notify_headers)
-      return if response.code == "202"
+    def notify(key, deadline:)
+      return TIMEOUT if deadline.expired?
+
+      response = transport_request(
+        :post,
+        @notify_url,
+        JSON.generate(key: key),
+        notify_headers,
+        timeout: deadline.remaining
+      )
+      return TIMEOUT if deadline.expired?
+      return SUCCESS if response.code == "202"
 
       @notify_failure_count.increment
       @logger.warn("[Flare::TraceExporter] notify failed: HTTP #{response.code}")
+      SUCCESS
     rescue StandardError => e
+      return TIMEOUT if deadline.expired? || e.is_a?(HttpTransport::DeadlineExceeded)
+
       @notify_failure_count.increment
       @logger.warn("[Flare::TraceExporter] notify exception: #{e.class}: #{e.message}")
+      SUCCESS
+    end
+
+    def transport_request(method, *args, timeout:)
+      parameters = @transport.method(method).parameters
+      accepts_timeout = parameters.any? do |type, name|
+        type == :keyrest || ([:key, :keyreq].include?(type) && name == :timeout)
+      end
+
+      if accepts_timeout
+        @transport.public_send(method, *args, timeout: timeout)
+      else
+        @transport.public_send(method, *args)
+      end
     end
 
     # Identifies the client on the Flare-API notify POST. The presigned R2

data/lib/flare/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Flare
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/flare.rb

@@ -13,6 +13,8 @@ require_relative "flare/metric_span_processor"
 require_relative "flare/metric_flusher"
 require_relative "flare/backoff_policy"
 require_relative "flare/metric_submitter"
+require_relative "flare/recording_batch_span_processor"
+require_relative "flare/lifecycle"
 
 require_relative "flare/sampler"
 require_relative "flare/marker"
@@ -88,7 +90,7 @@ module Flare
   end
 
   def span_processor
-    @span_processor ||= OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
+    @span_processor ||= RecordingBatchSpanProcessor.new(
       exporter,
       max_queue_size: 1000,
       max_export_batch_size: 100,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flare
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - John Nunemaker
@@ -198,10 +198,12 @@ files:
 - lib/flare/cli/status_command.rb
 - lib/flare/client_headers.rb
 - lib/flare/configuration.rb
+- lib/flare/deadline.rb
 - lib/flare/engine.rb
 - lib/flare/filtering_span_processor.rb
 - lib/flare/http_metrics_config.rb
 - lib/flare/http_transport.rb
+- lib/flare/lifecycle.rb
 - lib/flare/marker.rb
 - lib/flare/metric_counter.rb
 - lib/flare/metric_flusher.rb
@@ -209,6 +211,7 @@ files:
 - lib/flare/metric_span_processor.rb
 - lib/flare/metric_storage.rb
 - lib/flare/metric_submitter.rb
+- lib/flare/recording_batch_span_processor.rb
 - lib/flare/rule_manager.rb
 - lib/flare/sampler.rb
 - lib/flare/source_location.rb
@@ -245,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.7
+rubygems_version: 4.0.18
 specification_version: 4
 summary: Light up what's slowing you down
 test_files: []