opentelemetry-exporter-jaeger 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48eb17dede3682deb82d4d8156074468a58cc9e6cd237c7494b9d037c4d01d50
-  data.tar.gz: c965382a4bc8bdb7be2970d639422b8c319a315e126d454227c2fea123f6d666
+  metadata.gz: f89ac4b784e32860c8bc11bbfc96cbd40684d8b32a3ee9b187a7632e93286d15
+  data.tar.gz: d9953776e3c537296d8704bdfc486871b818c01f125d4b9d7368c1fc04887674
 SHA512:
-  metadata.gz: e2de52035860293e34621c93b73ec46eccfa4277ab721502526ffa42cb0d65c8e11aeb42df89ad70f8c06c19c7e93d6f62e0bc164fd52858f38952fea641f3f2
-  data.tar.gz: e0e6da6dbf841643251009e6e64d67d81c65b3946a079fdc00b61ac0b6e9b87923e49dc6d4d1fc36ee123bf7f0337ddf6fc1d48b2fff123d8af300abf6878553
+  metadata.gz: 8d61264052748362dc0c4b02f085017176a22eb4436cb1a415fb45328190c3b8a0d2fe7eeb22368ecd72c09da3f0ea04db7f8cb1b7395a94d5d9631223fdb8f1
+  data.tar.gz: 9679139b3932b3283021cdc4e0620bba094ffdef05b024060804d22cdcfa0e0002f2f78fb1e56f02bc0b9ad72b0dafaed3a1693cbad502cb83784f1e1de59709

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History: opentelemetry-exporter-jaeger
 
+### v0.22.0 / 2022-09-14
+
+* ADDED: Add dropped events/attributes/links counts to zipkin + jaeger exporters 
+* ADDED: Metrics reporter for Jaeger collector exporter 
+* ADDED: Support InstrumentationScope, and update OTLP proto to 0.18.0 
+
 ### v0.21.0 / 2022-06-09
 
 * (No significant changes)

data/lib/opentelemetry/exporter/jaeger/collector_exporter.rb

@@ -29,7 +29,8 @@ module OpenTelemetry
                        username: ENV['OTEL_EXPORTER_JAEGER_USER'],
                        password: ENV['OTEL_EXPORTER_JAEGER_PASSWORD'],
                        timeout: ENV.fetch('OTEL_EXPORTER_JAEGER_TIMEOUT', 10),
-                       ssl_verify_mode: CollectorExporter.ssl_verify_mode)
+                       ssl_verify_mode: CollectorExporter.ssl_verify_mode,
+                       metrics_reporter: nil)
           raise ArgumentError, "invalid url for Jaeger::CollectorExporter #{endpoint}" unless OpenTelemetry::Common::Utilities.valid_url?(endpoint)
           raise ArgumentError, 'username and password should either both be nil or both be set' if username.nil? != password.nil?
 
@@ -41,6 +42,7 @@ module OpenTelemetry
             @transport.add_headers(auth_header)
           end
           @serializer = ::Thrift::Serializer.new
+          @metrics_reporter = metrics_reporter || OpenTelemetry::SDK::Trace::Export::MetricsReporter
           @shutdown = false
         end
 
@@ -59,10 +61,13 @@ module OpenTelemetry
           end
 
           OpenTelemetry::Common::Utilities.untraced do
-            @transport.flush
+            measure_request_duration do
+              @transport.flush
+            end
           end
           SUCCESS
         rescue StandardError => e
+          @metrics_reporter.add_to_counter('otel.jaeger_exporter.failure', labels: { 'reason' => e.class.to_s })
           OpenTelemetry.handle_error(exception: e, message: 'unexpected error in Jaeger::CollectorExporter#export')
           FAILURE
         end
@@ -95,6 +100,15 @@ module OpenTelemetry
             Thrift::Batch.new('process' => process, 'spans' => spans)
           end
         end
+
+        def measure_request_duration
+          start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          yield
+        ensure
+          stop = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          duration_ms = 1000.0 * (stop - start)
+          @metrics_reporter.record_value('otel.jaeger_exporter.request_duration', value: duration_ms)
+        end
       end
     end
   end

data/lib/opentelemetry/exporter/jaeger/encoder.rb

@@ -64,10 +64,23 @@ module OpenTelemetry
           )
         end
 
-        def encoded_span(span_data) # rubocop:disable Metrics/AbcSize
+        def encoded_span(span_data) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
           start_time = span_data.start_timestamp / 1_000
           duration = span_data.end_timestamp / 1_000 - start_time
 
+          tags = encoded_tags(span_data.attributes) +
+                 encoded_status(span_data.status) +
+                 encoded_kind(span_data.kind) +
+                 encoded_instrumentation_scope(span_data.instrumentation_scope)
+
+          dropped_attributes_count = span_data.total_recorded_attributes - span_data.attributes&.size.to_i
+          dropped_events_count = span_data.total_recorded_events - span_data.events&.size.to_i
+          dropped_links_count = span_data.total_recorded_links - span_data.links&.size.to_i
+
+          tags << encoded_tag('otel.dropped_attributes_count', dropped_attributes_count) if dropped_attributes_count.positive?
+          tags << encoded_tag('otel.dropped_events_count', dropped_events_count) if dropped_events_count.positive?
+          tags << encoded_tag('otel.dropped_links_count', dropped_links_count) if dropped_links_count.positive?
+
           Thrift::Span.new(
             'traceIdLow' => int64(span_data.trace_id[8, 8]),
             'traceIdHigh' => int64(span_data.trace_id[0, 8]),
@@ -78,10 +91,7 @@ module OpenTelemetry
             'flags' => span_data.trace_flags.sampled? ? 1 : 0,
             'startTime' => start_time,
             'duration' => duration,
-            'tags' => encoded_tags(span_data.attributes) +
-                encoded_status(span_data.status) +
-                encoded_kind(span_data.kind) +
-                encoded_instrumentation_library(span_data.instrumentation_library),
+            'tags' => tags,
             'logs' => encoded_logs(span_data.events)
           )
         end
@@ -131,12 +141,20 @@ module OpenTelemetry
           )
         end
 
-        def encoded_instrumentation_library(instrumentation_library)
-          return EMPTY_ARRAY unless instrumentation_library
+        def encoded_instrumentation_scope(instrumentation_scope)
+          return EMPTY_ARRAY unless instrumentation_scope
 
           tags = []
-          tags << encoded_tag('otel.library.name', instrumentation_library.name) if instrumentation_library.name
-          tags << encoded_tag('otel.library.version', instrumentation_library.version) if instrumentation_library.version
+          if instrumentation_scope.name
+            tags << encoded_tag('otel.scope.name', instrumentation_scope.name)
+            tags << encoded_tag('otel.library.name', instrumentation_scope.name)
+          end
+
+          if instrumentation_scope.version
+            tags << encoded_tag('otel.scope.version', instrumentation_scope.version)
+            tags << encoded_tag('otel.library.version', instrumentation_scope.version)
+          end
+
           tags
         end
 

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

@@ -8,7 +8,7 @@ module OpenTelemetry
   module Exporter
     module Jaeger
       ## Current OpenTelemetry Jaeger exporter version
-      VERSION = '0.21.0'
+      VERSION = '0.22.0'
     end
   end
 end

data/lib/opentelemetry/exporter/jaeger.rb

@@ -18,7 +18,7 @@ module OpenTelemetry
   end
 end
 
-$LOAD_PATH.push(File.dirname(__FILE__) + '/../../../thrift/gen-rb')
+$LOAD_PATH.push("#{File.dirname(__FILE__)}/../../../thrift/gen-rb")
 
 require 'agent'
 require 'collector'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-exporter-jaeger
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-09 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-common
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-semantic_conventions
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +150,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.73.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.73.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -251,10 +265,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-jaeger/v0.21.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-exporter-jaeger/v0.22.0/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/exporter/jaeger
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-exporter-jaeger/v0.21.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-exporter-jaeger/v0.22.0
 post_install_message: 
 rdoc_options: []
 require_paths: