opentelemetry-sdk 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cb2a536d6bf68847feac7a09754a427cf7b17ef3e84bbffa46048f90cd6577e
-  data.tar.gz: 7b48fd5ecadc6f229b0a32672b280ed6ea924a5e3bf0cd20631694c0bf8ebef0
+  metadata.gz: ef291be552aa487d0348eeadee291923710eb8621f74b552d41835f480056869
+  data.tar.gz: 84ccd40e5b33a3a7a4c0c90b265e87708f3f42ba843166b39d2282aa5eb2382a
 SHA512:
-  metadata.gz: 7fe7fe35fbe00ea7e0370b2b9684800eeae0d13d71c10a28040b3a10f82c63422b4986dbf33164e83b97ed90723cf9d8eff1c75b693c854fab3a9a1f05f59846
-  data.tar.gz: 68795672a61c8a9118507ad0a6cd9b5fa52be71eb06021e2f53e9fc3a490330e1a8c844fd51868b5e413db356f668a8cb32e9a311f36fd51b0e3cb6211111a83
+  metadata.gz: 43c4598b75aaeea2c46e89c72db0bc10b2a78a9a9d553c3bf777d65dc0b80a8cdab4d3c0c52f05fa9fdf691a4e3e8e8cb5e808c4d762fdca7cfa0832ee6dd1a1
+  data.tar.gz: c4e434f89f6a8ee8207b8036e31147db0ea9bf4931bb6130db120c6b6a0b78a93ca32e17bf1316a1b56f6162724335716cfaaf34b6b046a1df28be22de4b9653

data/CHANGELOG.md

@@ -1,41 +1,51 @@
 # Release History: opentelemetry-sdk
 
+### v1.3.2 / 2024-01-23
+
+* FIXED: Reduce allocations on GraphQL hot paths
+* FIXED: Add context to metrics reporting of buffer-full events
+
+### v1.3.1 / 2023-11-02
+
+* FIXED: Spec compliance for span attribute limit
+* FIXED: BatchSpanProcessor#force_flush: purge inherited spans even on shutdown
+
 ### v1.3.0 / 2023-06-08
 
-* BREAKING CHANGE: Remove support for EoL Ruby 2.7 
+* BREAKING CHANGE: Remove support for EoL Ruby 2.7
 
-* ADDED: Remove support for EoL Ruby 2.7 
-* FIXED: SDK requires opentelemetry-common 0.19.7 
+* ADDED: Remove support for EoL Ruby 2.7
+* FIXED: SDK requires opentelemetry-common 0.19.7
 
 ### v1.2.1 / 2023-05-30
 
-* FIXED: Untraced only works with parent-based sampler 
-* DOCS: Improve formatting of usage examples in OpenTelemetry SDK rubydocs 
+* FIXED: Untraced only works with parent-based sampler
+* DOCS: Improve formatting of usage examples in OpenTelemetry SDK rubydocs
 
 ### v1.2.0 / 2022-09-14
 
-* ADDED: Support OTEL_PROPAGATORS=none 
-* ADDED: Support OTEL_ATTRIBUTE_{COUNT,VALUE_LENGTH}_LIMIT env vars 
-* ADDED: Support InstrumentationScope, and update OTLP proto to 0.18.0 
-* FIXED: SpanLimits setting event attributes length limit 
+* ADDED: Support OTEL_PROPAGATORS=none
+* ADDED: Support OTEL_ATTRIBUTE_{COUNT,VALUE_LENGTH}_LIMIT env vars
+* ADDED: Support InstrumentationScope, and update OTLP proto to 0.18.0
+* FIXED: SpanLimits setting event attributes length limit
 
 ### v1.1.0 / 2022-05-26
 
-* BREAKING CHANGE: This requires upgrading both the SDK and Instrumentation gem in tandem
+* BREAKING CHANGE: This requires upgrading both the SDK and Instrumentation gem in tandem
 
 
 ### v1.0.3 / 2022-05-02
 
 * ADDED: Truncate the strings in an array attribute value if length_limit is configured
-* FIXED: Update attribute length limit env var name to match spec 
-* FIXED: Warning about Struct initialization in Ruby 3.2+ 
-* FIXED: Warn on unsupported otlp transport protocols 
-* FIXED: Only allow certain types of Numeric values as attribute values. 
+* FIXED: Update attribute length limit env var name to match spec
+* FIXED: Warning about Struct initialization in Ruby 3.2+
+* FIXED: Warn on unsupported otlp transport protocols
+* FIXED: Only allow certain types of Numeric values as attribute values.
 
 ### v1.0.2 / 2021-12-01
 
-* FIXED: Default span kind 
-* FIXED: Use monotonic clock where possible 
+* FIXED: Default span kind
+* FIXED: Use monotonic clock where possible
 
 ### v1.0.1 / 2021-10-29
 

data/lib/opentelemetry/sdk/internal.rb

@@ -49,17 +49,17 @@ module OpenTelemetry
       end
 
       def valid_attributes?(owner, kind, attrs)
-        attrs.nil? || attrs.all? do |k, v|
+        attrs.nil? || attrs.each do |k, v|
           if !valid_key?(k)
             OpenTelemetry.handle_error(message: "invalid #{kind} attribute key type #{k.class} on span '#{owner}'")
-            false
+            return false
           elsif !valid_value?(v)
             OpenTelemetry.handle_error(message: "invalid #{kind} attribute value type #{v.class} for key '#{k}' on span '#{owner}'")
-            false
-          else
-            true
+            return false
           end
         end
+
+        true
       end
     end
   end

data/lib/opentelemetry/sdk/trace/export/batch_span_processor.rb

@@ -81,8 +81,8 @@ module OpenTelemetry
               reset_on_fork
               n = spans.size + 1 - max_queue_size
               if n.positive?
-                spans.shift(n)
-                report_dropped_spans(n, reason: 'buffer-full')
+                dropped_spans = spans.shift(n)
+                report_dropped_spans(dropped_spans, reason: 'buffer-full', function: __method__.to_s)
               end
               spans << span
               @condition.signal if spans.size > batch_size
@@ -100,10 +100,10 @@ module OpenTelemetry
           # @param [optional Numeric] timeout An optional timeout in seconds.
           # @return [Integer] SUCCESS if no error occurred, FAILURE if a
           #   non-specific failure occurred, TIMEOUT if a timeout occurred.
-          def force_flush(timeout: nil) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
+          def force_flush(timeout: nil) # rubocop:disable Metrics/MethodLength
             start_time = OpenTelemetry::Common::Utilities.timeout_timestamp
             snapshot = lock do
-              reset_on_fork if @keep_running
+              reset_on_fork(restart_thread: @keep_running)
               spans.shift(spans.size)
             end
             until snapshot.empty?
@@ -122,8 +122,8 @@ module OpenTelemetry
             lock do
               n = spans.size + snapshot.size - max_queue_size
               if n.positive?
-                snapshot.shift(n)
-                report_dropped_spans(n, reason: 'buffer-full')
+                dropped_spans = snapshot.shift(n)
+                report_dropped_spans(dropped_spans, reason: 'buffer-full', function: __method__.to_s)
               end
               spans.unshift(snapshot) unless snapshot.empty?
               @condition.signal if spans.size > max_queue_size / 2
@@ -146,8 +146,8 @@ module OpenTelemetry
 
             thread&.join(timeout)
             force_flush(timeout: OpenTelemetry::Common::Utilities.maybe_timeout(timeout, start_time))
-            dropped_spans = lock { spans.size }
-            report_dropped_spans(dropped_spans, reason: 'terminating') if dropped_spans.positive?
+            dropped_spans = lock { spans.shift(spans.length) }
+            report_dropped_spans(dropped_spans, reason: 'terminating') if dropped_spans.any?
             @exporter.shutdown(timeout: OpenTelemetry::Common::Utilities.maybe_timeout(timeout, start_time))
           end
 
@@ -200,12 +200,12 @@ module OpenTelemetry
             else
               OpenTelemetry.handle_error(exception: ExportError.new("Unable to export #{batch.size} spans"))
               @metrics_reporter.add_to_counter('otel.bsp.export.failure')
-              report_dropped_spans(batch.size, reason: 'export-failure')
+              report_dropped_spans(batch, reason: 'export-failure')
             end
           end
 
-          def report_dropped_spans(count, reason:)
-            @metrics_reporter.add_to_counter('otel.bsp.dropped_spans', increment: count, labels: { 'reason' => reason })
+          def report_dropped_spans(dropped_spans, reason:, function: nil)
+            @metrics_reporter.add_to_counter('otel.bsp.dropped_spans', increment: dropped_spans.size, labels: { 'reason' => reason, OpenTelemetry::SemanticConventions::Trace::CODE_FUNCTION => function }.compact)
           end
 
           def fetch_batch

data/lib/opentelemetry/sdk/trace/span.rb

@@ -282,7 +282,7 @@ module OpenTelemetry
         end
 
         # @api private
-        def initialize(context, parent_context, parent_span, name, kind, parent_span_id, span_limits, span_processors, attributes, links, start_timestamp, resource, instrumentation_scope) # rubocop:disable  Metrics/CyclomaticComplexity, Metrics/MethodLength,  Metrics/PerceivedComplexity
+        def initialize(context, parent_context, parent_span, name, kind, parent_span_id, span_limits, span_processors, attributes, links, start_timestamp, resource, instrumentation_scope) # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity
           super(span_context: context)
           @mutex = Mutex.new
           @name = name
@@ -297,7 +297,7 @@ module OpenTelemetry
           @total_recorded_events = 0
           @total_recorded_links = links&.size || 0
           @total_recorded_attributes = attributes&.size || 0
-          @attributes = attributes.nil? ? nil : Hash[attributes] # We need a mutable copy of attributes.
+          @attributes = attributes
           trim_span_attributes(@attributes)
           @events = nil
           @links = trim_links(links, span_limits.link_count_limit, span_limits.link_attribute_count_limit)
@@ -317,7 +317,7 @@ module OpenTelemetry
           # SpanData.
           @monotonic_start_timestamp = monotonic_now
           @realtime_start_timestamp = if parent_span.recording?
-                                        relative_realtime(parent_span.realtime_start_timestamp, parent_span.monotonic_start_timestamp)
+                                        relative_realtime(parent_span.realtime_start_timestamp, parent_span.monotonic_start_timestamp, @monotonic_start_timestamp)
                                       else
                                         realtime_now
                                       end
@@ -347,8 +347,14 @@ module OpenTelemetry
         def trim_span_attributes(attrs)
           return if attrs.nil?
 
-          excess = attrs.size - @span_limits.attribute_count_limit
-          excess.times { attrs.shift } if excess.positive?
+          if attrs.size > @span_limits.attribute_count_limit
+            n = @span_limits.attribute_count_limit
+            attrs.delete_if do |_key, _value|
+              n -= 1
+              n.negative?
+            end
+          end
+
           truncate_attribute_values(attrs, @span_limits.attribute_length_limit)
           nil
         end
@@ -413,15 +419,15 @@ module OpenTelemetry
         def relative_timestamp(timestamp)
           return time_in_nanoseconds(timestamp) unless timestamp.nil?
 
-          relative_realtime(realtime_start_timestamp, monotonic_start_timestamp)
+          relative_realtime(realtime_start_timestamp, monotonic_start_timestamp, monotonic_now)
         end
 
         def time_in_nanoseconds(timestamp)
           (timestamp.to_r * 1_000_000_000).to_i
         end
 
-        def relative_realtime(realtime_base, monotonic_base)
-          realtime_base + (monotonic_now - monotonic_base)
+        def relative_realtime(realtime_base, monotonic_base, now)
+          realtime_base + (now - monotonic_base)
         end
 
         def realtime_now

data/lib/opentelemetry/sdk/trace/tracer_provider.rb

@@ -141,7 +141,7 @@ module OpenTelemetry
           if result.recording? && !@stopped
             trace_flags = result.sampled? ? OpenTelemetry::Trace::TraceFlags::SAMPLED : OpenTelemetry::Trace::TraceFlags::DEFAULT
             context = OpenTelemetry::Trace::SpanContext.new(trace_id: trace_id, span_id: span_id, trace_flags: trace_flags, tracestate: result.tracestate)
-            attributes = attributes&.merge(result.attributes) || result.attributes
+            attributes = attributes&.merge(result.attributes) || result.attributes.dup
             Span.new(
               context,
               parent_context,

data/lib/opentelemetry/sdk/version.rb

@@ -7,6 +7,6 @@
 module OpenTelemetry
   module SDK
     ## Current OpenTelemetry version
-    VERSION = '1.3.0'
+    VERSION = '1.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-sdk
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-13 00:00:00.000000000 Z
+date: 2024-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -294,10 +294,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-sdk/v1.3.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-sdk/v1.3.2/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/sdk
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-sdk/v1.3.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-sdk/v1.3.2
 post_install_message: 
 rdoc_options: []
 require_paths: