opentelemetry-sdk 0.16.0 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0231dc6f06956325ffb14fc4a209f579001c7cc059659da14d4a4790fd07efeb
-  data.tar.gz: 676299747265e10f02eb15ffda455bfcd70155a9969e1f021804fb37c26ba768
+  metadata.gz: 17f7b73252b2a5e788e9e47e25d7ade10d5694481c2486751aa95f993ea61496
+  data.tar.gz: 1c9774adc9d2ae03b82e62d5c403cce431c8d3b301233985c88c286b93155666
 SHA512:
-  metadata.gz: ea3a1003fd132137846cbf7957da2524e21dca19d0899c9663cebbc5836bd5ce1adafe4b0ecf8f899600a94701b410534ea1eca56409da9e2dc3de658b0cb4c7
-  data.tar.gz: ee4b4487c397cee00f0d40854c3c19b7e405bfff70f145ee8520f1ceb924ac7a99cb8b15a43af30c826f59d08028345ab62535d5fef0164c89e43bd6b221d43c
+  metadata.gz: e586c8e065502a1651577c3389868a056b3f1146bd08567a721264367e7391b8af257c30401ec99333e63c18b8cb0f8ea9526ac5f24aeded17918e53600fe5a6
+  data.tar.gz: b5473a3c7be5039721c883bbbdb834db9ee1821d15e69287cf6a690a607dbc2ee99c267741260368315abdf4adc5a0ae3724351e2897d5119615fae56bf42a14

data/CHANGELOG.md

@@ -1,113 +1,185 @@
 # Release History: opentelemetry-sdk
 
+### v1.0.0.rc3 / 2021-08-12
+
+* BREAKING CHANGE: Remove optional parent_context from in_span
+* BREAKING CHANGE: Replace Time.now with Process.clock_gettime
+* BREAKING CHANGE: Refactor Baggage to remove Noop*
+* BREAKING CHANGE: Remove unnecessary readers from SDK Tracer
+* BREAKING CHANGE: Total order constraint on span.status=
+* BREAKING CHANGE: Use auto-generated resource constants in sdk and resource_detectors
+* BREAKING CHANGE: Span limits env vars
+
+* ADDED: Add Tracer.non_recording_span to API
+* ADDED: Add unnamed tracer warning message
+* ADDED: Allow disabling of install messages
+* ADDED: Make API's NoopTextMapPropagator private
+* ADDED: Use auto-generated resource constants in sdk and resource_detectors
+* ADDED: Allow selecting multiple exporter
+* ADDED: Add explicit BSP export error
+* FIXED: Remove optional parent_context from in_span
+* FIXED: Replace Time.now with Process.clock_gettime
+* FIXED: Rename cloud.zone to cloud.availability_zone
+* FIXED: Improve attribute error messages
+* FIXED: Refactor Baggage to remove Noop*
+* FIXED: Support OTEL_SERVICE_NAME env var
+* FIXED: Remove unnecessary readers from SDK Tracer
+* FIXED: Total order constraint on span.status=
+* FIXED: Flakey tracer provider test
+* FIXED: Split lock in TracerProvider
+* FIXED: Span limits env vars
+* FIXED: Prune invalid links
+* DOCS: Update docs to rely more on environment variable configuration
+
+### v1.0.0.rc2 / 2021-06-23
+
+* BREAKING CHANGE: Remove optional parent_context from in_span [729](https://github.com/open-telemetry/opentelemetry-ruby/pull/729)
+* BREAKING CHANGE: Replace Time.now with Process.clock_gettime [717](https://github.com/open-telemetry/opentelemetry-ruby/pull/717)
+* BREAKING CHANGE: Refactor Baggage to remove Noop* [800](https://github.com/open-telemetry/opentelemetry-ruby/pull/800)
+* BREAKING CHANGE: Remove unnecessary readers from SDK Tracer [820](https://github.com/open-telemetry/opentelemetry-ruby/pull/820)
+  - Tracer no longer surfaces attribute readers for the name, version, or tracer_provider
+* BREAKING CHANGE: Total order constraint on span.status= [805](https://github.com/open-telemetry/opentelemetry-ruby/pull/805)
+
+* ADDED: Add Tracer.non_recording_span to API [799](https://github.com/open-telemetry/opentelemetry-ruby/pull/799)
+* ADDED: Add unnamed tracer warning message [830](https://github.com/open-telemetry/opentelemetry-ruby/pull/830)
+* ADDED: Allow disabling of install messages [831](https://github.com/open-telemetry/opentelemetry-ruby/pull/831)
+* FIXED: Rename cloud.zone to cloud.availability_zone [734](https://github.com/open-telemetry/opentelemetry-ruby/pull/734)
+* FIXED: Improve attribute error messages [742](https://github.com/open-telemetry/opentelemetry-ruby/pull/742)
+* FIXED: Support OTEL_SERVICE_NAME env var [806]https://github.com/open-telemetry/opentelemetry-ruby/pull/806
+* FIXED: Flakey tracer provider test
+
+### v1.0.0.rc1 / 2021-05-21
+
+* BREAKING CHANGE: Remove optional parent_context from in_span
+* BREAKING CHANGE: Replace Time.now with Process.clock_gettime
+
+* FIXED: Remove optional parent_context from in_span
+* FIXED: Replace Time.now with Process.clock_gettime
+* FIXED: Rename cloud.zone to cloud.availability_zone
+* FIXED: Improve attribute error messages
+
+### v0.17.0 / 2021-04-22
+
+* BREAKING CHANGE: Replace TextMapInjector/TextMapExtractor pairs with a TextMapPropagator.
+
+  [Check the propagator documentation](https://open-telemetry.github.io/opentelemetry-ruby/) for the new usage.
+
+* ADDED: Add zipkin exporter
+* ADDED: Processors validate exporters on init.
+* ADDED: Add configurable truncation of span and event attribute values
+* ADDED: Add simple 'recording' attr_accessor to InMemorySpanExporter
+* FIXED: Typo in error message
+* FIXED: Improve configuration error reporting
+* FIXED: Refactor propagators to add #fields
+
 ### v0.16.0 / 2021-03-17
 
-* BREAKING CHANGE: Update SDK BaggageManager to match API 
-* BREAKING CHANGE: Implement Exporter#force_flush 
+* BREAKING CHANGE: Update SDK BaggageManager to match API
+* BREAKING CHANGE: Implement Exporter#force_flush
 
-* ADDED: Add force_flush to SDK's TracerProvider 
-* ADDED: Add k8s node to gcp resource detector 
-* ADDED: Add console option for OTEL_TRACES_EXPORTER 
-* ADDED: Span#add_attributes 
-* ADDED: Implement Exporter#force_flush 
-* FIXED: Update SDK BaggageManager to match API 
-* DOCS: Replace Gitter with GitHub Discussions 
+* ADDED: Add force_flush to SDK's TracerProvider
+* ADDED: Add k8s node to gcp resource detector
+* ADDED: Add console option for OTEL_TRACES_EXPORTER
+* ADDED: Span#add_attributes
+* ADDED: Implement Exporter#force_flush
+* FIXED: Update SDK BaggageManager to match API
+* DOCS: Replace Gitter with GitHub Discussions
 
 ### v0.15.0 / 2021-02-18
 
-* BREAKING CHANGE: Streamline processor pipeline 
+* BREAKING CHANGE: Streamline processor pipeline
 
-* ADDED: Add instrumentation config validation 
-* FIXED: Streamline processor pipeline 
-* FIXED: OTEL_TRACE -> OTEL_TRACES env vars 
-* FIXED: Change limits from 1000 to 128 
-* FIXED: OTEL_TRACES_EXPORTER and OTEL_PROPAGATORS 
-* FIXED: Add thread error handling to the BSP 
-* DOCS: Clarify nil attribute values not allowed 
+* ADDED: Add instrumentation config validation
+* FIXED: Streamline processor pipeline
+* FIXED: OTEL_TRACE -> OTEL_TRACES env vars
+* FIXED: Change limits from 1000 to 128
+* FIXED: OTEL_TRACES_EXPORTER and OTEL_PROPAGATORS
+* FIXED: Add thread error handling to the BSP
+* DOCS: Clarify nil attribute values not allowed
 
 ### v0.14.0 / 2021-02-03
 
-* BREAKING CHANGE: Replace getter and setter callables and remove rack specific propagators 
+* BREAKING CHANGE: Replace getter and setter callables and remove rack specific propagators
 
-* ADDED: Replace getter and setter callables and remove rack specific propagators 
+* ADDED: Replace getter and setter callables and remove rack specific propagators
 
 ### v0.13.1 / 2021-02-01
 
-* FIXED: Leaky test 
-* FIXED: Allow env var override of service.name 
+* FIXED: Leaky test
+* FIXED: Allow env var override of service.name
 
 ### v0.13.0 / 2021-01-29
 
-* BREAKING CHANGE: Remove MILLIS from BatchSpanProcessor vars 
+* BREAKING CHANGE: Remove MILLIS from BatchSpanProcessor vars
 
-* ADDED: Process.runtime resource 
-* ADDED: Provide default resource in SDK 
-* ADDED: Add optional attributes to record_exception 
-* FIXED: Resource.merge consistency 
-* FIXED: Remove MILLIS from BatchSpanProcessor vars 
+* ADDED: Process.runtime resource
+* ADDED: Provide default resource in SDK
+* ADDED: Add optional attributes to record_exception
+* FIXED: Resource.merge consistency
+* FIXED: Remove MILLIS from BatchSpanProcessor vars
 
 ### v0.12.1 / 2021-01-13
 
-* FIXED: Fix several BatchSpanProcessor errors related to fork safety 
-* FIXED: Define default value for traceid ratio 
+* FIXED: Fix several BatchSpanProcessor errors related to fork safety
+* FIXED: Define default value for traceid ratio
 
 ### v0.12.0 / 2020-12-24
 
-* ADDED: Structured error handling 
-* ADDED: Pluggable ID generation 
-* FIXED: BSP dropped span buffer full reporting 
-* FIXED: Implement SDK environment variables 
-* FIXED: Remove incorrect TODO 
+* ADDED: Structured error handling
+* ADDED: Pluggable ID generation
+* FIXED: BSP dropped span buffer full reporting
+* FIXED: Implement SDK environment variables
+* FIXED: Remove incorrect TODO
 
 ### v0.11.1 / 2020-12-16
 
-* FIXED: BSP dropped span buffer full reporting 
+* FIXED: BSP dropped span buffer full reporting
 
 ### v0.11.0 / 2020-12-11
 
-* ADDED: Metrics reporting from trace export 
-* FIXED: Copyright comments to not reference year 
+* ADDED: Metrics reporting from trace export
+* FIXED: Copyright comments to not reference year
 
 ### v0.10.0 / 2020-12-03
 
-* BREAKING CHANGE: Allow samplers to modify tracestate 
+* BREAKING CHANGE: Allow samplers to modify tracestate
 
-* FIXED: Allow samplers to modify tracestate 
+* FIXED: Allow samplers to modify tracestate
 
 ### v0.9.0 / 2020-11-27
 
-* BREAKING CHANGE: Pass full Context to samplers 
-* BREAKING CHANGE: Add timeout for force_flush and shutdown 
+* BREAKING CHANGE: Pass full Context to samplers
+* BREAKING CHANGE: Add timeout for force_flush and shutdown
 
-* ADDED: Add OTEL_RUBY_BSP_START_THREAD_ON_BOOT env var 
-* ADDED: Add timeout for force_flush and shutdown 
-* FIXED: Signal at batch_size 
-* FIXED: SDK Span.recording? after finish 
-* FIXED: Pass full Context to samplers 
-* DOCS: Add documentation on usage scenarios for span processors 
+* ADDED: Add OTEL_RUBY_BSP_START_THREAD_ON_BOOT env var
+* ADDED: Add timeout for force_flush and shutdown
+* FIXED: Signal at batch_size
+* FIXED: SDK Span.recording? after finish
+* FIXED: Pass full Context to samplers
+* DOCS: Add documentation on usage scenarios for span processors
 
 ### v0.8.0 / 2020-10-27
 
-* BREAKING CHANGE: Move context/span methods to Trace module 
-* BREAKING CHANGE: Remove 'canonical' from status codes 
-* BREAKING CHANGE: Assorted SpanContext fixes 
+* BREAKING CHANGE: Move context/span methods to Trace module
+* BREAKING CHANGE: Remove 'canonical' from status codes
+* BREAKING CHANGE: Assorted SpanContext fixes
 
-* FIXED: Move context/span methods to Trace module 
-* FIXED: Remove 'canonical' from status codes 
-* FIXED: Assorted SpanContext fixes 
+* FIXED: Move context/span methods to Trace module
+* FIXED: Remove 'canonical' from status codes
+* FIXED: Assorted SpanContext fixes
 
 ### v0.7.0 / 2020-10-07
 
-* ADDED: Add service_name setter to configurator 
-* ADDED: Add service_version setter to configurator 
-* FIXED: Fork safety for batch processor 
-* FIXED: Don't generate a span ID unnecessarily 
-* DOCS: Fix Configurator#add_span_processor 
-* DOCS: Standardize toplevel docs structure and readme 
+* ADDED: Add service_name setter to configurator
+* ADDED: Add service_version setter to configurator
+* FIXED: Fork safety for batch processor
+* FIXED: Don't generate a span ID unnecessarily
+* DOCS: Fix Configurator#add_span_processor
+* DOCS: Standardize toplevel docs structure and readme
 
 ### v0.6.0 / 2020-09-10
 
-* BREAKING CHANGE: Rename Resource labels to attributes 
+* BREAKING CHANGE: Rename Resource labels to attributes
 * BREAKING CHANGE: Export resource from Span/SpanData instead of library_resource
 * BREAKING CHANGE: Rename CorrelationContext to Baggage
 * BREAKING CHANGE: Rename Text* to TextMap* (propagators, injectors, extractors)
@@ -117,7 +189,7 @@
 
 * ADDED: Add OTLP exporter
 * ADDED: Add support for OTEL_LOG_LEVEL env var
-* FIXED: Rename Resource labels to attributes 
+* FIXED: Rename Resource labels to attributes
 * ADDED: Environment variable resource detection
 * ADDED: BatchSpanProcessor environment variable support
 * FIXED: Remove semver prefix

data/README.md

@@ -29,10 +29,33 @@ Then, configure the SDK according to your desired handling of telemetry data, an
 ```ruby
 require 'opentelemetry/sdk'
 
-# Configure the sdk with default export and context propagation formats
-# see SDK#configure for customizing the setup
+# Configure the sdk with default export and context propagation formats.
 OpenTelemetry::SDK.configure
 
+# Many configuration options may be set via the environment. To use them,
+# set the appropriate variable before calling configure. For example:
+#
+# ENV['OTEL_TRACES_EXPORTER'] = 'console'
+# ENV['OTEL_PROPAGATORS'] = 'ottrace'
+# OpenTelemetry::SDK.configure
+#
+# You may also configure the SDK programmatically, for advanced usage or to
+# enable auto-instrumentation. For example:
+#
+# OpenTelemetry::SDK.configure do |c|
+#   c.service_name = something_calculated_dynamically
+#   c.add_span_processor(
+#     OpenTelemetry::SDK::Trace::Export::SimpleSpanProcessor.new(
+#       OpenTelemetry::SDK::Trace::Export::ConsoleSpanExporter.new
+#     )
+#   )
+#
+#   c.use 'OpenTelemetry::Instrumentation::Net::HTTP'
+# end
+#
+# Note that the SimpleSpanExporter is not recommended for use in production.
+
+
 # To start a trace you need to get a Tracer from the TracerProvider
 tracer = OpenTelemetry.tracer_provider.tracer('my_app_or_gem', '0.1.0')
 

data/lib/opentelemetry/sdk.rb

@@ -6,6 +6,8 @@
 
 require 'opentelemetry'
 require 'opentelemetry/common'
+require 'opentelemetry-instrumentation-base'
+require 'opentelemetry-semantic_conventions'
 
 # OpenTelemetry is an open source observability framework, providing a
 # general-purpose API, SDK, and related tools required for the instrumentation
@@ -54,7 +56,7 @@ module OpenTelemetry
     #   Configure everything
     #
     #     OpenTelemetry::SDK.configure do |c|
-    #       c.logger = Logger.new('/dev/null')
+    #       c.logger = Logger.new(File::NULL)
     #       c.add_span_processor SpanProcessor.new(SomeExporter.new)
     #       c.use_all
     #     end
@@ -66,14 +68,14 @@ module OpenTelemetry
       begin
         raise ConfigurationError
       rescue ConfigurationError => e
-        OpenTelemetry.handle_error(exception: e, message: 'unexpected configuration error')
+        OpenTelemetry.handle_error(exception: e, message: "unexpected configuration error due to #{e.cause}")
       end
     end
   end
 end
 
 require 'opentelemetry/sdk/configurator'
-require 'opentelemetry/sdk/baggage'
+require 'opentelemetry/sdk/forwarding_logger'
 require 'opentelemetry/sdk/internal'
 require 'opentelemetry/sdk/instrumentation_library'
 require 'opentelemetry/sdk/resources'

data/lib/opentelemetry/sdk/configurator.rb

@@ -9,20 +9,34 @@ module OpenTelemetry
     # The configurator provides defaults and facilitates configuring the
     # SDK for use.
     class Configurator # rubocop:disable Metrics/ClassLength
+      # @api private
+      class NoopTextMapPropagator
+        EMPTY_LIST = [].freeze
+        private_constant(:EMPTY_LIST)
+
+        def inject(carrier, context: Context.current, setter: Context::Propagation.text_map_setter); end
+
+        def extract(carrier, context: Context.current, getter: Context::Propagation.text_map_getter)
+          context
+        end
+
+        def fields
+          EMPTY_LIST
+        end
+      end
+
       USE_MODE_UNSPECIFIED = 0
       USE_MODE_ONE = 1
       USE_MODE_ALL = 2
 
       private_constant :USE_MODE_UNSPECIFIED, :USE_MODE_ONE, :USE_MODE_ALL
 
-      attr_writer :logger, :extractors, :injectors, :error_handler,
-                  :id_generator
+      attr_writer :propagators, :error_handler, :id_generator
 
       def initialize
         @instrumentation_names = []
         @instrumentation_config_map = {}
-        @injectors = nil
-        @extractors = nil
+        @propagators = nil
         @span_processors = []
         @use_mode = USE_MODE_UNSPECIFIED
         @resource = Resources::Resource.default
@@ -33,6 +47,15 @@ module OpenTelemetry
         @logger ||= OpenTelemetry.logger
       end
 
+      # Accepts a logger and wraps it in the {ForwardingLogger} which allows
+      # for controlling the severity level emitted by the OpenTelemetry.logger
+      # independently of the supplied logger.
+      #
+      # @param [Logger] new_logger The logger for OpenTelemetry to use
+      def logger=(new_logger)
+        @logger = ForwardingLogger.new(new_logger, level: ENV['OTEL_LOG_LEVEL'] || Logger::INFO)
+      end
+
       def error_handler
         @error_handler ||= OpenTelemetry.error_handler
       end
@@ -53,7 +76,7 @@ module OpenTelemetry
       # @param [String] service_name The value to be used as the service name
       def service_name=(service_name)
         self.resource = OpenTelemetry::SDK::Resources::Resource.create(
-          OpenTelemetry::SDK::Resources::Constants::SERVICE_RESOURCE[:name] => service_name
+          OpenTelemetry::SemanticConventions::Resource::SERVICE_NAME => service_name
         )
       end
 
@@ -63,7 +86,7 @@ module OpenTelemetry
       # @param [String] service_version The value to be used as the service version
       def service_version=(service_version)
         self.resource = OpenTelemetry::SDK::Resources::Resource.create(
-          OpenTelemetry::SDK::Resources::Constants::SERVICE_RESOURCE[:version] => service_version
+          OpenTelemetry::SemanticConventions::Resource::SERVICE_VERSION => service_version
         )
       end
 
@@ -114,7 +137,6 @@ module OpenTelemetry
       def configure
         OpenTelemetry.logger = logger
         OpenTelemetry.error_handler = error_handler
-        OpenTelemetry.baggage = Baggage::Manager.new
         configure_propagation
         configure_span_processors
         tracer_provider.id_generator = @id_generator
@@ -125,7 +147,7 @@ module OpenTelemetry
       private
 
       def tracer_provider
-        @tracer_provider ||= Trace::TracerProvider.new(@resource)
+        @tracer_provider ||= Trace::TracerProvider.new(resource: @resource)
       end
 
       def check_use_mode!(mode)
@@ -136,39 +158,38 @@ module OpenTelemetry
       def install_instrumentation
         case @use_mode
         when USE_MODE_ONE
-          OpenTelemetry.instrumentation_registry.install(@instrumentation_names, @instrumentation_config_map)
+          OpenTelemetry::Instrumentation.registry.install(@instrumentation_names, @instrumentation_config_map)
         when USE_MODE_ALL
-          OpenTelemetry.instrumentation_registry.install_all(@instrumentation_config_map)
+          OpenTelemetry::Instrumentation.registry.install_all(@instrumentation_config_map)
         end
       end
 
       def configure_span_processors
-        processors = @span_processors.empty? ? [wrapped_exporter_from_env].compact : @span_processors
+        processors = @span_processors.empty? ? wrapped_exporters_from_env.compact : @span_processors
         processors.each { |p| tracer_provider.add_span_processor(p) }
       end
 
-      def wrapped_exporter_from_env
-        exporter = ENV.fetch('OTEL_TRACES_EXPORTER', 'otlp')
-        case exporter
-        when 'none' then nil
-        when 'otlp' then fetch_exporter(exporter, 'OpenTelemetry::Exporter::OTLP::Exporter')
-        when 'jaeger' then fetch_exporter(exporter, 'OpenTelemetry::Exporter::Jaeger::CollectorExporter')
-        when 'zipkin' then fetch_exporter(exporter, 'OpenTelemetry::Exporter::Zipkin::Exporter')
-        when 'console' then Trace::Export::SimpleSpanProcessor.new(Trace::Export::ConsoleSpanExporter.new)
-        else
-          OpenTelemetry.logger.warn "The #{exporter} exporter is unknown and cannot be configured, spans will not be exported"
-          nil
+      def wrapped_exporters_from_env
+        exporters = ENV.fetch('OTEL_TRACES_EXPORTER', 'otlp')
+        exporters.split(',').map do |exporter|
+          case exporter.strip
+          when 'none' then nil
+          when 'otlp' then fetch_exporter(exporter, 'OpenTelemetry::Exporter::OTLP::Exporter')
+          when 'jaeger' then fetch_exporter(exporter, 'OpenTelemetry::Exporter::Jaeger::CollectorExporter')
+          when 'zipkin' then fetch_exporter(exporter, 'OpenTelemetry::Exporter::Zipkin::Exporter')
+          when 'console' then Trace::Export::SimpleSpanProcessor.new(Trace::Export::ConsoleSpanExporter.new)
+          else
+            OpenTelemetry.logger.warn "The #{exporter} exporter is unknown and cannot be configured, spans will not be exported"
+            nil
+          end
         end
       end
 
-      def configure_propagation # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
-        propagators = ENV.fetch('OTEL_PROPAGATORS', 'tracecontext,baggage').split(',')
-        injectors, extractors = propagators.uniq.collect do |propagator|
+      def configure_propagation # rubocop:disable Metrics/CyclomaticComplexity
+        propagators = ENV.fetch('OTEL_PROPAGATORS', 'tracecontext,baggage').split(',').uniq.collect do |propagator|
           case propagator
-          when 'tracecontext'
-            [OpenTelemetry::Trace::Propagation::TraceContext.text_map_injector, OpenTelemetry::Trace::Propagation::TraceContext.text_map_extractor]
-          when 'baggage'
-            [OpenTelemetry::Baggage::Propagation.text_map_injector, OpenTelemetry::Baggage::Propagation.text_map_extractor]
+          when 'tracecontext' then OpenTelemetry::Trace::Propagation::TraceContext.text_map_propagator
+          when 'baggage' then OpenTelemetry::Baggage::Propagation.text_map_propagator
           when 'b3' then fetch_propagator(propagator, 'OpenTelemetry::Propagator::B3::Single')
           when 'b3multi' then fetch_propagator(propagator, 'OpenTelemetry::Propagator::B3::Multi', 'b3')
           when 'jaeger' then fetch_propagator(propagator, 'OpenTelemetry::Propagator::Jaeger')
@@ -176,27 +197,17 @@ module OpenTelemetry
           when 'ottrace' then fetch_propagator(propagator, 'OpenTelemetry::Propagator::OTTrace')
           else
             OpenTelemetry.logger.warn "The #{propagator} propagator is unknown and cannot be configured"
-            [Context::Propagation::NoopInjector.new, Context::Propagation::NoopExtractor.new]
+            NoopTextMapPropagator.new
           end
-        end.transpose
-        OpenTelemetry.propagation = create_propagator(@injectors || injectors.compact,
-                                                      @extractors || extractors.compact)
-      end
-
-      def create_propagator(injectors, extractors)
-        if injectors.size > 1 || extractors.size > 1
-          Context::Propagation::CompositePropagator.new(injectors, extractors)
-        else
-          Context::Propagation::Propagator.new(injectors.first, extractors.first)
         end
+        OpenTelemetry.propagation = Context::Propagation::CompositeTextMapPropagator.compose_propagators((@propagators || propagators).compact)
       end
 
       def fetch_propagator(name, class_name, gem_suffix = name)
-        propagator_class = Kernel.const_get(class_name)
-        [propagator_class.text_map_injector, propagator_class.text_map_extractor]
+        Kernel.const_get(class_name).text_map_propagator
       rescue NameError
         OpenTelemetry.logger.warn "The #{name} propagator cannot be configured - please add opentelemetry-propagator-#{gem_suffix} to your Gemfile"
-        [nil, nil]
+        nil
       end
 
       def fetch_exporter(name, class_name)