opencensus-jaeger 0.2.1 → 0.2.2.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ab04faa511449c33f5c7c610f30e22ca6f2233be
-  data.tar.gz: 1a0c9161dc48a8176825553d3626b2b60b5cac9d
+SHA256:
+  metadata.gz: 5dd7bb5db8172809eb77eee4d0768e0413a99041c6a3d946b12871c0161beec9
+  data.tar.gz: 7daba3d1c892723348e98c3d5930fe72a107d40549f5486a5e3429cf53dfa010
 SHA512:
-  metadata.gz: 00d6fbd953b5634dc73e4bd142392362242ac19b5fa5f3d970d67e3271b6fbfcc96744092363af5155c227602a115aa1a9c53c96a6d12c86a23c3a80134ee1d1
-  data.tar.gz: 54883e2569cd6b385779b36f492d892cc6f12906653e0d5d3e7d3ab441246165e205702755a30fe90a58b20d27b16e63b9b4b51d8ea2d1faf4462ddce61927c2
+  metadata.gz: 55f55441d6c18c6382978f114902717b839243a29d1003a322ab755ae1e1f6425fb654f033973cf31b5d11749265b2785f5331af46dc884bee6a7904d9611144
+  data.tar.gz: 6acd01f7980d0aa18482c09269854ac8b8a024bac6b97990cea8a122e0e3e2f4c97b8d5a26542dea25b3f1742428ea382356ad75a11f5966b82af102173ec61f

data/examples/.gitignore

@@ -0,0 +1 @@
+.byebug_history

data/examples/Gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem 'byebug'
 gem 'opencensus'
 gem 'sinatra'
 gem 'thin'

data/examples/Gemfile.lock

@@ -1,41 +1,42 @@
 PATH
   remote: ..
   specs:
-    opencensus-jaeger (0.2.0)
-      opencensus (~> 0.4.0)
+    opencensus-jaeger (0.2.2)
+      opencensus (~> 0.5.0)
       thrift (~> 0.11.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    byebug (11.0.1)
     daemons (1.3.1)
     eventmachine (1.2.7)
-    faraday (0.15.4)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     mustermann (1.0.3)
-    opencensus (0.4.0)
-    rack (2.0.6)
-    rack-protection (2.0.5)
+    opencensus (0.5.0)
+    rack (2.0.7)
+    rack-protection (2.0.7)
       rack
-    sinatra (2.0.5)
+    sinatra (2.0.7)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.5)
+      rack-protection (= 2.0.7)
       tilt (~> 2.0)
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thrift (0.11.0.0)
-    tilt (2.0.9)
+    tilt (2.0.10)
 
 PLATFORMS
   ruby
-  x86_64-darwin-17
   x86_64-darwin-18
 
 DEPENDENCIES
+  byebug
   faraday
   opencensus
   opencensus-jaeger!
@@ -43,4 +44,4 @@ DEPENDENCIES
   thin
 
 BUNDLED WITH
-   1.17.3
+   2.0.2

data/lib/opencensus/jaeger/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module OpenCensus
   module Jaeger
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.2.2.alpha'
   end
 end

data/lib/opencensus/jaeger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'opencensus'
 
 module OpenCensus

data/lib/opencensus/logging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logger'
 
 module Logging

data/lib/opencensus/trace/exporters/jaeger_driver/intermediate_transport.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OpenCensus
   module Trace
     module Exporters

data/lib/opencensus/trace/exporters/jaeger_driver/udp_sender.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'opencensus/trace/exporters/jaeger_driver/udp_transport'
 
 module OpenCensus
@@ -18,8 +20,8 @@ module OpenCensus
 
           def send_spans(spans)
             @client.emitBatch(spans)
-          rescue StandardError => error
-            @logger.error "Failure while sending a batch of spans: #{error}"
+          rescue StandardError => e
+            @logger.error "Failure while sending a batch of spans: #{e}"
           end
         end
       end

data/lib/opencensus/trace/exporters/jaeger_driver/udp_transport.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OpenCensus
   module Trace
     module Exporters

data/lib/opencensus/trace/exporters/jaeger_driver.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'socket'
 require 'thrift'
 require 'opencensus/trace/exporters/jaeger_driver/intermediate_transport'
 require 'opencensus/trace/exporters/jaeger_driver/udp_sender'
-
 module OpenCensus
+
   module Trace
     module Exporters
       module JaegerDriver
@@ -23,6 +25,8 @@ module OpenCensus
 
         def encode_span(span)
           tags = build_thrift_tags(span.attributes)
+          logs = build_logs(span.time_events)
+          references = build_references(span.links)
           trace_id_high = base16_hex_to_int64(
             span.trace_id.slice(0, 16)
           )
@@ -36,10 +40,9 @@ module OpenCensus
             span.parent_span_id
           )
           operation_name = span.name.value
-          references = []
           flags = 0x01
-          start_time = span.start_time.to_f * 1_000_000
-          end_time = span.end_time.to_f * 1_000_000
+          start_time = (span.start_time.to_f * 1_000_000).to_i
+          end_time = (span.end_time.to_f * 1_000_000).to_i
           duration = end_time - start_time
 
           ::Jaeger::Thrift::Span.new(
@@ -52,7 +55,8 @@ module OpenCensus
             'flags': flags,
             'startTime': start_time,
             'duration': duration,
-            'tags': tags
+            'tags': tags,
+            'logs': logs
           )
         rescue StandardError => e
           puts "convert error #{e}"
@@ -66,7 +70,7 @@ module OpenCensus
         def base16_hex_id_to_uint64(id)
           return nil unless id
           value = id.to_i(16)
-          value > MAX_64BIT_UNSIGNED_INT || value < 0 ? 0 : value
+          value > MAX_64BIT_UNSIGNED_INT || value.negative? ? 0 : value
         end
 
         # Thrift defines ID fields as i64, which is signed, therefore we convert
@@ -114,11 +118,51 @@ module OpenCensus
                   VSTR => value.to_s
                 )
               end
-            rescue StandardError => error
-              logger.error "Cannot build thrift tags for #{key}:#{value}, error: #{error}"
+            rescue StandardError => e
+              logger.error "Cannot build thrift tags for #{key}:#{value}, error: #{e}"
             end
           end
         end
+
+        def build_logs(time_events)
+          time_events.map do |event|
+            ::Jaeger::Thrift::Log.new(
+              'timestamp' => (event.time.to_f * 1_000_000).to_i,
+              'fields' => build_thrift_tags(
+                'message.id': event.id,
+                'message.type': event.type
+              )
+            )
+          end
+        end
+
+        def build_references(links)
+          links.map do |link|
+            ::Jaeger::Thrift::SpanRef.new(
+              'refType' => build_span_ref(link.type),
+              'traceIdLow' => base16_hex_to_int64(
+                link.trace_id.slice(0, 16)
+              ),
+              'traceIdHigh' => base16_hex_to_int64(
+                link.trace_id.slice(16)
+              ),
+              'spanId' => base16_hex_to_int64(
+                link.span_id
+              )
+            )
+          end
+        end
+
+        def build_span_ref(type)
+          case type
+          when OpenCensus::Trace::CHILD_LINKED_SPAN
+            ::Jaeger::Thrift::SpanRefType::CHILD_OF
+          when OpenTracing::Reference::PARENT_LINKED_SPAN
+            ::Jaeger::Thrift::SpanRefType::FOLLOWS_FROM
+          else
+            logger.error "Cannot build thrift reference with #{ref_type}"
+          end
+        end
       end
     end
   end

data/lib/opencensus/trace/exporters/jaeger_exporter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'opencensus/trace/exporters/jaeger_driver'
 
 module OpenCensus
@@ -5,9 +7,9 @@ module OpenCensus
     module Exporters
       class JaegerExporter
         include ::Logging
-        JAEGER_OPENCENSUS_EXPORTER_VERSION_TAG_KEY = 'opencensus.exporter.jaeger.version'.freeze
-        TRACER_HOSTNAME_TAG_KEY = 'opencensus.exporter.jaeger.hostname'.freeze
-        PROCESS_IP = 'ip'.freeze
+        JAEGER_OPENCENSUS_EXPORTER_VERSION_TAG_KEY = 'opencensus.exporter.jaeger.version'
+        TRACER_HOSTNAME_TAG_KEY = 'opencensus.exporter.jaeger.hostname'
+        PROCESS_IP = 'ip'
         DEFAULT_MAX_LENGTH = 65_000 # Jaeger agent only accepts up to 65_000
 
         attr_reader :client, :span_batches

data/lib/opencensus-jaeger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OpenCensus
 end
 

data/opencensus-jaeger.gemspec

@@ -1,45 +1,47 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'opencensus/jaeger/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'opencensus-jaeger'
   spec.version       = OpenCensus::Jaeger::VERSION
-  spec.authors       = ["Luong Vo"]
-  spec.email         = ["vo.tran.thanh.luong@gmail.com"]
+  spec.authors       = ['Luong Vo']
+  spec.email         = ['vo.tran.thanh.luong@gmail.com']
 
-  spec.summary       = %q{Jaeger exporter for OpenCensus}
-  spec.description   = %q{Jaeger exporter for OpenCensus}
-  spec.homepage      = "https://www.github.com/Thinkei/opencensus-ruby-exporter-jaeger"
-  spec.license       = "Apache-2.0"
+  spec.summary       = 'Jaeger exporter for OpenCensus'
+  spec.description   = 'Jaeger exporter for OpenCensus'
+  spec.homepage      = 'https://www.github.com/Thinkei/opencensus-ruby-exporter-jaeger'
+  spec.license       = 'Apache-2.0'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-  #   spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-  #
-    spec.metadata["homepage_uri"] = spec.homepage
-    spec.metadata["source_code_uri"] = spec.homepage
-    spec.metadata["changelog_uri"] = 'https://github.com/Thinkei/opencensus-ruby-exporter-jaeger/blob/master/CHANGELOG.md'
-  # else
-  #   raise "RubyGems 2.0 or newer is required to protect against " \
-  #     "public gem pushes."
+    #   spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
+    #
+    spec.metadata['homepage_uri'] = spec.homepage
+    spec.metadata['source_code_uri'] = spec.homepage
+    spec.metadata['changelog_uri'] = 'https://github.com/Thinkei/opencensus-ruby-exporter-jaeger/blob/master/CHANGELOG.md'
+    # else
+    #   raise "RubyGems 2.0 or newer is required to protect against " \
+    #     "public gem pushes."
   end
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "opencensus", "~> 0.4.0"
-  spec.add_dependency "thrift", "~> 0.11.0"
+  spec.add_dependency 'opencensus', '~> 0.5.0'
+  spec.add_dependency 'thrift', '~> 0.11.0'
 
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opencensus-jaeger
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2.alpha
 platform: ruby
 authors:
 - Luong Vo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opencensus
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: thrift
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -102,7 +116,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- examples/.byebug_history
+- examples/.gitignore
 - examples/Gemfile
 - examples/Gemfile.lock
 - examples/config.ru
@@ -117,8 +131,6 @@ files:
 - lib/opencensus/trace/exporters/jaeger_driver/udp_transport.rb
 - lib/opencensus/trace/exporters/jaeger_exporter.rb
 - opencensus-jaeger.gemspec
-- scripts/publish.rb
-- scripts/rename_collectors.rb
 - thrift/agent.thrift
 - thrift/gen-rb/jaeger/thrift/agent.rb
 - thrift/gen-rb/jaeger/thrift/agent_constants.rb
@@ -149,12 +161,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Jaeger exporter for OpenCensus

data/examples/.byebug_history

@@ -1,97 +0,0 @@
-c
-continue
-next
-step
-next
-a.running?
-a=OpenCensus.config.trace.exporter.instance_variable_get('@executor')
-a.running?
-next
-a.running?
-a=OpenCensus.config.trace.exporter.instance_variable_get('@executor')
-a = _
-OpenCensus.config.trace.exporter.instance_variable_get('@executor')
-OpenCensus.config.trace.exporter.instance_variable_get('executor')
-OpenCensus.config.trace.exporter.instance_variable_get(:executor)
-OpenCensus.config.trace.exporter.running?
-OpenCensus.config.trace.exporter
-OpenCensus.config.trace.methods
-OpenCensus.config.trace
-OpenCensus.config.trcae
-OpenCensus.config.methods
-OpenCensus.config
-next
-value
-field.value
-next
-field
-field.exporter
-field
-key
-next
-key
-@fields
-field
-n
-'n
-n
-next
-field
-key
-next
-key
-field.exporter.methods
-field.exporter
-field.methods
-field
-field.is_a? Config
-field.value
-@fields
-field
-fiel
-next
-backtrace
-step
-puts "#{c}"
-step
-next
-step
-c
-step
-next
-step
-continue
-require 'jaeger/client'
-continue
-Jaeger.constants
-Jaeger::Thrift
-$LOAD_PATH
-require_relative 'jaeger/client/../../thrift/gen-rb'
-require 'jaeger/client/../../thrift/gen-rb'
-require 'jaeger/client'
-require 'jaeger/client/../../thrift/gen-rb'
-require_relative 'jaeger/client/../../thrift/gen-rb'
-require 'jaeger/client/../../thrift/gen-rb'
-require 'jaeger/client'
-require_relative 'jaeger/client/../../thrift/gen-rb'
-__FILE__
-File.dirname(__FILE__)
-require 'jaeger'
-$LOAD_PATH.push(File.dirname(__FILE__)+ '/../../thrift/gen-rb')
-'
-require 'jaeger/thrift/gen-rb/'
-require 'jaeger/thrift/agent'
-$LOAD_PATH.push(File.dirname(__FILE__)+ '/../../thrift/gen-rb')
-require 'opentracing'
-require 'jaeger/thrift/agent'
-Jaeger::Thrift
-Jaeger::Span.constants
-Jaeger::Span.constant
-Jaeger::Span.class
-Jaeger::Span
-Jaeger.constants
-Jaeger.class
-Jaeger.type
-Jaeger.tyoe
-Jaeger.methods
-Jaeger

data/scripts/publish.rb

@@ -1,7 +0,0 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'opencensus/jaeger/version'
-
-version = OpenCensus::Jaeger::VERSION
-
-exec("gem build opencensus-jaeger.gemspec && curl -F package=@opencensus-jaeger-#{version}.gem https://#{ENV['GEMFURY_TOKEN']}@push.fury.io/#{ENV['GEMFURY_PACKAGE']}/")

data/scripts/rename_collectors.rb

@@ -1,88 +0,0 @@
-require 'parser/current'
-require 'byebug'
-require 'fileutils'
-
-class CollectorRewrite < Parser::Rewriter
-  def on_class(node)
-    klass = node.children.first
-    range = Parser::Source::Range.new(
-      klass.loc.expression,
-      klass.loc.expression.begin_pos,
-      klass.loc.expression.end_pos
-    )
-    replace(range, klass.children.last.to_s)
-
-    range = Parser::Source::Range.new(
-      node.loc.expression,
-      node.loc.expression.begin_pos,
-      node.loc.expression.end_pos
-    )
-
-    wrap(range, "module ::EhMonitoring::Collectors\n", "\nend")
-  end
-end
-
-class CollectorMigration < Parser::Rewriter
-  def on_const(node)
-    if node.children.last.to_s =~ /.*Collector$/ && node.children[-2].to_s != ~ /Collectors/
-      range = Parser::Source::Range.new(
-        node.loc.expression,
-        node.loc.expression.begin_pos,
-        node.loc.expression.end_pos
-      )
-      replace(range, "EhMonitoring::Collectors::#{node.children.last}")
-    end
-  end
-
-  def on_send(node)
-    if node.children[1] == :require
-      file = node.children.last
-      file_link = file.children.first
-      if file_link =~ /collector$/ && file_link != ~ /collectors/
-        range = Parser::Source::Range.new(
-          file.loc.expression,
-          file.loc.expression.begin_pos,
-          file.loc.expression.end_pos
-        )
-        files = file_link.split "/"
-        replace(range, "\"#{files.insert(files.length - 1, "collectors").join("/")}\"")
-      end
-    elsif node.children[2]&.type == :const
-      on_const(node.children[2])
-    end
-  end
-end
-
-FileUtils.mkdir_p("lib/eh_monitoring/collectors")
-FileUtils.mkdir_p("spec/units/eh_monitoring/collectors")
-
-Dir["lib/**/*_collector.rb"].each do |file|
-  buffer = Parser::Source::Buffer.new("(Migration)")
-  buffer.source = File.read(file)
-  ast = Parser::CurrentRuby.new.parse(buffer)
-  rewriter = CollectorRewrite.new
-  content = rewriter.rewrite(buffer, ast)
-  lines = content.split("\n")
-  lines.each_with_index do |line, index|
-    next if index == 0 || index == lines.length - 1
-    lines[index] = "  #{line}"
-  end
-  content = lines.join("\n")
-  File.write("lib/eh_monitoring/collectors/#{file.split("/").last}", content)
-  File.delete(file)
-end
-
-Dir["spec/units/eh_monitoring/*_collector_spec.rb"].each do |file|
-  File.write("spec/units/eh_monitoring/collectors/#{file.split("/").last}", File.read(file))
-  File.delete(file)
-end
-
-file = "spec/units/eh_monitoring/instance_spec.rb"
-Dir["**/*.rb"].each do |file|
-  buffer = Parser::Source::Buffer.new("(Migration)")
-  buffer.source = File.read(file)
-  ast = Parser::CurrentRuby.new.parse(buffer)
-  rewriter = CollectorMigration.new
-  content = rewriter.rewrite(buffer, ast)
-  File.write(file, content)
-end