opentelemetry-exporter-jaeger 0.6.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a03b81e62868c39eef8cce68fc2398943bdbf25332e820b83436800bf4c31c18
-  data.tar.gz: 3de28d023cd628c227f75ae6b3c35349cefea2f27b1b11a07c08924142e11a2a
+  metadata.gz: 848703d712cf95041d24a3bea79822392a41aeb2f31969586d76a4284cf1a3f9
+  data.tar.gz: 6473f43ecc99f1fcfecbe5b44d02c96ad14a81477d52dbf8e824cf08468a0247
 SHA512:
-  metadata.gz: fec1be44ab72848de2ee1880863cadbb2c66df7ac0afde1b239ad26cc51846b84370459603a5e25afd2a75d326350a01ae4d5db29adf02b6b78014dbcb5c5577
-  data.tar.gz: b494bb1e4dc463d80c2d96fc3dabba772abafc02fcc94b3678b18bdb0651ea903f8095174b8f0630d21cdf20d0e9d75cd9c0b8d09640313ed8097317ea0ca4e2
+  metadata.gz: ae9eabba37cd413ecfdc4e51cb5d9b009a34860d7fe951fa494899d9ae23b779b2d8fe8442350c350a9975da8895d1404f9a3603a6b69d7f9e2fa26b05286d2f
+  data.tar.gz: 47aa3c269bc97346d3ad562e328dcd153202561f8e22e11b29fbdbde0ac2c50edea77f3fc40d183ca29656c98bfdf4e8d88f30a9bac6535699765bf3a7c42dc0

data/.yardopts

@@ -1,9 +1,9 @@
 --no-private
 --title=OpenTelemetry Jaeger Exporter
 --markup=markdown
---main=OVERVIEW.md
+--main=README.md
 ./lib/opentelemetry/exporter/jaeger/**/*.rb
 ./lib/opentelemetry/exporter/jaeger.rb
 -
-OVERVIEW.md
+README.md
 CHANGELOG.md

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Release History: opentelemetry-exporter-jaeger
 
+### v0.11.0 / 2020-12-11
+
+* FIXED: Copyright comments to not reference year 
+
+### v0.10.0 / 2020-12-03
+
+* (No significant changes)
+
+### v0.9.0 / 2020-11-27
+
+* BREAKING CHANGE: Add timeout for force_flush and shutdown 
+
+* ADDED: Add timeout for force_flush and shutdown 
+
+### 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 
+
+* 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_version setter to configurator 
+* FIXED: Update IL attribute naming convention to match spec 
+* DOCS: Standardize toplevel docs structure and readme 
+* DOCS: Use BatchSpanProcessor in examples 
+
 ### v0.6.0 / 2020-09-10
 
 * This gem was renamed from `opentelemetry-exporters-jaeger`.

data/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020 OpenTelemetry Authors
+   Copyright The OpenTelemetry Authors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/README.md

@@ -34,15 +34,14 @@ require 'opentelemetry/exporter/jaeger'
 # Configure the sdk with custom export
 OpenTelemetry::SDK.configure do |c|
   c.add_span_processor(
-    OpenTelemetry::SDK::Trace::Export::SimpleSpanProcessor.new(
-      OpenTelemetry::Exporter::Jaeger::AgentExporter.new(host: '127.0.0.1', port: 6831)
+    OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
+      exporter: OpenTelemetry::Exporter::Jaeger::AgentExporter.new(host: '127.0.0.1', port: 6831)
       # Alternatively, for the collector exporter:
-      # OpenTelemetry::Exporter::Jaeger::CollectorExporter.new(endpoint: 'http://192.168.0.1:14268')
+      # exporter: OpenTelemetry::Exporter::Jaeger::CollectorExporter.new(endpoint: 'http://192.168.0.1:14268/api/traces')
     )
   )
-  c.resource = OpenTelemetry::SDK::Resources::Resource.create(
-    OpenTelemetry::SDK::Resources::Constants::SERVICE_RESOURCE[:name] => 'jaeger-example'
-  )
+  c.service_name = 'jaeger-example'
+  c.service_version = '0.6.0'
 end
 
 # To start a trace you need to get a Tracer from the TracerProvider

data/lib/opentelemetry-exporter-jaeger.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2019 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 

data/lib/opentelemetry/exporter/jaeger.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2019 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -23,6 +23,7 @@ $LOAD_PATH.push(File.dirname(__FILE__) + '/../../../thrift/gen-rb')
 require 'agent'
 require 'collector'
 require 'opentelemetry/sdk'
+require 'opentelemetry/common'
 require 'socket'
 require 'opentelemetry/exporter/jaeger/encoder'
 require 'opentelemetry/exporter/jaeger/transport'

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2019 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -30,12 +30,14 @@ module OpenTelemetry
         # @param [Enumerable<OpenTelemetry::SDK::Trace::SpanData>] span_data the
         #   list of recorded {OpenTelemetry::SDK::Trace::SpanData} structs to be
         #   exported.
+        # @param [optional Numeric] timeout An optional timeout in seconds.
         # @return [Integer] the result of the export.
-        def export(span_data)
+        def export(span_data, timeout: nil)
           return FAILURE if @shutdown
 
+          start_time = Time.now
           encoded_batches(span_data) do |batch|
-            return FAILURE if @shutdown
+            return FAILURE if @shutdown || OpenTelemetry::Common::Utilities.maybe_timeout(timeout, start_time)&.zero?
 
             @client.emitBatch(batch)
           end
@@ -44,7 +46,9 @@ module OpenTelemetry
         # Called when {OpenTelemetry::SDK::Trace::Tracer#shutdown} is called, if
         # this exporter is registered to a {OpenTelemetry::SDK::Trace::Tracer}
         # object.
-        def shutdown
+        #
+        # @param [optional Numeric] timeout An optional timeout in seconds.
+        def shutdown(timeout: nil)
           @shutdown = true
         end
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2019 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -29,7 +29,6 @@ module OpenTelemetry
           end
           @serializer = ::Thrift::Serializer.new
           @shutdown = false
-          @tracer = OpenTelemetry.tracer_provider.tracer
         end
 
         # Called to export sampled {OpenTelemetry::SDK::Trace::SpanData} structs.
@@ -37,8 +36,9 @@ module OpenTelemetry
         # @param [Enumerable<OpenTelemetry::SDK::Trace::SpanData>] span_data the
         #   list of recorded {OpenTelemetry::SDK::Trace::SpanData} structs to be
         #   exported.
+        # @param [optional Numeric] timeout An optional timeout in seconds.
         # @return [Integer] the result of the export.
-        def export(span_data)
+        def export(span_data, timeout: nil)
           return FAILURE if @shutdown
 
           encoded_batches(span_data).each do |batch|
@@ -57,7 +57,9 @@ module OpenTelemetry
         # Called when {OpenTelemetry::SDK::Trace::Tracer#shutdown} is called, if
         # this exporter is registered to a {OpenTelemetry::SDK::Trace::Tracer}
         # object.
-        def shutdown
+        #
+        # @param [optional Numeric] timeout An optional timeout in seconds.
+        def shutdown(timeout: nil)
           @shutdown = true
         end
 
@@ -73,7 +75,7 @@ module OpenTelemetry
         end
 
         def untraced
-          @tracer.with_span(OpenTelemetry::Trace::Span.new) { yield }
+          OpenTelemetry::Trace.with_span(OpenTelemetry::Trace::Span.new) { yield }
         end
 
         def encoded_batches(span_data)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2020 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -111,24 +111,31 @@ module OpenTelemetry
           links&.map do |link|
             Thrift::SpanRef.new(
               'refType' => Thrift::SpanRefType::CHILD_OF,
-              'traceIdLow' => int64(link.context.trace_id[16, 16]),
-              'traceIdHigh' => int64(link.context.trace_id[0, 16]),
-              'spanId' => int64(link.context.span_id)
+              'traceIdLow' => int64(link.span_context.trace_id[16, 16]),
+              'traceIdHigh' => int64(link.span_context.trace_id[0, 16]),
+              'spanId' => int64(link.span_context.span_id)
             )
           end
         end
 
         def encoded_status(status)
-          # TODO: OpenTracing doesn't specify how to report non-HTTP (i.e. generic) status.
-          EMPTY_ARRAY
+          return EMPTY_ARRAY unless status&.code == OpenTelemetry::Trace::Status::ERROR
+
+          Array(
+            Thrift::Tag.new(
+              KEY => 'error',
+              TYPE => Thrift::TagType::BOOL,
+              BOOL => true
+            )
+          )
         end
 
         def encoded_instrumentation_library(instrumentation_library)
           return EMPTY_ARRAY unless instrumentation_library
 
           tags = []
-          tags << encoded_tag('otel.instrumentation_library.name', instrumentation_library.name) if instrumentation_library.name
-          tags << encoded_tag('otel.instrumentation_library.version', instrumentation_library.version) if instrumentation_library.version
+          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
           tags
         end
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2019 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2019 OpenTelemetry Authors
+# Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -8,7 +8,7 @@ module OpenTelemetry
   module Exporter
     module Jaeger
       ## Current OpenTelemetry Jaeger exporter version
-      VERSION = '0.6.0'
+      VERSION = '0.11.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-exporter-jaeger
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.11.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: thrift
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +208,11 @@ files:
 homepage: https://github.com/open-telemetry/opentelemetry-ruby
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-exporter-jaeger/v0.11.0/file.CHANGELOG.html
+  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/master/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.11.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -210,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Jaeger trace exporter for the OpenTelemetry framework