opentelemetry-exporter-otlp 0.24.0 → 0.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4df026382336e315dde278109b3b4e009f0df5a48193afe310dbb6a8b792144
-  data.tar.gz: '094b9bea07b4aea167f8a9b8b80ab269836f1e899b41aba22792f55603b9de6a'
+  metadata.gz: 065a8e1b1bf3909dfd98b7cd241ad11ab786f397bfa97eaf5b70e2331ba57133
+  data.tar.gz: 8d959b7a39ec689edbabd24a50c234527b9da0f9a50e059294f4b76f04c3b2d3
 SHA512:
-  metadata.gz: 6c9d4259369e3db4ae04b60cd7dadc77606726902223f6ed6302ea5728f907bd0d2832d50ef1e3796ad3ab802277ee4cc96346522180b6726d602fc8523b0dea
-  data.tar.gz: ba4d5bf4433064a5780659fe33fbbdacb6daad86e26ad77e356b82eed8bbdf9f0258cf4c228a5a56ed00216aa29638ae2fc8e46a44347f50ca42baf23f433662
+  metadata.gz: '04821ccaeee2fc1dc3d11fa78d68e1e8c960e1fade66216deb472de2a4ff116d465a29e5d637f6f3a7c1934cf94871ee06b36f2ce9c7b15a435377fb3c78ba21'
+  data.tar.gz: 2fce9747568da590085705ff023c6cb5df5e731ad981c12dd0c4e4457d23aaa10bbfdb0f1104f77d79dca707a691f11e094c79bf964a0acabb17b9eae9e840ba

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Release History: opentelemetry-exporter-otlp
 
+### v0.24.2 / 2023-07-12
+
+* FIXED: Otlp exporter version require order
+
+### v0.24.1 / 2023-05-30
+
+* FIXED: Add Ruby 3.2 to CI and do small fix 
+* FIXED: Adds User-Agent header in OTLP exporter 
+
 ### v0.24.0 / 2022-09-14
 
 * ADDED: Support InstrumentationScope, and update OTLP proto to 0.18.0 

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

@@ -35,6 +35,8 @@ module OpenTelemetry
         ERROR_MESSAGE_INVALID_HEADERS = 'headers must be a String with comma-separated URL Encoded UTF-8 k=v pairs or a Hash'
         private_constant(:ERROR_MESSAGE_INVALID_HEADERS)
 
+        DEFAULT_USER_AGENT = "OTel-OTLP-Exporter-Ruby/#{OpenTelemetry::Exporter::OTLP::VERSION} Ruby/#{RUBY_VERSION} (#{RUBY_PLATFORM}; #{RUBY_ENGINE}/#{RUBY_ENGINE_VERSION})"
+
         def self.ssl_verify_mode
           if ENV.key?('OTEL_RUBY_EXPORTER_OTLP_SSL_VERIFY_PEER')
             OpenSSL::SSL::VERIFY_PEER
@@ -45,7 +47,7 @@ module OpenTelemetry
           end
         end
 
-        def initialize(endpoint: OpenTelemetry::Common::Utilities.config_opt('OTEL_EXPORTER_OTLP_TRACES_ENDPOINT', 'OTEL_EXPORTER_OTLP_ENDPOINT', default: 'http://localhost:4318/v1/traces'), # rubocop:disable Metrics/CyclomaticComplexity
+        def initialize(endpoint: OpenTelemetry::Common::Utilities.config_opt('OTEL_EXPORTER_OTLP_TRACES_ENDPOINT', 'OTEL_EXPORTER_OTLP_ENDPOINT', default: 'http://localhost:4318/v1/traces'),
                        certificate_file: OpenTelemetry::Common::Utilities.config_opt('OTEL_EXPORTER_OTLP_TRACES_CERTIFICATE', 'OTEL_EXPORTER_OTLP_CERTIFICATE'),
                        ssl_verify_mode: Exporter.ssl_verify_mode,
                        headers: OpenTelemetry::Common::Utilities.config_opt('OTEL_EXPORTER_OTLP_TRACES_HEADERS', 'OTEL_EXPORTER_OTLP_HEADERS', default: {}),
@@ -64,12 +66,7 @@ module OpenTelemetry
           @http = http_connection(@uri, ssl_verify_mode, certificate_file)
 
           @path = @uri.path
-          @headers = case headers
-                     when String then parse_headers(headers)
-                     when Hash then headers
-                     else
-                       raise ArgumentError, ERROR_MESSAGE_INVALID_HEADERS
-                     end
+          @headers = prepare_headers(headers)
           @timeout = timeout.to_f
           @compression = compression
           @metrics_reporter = metrics_reporter || OpenTelemetry::SDK::Trace::Export::MetricsReporter
@@ -389,6 +386,19 @@ module OpenTelemetry
           result
         end
 
+        def prepare_headers(config_headers)
+          headers = case config_headers
+                    when String then parse_headers(config_headers)
+                    when Hash then config_headers.dup
+                    else
+                      raise ArgumentError, ERROR_MESSAGE_INVALID_HEADERS
+                    end
+
+          headers['User-Agent'] = "#{headers.fetch('User-Agent', '')} #{DEFAULT_USER_AGENT}".strip
+
+          headers
+        end
+
         def parse_headers(raw)
           entries = raw.split(',')
           raise ArgumentError, ERROR_MESSAGE_INVALID_HEADERS if entries.empty?
@@ -398,6 +408,8 @@ module OpenTelemetry
             begin
               k = k.to_s.strip
               v = v.to_s.strip
+            rescue Encoding::CompatibilityError
+              raise ArgumentError, ERROR_MESSAGE_INVALID_HEADERS
             rescue ArgumentError => e
               raise e, ERROR_MESSAGE_INVALID_HEADERS
             end

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

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

data/lib/opentelemetry/exporter/otlp.rb

@@ -4,8 +4,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-require 'opentelemetry/exporter/otlp/exporter'
 require 'opentelemetry/exporter/otlp/version'
+require 'opentelemetry/exporter/otlp/exporter'
 
 # OpenTelemetry is an open source observability framework, providing a
 # general-purpose API, SDK, and related tools required for the instrumentation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-exporter-otlp
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.2
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: googleapis-common-protos-types
@@ -279,10 +279,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-exporter-otlp/v0.24.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-exporter-otlp/v0.24.2/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/exporter/otlp
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-exporter-otlp/v0.24.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-exporter-otlp/v0.24.2
 post_install_message: 
 rdoc_options: []
 require_paths: