bitfab 0.76.4 → 0.76.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 99143cec76387e336a55ce05cf5d971026a2861c3f7ff0d4d8b960de2f06b5eb
4
- data.tar.gz: '080f2fee8ac925c38c1a05b417718b61ac99aa4e285791efeeac897ea7981c24'
3
+ metadata.gz: 2c5e307bee890a9811d0a4cf375fd02ba519176f383bf606ddcc5df2e1db9a9f
4
+ data.tar.gz: f1b7bef4a375dc0351ebca086e72c243c07d6b2e07ed13b916242f01ed22b5e3
5
5
  SHA512:
6
- metadata.gz: be0a213a0a8600e3ed1eb8aa3f0e3a8d5d8d60b85439b51ceecb2ef84185c9a469a0e8b2e2ff606e2c8baa9a44166de69110d34173514ea0d959601dcaaabf0b
7
- data.tar.gz: 198b044448bafe78bcde28186539fca6bb2d648d18467dd14782b754e5cc391a0d8b4c9141c501f305658e206848ad0a65e37d1249d74835f600191a578572ed
6
+ metadata.gz: 0eecc9bba69d6759142c31455f922c2273d1663017b8ec7cc97b5db7d7b0e0b421b114f71d6320a0725dcffaca6ec44fbd141de1d1fe41bac913081823b2a96a
7
+ data.tar.gz: 1106bf462974cd41836a0be4c16f97abdd8397311baf6957d0f154625de50856fdb23ff49aa71d3f9f26f06a8f8e50ef4e14c95ddd5c0f773deb85e4e81266a8
@@ -12,7 +12,7 @@ module Bitfab
12
12
  # batches) ride uncompressed.
13
13
  MIN_COMPRESSED_BYTES = 8_192
14
14
 
15
- PreparedRequest = Struct.new(:body, :content_encoding, :raw_bytes, :wire_bytes)
15
+ PreparedRequest = Struct.new(:body, :content_encoding, :raw_bytes, :wire_bytes, :headers)
16
16
 
17
17
  module_function
18
18
 
@@ -22,10 +22,13 @@ module Bitfab
22
22
  # What a caller learns about one tracked trace once it takes it back.
23
23
  # server_trace_id is the server's assigned traces.id, read back off the OTLP
24
24
  # ingest response; nil when the server predates the field or nothing was acked.
25
- DeliveryReport = Struct.new(:span_count, :closed, :delivered, :server_trace_id)
25
+ # delivered means every carrier came back accepted and stored; it is false
26
+ # when any was only queued. queued is true when the server queued at least
27
+ # one of the trace's carriers instead of storing it.
28
+ DeliveryReport = Struct.new(:span_count, :closed, :delivered, :server_trace_id, :queued)
26
29
 
27
30
  TraceDelivery = Struct.new(:submitted_span_ids, :acked_span_ids, :closed, :closing_acked,
28
- :server_trace_id)
31
+ :server_trace_id, :queued)
29
32
 
30
33
  class HttpClient
31
34
  OTLP_TRACES_ENDPOINT = "/api/sdk/otel/v1/traces"
@@ -167,6 +170,7 @@ module Bitfab
167
170
  max_retries.times do |attempt|
168
171
  req = Net::HTTPGenericRequest.new(method, true, true, uri.request_uri, headers)
169
172
  req["Content-Encoding"] = prepared.content_encoding if prepared.content_encoding
173
+ prepared.headers&.each { |name, value| req[name] = value }
170
174
  req.body = prepared.body
171
175
 
172
176
  response = @connections.with_connection(uri, request_timeout) { |http| http.request(req) }
@@ -568,11 +572,12 @@ module Bitfab
568
572
  server_trace_ids = response.is_a?(Hash) ? response["traceIds"] : nil
569
573
  record_server_trace_ids(server_trace_ids) if server_trace_ids.is_a?(Hash)
570
574
 
575
+ receipt = Otel::DeliveryReceipt.new(queued: response.is_a?(Hash) && response["accepted"] == true)
571
576
  partial_success = response.is_a?(Hash) ? response["partialSuccess"] : nil
572
- return unless partial_success.is_a?(Hash)
577
+ return receipt unless partial_success.is_a?(Hash)
573
578
 
574
579
  rejected = partial_success["rejectedSpans"]
575
- return if rejected.nil? || rejected.to_s == "0"
580
+ return receipt if rejected.nil? || rejected.to_s == "0"
576
581
 
577
582
  # The server's verdict on the payload, not a transient fault.
578
583
  raise Otel::DeliveryError.new(
@@ -617,7 +622,7 @@ module Bitfab
617
622
  trace_ids.each do |trace_id|
618
623
  trace_deliveries[trace_id] ||= TraceDelivery.new(
619
624
  submitted_span_ids: Set.new, acked_span_ids: Set.new,
620
- closed: false, closing_acked: false
625
+ closed: false, closing_acked: false, queued: false
621
626
  )
622
627
  end
623
628
  end
@@ -646,9 +651,10 @@ module Bitfab
646
651
  acc[trace_id] = DeliveryReport.new(
647
652
  span_count: delivery.submitted_span_ids.size,
648
653
  closed: delivery.closed,
649
- delivered: delivery.closing_acked &&
654
+ delivered: !delivery.queued && delivery.closing_acked &&
650
655
  delivery.submitted_span_ids.subset?(delivery.acked_span_ids),
651
- server_trace_id: delivery.server_trace_id
656
+ server_trace_id: delivery.server_trace_id,
657
+ queued: delivery.queued
652
658
  )
653
659
  end
654
660
  end
@@ -696,17 +702,14 @@ module Bitfab
696
702
  end
697
703
  end
698
704
 
699
- # Ingestion commits every carrier in a request before it answers, so a
700
- # delivered ref is proof its row exists: the same fact the replay status
701
- # endpoint would report, already in hand.
702
- #
703
- # Called on exporter threads, hence the mutex.
704
- def record_delivered_carriers(refs)
705
+ def record_delivered_carriers(refs, queued = false)
705
706
  @delivery_mutex.synchronize do
706
707
  refs.each do |ref|
707
708
  delivery = trace_deliveries[ref.trace_id]
708
709
  next if delivery.nil?
709
710
 
711
+ delivery.queued ||= queued
712
+
710
713
  if ref.span_id.nil?
711
714
  delivery.closing_acked = true
712
715
  else
data/lib/bitfab/otel.rb CHANGED
@@ -20,6 +20,7 @@ module Bitfab
20
20
  OPERATION_ATTRIBUTE = "bitfab.operation"
21
21
  PAYLOAD_ATTRIBUTE = "bitfab.payload"
22
22
  CARRIER_REF_IVAR = :@bitfab_carrier_ref
23
+ ASYNC_OK_HEADER = "X-Bitfab-Async-Ok"
23
24
  MAX_REQUEST_BYTES_ENV = "BITFAB_OTEL_MAX_REQUEST_BYTES"
24
25
  EXPORT_CONCURRENCY_ENV = "BITFAB_OTEL_EXPORT_CONCURRENCY"
25
26
  MAX_EXPORT_REQUEST_BYTES = 3_000_000
@@ -66,6 +67,11 @@ module Bitfab
66
67
  # "bitfab.<operation>", nil timestamps let OTel stamp the carrier itself.
67
68
  CarrierMeta = Struct.new(:ref, :name, :started_at, :ended_at, :errored)
68
69
 
70
+ # What the server's acceptance of a request means for its carriers. queued
71
+ # is true when the server queued the request instead of storing it before
72
+ # answering.
73
+ DeliveryReceipt = Struct.new(:queued)
74
+
69
75
  # The invariant head and tail of an OTLP request for one export window. Key
70
76
  # order matches what JSON.generate emits for the equivalent Hash, so a body
71
77
  # assembled by concatenation is byte-identical to encoding that Hash.
@@ -298,11 +304,12 @@ module Bitfab
298
304
  if request_raw_bytes <= MAX_DECOMPRESSED_REQUEST_BYTES
299
305
  prepared = Compress.prepare_request_body(Encoder.encode_request(envelope, request_spans))
300
306
  if prepared.wire_bytes <= @max_request_bytes
301
- send_with_retries(prepared)
307
+ prepared.headers = {ASYNC_OK_HEADER => "1"}
308
+ receipt = send_with_retries(prepared)
302
309
  # Refs come from the original spans: trimming rebuilds a span
303
310
  # without one, and a trimmed carrier still reached the server
304
311
  # under its own identity.
305
- report_delivered(batch.spans)
312
+ report_delivered(batch.spans, receipt.is_a?(DeliveryReceipt) && receipt.queued == true)
306
313
  return true
307
314
  end
308
315
  end
@@ -368,14 +375,14 @@ module Bitfab
368
375
 
369
376
  # Announce the carriers a request delivered. Wrapped because a listener
370
377
  # that raises must never turn a delivered batch into a failed export.
371
- def report_delivered(spans)
378
+ def report_delivered(spans, queued)
372
379
  return if @on_delivered.nil?
373
380
 
374
381
  refs = spans.filter_map(&:ref)
375
382
  return if refs.empty?
376
383
 
377
384
  begin
378
- @on_delivered.call(refs)
385
+ @on_delivered.call(refs, queued)
379
386
  rescue => e
380
387
  Bitfab.warn_once("otel-delivery-listener-failed", "a delivery listener raised: #{e.message}")
381
388
  end
data/lib/bitfab/replay.rb CHANGED
@@ -151,6 +151,7 @@ module Bitfab
151
151
  UNSET_DEFAULT = Object.new.freeze
152
152
  OPTION_DEFAULTS = {mock: "marked"}.freeze
153
153
  PERSISTENCE_TIMEOUT_SECONDS = 30.0
154
+ QUEUED_PERSISTENCE_TIMEOUT_SECONDS = 120.0
154
155
  PERSISTENCE_POLL_SECONDS = 0.1
155
156
  JUDGE_ASSERTIONS_DEPRECATION = "judge_assertions is deprecated. Assertion judging is on by default; " \
156
157
  "pass skip_assertion_judging: true (--skip-assertion-judging) to turn it off."
@@ -1389,7 +1390,8 @@ module Bitfab
1389
1390
  expected_span_counts = deliveries.transform_values(&:span_count)
1390
1391
  return read_back_trace_ids if expected_span_counts.empty? || deliveries.each_value.all?(&:delivered)
1391
1392
 
1392
- deadline = Otel.monotonic_now + timeout
1393
+ poll_budget = raw_deliveries.each_value.any?(&:queued) ? [timeout, QUEUED_PERSISTENCE_TIMEOUT_SECONDS].max : timeout
1394
+ deadline = Otel.monotonic_now + poll_budget
1393
1395
  missing = expected_span_counts.keys
1394
1396
 
1395
1397
  while missing.any?
@@ -1405,7 +1407,7 @@ module Bitfab
1405
1407
  end
1406
1408
 
1407
1409
  missing.each do |trace_id|
1408
- warn_unconfirmed_replay(unconfirmed_replay_warning(labels.fetch(trace_id, trace_id), timeout, flushed))
1410
+ warn_unconfirmed_replay(unconfirmed_replay_warning(labels.fetch(trace_id, trace_id), poll_budget, flushed))
1409
1411
  end
1410
1412
  read_back_trace_ids
1411
1413
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Bitfab
4
- VERSION = "0.76.4"
4
+ VERSION = "0.76.5"
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bitfab
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.76.4
4
+ version: 0.76.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Harvest Team