opentelemetry-sdk 0.5.1 → 0.10.0

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

@@ -14,7 +14,6 @@ module OpenTelemetry
                             :kind,
                             :status,
                             :parent_span_id,
-                            :child_count,
                             :total_recorded_attributes,
                             :total_recorded_events,
                             :total_recorded_links,
@@ -23,12 +22,26 @@ module OpenTelemetry
                             :attributes,
                             :links,
                             :events,
-                            :library_resource,
+                            :resource,
                             :instrumentation_library,
                             :span_id,
                             :trace_id,
                             :trace_flags,
-                            :tracestate)
+                            :tracestate) do
+                              # Returns the lowercase [hex encoded](https://tools.ietf.org/html/rfc4648#section-8) span ID.
+                              #
+                              # @return [String] A 16-hex-character lowercase string.
+                              def hex_span_id
+                                span_id.unpack1('H*')
+                              end
+
+                              # Returns the lowercase [hex encoded](https://tools.ietf.org/html/rfc4648#section-8) trace ID.
+                              #
+                              # @return [String] A 32-hex-character lowercase string.
+                              def hex_trace_id
+                                trace_id.unpack1('H*')
+                              end
+                            end
     end
   end
 end

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

@@ -30,33 +30,34 @@ module OpenTelemetry
         end
 
         def start_root_span(name, attributes: nil, links: nil, start_timestamp: nil, kind: nil)
-          start_span(name, with_parent_context: Context.empty, attributes: attributes, links: links, start_timestamp: start_timestamp, kind: kind)
+          start_span(name, with_parent: Context.empty, attributes: attributes, links: links, start_timestamp: start_timestamp, kind: kind)
         end
 
-        def start_span(name, with_parent: nil, with_parent_context: nil, attributes: nil, links: nil, start_timestamp: nil, kind: nil)
+        def start_span(name, with_parent: nil, attributes: nil, links: nil, start_timestamp: nil, kind: nil)
           name ||= 'empty'
 
-          parent_span_context = with_parent&.context || active_span_context(with_parent_context)
-          parent_span_context = nil unless parent_span_context.valid?
-          parent_span_id = parent_span_context&.span_id
-          tracestate = parent_span_context&.tracestate
-          trace_id = parent_span_context&.trace_id
+          with_parent ||= Context.current
+          parent_span_context = OpenTelemetry::Trace.current_span(with_parent).context
+          if parent_span_context.valid?
+            parent_span_id = parent_span_context.span_id
+            trace_id = parent_span_context.trace_id
+          end
           trace_id ||= OpenTelemetry::Trace.generate_trace_id
-          span_id = OpenTelemetry::Trace.generate_span_id
           sampler = tracer_provider.active_trace_config.sampler
-          result = sampler.should_sample?(trace_id: trace_id, parent_context: parent_span_context, links: links, name: name, kind: kind, attributes: attributes)
-          internal_create_span(result, name, kind, trace_id, span_id, parent_span_id, attributes, links, start_timestamp, tracestate)
+          result = sampler.should_sample?(trace_id: trace_id, parent_context: with_parent, links: links, name: name, kind: kind, attributes: attributes)
+          internal_create_span(result, name, kind, trace_id, parent_span_id, attributes, links, start_timestamp, with_parent)
         end
 
         private
 
-        def internal_create_span(result, name, kind, trace_id, span_id, parent_span_id, attributes, links, start_timestamp, tracestate) # rubocop:disable Metrics/AbcSize
+        def internal_create_span(result, name, kind, trace_id, parent_span_id, attributes, links, start_timestamp, parent_context) # rubocop:disable Metrics/AbcSize
           if result.recording? && !tracer_provider.stopped?
             trace_flags = result.sampled? ? OpenTelemetry::Trace::TraceFlags::SAMPLED : OpenTelemetry::Trace::TraceFlags::DEFAULT
-            context = OpenTelemetry::Trace::SpanContext.new(trace_id: trace_id, trace_flags: trace_flags, tracestate: tracestate)
+            context = OpenTelemetry::Trace::SpanContext.new(trace_id: trace_id, trace_flags: trace_flags, tracestate: result.tracestate)
             attributes = attributes&.merge(result.attributes) || result.attributes
             Span.new(
               context,
+              parent_context,
               name,
               kind,
               parent_span_id,

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

@@ -49,13 +49,15 @@ module OpenTelemetry
         # processed and exported.
         #
         # After this is called all the newly created {Span}s will be no-op.
-        def shutdown
+        #
+        # @param [optional Numeric] timeout An optional timeout in seconds.
+        def shutdown(timeout: nil)
           @mutex.synchronize do
             if @stopped
               OpenTelemetry.logger.warn('calling Tracer#shutdown multiple times.')
               return
             end
-            @active_span_processor.shutdown
+            @active_span_processor.shutdown(timeout: timeout)
             @stopped = true
           end
         end

data/lib/opentelemetry/sdk/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-sdk
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.10.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -149,10 +163,10 @@ files:
 - README.md
 - lib/opentelemetry-sdk.rb
 - lib/opentelemetry/sdk.rb
+- lib/opentelemetry/sdk/baggage.rb
+- lib/opentelemetry/sdk/baggage/builder.rb
+- lib/opentelemetry/sdk/baggage/manager.rb
 - lib/opentelemetry/sdk/configurator.rb
-- lib/opentelemetry/sdk/correlation_context.rb
-- lib/opentelemetry/sdk/correlation_context/builder.rb
-- lib/opentelemetry/sdk/correlation_context/manager.rb
 - lib/opentelemetry/sdk/instrumentation_library.rb
 - lib/opentelemetry/sdk/internal.rb
 - lib/opentelemetry/sdk/resources.rb
@@ -161,6 +175,7 @@ files:
 - lib/opentelemetry/sdk/trace.rb
 - lib/opentelemetry/sdk/trace/config.rb
 - lib/opentelemetry/sdk/trace/config/trace_config.rb
+- lib/opentelemetry/sdk/trace/event.rb
 - lib/opentelemetry/sdk/trace/export.rb
 - lib/opentelemetry/sdk/trace/export/batch_span_processor.rb
 - lib/opentelemetry/sdk/trace/export/console_span_exporter.rb
@@ -173,9 +188,9 @@ files:
 - lib/opentelemetry/sdk/trace/samplers.rb
 - lib/opentelemetry/sdk/trace/samplers/constant_sampler.rb
 - lib/opentelemetry/sdk/trace/samplers/decision.rb
-- lib/opentelemetry/sdk/trace/samplers/parent_or_else.rb
-- lib/opentelemetry/sdk/trace/samplers/probability_sampler.rb
+- lib/opentelemetry/sdk/trace/samplers/parent_based.rb
 - lib/opentelemetry/sdk/trace/samplers/result.rb
+- lib/opentelemetry/sdk/trace/samplers/trace_id_ratio_based.rb
 - lib/opentelemetry/sdk/trace/span.rb
 - lib/opentelemetry/sdk/trace/span_data.rb
 - lib/opentelemetry/sdk/trace/tracer.rb
@@ -184,7 +199,11 @@ files:
 homepage: https://github.com/open-telemetry/opentelemetry-ruby
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-sdk/v0.10.0/file.CHANGELOG.html
+  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/master/sdk
+  bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-sdk/v0.10.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -200,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A stats collection and distributed tracing framework

data/lib/opentelemetry/sdk/correlation_context.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2019 OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-require 'opentelemetry/sdk/correlation_context/builder'
-require 'opentelemetry/sdk/correlation_context/manager'
-
-module OpenTelemetry
-  module SDK
-    # Contains operational implementations of the CorrelationContext::Manager
-    module CorrelationContext
-    end
-  end
-end

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

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright The OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-module OpenTelemetry
-  module SDK
-    module Trace
-      module Samplers
-        # @api private
-        #
-        # This is a composite sampler. It either respects the parent span's sampling
-        # decision or delegates to delegate_sampler for root spans.
-        class ParentOrElse
-          def initialize(delegate_sampler)
-            @delegate_sampler = delegate_sampler
-          end
-
-          # @api private
-          #
-          # See {Samplers}.
-          def description
-            "ParentOrElse{#{@delegate_sampler.description}}"
-          end
-
-          # @api private
-          #
-          # See {Samplers}.
-          def should_sample?(trace_id:, parent_context:, links:, name:, kind:, attributes:)
-            if parent_context.nil?
-              @delegate_sampler.should_sample?(trace_id: trace_id, parent_context: parent_context, links: links, name: name, kind: kind, attributes: attributes)
-            elsif parent_context.trace_flags.sampled?
-              RECORD_AND_SAMPLED
-            else
-              NOT_RECORD
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2019 OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-module OpenTelemetry
-  module SDK
-    module Trace
-      module Samplers
-        # @api private
-        #
-        # Implements sampling based on a probability.
-        class ProbabilitySampler
-          attr_reader :description
-
-          def initialize(probability, ignore_parent:, apply_to_remote_parent:, apply_to_all_spans:)
-            @probability = probability
-            @id_upper_bound = (probability * (2**64 - 1)).ceil
-            @use_parent_sampled_flag = !ignore_parent
-            @apply_to_remote_parent = apply_to_remote_parent
-            @apply_to_all_spans = apply_to_all_spans
-            @description = format('ProbabilitySampler{%.6f}', probability)
-          end
-
-          # @api private
-          #
-          # See {Samplers}.
-          def should_sample?(trace_id:, parent_context:, links:, name:, kind:, attributes:)
-            # Ignored for sampling decision: links, name, kind, attributes.
-
-            if sample?(trace_id, parent_context)
-              RECORD_AND_SAMPLED
-            else
-              NOT_RECORD
-            end
-          end
-
-          private
-
-          def sample?(trace_id, parent_context)
-            if parent_context.nil?
-              sample_trace_id?(trace_id)
-            else
-              parent_sampled?(parent_context) || sample_trace_id_for_child?(parent_context, trace_id)
-            end
-          end
-
-          def parent_sampled?(parent_context)
-            @use_parent_sampled_flag && parent_context.trace_flags.sampled?
-          end
-
-          def sample_trace_id_for_child?(parent_context, trace_id)
-            (@apply_to_all_spans || (@apply_to_remote_parent && parent_context.remote?)) && sample_trace_id?(trace_id)
-          end
-
-          def sample_trace_id?(trace_id)
-            @probability == 1.0 || trace_id[8, 8].unpack1('Q>') < @id_upper_bound
-          end
-        end
-      end
-    end
-  end
-end