foam-otel 3.0.0.alpha.11 → 3.0.0.alpha.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a99c91ac48b87605a88f36e38e06ceddf80a6af6f029aad030203bc3d09603fb
-  data.tar.gz: 840a2d7cbf0baebf643c3f0422c310da434d3dc147c23e0c919792f36b4e3726
+  metadata.gz: b67fa02fd12d317a0bceff3c596f63d928b0187995d02e95191f9ecb05b7383e
+  data.tar.gz: 6933cac173a8df6fa83fe474f06fd59569d0da61eb4a78f16919c695561b63af
 SHA512:
-  metadata.gz: b01ef004f8ee7e8638badb8ee4934b07df03a2f636ec61bbf6a0f1d77fae7e187ddb41dca30c0b0dc667e9a3a1c2d9792bb70fe7f4f38295c0e03e4474d40471
-  data.tar.gz: 666a66c3c6a5da5e8d3daf5c50b4536155538bfa321ce82bd6bfa3dcf97f407fac976b81999b50abdd4e0d7d50ac7e3172b55f30f1dca3afbbb223653ca3eea3
+  metadata.gz: a7080090c2024fda65b0bf8d76edbe311961ae7c26814cd3154c11e9c7735e9730c10e100468d1046acc94e1cb2b2d1518b50cdc72b631201187b271b167c722
+  data.tar.gz: 184764049f1395f94f270cec7054138cfd78c8f6b40c93c3cafafdcb4cd7a3754bfa1eed0851e47d1f96258f10e1dea51889624862e07f86579e42d73a26353a

data/README.md

@@ -443,7 +443,7 @@ Traces, metrics, and logs are flushed before the handler returns (including fail
 
 ## Pre-forking servers and threads
 
-TODO(jhartquist): pre-forking servers (Puma in cluster mode, Unicorn, Pitchfork, Resque): whether to call `init` before or after the fork, and what the SDK's batch processors and the metric reader do in the child. Foam registers no fork hook today.
+Call `init` once, in the process that forks: the master of Puma in cluster mode with `preload_app!` (the default since Puma 7), the master of Unicorn with `preload_app true`, or a worker that forks a child per job. Each child exports its own traces, logs, and metrics, carrying its own `process.pid`.
 
 The current span and baggage are stored per fiber. A `Thread.new` or `Fiber.new` starts with none, so spans started inside it begin a new trace. To continue the trace, capture the context first and make it current inside the thread:
 

data/lib/foam/otel/internal/exporters.rb

@@ -12,12 +12,16 @@ module Foam
         # A copy has the before_send hook's edits, Foam's identity merged over its resource, and every
         # sensitive value masked.
         module ExportCopies
-          # Explicit path and headers so the SDK does not derive them from OTEL_* env.
+          # Explicit path, headers, and compression so the SDK does not derive them from OTEL_* env.
           def initialize(token:, redactor:, before_send: BeforeSend::NONE, stamp: {})
             @redactor = redactor
             @before_send = before_send
             @stamp = OpenTelemetry::SDK::Resources::Resource.create(stamp)
-            super(endpoint: Endpoint.url(self.class::PATH), headers: Constants.bearer_headers(token))
+            super(
+              endpoint: Endpoint.url(self.class::PATH),
+              headers: Constants.bearer_headers(token),
+              compression: "gzip"
+            )
           end
 
           # The encoder groups items by resource object, so items sharing one must share its
@@ -50,12 +54,6 @@ module Foam
           def redacted_attributes(attributes)
             attributes && @redactor.redact_attributes(attributes)
           end
-
-          # The encoder derives a dropped count as the total minus what is present, so the copy's total
-          # must follow its size to keep the SDK's dropped count.
-          def total_recorded(original_total, original_list, list)
-            original_total - original_list&.size.to_i + list.size
-          end
         end
 
         class TraceExporter < OpenTelemetry::Exporter::OTLP::Exporter
@@ -70,8 +68,31 @@ module Foam
           }.freeze
           SUCCESS = OpenTelemetry::SDK::Trace::Export::SUCCESS
 
+          # The upstream span encoder, with a hash the hook added exported as a nested map, as it is in
+          # a log attribute. The upstream encoder has no case for a hash and sends an empty value.
+          module Encoder
+            include OpenTelemetry::Exporter::OTLP::Common
+            extend self
+
+            private
+
+            def as_otlp_any_value(value)
+              return super unless value.is_a?(Hash)
+
+              values = value.map { |key, item| as_otlp_key_value(key.to_s, item) }
+              Opentelemetry::Proto::Common::V1::AnyValue.new(
+                kvlist_value: Opentelemetry::Proto::Common::V1::KeyValueList.new(values: values)
+              )
+            end
+          end
+
           private
 
+          # The inherited method calls the upstream encoder directly.
+          def encode(span_data)
+            Encoder.as_encoded_etsr(span_data)
+          end
+
           # The span as the hook left it, with its own, event, and link attributes and its status redacted; nil when
           # the hook dropped it.
           def redacted_copy(span, resource, &on_raise)
@@ -142,15 +163,10 @@ module Foam
             )
           end
 
-          # A hash the hook added exports as a nested map, as it does in a log attribute; the span
-          # encoder this class inherits has no case for one and would send an empty value.
-          def as_otlp_any_value(value)
-            return super unless value.is_a?(Hash)
-
-            values = value.map { |key, item| as_otlp_key_value(key.to_s, item) }
-            Opentelemetry::Proto::Common::V1::AnyValue.new(
-              kvlist_value: Opentelemetry::Proto::Common::V1::KeyValueList.new(values: values)
-            )
+          # The encoder derives a dropped count as the total minus what is present, so the copy's total
+          # must follow its size to keep the SDK's dropped count.
+          def total_recorded(original_total, original_list, list)
+            original_total - original_list&.size.to_i + list.size
           end
         end
 
@@ -172,8 +188,6 @@ module Foam
               copy.severity_text = event[:severity_text]
               copy.severity_number = event[:severity_number]
               copy.attributes = redacted_attributes(event[:attributes])
-              copy.total_recorded_attributes =
-                total_recorded(record.total_recorded_attributes, record.attributes, copy.attributes)
               copy.resource = resource
             end
           end

data/lib/foam/otel/version.rb

@@ -2,6 +2,6 @@
 
 module Foam
   module Otel
-    VERSION = "3.0.0.alpha.11"
+    VERSION = "3.0.0.alpha.12"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foam-otel
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.11
+  version: 3.0.0.alpha.12
 platform: ruby
 authors:
 - Foam
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.34.1
+        version: 0.37.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.34.1
+        version: 0.37.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-exporter-otlp-logs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-exporter-otlp-metrics
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-all
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.96.0
+        version: 0.97.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.96.0
+        version: 0.97.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-logger
   requirement: !ruby/object:Gem::Requirement
@@ -86,56 +86,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-logs-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-metrics-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-metrics-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement