opentelemetry-api 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6851022b08b4488e128a4bc73ef53b1463c8bd04763aba1ecd7279aaf32e65ae
-  data.tar.gz: fa593580948f328f9445849846e0856ff496f63513c6352e5000cc27f6695faa
+  metadata.gz: 538ed3a78ed2551d82e647c361b94afc77a083a1126093cb26674e324197d0a0
+  data.tar.gz: eb5a65a102585407772dcc8b57b375c83198cbddc432c97a71d9fdef97e3171a
 SHA512:
-  metadata.gz: 280ab63486d494ab2e338cba6d9d8c60ff8dd9c7bf79f70ab83606caa7dd16eb9e10708d6205e6725fed1e519b07e26faf1e267d59d0579cd4b673e97fdfc7cb
-  data.tar.gz: 756dc2722afe75c45c3aef8c06a1885e77a6f132d7cf4772488df40a5205b6ee182d9cd9e683951c49e9f18b81d12176adc1286e12fbe8dd1c732335df6e2d20
+  metadata.gz: '097a3f2d32207a56ba207cc2918f24e4eee28483117c54ed0412e83e617922980f385bf5c1949a91b232c4fa4a5bfccf5c66947ee65fc4ebc26460a27a33f6b6'
+  data.tar.gz: 533897d0cea9a0f731e4d7badf100089fb2bb87e95cbe28060e222aea4137272a4e71f9dd65e12ef8a8558bf3635cc512e663de2d5364fea9a1086cab3a9cef1

data/CHANGELOG.md

@@ -1 +1,14 @@
 # Release History: opentelemetry-api
+
+### v0.6.0 / 2020-09-10
+
+* ADDED: Add support for OTEL_LOG_LEVEL env var
+* Documented array valued attributes [#343](https://github.com/open-telemetry/opentelemetry-ruby/pull/343)
+* Renamed CorrelationContext to Baggage [#338](https://github.com/open-telemetry/opentelemetry-ruby/pull/338)
+* Renamed Text* to TextMap* (propagators) [#335](https://github.com/open-telemetry/opentelemetry-ruby/pull/335)
+* Fixed exception semantic conventions (`span.record_error` -> `span.record_exception`) [#333](https://github.com/open-telemetry/opentelemetry-ruby/pull/333)
+* Removed support for lazy event creation [#329](https://github.com/open-telemetry/opentelemetry-ruby/pull/329)
+  * `name:` named parameter to `span.add_event` becomes first positional argument
+  * `Event` class removed from API
+* Added `hex_trace_id` and `hex_span_id` helpers to `SpanContext` [#332](https://github.com/open-telemetry/opentelemetry-ruby/pull/332)
+* Added `CorrelationContext::Manager.values` method to return correlations as a `Hash` [#323](https://github.com/open-telemetry/opentelemetry-ruby/pull/323)

data/lib/opentelemetry.rb

@@ -8,8 +8,7 @@ require 'logger'
 
 require 'opentelemetry/error'
 require 'opentelemetry/context'
-require 'opentelemetry/correlation_context'
-require 'opentelemetry/internal'
+require 'opentelemetry/baggage'
 require_relative './opentelemetry/instrumentation'
 require 'opentelemetry/metrics'
 require 'opentelemetry/trace'
@@ -23,9 +22,12 @@ require 'opentelemetry/version'
 module OpenTelemetry
   extend self
 
-  attr_writer :tracer_provider, :meter_provider, :correlations
+  attr_writer :tracer_provider, :meter_provider, :baggage, :logger
 
-  attr_accessor :logger
+  # @return [Object, Logger] configured Logger or a default STDOUT Logger.
+  def logger
+    @logger ||= Logger.new(STDOUT, level: ENV['OTEL_LOG_LEVEL'] || Logger::INFO)
+  end
 
   # @return [Object, Trace::TracerProvider] registered tracer provider or a
   #   default no-op implementation of the tracer provider.
@@ -45,17 +47,15 @@ module OpenTelemetry
     @instrumentation_registry ||= Instrumentation::Registry.new
   end
 
-  # @return [Object, CorrelationContext::Manager] registered
-  #   correlation context manager or a default no-op implementation of the
+  # @return [Object, Baggage::Manager] registered
+  #   baggage manager or a default no-op implementation of the
   #   manager.
-  def correlations
-    @correlations ||= CorrelationContext::Manager.new
+  def baggage
+    @baggage ||= Baggage::Manager.new
   end
 
   # @return [Context::Propagation::Propagation] an instance of the propagation API
   def propagation
     @propagation ||= Context::Propagation::Propagation.new
   end
-
-  self.logger = Logger.new(STDOUT)
 end

data/lib/opentelemetry/baggage.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Copyright 2019 OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+require 'opentelemetry/baggage/builder'
+require 'opentelemetry/baggage/manager'
+require 'opentelemetry/baggage/propagation'
+
+module OpenTelemetry
+  # The Baggage module provides functionality to record and propagate
+  # baggage in a distributed trace
+  module Baggage
+  end
+end

data/lib/opentelemetry/{correlation_context → baggage}/builder.rb

@@ -5,8 +5,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 module OpenTelemetry
-  module CorrelationContext
-    # No op implementation of CorrelationContext::Builder
+  module Baggage
+    # No op implementation of Baggage::Builder
     class Builder
       def set_value(key, value); end
 

data/lib/opentelemetry/{correlation_context → baggage}/manager.rb

@@ -5,11 +5,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
 module OpenTelemetry
-  module CorrelationContext
-    # No op implementation of CorrelationContext::Manager
+  module Baggage
+    # No op implementation of Baggage::Manager
     class Manager
       NOOP_BUILDER = Builder.new
-      private_constant :NOOP_BUILDER
+      EMPTY_VALUES = {}.freeze
+      private_constant(:NOOP_BUILDER, :EMPTY_VALUES)
 
       def build(context: Context.current)
         yield NOOP_BUILDER
@@ -24,6 +25,10 @@ module OpenTelemetry
         nil
       end
 
+      def values(context: Context.current)
+        EMPTY_VALUES
+      end
+
       def remove_value(key, context: Context.current)
         context
       end

data/lib/opentelemetry/baggage/propagation.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+# Copyright 2019 OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+require 'opentelemetry/baggage/propagation/context_keys'
+require 'opentelemetry/baggage/propagation/text_map_injector'
+require 'opentelemetry/baggage/propagation/text_map_extractor'
+
+module OpenTelemetry
+  module Baggage
+    # The Baggage::Propagation module contains injectors and
+    # extractors for sending and receiving baggage over the wire
+    module Propagation
+      extend self
+
+      TEXT_MAP_EXTRACTOR = TextMapExtractor.new
+      TEXT_MAP_INJECTOR = TextMapInjector.new
+      RACK_EXTRACTOR = TextMapExtractor.new(
+        baggage_key: 'HTTP_BAGGAGE'
+      )
+      RACK_INJECTOR = TextMapInjector.new(
+        baggage_key: 'HTTP_BAGGAGE'
+      )
+
+      private_constant :TEXT_MAP_INJECTOR, :TEXT_MAP_EXTRACTOR, :RACK_INJECTOR,
+                       :RACK_EXTRACTOR
+
+      # Returns an extractor that extracts context using the W3C Baggage
+      # format
+      def text_map_injector
+        TEXT_MAP_INJECTOR
+      end
+
+      # Returns an injector that injects context using the W3C Baggage
+      # format
+      def text_map_extractor
+        TEXT_MAP_EXTRACTOR
+      end
+
+      # Returns an extractor that extracts context using the W3C Baggage
+      # format with Rack normalized keys (upcased and prefixed with
+      # HTTP_)
+      def rack_injector
+        RACK_INJECTOR
+      end
+
+      # Returns an injector that injects context using the W3C Baggage
+      # format with Rack normalized keys (upcased and prefixed with
+      # HTTP_)
+      def rack_extractor
+        RACK_EXTRACTOR
+      end
+    end
+  end
+end

data/lib/opentelemetry/baggage/propagation/context_keys.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# Copyright 2019 OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Baggage
+    module Propagation
+      # The ContextKeys module contains the keys used to index baggage
+      # in a {Context} instance
+      module ContextKeys
+        extend self
+
+        BAGGAGE_KEY = Context.create_key('baggage')
+        private_constant :BAGGAGE_KEY
+
+        # Returns the context key that baggage are indexed by
+        #
+        # @return [Context::Key]
+        def baggage_key
+          BAGGAGE_KEY
+        end
+      end
+    end
+  end
+end

data/lib/opentelemetry/{correlation_context/propagation/text_extractor.rb → baggage/propagation/text_map_extractor.rb}

@@ -7,41 +7,41 @@
 require 'cgi'
 
 module OpenTelemetry
-  module CorrelationContext
+  module Baggage
     module Propagation
-      # Extracts correlations from carriers in the W3C Correlation Context format
-      class TextExtractor
+      # Extracts baggage from carriers in the W3C Baggage format
+      class TextMapExtractor
         include Context::Propagation::DefaultGetter
 
-        # Returns a new TextExtractor that extracts context using the specified
+        # Returns a new TextMapExtractor that extracts context using the specified
         # header key
         #
-        # @param [String] correlation_context_key The correlation context header
+        # @param [String] baggage_key The baggage header
         #   key used in the carrier
-        # @return [TextExtractor]
-        def initialize(correlation_context_key: 'otcorrelations')
-          @correlation_context_key = correlation_context_key
+        # @return [TextMapExtractor]
+        def initialize(baggage_key: 'baggage')
+          @baggage_key = baggage_key
         end
 
-        # Extract remote correlations from the supplied carrier.
+        # Extract remote baggage from the supplied carrier.
         # If extraction fails, the original context will be returned
         #
         # @param [Carrier] carrier The carrier to get the header from
-        # @param [Context] context The context to be updated with extracted correlations
+        # @param [Context] context The context to be updated with extracted baggage
         # @param [optional Callable] getter An optional callable that takes a carrier and a key and
         #   returns the value associated with the key. If omitted the default getter will be used
         #   which expects the carrier to respond to [] and []=.
         # @yield [Carrier, String] if an optional getter is provided, extract will yield the carrier
         #   and the header key to the getter.
-        # @return [Context] context updated with extracted correlations, or the original context
+        # @return [Context] context updated with extracted baggage, or the original context
         #   if extraction fails
         def extract(carrier, context, &getter)
           getter ||= default_getter
-          header = getter.call(carrier, @correlation_context_key)
+          header = getter.call(carrier, @baggage_key)
 
           entries = header.gsub(/\s/, '').split(',')
 
-          correlations = entries.each_with_object({}) do |entry, memo|
+          baggage = entries.each_with_object({}) do |entry, memo|
             # The ignored variable below holds properties as per the W3C spec.
             # OTel is not using them currently, but they might be used for
             # metadata in the future
@@ -50,7 +50,7 @@ module OpenTelemetry
             memo[k] = v
           end
 
-          context.set_value(ContextKeys.correlation_context_key, correlations)
+          context.set_value(ContextKeys.baggage_key, baggage)
         rescue StandardError
           context
         end

data/lib/opentelemetry/baggage/propagation/text_map_injector.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+# Copyright 2019 OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+require 'cgi'
+
+module OpenTelemetry
+  module Baggage
+    module Propagation
+      # Injects baggage using the W3C Baggage format
+      class TextMapInjector
+        include Context::Propagation::DefaultSetter
+
+        # Returns a new TextMapInjector that injects context using the specified
+        # header key
+        #
+        # @param [String] baggage_header_key The baggage header
+        #   key used in the carrier
+        # @return [TextMapInjector]
+        def initialize(baggage_key: 'baggage')
+          @baggage_key = baggage_key
+        end
+
+        # Inject in-process baggage into the supplied carrier.
+        #
+        # @param [Carrier] carrier The carrier to inject baggage into
+        # @param [Context] context The context to read baggage from
+        # @param [optional Callable] getter An optional callable that takes a carrier and a key and
+        #   returns the value associated with the key. If omitted the default getter will be used
+        #   which expects the carrier to respond to [] and []=.
+        # @yield [Carrier, String] if an optional getter is provided, inject will yield the carrier
+        #   and the header key to the getter.
+        # @return [Object] carrier with injected baggage
+        def inject(carrier, context, &setter)
+          return carrier unless (baggage = context[ContextKeys.baggage_key]) && !baggage.empty?
+
+          setter ||= default_setter
+          setter.call(carrier, @baggage_key, encode(baggage))
+
+          carrier
+        end
+
+        private
+
+        def encode(baggage)
+          baggage.inject(+'') do |memo, (k, v)|
+            memo << CGI.escape(k.to_s) << '=' << CGI.escape(v.to_s) << ','
+          end.chop!
+        end
+      end
+    end
+  end
+end

data/lib/opentelemetry/trace.rb

@@ -39,13 +39,12 @@ module OpenTelemetry
   end
 end
 
-require 'opentelemetry/trace/event'
 require 'opentelemetry/trace/link'
-require 'opentelemetry/trace/propagation'
 require 'opentelemetry/trace/trace_flags'
 require 'opentelemetry/trace/span_context'
 require 'opentelemetry/trace/span_kind'
 require 'opentelemetry/trace/span'
 require 'opentelemetry/trace/status'
+require 'opentelemetry/trace/propagation'
 require 'opentelemetry/trace/tracer'
 require 'opentelemetry/trace/tracer_provider'

data/lib/opentelemetry/trace/propagation/trace_context.rb

@@ -5,8 +5,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 require 'opentelemetry/trace/propagation/trace_context/trace_parent'
-require 'opentelemetry/trace/propagation/trace_context/text_extractor'
-require 'opentelemetry/trace/propagation/trace_context/text_injector'
+require 'opentelemetry/trace/propagation/trace_context/text_map_extractor'
+require 'opentelemetry/trace/propagation/trace_context/text_map_injector'
 
 module OpenTelemetry
   module Trace
@@ -16,30 +16,30 @@ module OpenTelemetry
       module TraceContext
         extend self
 
-        TEXT_EXTRACTOR = TextExtractor.new
-        TEXT_INJECTOR = TextInjector.new
-        RACK_EXTRACTOR = TextExtractor.new(
+        TEXT_MAP_EXTRACTOR = TextMapExtractor.new
+        TEXT_MAP_INJECTOR = TextMapInjector.new
+        RACK_EXTRACTOR = TextMapExtractor.new(
           traceparent_key: 'HTTP_TRACEPARENT',
           tracestate_key: 'HTTP_TRACESTATE'
         )
-        RACK_INJECTOR = TextInjector.new(
+        RACK_INJECTOR = TextMapInjector.new(
           traceparent_key: 'HTTP_TRACEPARENT',
           tracestate_key: 'HTTP_TRACESTATE'
         )
 
-        private_constant :TEXT_INJECTOR, :TEXT_EXTRACTOR,
+        private_constant :TEXT_MAP_INJECTOR, :TEXT_MAP_EXTRACTOR,
                          :RACK_INJECTOR, :RACK_EXTRACTOR
 
         # Returns an extractor that extracts context using the W3C Trace Context
         # format
-        def text_extractor
-          TEXT_EXTRACTOR
+        def text_map_extractor
+          TEXT_MAP_EXTRACTOR
         end
 
         # Returns an injector that injects context using the W3C Trace Context
         # format
-        def text_injector
-          TEXT_INJECTOR
+        def text_map_injector
+          TEXT_MAP_INJECTOR
         end
 
         # Returns an extractor that extracts context using the W3C Trace Context

data/lib/opentelemetry/trace/propagation/trace_context/{text_extractor.rb → text_map_extractor.rb}

@@ -8,15 +8,15 @@ module OpenTelemetry
     module Propagation
       module TraceContext
         # Extracts context from carriers in the W3C Trace Context format
-        class TextExtractor
+        class TextMapExtractor
           include Context::Propagation::DefaultGetter
 
-          # Returns a new TextExtractor that extracts context using the
+          # Returns a new TextMapExtractor that extracts context using the
           # specified header keys
           #
           # @param [String] traceparent_key The traceparent header key used in the carrier
           # @param [String] tracestate_key The tracestate header key used in the carrier
-          # @return [TextExtractor]
+          # @return [TextMapExtractor]
           def initialize(traceparent_key: 'traceparent',
                          tracestate_key: 'tracestate')
             @traceparent_key = traceparent_key

data/lib/opentelemetry/trace/propagation/trace_context/{text_injector.rb → text_map_injector.rb}

@@ -8,15 +8,15 @@ module OpenTelemetry
     module Propagation
       module TraceContext
         # Injects context into carriers using the W3C Trace Context format
-        class TextInjector
+        class TextMapInjector
           include Context::Propagation::DefaultSetter
 
-          # Returns a new TextInjector that injects context using the
+          # Returns a new TextMapInjector that injects context using the
           # specified header keys
           #
           # @param [String] traceparent_key The traceparent header key used in the carrier
           # @param [String] tracestate_key The tracestate header key used in the carrier
-          # @return [TextInjector]
+          # @return [TextMapInjector]
           def initialize(traceparent_key: 'traceparent',
                          tracestate_key: 'tracestate')
             @traceparent_key = traceparent_key

data/lib/opentelemetry/trace/propagation/trace_context/trace_parent.rb

@@ -25,8 +25,8 @@ module OpenTelemetry
           REGEXP = /^(?<version>[A-Fa-f0-9]{2})-(?<trace_id>[A-Fa-f0-9]{32})-(?<span_id>[A-Fa-f0-9]{16})-(?<flags>[A-Fa-f0-9]{2})(?<ignored>-.*)?$/.freeze
           private_constant :REGEXP
 
-          INVALID_TRACE_ID = OpenTelemetry::Trace::INVALID_TRACE_ID.unpack1('H*')
-          INVALID_SPAN_ID = OpenTelemetry::Trace::INVALID_SPAN_ID.unpack1('H*')
+          INVALID_TRACE_ID = OpenTelemetry::Trace::SpanContext::INVALID.hex_trace_id
+          INVALID_SPAN_ID = OpenTelemetry::Trace::SpanContext::INVALID.hex_span_id
           private_constant :INVALID_TRACE_ID, :INVALID_SPAN_ID
 
           class << self

data/lib/opentelemetry/trace/span.rb

@@ -50,7 +50,7 @@ module OpenTelemetry
       # meanings.
       #
       # @param [String] key
-      # @param [String, Boolean, Numeric] value
+      # @param [String, Boolean, Numeric, Array<String, Numeric, Boolean>] value
       #
       # @return [self] returns itself
       def set_attribute(key, value)
@@ -58,44 +58,36 @@ module OpenTelemetry
       end
       alias []= set_attribute
 
-      # Add an Event to a {Span}. This can be accomplished eagerly or lazily.
-      # Lazy evaluation is useful when the event attributes are expensive to
-      # build and where the cost can be avoided for an unsampled {Span}.
+      # Add an event to a {Span}.
       #
-      # Eager example:
+      # Example:
       #
-      #   span.add_event(name: 'event', attributes: {'eager' => true})
-      #
-      # Lazy example:
-      #
-      #   span.add_event { tracer.create_event(name: 'event', attributes: {'eager' => false}) }
+      #   span.add_event('event', attributes: {'eager' => true})
       #
       # Note that the OpenTelemetry project
       # {https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/data-semantic-conventions.md
       # documents} certain "standard event names and keys" which have
       # prescribed semantic meanings.
       #
-      # @param [optional String] name Optional name of the event. This is
-      #   required if a block is not given.
+      # @param [String] name Name of the event.
       # @param [optional Hash{String => String, Numeric, Boolean, Array<String, Numeric, Boolean>}]
       #   attributes One or more key:value pairs, where the keys must be
       #   strings and the values may be (array of) string, boolean or numeric
-      #   type. This argument should only be used when passing in a name.
+      #   type.
       # @param [optional Time] timestamp Optional timestamp for the event.
-      #   This argument should only be used when passing in a name.
       #
       # @return [self] returns itself
-      def add_event(name: nil, attributes: nil, timestamp: nil)
+      def add_event(name, attributes: nil, timestamp: nil)
         self
       end
 
-      # Record an error during the execution of this span. Multiple errors
+      # Record an exception during the execution of this span. Multiple exceptions
       # can be recorded on a span.
       #
-      # @param [Exception] error The error to recorded
+      # @param [Exception] exception The exception to recorded
       #
       # @return [void]
-      def record_error(error); end
+      def record_exception(exception); end
 
       # Sets the Status to the Span
       #

data/lib/opentelemetry/trace/span_context.rb

@@ -11,7 +11,7 @@ module OpenTelemetry
     # {TraceFlags}, a system-specific tracestate, and a boolean indicating that the SpanContext was
     # extracted from the wire.
     class SpanContext
-      attr_reader :trace_id, :span_id, :trace_flags, :tracestate
+      attr_reader :trace_flags, :tracestate
 
       # Returns a new {SpanContext}.
       #
@@ -35,6 +35,30 @@ module OpenTelemetry
         @remote = remote
       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
+
+      # 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 binary representation of the trace ID.
+      #
+      # @return [String] A 16-byte binary string.
+      attr_reader :trace_id
+
+      # Returns the binary representation of the span ID.
+      #
+      # @return [String] An 8-byte binary string.
+      attr_reader :span_id
+
       # Returns true if the {SpanContext} has a non-zero trace ID and non-zero span ID.
       #
       # @return [Boolean]

data/lib/opentelemetry/trace/tracer.rb

@@ -56,7 +56,7 @@ module OpenTelemetry
         span = start_span(name, attributes: attributes, links: links, start_timestamp: start_timestamp, kind: kind, with_parent: with_parent, with_parent_context: with_parent_context)
         with_span(span) { |s, c| yield s, c }
       rescue Exception => e # rubocop:disable Lint/RescueException
-        span.record_error(e)
+        span.record_exception(e)
         span.status = Status.new(Status::UNKNOWN_ERROR,
                                  description: "Unhandled exception of type: #{e.class}")
         raise e

data/lib/opentelemetry/version.rb

@@ -6,5 +6,5 @@
 
 module OpenTelemetry
   ## Current OpenTelemetry version
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-api
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ipsa
@@ -149,6 +149,13 @@ files:
 - OVERVIEW.md
 - lib/opentelemetry-api.rb
 - lib/opentelemetry.rb
+- lib/opentelemetry/baggage.rb
+- lib/opentelemetry/baggage/builder.rb
+- lib/opentelemetry/baggage/manager.rb
+- lib/opentelemetry/baggage/propagation.rb
+- lib/opentelemetry/baggage/propagation/context_keys.rb
+- lib/opentelemetry/baggage/propagation/text_map_extractor.rb
+- lib/opentelemetry/baggage/propagation/text_map_injector.rb
 - lib/opentelemetry/context.rb
 - lib/opentelemetry/context/key.rb
 - lib/opentelemetry/context/propagation.rb
@@ -159,31 +166,22 @@ files:
 - lib/opentelemetry/context/propagation/noop_injector.rb
 - lib/opentelemetry/context/propagation/propagation.rb
 - lib/opentelemetry/context/propagation/propagator.rb
-- lib/opentelemetry/correlation_context.rb
-- lib/opentelemetry/correlation_context/builder.rb
-- lib/opentelemetry/correlation_context/manager.rb
-- lib/opentelemetry/correlation_context/propagation.rb
-- lib/opentelemetry/correlation_context/propagation/context_keys.rb
-- lib/opentelemetry/correlation_context/propagation/text_extractor.rb
-- lib/opentelemetry/correlation_context/propagation/text_injector.rb
 - lib/opentelemetry/error.rb
 - lib/opentelemetry/instrumentation.rb
 - lib/opentelemetry/instrumentation/base.rb
 - lib/opentelemetry/instrumentation/registry.rb
-- lib/opentelemetry/internal.rb
 - lib/opentelemetry/metrics.rb
 - lib/opentelemetry/metrics/handles.rb
 - lib/opentelemetry/metrics/instruments.rb
 - lib/opentelemetry/metrics/meter.rb
 - lib/opentelemetry/metrics/meter_provider.rb
 - lib/opentelemetry/trace.rb
-- lib/opentelemetry/trace/event.rb
 - lib/opentelemetry/trace/link.rb
 - lib/opentelemetry/trace/propagation.rb
 - lib/opentelemetry/trace/propagation/context_keys.rb
 - lib/opentelemetry/trace/propagation/trace_context.rb
-- lib/opentelemetry/trace/propagation/trace_context/text_extractor.rb
-- lib/opentelemetry/trace/propagation/trace_context/text_injector.rb
+- lib/opentelemetry/trace/propagation/trace_context/text_map_extractor.rb
+- lib/opentelemetry/trace/propagation/trace_context/text_map_injector.rb
 - lib/opentelemetry/trace/propagation/trace_context/trace_parent.rb
 - lib/opentelemetry/trace/span.rb
 - lib/opentelemetry/trace/span_context.rb
@@ -213,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A stats collection and distributed tracing framework

data/lib/opentelemetry/correlation_context.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2019 OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-require 'opentelemetry/correlation_context/builder'
-require 'opentelemetry/correlation_context/manager'
-require 'opentelemetry/correlation_context/propagation'
-
-module OpenTelemetry
-  # The CorrelationContext module provides functionality to record and propagate
-  # correlations in a distributed trace
-  module CorrelationContext
-  end
-end

data/lib/opentelemetry/correlation_context/propagation.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2019 OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-require 'opentelemetry/correlation_context/propagation/context_keys'
-require 'opentelemetry/correlation_context/propagation/text_injector'
-require 'opentelemetry/correlation_context/propagation/text_extractor'
-
-module OpenTelemetry
-  module CorrelationContext
-    # The Correlation::Propagation module contains injectors and
-    # extractors for sending and receiving correlation context over the wire
-    module Propagation
-      extend self
-
-      TEXT_EXTRACTOR = TextExtractor.new
-      TEXT_INJECTOR = TextInjector.new
-      RACK_EXTRACTOR = TextExtractor.new(
-        correlation_context_key: 'HTTP_OTCORRELATIONS'
-      )
-      RACK_INJECTOR = TextInjector.new(
-        correlation_context_key: 'HTTP_OTCORRELATIONS'
-      )
-
-      private_constant :TEXT_INJECTOR, :TEXT_EXTRACTOR, :RACK_INJECTOR,
-                       :RACK_EXTRACTOR
-
-      # Returns an extractor that extracts context using the W3C Correlation
-      # Context format
-      def text_injector
-        TEXT_INJECTOR
-      end
-
-      # Returns an injector that injects context using the W3C Correlation
-      # Context format
-      def text_extractor
-        TEXT_EXTRACTOR
-      end
-
-      # Returns an extractor that extracts context using the W3C Correlation
-      # Context format with Rack normalized keys (upcased and prefixed with
-      # HTTP_)
-      def rack_injector
-        RACK_INJECTOR
-      end
-
-      # Returns an injector that injects context using the W3C Correlation
-      # Context format with Rack normalized keys (upcased and prefixed with
-      # HTTP_)
-      def rack_extractor
-        RACK_EXTRACTOR
-      end
-    end
-  end
-end

data/lib/opentelemetry/correlation_context/propagation/context_keys.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2019 OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-module OpenTelemetry
-  module CorrelationContext
-    module Propagation
-      # The ContextKeys module contains the keys used to index correlations
-      # in a {Context} instance
-      module ContextKeys
-        extend self
-
-        CORRELATION_CONTEXT_KEY = Context.create_key('correlation-context')
-        private_constant :CORRELATION_CONTEXT_KEY
-
-        # Returns the context key that correlations are indexed by
-        #
-        # @return [Context::Key]
-        def correlation_context_key
-          CORRELATION_CONTEXT_KEY
-        end
-      end
-    end
-  end
-end

data/lib/opentelemetry/correlation_context/propagation/text_injector.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2019 OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-require 'cgi'
-
-module OpenTelemetry
-  module CorrelationContext
-    module Propagation
-      # Injects correlation context using the W3C Correlation Context format
-      class TextInjector
-        include Context::Propagation::DefaultSetter
-
-        # Returns a new TextInjector that injects context using the specified
-        # header key
-        #
-        # @param [String] correlation_context_header_key The correlation context header
-        #   key used in the carrier
-        # @return [TextInjector]
-        def initialize(correlation_context_key: 'otcorrelations')
-          @correlation_context_key = correlation_context_key
-        end
-
-        # Inject in-process correlations into the supplied carrier.
-        #
-        # @param [Carrier] carrier The carrier to inject correlations into
-        # @param [Context] context The context to read correlations from
-        # @param [optional Callable] getter An optional callable that takes a carrier and a key and
-        #   returns the value associated with the key. If omitted the default getter will be used
-        #   which expects the carrier to respond to [] and []=.
-        # @yield [Carrier, String] if an optional getter is provided, inject will yield the carrier
-        #   and the header key to the getter.
-        # @return [Object] carrier with injected correlations
-        def inject(carrier, context, &setter)
-          return carrier unless (correlations = context[ContextKeys.correlation_context_key]) && !correlations.empty?
-
-          setter ||= default_setter
-          setter.call(carrier, @correlation_context_key, encode(correlations))
-
-          carrier
-        end
-
-        private
-
-        def encode(correlations)
-          correlations.inject(+'') do |memo, (k, v)|
-            memo << CGI.escape(k.to_s) << '=' << CGI.escape(v.to_s) << ','
-          end.chop!
-        end
-      end
-    end
-  end
-end

data/lib/opentelemetry/internal.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2019 OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-module OpenTelemetry
-  # @api private
-  #
-  # Internal contains helpers used by the no-op API implementation.
-  module Internal
-    extend self
-
-    def printable_ascii?(string)
-      return false unless string.is_a?(String)
-
-      r = 32..126
-      string.each_codepoint { |c| return false unless r.include?(c) }
-      true
-    end
-  end
-end

data/lib/opentelemetry/trace/event.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2019 OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-module OpenTelemetry
-  module Trace
-    # A text annotation with a set of attributes and a timestamp.
-    class Event
-      EMPTY_ATTRIBUTES = {}.freeze
-
-      private_constant :EMPTY_ATTRIBUTES
-
-      # Returns the name of this event
-      #
-      # @return [String]
-      attr_reader :name
-
-      # Returns the frozen attributes for this event
-      #
-      # @return [Hash{String => String, Numeric, Boolean, Array<String, Numeric, Boolean>}]
-      attr_reader :attributes
-
-      # Returns the timestamp for this event
-      #
-      # @return [Time]
-      attr_reader :timestamp
-
-      # Returns a new immutable {Event}.
-      #
-      # @param [String] name The name of this event
-      # @param [optional Hash{String => String, Numeric, Boolean, Array<String, Numeric, Boolean>}]
-      #   attributes A hash of attributes for this event. Attributes will be
-      #   frozen during Event initialization.
-      # @param [optional Time] timestamp The timestamp for this event.
-      #   Defaults to Time.now.
-      # @return [Event]
-      def initialize(name:, attributes: nil, timestamp: nil)
-        @name = name
-        @attributes = attributes.freeze || EMPTY_ATTRIBUTES
-        @timestamp = timestamp || Time.now
-      end
-    end
-  end
-end