opentelemetry-sdk 0.17.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4be88dba1f3a925ceb97494267f2d27cfb24f5f89e417236d5cca698c0388b9b
-  data.tar.gz: 8e43a87d87dc739c1323acecaa18e93dac8a911fc28a119c016e5e834ca74615
+  metadata.gz: 945d2fc6ef9f85d085850f3060ec9dcf1687d9066aaa1eb9a0209a6ca5aad28d
+  data.tar.gz: a5fa5d0cd5eb0de4c8d99ecf87fa8e4ba965dd5ae7817847c454b48c1d18e74e
 SHA512:
-  metadata.gz: 672426fc31d0c6cce4f363509085b40bddf66d6c6516048e40ae1661fefaf2a6a3482acfe9a6dcff8db328675fb2e5ec02c9fe89d91486f551bf029bcb390f6b
-  data.tar.gz: 42b693687ddfdf1221c972d902e9249fcec6a947bb48416b4627fbd805859ac8bc5fcdb18ac44e4fb628bfd56f67bf42d028465f6e34c4c679844a7c1027515d
+  metadata.gz: 94ba24237af75d15d0b5aea94c41b01f19392f04a9c7237cfe23388f468e54dcc45a6c0e32c9fd51fbe0d2439dc63d18d1ac6564634fa211110d75bc22069083
+  data.tar.gz: 3889a79b962b13be77e54374af5fc0335089eb2b0ee2637547014a74e744f359a03179838584846837e54e5e6f38c80c8b30690f9e9a85dc99657e858b012e6e

data/CHANGELOG.md

@@ -1,127 +1,189 @@
 # Release History: opentelemetry-sdk
 
+### v1.0.0 / 2021-09-29
+
+* (No significant changes)
+
+### 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 
+* 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)
@@ -131,7 +193,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/configurator.rb

@@ -9,13 +9,29 @@ 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, :propagators, :error_handler, :id_generator
+      attr_writer :propagators, :error_handler, :id_generator
 
       def initialize
         @instrumentation_names = []
@@ -31,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
@@ -51,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
 
@@ -61,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
 
@@ -112,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
@@ -123,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)
@@ -141,21 +165,23 @@ module OpenTelemetry
       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
 
@@ -171,7 +197,7 @@ 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::NoopTextMapPropagator.new
+            NoopTextMapPropagator.new
           end
         end
         OpenTelemetry.propagation = Context::Propagation::CompositeTextMapPropagator.compose_propagators((@propagators || propagators).compact)

data/lib/opentelemetry/sdk/forwarding_logger.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+module OpenTelemetry
+  module SDK
+    # The ForwardingLogger provides a wrapper to control the OpenTelemetry
+    # log level, while respecting the configured level of the supplied logger.
+    # If the OTEL_LOG_LEVEL is set to debug, and the supplied logger is configured
+    # with an ERROR log level, only OpenTelemetry logs at the ERROR level or higher
+    # will be emitted.
+    class ForwardingLogger
+      def initialize(logger, level:) # rubocop:disable Metrics/CyclomaticComplexity
+        @logger = logger
+
+        if level.is_a?(Integer)
+          @level = level
+        else
+          case level.to_s.downcase
+          when 'debug'
+            @level = Logger::DEBUG
+          when 'info'
+            @level = Logger::INFO
+          when 'warn'
+            @level = Logger::WARN
+          when 'error'
+            @level = Logger::ERROR
+          when 'fatal'
+            @level = Logger::FATAL
+          when 'unknown'
+            @level = Logger::UNKNOWN
+          else
+            raise ArgumentError, "invalid log level: #{level}"
+          end
+        end
+      end
+
+      def add(severity, message = nil, progname = nil)
+        return true if severity < @level
+
+        @logger.add(severity, message, progname)
+      end
+
+      def debug(progname = nil, &block)
+        add(Logger::DEBUG, nil, progname, &block)
+      end
+
+      def info(progname = nil, &block)
+        add(Logger::INFO, nil, progname, &block)
+      end
+
+      def warn(progname = nil, &block)
+        add(Logger::WARN, nil, progname, &block)
+      end
+
+      def error(progname = nil, &block)
+        add(Logger::ERROR, nil, progname, &block)
+      end
+
+      def fatal(progname = nil, &block)
+        add(Logger::FATAL, nil, progname, &block)
+      end
+
+      def unknown(progname = nil, &block)
+        add(Logger::UNKNOWN, nil, progname, &block)
+      end
+    end
+  end
+end

data/lib/opentelemetry/sdk/internal.rb

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

data/lib/opentelemetry/sdk/resources/resource.rb

@@ -31,14 +31,14 @@ module OpenTelemetry
           end
 
           def default
-            @default ||= create(Constants::SERVICE_RESOURCE[:name] => 'unknown_service').merge(process).merge(telemetry_sdk)
+            @default ||= create(SemanticConventions::Resource::SERVICE_NAME => 'unknown_service').merge(process).merge(telemetry_sdk).merge(service_name_from_env)
           end
 
           def telemetry_sdk
             resource_attributes = {
-              Constants::TELEMETRY_SDK_RESOURCE[:name] => 'opentelemetry',
-              Constants::TELEMETRY_SDK_RESOURCE[:language] => 'ruby',
-              Constants::TELEMETRY_SDK_RESOURCE[:version] => OpenTelemetry::SDK::VERSION
+              SemanticConventions::Resource::TELEMETRY_SDK_NAME => 'opentelemetry',
+              SemanticConventions::Resource::TELEMETRY_SDK_LANGUAGE => 'ruby',
+              SemanticConventions::Resource::TELEMETRY_SDK_VERSION => OpenTelemetry::SDK::VERSION
             }
 
             resource_pairs = ENV['OTEL_RESOURCE_ATTRIBUTES']
@@ -55,15 +55,22 @@ module OpenTelemetry
 
           def process
             resource_attributes = {
-              Constants::PROCESS_RESOURCE[:pid] => Process.pid,
-              Constants::PROCESS_RESOURCE[:command] => $PROGRAM_NAME,
-              Constants::PROCESS_RUNTIME_RESOURCE[:name] => RUBY_ENGINE,
-              Constants::PROCESS_RUNTIME_RESOURCE[:version] => RUBY_VERSION,
-              Constants::PROCESS_RUNTIME_RESOURCE[:description] => RUBY_DESCRIPTION
+              SemanticConventions::Resource::PROCESS_PID => Process.pid,
+              SemanticConventions::Resource::PROCESS_COMMAND => $PROGRAM_NAME,
+              SemanticConventions::Resource::PROCESS_RUNTIME_NAME => RUBY_ENGINE,
+              SemanticConventions::Resource::PROCESS_RUNTIME_VERSION => RUBY_VERSION,
+              SemanticConventions::Resource::PROCESS_RUNTIME_DESCRIPTION => RUBY_DESCRIPTION
             }
 
             create(resource_attributes)
           end
+
+          private
+
+          def service_name_from_env
+            service_name = ENV['OTEL_SERVICE_NAME']
+            create(SemanticConventions::Resource::SERVICE_NAME => service_name) unless service_name.nil?
+          end
         end
 
         # @api private

data/lib/opentelemetry/sdk/resources.rb

@@ -13,4 +13,3 @@ module OpenTelemetry
 end
 
 require 'opentelemetry/sdk/resources/resource'
-require 'opentelemetry/sdk/resources/constants'

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

@@ -7,42 +7,13 @@
 module OpenTelemetry
   module SDK
     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
+      # A text annotation with a set of attributes and a timestamp for export.
+      #
+      # Field types are as follows:
+      #  name: String
+      #  attributes: frozen Hash{String => String, Numeric, Boolean, Array<String, Numeric, Boolean>}
+      #  timestamp: Integer nanoseconds since Epoch
+      Event = Struct.new(:name, :attributes, :timestamp)
     end
   end
 end