opentelemetry-exporter-otlp 0.35.0 → 0.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a70dac4077778d7509007cb05dbee8be6a986fd42922989774a63d9fcae2c12
-  data.tar.gz: 505e121828f48cb6422cc50a65dc3da7034af89a122d28a3aa69ef2c2a5748d7
+  metadata.gz: aab12b9c747b15ac934de3019f3ec6e158b5cb449b2adf7bd82dfd277706fe40
+  data.tar.gz: e964a0b367f4a2fa875b0b089291c09dbfdc4b68cd09c47c01d9920496e7f030
 SHA512:
-  metadata.gz: be9417b211b89cfc33cb3d121d78c2016761ddbfa4df0a18b6e9431f6b35e6ad6bf40c1c9742f5077c136ab6b33e8e01e51817a6f72334c9fa88724d7a429db0
-  data.tar.gz: 57c79d67e71d2dc46bc78b6deb504e6fb0fab260b16a57098534b51804b6a2132f344978af29cd689e0d480c74acc5c079057a7e9b153ff42a9468c827699190
+  metadata.gz: 4fa989d717b311dfa3b0549f4f8d9ae97781e0155cc120e27e24ae59a183feb6a0325b833a0700ee5e94656de88384ba56ebff0eedb4380706f47b123c71e94d
+  data.tar.gz: 993a85f5b384acf4f1f1f6a72c442e1d899356ba7eabe8e076d60b466ce1319a43798f01a270ea1454be71ea071c87319705b561f1236e2c0e73796356a22af6

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-exporter-otlp
 
+### v0.35.1 / 2026-09-01
+
+* REVERT: Use common conversion including supporting flags (#2328)
+
 ### v0.35.0 / 2026-09-01
 
 * ADDED: Use common conversion including supporting flags (#2250)

data/lib/opentelemetry/exporter/otlp/exporter.rb

@@ -5,7 +5,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 require 'opentelemetry/common'
-require 'opentelemetry/exporter/otlp/common'
 require 'opentelemetry/sdk'
 require 'net/http'
 require 'zlib'
@@ -106,6 +105,26 @@ module OpenTelemetry
 
         private
 
+        # Builds span flags based on whether the parent span context is remote.
+        # This follows the OTLP specification for span flags.
+        def build_span_flags(parent_span_is_remote, base_flags)
+          # Extract integer value from TraceFlags object if needed
+          # Derive the low 8-bit W3C trace flags using the public API.
+          base_flags_int =
+            if base_flags.sampled?
+              1
+            else
+              0
+            end
+
+          has_remote_mask = Opentelemetry::Proto::Trace::V1::SpanFlags::SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK
+          is_remote_mask = Opentelemetry::Proto::Trace::V1::SpanFlags::SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK
+
+          flags = base_flags_int | has_remote_mask
+          flags |= is_remote_mask if parent_span_is_remote
+          flags
+        end
+
         def http_connection(uri, ssl_verify_mode, certificate_file, client_certificate_file, client_key_file)
           http = Net::HTTP.new(uri.hostname, uri.port)
           http.use_ssl = uri.scheme == 'https'
@@ -274,9 +293,32 @@ module OpenTelemetry
           true
         end
 
-        def encode(span_data)
+        def encode(span_data) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
           start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-          OpenTelemetry::Exporter::OTLP::Common.as_encoded_etsr(span_data)
+          Opentelemetry::Proto::Collector::Trace::V1::ExportTraceServiceRequest.encode(
+            Opentelemetry::Proto::Collector::Trace::V1::ExportTraceServiceRequest.new(
+              resource_spans: span_data
+                              .group_by(&:resource)
+                              .map do |resource, span_datas|
+                                Opentelemetry::Proto::Trace::V1::ResourceSpans.new(
+                                  resource: Opentelemetry::Proto::Resource::V1::Resource.new(
+                                    attributes: resource.attribute_enumerator.map { |key, value| as_otlp_key_value(key, value) }
+                                  ),
+                                  scope_spans: span_datas
+                                               .group_by(&:instrumentation_scope)
+                                               .map do |il, sds|
+                                                 Opentelemetry::Proto::Trace::V1::ScopeSpans.new(
+                                                   scope: Opentelemetry::Proto::Common::V1::InstrumentationScope.new(
+                                                     name: il.name,
+                                                     version: il.version
+                                                   ),
+                                                   spans: sds.map { |sd| as_otlp_span(sd) }
+                                                 )
+                                               end
+                                )
+                              end
+            )
+          )
         rescue StandardError => e
           OpenTelemetry.handle_error(exception: e, message: 'unexpected error in OTLP::Exporter#encode')
           nil
@@ -287,6 +329,93 @@ module OpenTelemetry
                                          value: duration_ms)
         end
 
+        def as_otlp_span(span_data) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          Opentelemetry::Proto::Trace::V1::Span.new(
+            trace_id: span_data.trace_id,
+            span_id: span_data.span_id,
+            trace_state: span_data.tracestate.to_s,
+            parent_span_id: span_data.parent_span_id == OpenTelemetry::Trace::INVALID_SPAN_ID ? nil : span_data.parent_span_id,
+            name: span_data.name,
+            kind: as_otlp_span_kind(span_data.kind),
+            start_time_unix_nano: span_data.start_timestamp,
+            end_time_unix_nano: span_data.end_timestamp,
+            attributes: span_data.attributes&.map { |k, v| as_otlp_key_value(k, v) },
+            dropped_attributes_count: span_data.total_recorded_attributes - span_data.attributes&.size.to_i,
+            events: span_data.events&.map do |event|
+              Opentelemetry::Proto::Trace::V1::Span::Event.new(
+                time_unix_nano: event.timestamp,
+                name: event.name,
+                attributes: event.attributes&.map { |k, v| as_otlp_key_value(k, v) }
+                # TODO: track dropped_attributes_count in Span#append_event
+              )
+            end,
+            dropped_events_count: span_data.total_recorded_events - span_data.events&.size.to_i,
+            links: span_data.links&.map do |link|
+              Opentelemetry::Proto::Trace::V1::Span::Link.new(
+                trace_id: link.span_context.trace_id,
+                span_id: link.span_context.span_id,
+                trace_state: link.span_context.tracestate.to_s,
+                attributes: link.attributes&.map { |k, v| as_otlp_key_value(k, v) },
+                # TODO: track dropped_attributes_count in Span#trim_links
+                flags: build_span_flags(link.span_context.remote?, link.span_context.trace_flags)
+              )
+            end,
+            dropped_links_count: span_data.total_recorded_links - span_data.links&.size.to_i,
+            status: span_data.status&.then do |status|
+              Opentelemetry::Proto::Trace::V1::Status.new(
+                code: as_otlp_status_code(status.code),
+                message: status.description
+              )
+            end,
+            flags: build_span_flags(span_data.parent_span_is_remote, span_data.trace_flags)
+          )
+        end
+
+        def as_otlp_status_code(code)
+          case code
+          when OpenTelemetry::Trace::Status::OK then Opentelemetry::Proto::Trace::V1::Status::StatusCode::STATUS_CODE_OK
+          when OpenTelemetry::Trace::Status::ERROR then Opentelemetry::Proto::Trace::V1::Status::StatusCode::STATUS_CODE_ERROR
+          else Opentelemetry::Proto::Trace::V1::Status::StatusCode::STATUS_CODE_UNSET
+          end
+        end
+
+        def as_otlp_span_kind(kind)
+          case kind
+          when :internal then Opentelemetry::Proto::Trace::V1::Span::SpanKind::SPAN_KIND_INTERNAL
+          when :server then Opentelemetry::Proto::Trace::V1::Span::SpanKind::SPAN_KIND_SERVER
+          when :client then Opentelemetry::Proto::Trace::V1::Span::SpanKind::SPAN_KIND_CLIENT
+          when :producer then Opentelemetry::Proto::Trace::V1::Span::SpanKind::SPAN_KIND_PRODUCER
+          when :consumer then Opentelemetry::Proto::Trace::V1::Span::SpanKind::SPAN_KIND_CONSUMER
+          else Opentelemetry::Proto::Trace::V1::Span::SpanKind::SPAN_KIND_UNSPECIFIED
+          end
+        end
+
+        def as_otlp_key_value(key, value)
+          Opentelemetry::Proto::Common::V1::KeyValue.new(key: key, value: as_otlp_any_value(value))
+        rescue Encoding::UndefinedConversionError => e
+          encoded_value = value.encode('UTF-8', invalid: :replace, undef: :replace, replace: '�')
+          OpenTelemetry.handle_error(exception: e, message: "encoding error for key #{key} and value #{encoded_value}")
+          Opentelemetry::Proto::Common::V1::KeyValue.new(key: key, value: as_otlp_any_value('Encoding Error'))
+        end
+
+        def as_otlp_any_value(value)
+          result = Opentelemetry::Proto::Common::V1::AnyValue.new
+          case value
+          when String
+            result.string_value = value
+          when Integer
+            result.int_value = value
+          when Float
+            result.double_value = value
+          when true, false
+            result.bool_value = value
+          when Array
+            values = value.map { |element| as_otlp_any_value(element) }
+            result.array_value = Opentelemetry::Proto::Common::V1::ArrayValue.new(values: values)
+          end
+          result
+        end
+
         def prepare_endpoint(endpoint)
           endpoint ||= ENV.fetch('OTEL_EXPORTER_OTLP_TRACES_ENDPOINT', nil)
           if endpoint.nil?

data/lib/opentelemetry/exporter/otlp/version.rb

@@ -8,7 +8,7 @@ module OpenTelemetry
   module Exporter
     module OTLP
       ## Current OpenTelemetry OTLP exporter version
-      VERSION = '0.35.0'
+      VERSION = '0.35.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-exporter-otlp
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.35.1
 platform: ruby
 authors:
 - OpenTelemetry Authors
@@ -65,20 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
-- !ruby/object:Gem::Dependency
-  name: opentelemetry-exporter-otlp-common
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -136,10 +122,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-exporter-otlp/0.35.0/file/CHANGELOG.md
-  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/opentelemetry-exporter-otlp/v0.35.0/exporter/otlp
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-exporter-otlp/0.35.1/file/CHANGELOG.md
+  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/opentelemetry-exporter-otlp/v0.35.1/exporter/otlp
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-exporter-otlp/0.35.0
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-exporter-otlp/0.35.1
 rdoc_options: []
 require_paths:
 - lib