opentelemetry-exporter-zipkin 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f303f4ec1d21048a8a00a8eb82fca6b9e2296d85f890d6fa2b682ad6f0e9c8ba
-  data.tar.gz: a539f38defe2866b56347f1386c92ca6ab214e1fdc82ea31ec33d3af6ff201b5
+  metadata.gz: dd0f6efbe1457e04c816f0e2be81ad8cf1ea5ab59a8c76a939429776cb46b9fa
+  data.tar.gz: 46067ad66e3b6b3c5121936f5f0fa74860d21a14c90abcdbf266f37ea8471e9d
 SHA512:
-  metadata.gz: a4ca4f972e03ef088f2724732195ceae1d57681510d818ab9be27ffdc11a6c35ead0217f19b326fd6ed86fcdfd52c9be31603d020157b176b8b1f0327d332ea3
-  data.tar.gz: e7d6684134bb4d7490093e7ec73482a97659931dd5be21078fa2817191f5b8813c9503263ea0607d387b6c56b09cb6455d98f5e4cb6beafea4e8d3de70b728f4
+  metadata.gz: 50cc28cfa5da93f15b5f0e32ef10b003357dc06583638cd93ae9574f0fc187e5e3aff5694f6007b326f784e5aca2ba7adaf1da47b583f6cdf766c9aea1246142
+  data.tar.gz: 3418502a4f82b0e2e260bee0423f51aa28772f69ba7ea9233a54877bf76c3f77669caf6bafcdfd05bf8da47a2cd2835565714a9ff69ee3693460b1c5eead14bc

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Release History: opentelemetry-exporter-zipkin
 
+### v0.20.0 / 2022-06-09
+
+* (No significant changes)
+
+### v0.19.3 / 2021-12-01
+
+* FIXED: Change net attribute names to match the semantic conventions spec for http 
+
+### v0.19.2 / 2021-09-29
+
+* (No significant changes)
+
 ### v0.19.1 / 2021-08-12
 
 * DOCS: Update docs to rely more on environment variable configuration 

data/lib/opentelemetry/exporter/zipkin/exporter.rb

@@ -27,10 +27,10 @@ module OpenTelemetry
         WRITE_TIMEOUT_SUPPORTED = Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6')
         private_constant(:KEEP_ALIVE_TIMEOUT, :RETRY_COUNT, :WRITE_TIMEOUT_SUPPORTED)
 
-        def initialize(endpoint: config_opt('OTEL_EXPORTER_ZIPKIN_ENDPOINT', default: 'http://localhost:9411/api/v2/spans'),
-                       headers: config_opt('OTEL_EXPORTER_ZIPKIN_TRACES_HEADERS', 'OTEL_EXPORTER_ZIPKIN_HEADERS'),
-                       timeout: config_opt('OTEL_EXPORTER_ZIPKIN_TRACES_TIMEOUT', 'OTEL_EXPORTER_ZIPKIN_TIMEOUT', default: 10))
-          raise ArgumentError, "invalid url for Zipkin::Exporter #{endpoint}" if invalid_url?(endpoint)
+        def initialize(endpoint: OpenTelemetry::Common::Utilities.config_opt('OTEL_EXPORTER_ZIPKIN_ENDPOINT', default: 'http://localhost:9411/api/v2/spans'),
+                       headers: OpenTelemetry::Common::Utilities.config_opt('OTEL_EXPORTER_ZIPKIN_TRACES_HEADERS', 'OTEL_EXPORTER_ZIPKIN_HEADERS'),
+                       timeout: OpenTelemetry::Common::Utilities.config_opt('OTEL_EXPORTER_ZIPKIN_TRACES_TIMEOUT', 'OTEL_EXPORTER_ZIPKIN_TIMEOUT', default: 10))
+          raise ArgumentError, "invalid url for Zipkin::Exporter #{endpoint}" unless OpenTelemetry::Common::Utilities.valid_url?(endpoint)
           raise ArgumentError, 'headers must be comma-separated k=v pairs or a Hash' unless valid_headers?(headers)
 
           @uri = if endpoint == ENV['OTEL_EXPORTER_ZIPKIN_ENDPOINT']
@@ -94,14 +94,6 @@ module OpenTelemetry
 
         private
 
-        def config_opt(*env_vars, default: nil)
-          env_vars.each do |env_var|
-            val = ENV[env_var]
-            return val unless val.nil?
-          end
-          default
-        end
-
         def encode_spans(span_data)
           span_data.map! { |span| Transformer.to_zipkin_span(span, span.resource) }
         end
@@ -110,15 +102,6 @@ module OpenTelemetry
           OpenTelemetry::Common::Utilities.untraced { yield }
         end
 
-        def invalid_url?(url)
-          return true if url.nil? || url.strip.empty?
-
-          URI(url)
-          false
-        rescue URI::InvalidURIError
-          true
-        end
-
         def valid_headers?(headers)
           return true if headers.nil? || headers.is_a?(Hash)
           return false unless headers.is_a?(String)

data/lib/opentelemetry/exporter/zipkin/transformer.rb

@@ -29,10 +29,10 @@ module OpenTelemetry
         STATUS_ERROR = 'ERROR'
         STATUS_OK = 'OK'
         ATTRIBUTE_PEER_SERVICE = 'peer.service'
-        ATTRIBUTE_NET_PEER_IP = 'peer.ip'
-        ATTRIBUTE_NET_PEER_PORT = 'peer.port'
-        ATTRIBUTE_NET_HOST_IP = 'host.ip'
-        ATTRIBUTE_NET_HOST_PORT = 'host.port'
+        ATTRIBUTE_NET_PEER_IP = 'net.peer.ip'
+        ATTRIBUTE_NET_PEER_PORT = 'net.peer.port'
+        ATTRIBUTE_NET_HOST_IP = 'net.host.ip'
+        ATTRIBUTE_NET_HOST_PORT = 'net.host.port'
 
         DEFAULT_SERVICE_NAME = OpenTelemetry::SDK::Resources::Resource.default.attribute_enumerator.find { |k, _| k == SERVICE_NAME_ATTRIBUTE_KEY }&.last || 'unknown_service'
         private_constant(:KIND_MAP, :DEFAULT_SERVICE_NAME, :SERVICE_NAME_ATTRIBUTE_KEY, :ERROR_TAG_KEY, :STATUS_CODE_NAME, :STATUS_ERROR, :STATUS_OK, :ATTRIBUTE_PEER_SERVICE, :ATTRIBUTE_NET_PEER_IP, :ATTRIBUTE_NET_PEER_PORT, :ATTRIBUTE_NET_HOST_IP, :ATTRIBUTE_NET_HOST_PORT)

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

@@ -8,7 +8,7 @@ module OpenTelemetry
   module Exporter
     module Zipkin
       ## Current OpenTelemetry Zipkin exporter version
-      VERSION = '0.19.1'
+      VERSION = '0.20.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-exporter-zipkin
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -16,42 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.19.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.19.6
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-semantic_conventions
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-test-helpers
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -198,10 +226,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-zipkin/v0.19.1/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-exporter-zipkin/v0.20.0/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/exporter/zipkin
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-exporter-zipkin/v0.19.1
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-exporter-zipkin/v0.20.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -210,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="