opentelemetry-sdk-experimental 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 810bad2b227d4e0345bab51445002ccae0dde9cc7a8651d05fc5c44c1bd7df6c
-  data.tar.gz: 53dd2c762679bda44159ec4936ae8beb6052a536a618d52e793eb25f187b68fd
+  metadata.gz: be212866685d65872e43767ebdadebff97a0a31c46a19245de8c257b06bd3301
+  data.tar.gz: '08f676fb84c65d7f58b9c5e181fd8d4ae7f58d640741e0006cee18418ff8b11c'
 SHA512:
-  metadata.gz: b48e7906d4250ff6cc7f01d32152e1c85ac0627993cba7171debb16514ef8b6a6af79d186098629cb66dbbf9c5b901f05c007144e2f7dcdc06b7b4b6f71a0c39
-  data.tar.gz: 3a861705fa43bfd6150c6441c4e6487dd95857acf85f2d6a21dafd14b32e66ff18eb312d3aa1e13cde5f5b971359de304852f05d34e073e28b0a40824bae97b4
+  metadata.gz: ef59d111a8416be5b53efd7d49a4645b2d90e6ca4da97b6ab40903df776d7bb76d0149b12e3bf1fb674e4b5e06469a2bfad14261b125200fe906837f827bf3b2
+  data.tar.gz: 4b39e784ed7f9f41af5de58ff35aab476b393646b015ba9aed90f0dca979c9f6ea037860973d430e1389b5d091bfee7709301336e97ccd598afae40cd3005c38

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release History: opentelemetry-sdk-experimental
 
+### v0.1.1 / 2023-03-06
+
+* FIXED: Reduce allocations in update_tracestate 
+* FIXED: Refactor consistent prob sampler for reuse 
+
 ### v0.1.0 / 2022-11-09
 
 * Initial release.

data/lib/opentelemetry/sdk/experimental/version.rb

@@ -8,7 +8,7 @@ module OpenTelemetry
   module SDK
     module Experimental
       # Current OpenTelemetry experimental sdk version
-      VERSION = '0.1.0'
+      VERSION = '0.1.1'
     end
   end
 end

data/lib/opentelemetry/sdk/trace/samplers/consistent_probability_based.rb

@@ -69,12 +69,6 @@ module OpenTelemetry
 
           private
 
-          def generate_r(trace_id)
-            x = trace_id[8, 8].unpack1('Q>') | 0x3
-            clz = 64 - x.bit_length
-            clz
-          end
-
           def probabilistic_p
             if Random.rand < @p_ceil_probability
               @p_ceil

data/lib/opentelemetry/sdk/trace/samplers/consistent_probability_tracestate.rb

@@ -17,6 +17,31 @@ module OpenTelemetry
           MAX_LIST_LENGTH = 256 # Defined by https://www.w3.org/TR/trace-context/
           private_constant(:DECIMAL, :MAX_LIST_LENGTH)
 
+          private
+
+          # sanitized_tracestate returns an OpenTelemetry Tracestate object with the
+          # tracestate sanitized according to the Context invariants defined in the
+          # tracestate probability sampling spec.
+          #
+          # @param span_context [OpenTelemetry::Trace::SpanContext] the parent span context
+          # @return [OpenTelemetry::Trace::Tracestate] the sanitized tracestate
+          def sanitized_tracestate(span_context)
+            sampled = span_context.trace_flags.sampled?
+            tracestate = span_context.tracestate
+            parse_ot_vendor_tag(tracestate) do |p, r, rest|
+              if !r.nil? && r > 62
+                p = r = nil
+              elsif !p.nil? && p > 63
+                p = nil
+              elsif !p.nil? && !r.nil? && !invariant(p, r, sampled)
+                p = nil
+              else
+                return tracestate
+              end
+              update_tracestate(tracestate, p, r, rest)
+            end
+          end
+
           # parse_ot_vendor_tag parses the 'ot' vendor tag of the tracestate.
           # It yields the parsed probability fields and the remaining tracestate.
           # It returns the result of the block.
@@ -44,15 +69,22 @@ module OpenTelemetry
           end
 
           def update_tracestate(tracestate, p, r, rest) # rubocop:disable Naming/UncommunicativeMethodParamName
-            # This could be more efficient and allocate less, however it *should* only be used for root spans and sanitizing invalid tracestate
-            # in the most common configuration of parent_consistent_probability_based(root: consistent_probability_based(p)).
-            ps = "p:#{p}" unless p.nil?
-            rs = "r:#{r}" unless r.nil?
-            ot = [ps, rs, rest].compact.join(';')
-            if ot.empty?
+            if p.nil? && r.nil? && rest.nil?
               tracestate.delete('ot')
+            elsif p.nil? && r.nil?
+              tracestate.set_value('ot', rest)
+            elsif p.nil? && rest.nil?
+              tracestate.set_value('ot', "r:#{r}")
+            elsif r.nil? && rest.nil?
+              tracestate.set_value('ot', "p:#{p}")
+            elsif p.nil?
+              tracestate.set_value('ot', "r:#{r};#{rest}")
+            elsif r.nil?
+              tracestate.set_value('ot', "p:#{p};#{rest}")
+            elsif rest.nil?
+              tracestate.set_value('ot', "p:#{p};r:#{r}")
             else
-              tracestate.set_value('ot', ot)
+              tracestate.set_value('ot', "p:#{p};r:#{r};#{rest}")
             end
           end
 
@@ -75,6 +107,12 @@ module OpenTelemetry
           def decimal(str)
             str.to_i if !str.nil? && DECIMAL.match?(str)
           end
+
+          def generate_r(trace_id)
+            x = trace_id[8, 8].unpack1('Q>') | 0x3
+            clz = 64 - x.bit_length
+            clz
+          end
         end
       end
     end

data/lib/opentelemetry/sdk/trace/samplers/parent_consistent_probability_based.rb

@@ -55,31 +55,6 @@ module OpenTelemetry
           protected
 
           attr_reader :root
-
-          private
-
-          # sanitized_tracestate returns an OpenTelemetry Tracestate object with the
-          # tracestate sanitized according to the Context invariants defined in the
-          # tracestate probability sampling spec.
-          #
-          # @param span_context [OpenTelemetry::Trace::SpanContext] the parent span context
-          # @return [OpenTelemetry::Trace::Tracestate] the sanitized tracestate
-          def sanitized_tracestate(span_context)
-            sampled = span_context.trace_flags.sampled?
-            tracestate = span_context.tracestate
-            parse_ot_vendor_tag(tracestate) do |p, r, rest|
-              if !r.nil? && r > 62
-                p = r = nil
-              elsif !p.nil? && p > 63
-                p = nil
-              elsif !p.nil? && !r.nil? && !invariant(p, r, sampled)
-                p = nil
-              else
-                return tracestate
-              end
-              update_tracestate(tracestate, p, r, rest)
-            end
-          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-sdk-experimental
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -200,10 +200,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-experimental/v0.1.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-sdk-experimental/v0.1.1/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/api
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-sdk-experimental/v0.1.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-sdk-experimental/v0.1.1
 post_install_message: 
 rdoc_options: []
 require_paths: