opentelemetry-exporter-jaeger 0.8.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef11e9bffe5473b6c509d6b0b146734425a45c861fe1b6b4497157c056a1d8e5
-  data.tar.gz: 0fd8eeea6fd343d977791239b48a621e34ec60617d6adcdc6df163c216326cdb
+  metadata.gz: 8d0e654477f44b2ea26f79309a2e97a27c263944cc6b2f0197a9970a761d6bcc
+  data.tar.gz: 445b71745ce42e3ef5663abca54cd054b36886f77f40057bb959ce237c7c84ae
 SHA512:
-  metadata.gz: f641e6bdb691090b6588f8122eef54c5287562aab81806a7fc6d765a419a5f09183821ea04656354a3938ad8934cd7823bb87564318a0837612d697dc1628c6f
-  data.tar.gz: ec0199b2c69385778196d7b4a252cb3f8a40bd98461d66dd71384b80edf4eb7521301c784e7ff7d2a9f40bf40eb88a4d16b57e708ab91afb266bdf5ad6129b2e
+  metadata.gz: 75284455a0a3a2a9f639524fce113c3d293d19e013430d9b352b4618e2c15a1df74b9da618b62ed6968e04f8f16caad1cadd9f55faaa5922d7eff142f6d442a0
+  data.tar.gz: edee99a7928706c94d48c7498ad431b6d462add2b971f7a3bdee9f16f1350c6d8b92d67c2a4c468aaa5f97ff352da102576c9fb3e78a4a858ad4b5d4a45e4859

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Release History: opentelemetry-exporter-jaeger
 
+### v0.13.0 / 2021-01-29
+
+* ADDED: Provide default resource in SDK 
+* ADDED: Add untraced wrapper to common utils 
+* FIXED: Jaeger ref type should be FOLLOWS_FROM 
+
+### v0.12.0 / 2020-12-24
+
+* ADDED: Structured error handling 
+
+### 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 

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

@@ -96,8 +96,8 @@ The `opentelemetry-exporter-jaeger` gem is distributed under the Apache 2.0 lice
 [opentelemetry-home]: https://opentelemetry.io
 [bundler-home]: https://bundler.io
 [repo-github]: https://github.com/open-telemetry/opentelemetry-ruby
-[license-github]: https://github.com/open-telemetry/opentelemetry-ruby/blob/master/LICENSE
-[examples-github]: https://github.com/open-telemetry/opentelemetry-ruby/tree/master/examples
+[license-github]: https://github.com/open-telemetry/opentelemetry-ruby/blob/main/LICENSE
+[examples-github]: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/examples
 [ruby-sig]: https://github.com/open-telemetry/community#ruby-sig
 [community-meetings]: https://github.com/open-telemetry/community#community-meetings
 [ruby-gitter]: https://gitter.im/open-telemetry/opentelemetry-ruby

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
 
@@ -36,27 +36,30 @@ 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|
             @transport.write(@serializer.serialize(batch))
           end
 
-          untraced do
+          OpenTelemetry::Common::Utilities.untraced do
             @transport.flush
           end
           SUCCESS
         rescue StandardError => e
-          OpenTelemetry.logger.error("unexpected error in Jaeger::CollectorExporter#export - #{e}")
+          OpenTelemetry.handle_error(exception: e, message: 'unexpected error in Jaeger::CollectorExporter#export')
           FAILURE
         end
 
         # 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
 
@@ -71,10 +74,6 @@ module OpenTelemetry
           true
         end
 
-        def untraced
-          OpenTelemetry::Trace.with_span(OpenTelemetry::Trace::Span.new) { yield }
-        end
-
         def encoded_batches(span_data)
           span_data.group_by(&:resource).map do |resource, spans|
             process = Encoder.encoded_process(resource)

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
 
@@ -30,10 +30,11 @@ module OpenTelemetry
           OpenTelemetry::Trace::SpanKind::PRODUCER => 'producer',
           OpenTelemetry::Trace::SpanKind::CONSUMER => 'consumer'
         }.freeze
-        private_constant(:EMPTY_ARRAY, :LONG, :DOUBLE, :STRING, :BOOL, :KEY, :TYPE, :TYPE_MAP, :KIND_MAP)
+        DEFAULT_SERVICE_NAME = OpenTelemetry::SDK::Resources::Resource.default.attribute_enumerator.find { |k, _| k == 'service.name' }&.last || 'unknown_service'
+        private_constant(:EMPTY_ARRAY, :LONG, :DOUBLE, :STRING, :BOOL, :KEY, :TYPE, :TYPE_MAP, :KIND_MAP, :DEFAULT_SERVICE_NAME)
 
         def encoded_process(resource)
-          service_name = 'unknown'
+          service_name = DEFAULT_SERVICE_NAME
           tags = resource&.attribute_enumerator&.select do |key, value|
             service_name = value if key == 'service.name'
             key != 'service.name'
@@ -110,7 +111,7 @@ module OpenTelemetry
         def encoded_references(links)
           links&.map do |link|
             Thrift::SpanRef.new(
-              'refType' => Thrift::SpanRefType::CHILD_OF,
+              'refType' => Thrift::SpanRefType::FOLLOWS_FROM,
               '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)

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.8.0'
+      VERSION = '0.13.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-exporter-jaeger
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.13.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2021-01-30 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.8.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.13.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: thrift
   requirement: !ruby/object:Gem::Requirement
@@ -195,10 +209,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.8.0/file.CHANGELOG.html
-  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/master/exporter/jaeger
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-exporter-jaeger/v0.13.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.8.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-exporter-jaeger/v0.13.0
 post_install_message: 
 rdoc_options: []
 require_paths: