codecov_opentelem 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b38a258d6a6d83c82f8c7070d2b3af2338fa15f3de88d91d26aeae9a354a05b4
-  data.tar.gz: a19bf2fed924c9db850b82ca4d08ef082386a0651e0b7f23d68f9eb75a8e35ef
+  metadata.gz: d385d9be5936bef168660940493430288123e80e7e52ef7cfe3c745d7426dc71
+  data.tar.gz: ee1593d6f7e9b04d964f81d290a6116ea6d460ad65352500cc3b8b0d8c9b813d
 SHA512:
-  metadata.gz: 61f4db26ef7efd8818bda8d02c8f8efec796cced149886c69ed552087699b031d71405dc5956a51a3297f7e0ab59de652ba3a64ababdde09be439b495d196e26
-  data.tar.gz: b6502f4b505a8310cf8e752a0975e719782972d07e8f08d3849fc78c425d306a9491eca665a7f200cbfa0084b82a0e8eb91d463965a137c6d7057fd3038bd1a2
+  metadata.gz: 970d7e5aeecdea1689d933bfa78c222b70265345f3c62b62c79220b6ff212832146a41bcff5cc1017987b572c46d49c8a934cf883d3841630056400e1df5796a
+  data.tar.gz: 02fbe4c9bbc6c9e36f346d139dd6c0ea5f82fc4216d75a307a31d79a64ea146775ea06eb8f05d88eff076087f4959b60d97525b744867efb5bf12330dae1017c

data/Gemfile.lock

@@ -0,0 +1,221 @@
+PATH
+  remote: .
+  specs:
+    codecov_opentelem (0.1.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.5.0)
+    google-protobuf (3.21.1-x86_64-darwin)
+    googleapis-common-protos-types (1.3.1)
+      google-protobuf (~> 3.14)
+    opentelemetry-api (1.0.2)
+    opentelemetry-common (0.19.6)
+      opentelemetry-api (~> 1.0)
+    opentelemetry-exporter-otlp (0.22.0)
+      google-protobuf (~> 3.19)
+      googleapis-common-protos-types (~> 1.3)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.19.6)
+      opentelemetry-sdk (~> 1.0)
+      opentelemetry-semantic_conventions
+    opentelemetry-instrumentation-action_pack (0.2.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+      opentelemetry-instrumentation-rack (~> 0.21.0)
+    opentelemetry-instrumentation-action_view (0.3.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-active_support (~> 0.1)
+      opentelemetry-instrumentation-base (~> 0.20)
+    opentelemetry-instrumentation-active_job (0.3.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-active_model_serializers (0.19.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-active_record (0.4.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+      ruby2_keywords
+    opentelemetry-instrumentation-active_support (0.2.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-all (0.25.0)
+      opentelemetry-instrumentation-action_pack (~> 0.2.0)
+      opentelemetry-instrumentation-action_view (~> 0.3.0)
+      opentelemetry-instrumentation-active_job (~> 0.3.0)
+      opentelemetry-instrumentation-active_model_serializers (~> 0.19.0)
+      opentelemetry-instrumentation-active_record (~> 0.4.0)
+      opentelemetry-instrumentation-active_support (~> 0.2.0)
+      opentelemetry-instrumentation-aws_sdk (~> 0.3.0)
+      opentelemetry-instrumentation-bunny (~> 0.19.0)
+      opentelemetry-instrumentation-concurrent_ruby (~> 0.20.0)
+      opentelemetry-instrumentation-dalli (~> 0.22.0)
+      opentelemetry-instrumentation-delayed_job (~> 0.19.0)
+      opentelemetry-instrumentation-ethon (~> 0.20.0)
+      opentelemetry-instrumentation-excon (~> 0.20.0)
+      opentelemetry-instrumentation-faraday (~> 0.21.0)
+      opentelemetry-instrumentation-graphql (~> 0.20.0)
+      opentelemetry-instrumentation-http (~> 0.20.0)
+      opentelemetry-instrumentation-http_client (~> 0.20.0)
+      opentelemetry-instrumentation-koala (~> 0.19.0)
+      opentelemetry-instrumentation-lmdb (~> 0.21.0)
+      opentelemetry-instrumentation-mongo (~> 0.20.0)
+      opentelemetry-instrumentation-mysql2 (~> 0.21.0)
+      opentelemetry-instrumentation-net_http (~> 0.20.0)
+      opentelemetry-instrumentation-pg (~> 0.21.0)
+      opentelemetry-instrumentation-que (~> 0.4.0)
+      opentelemetry-instrumentation-rack (~> 0.21.0)
+      opentelemetry-instrumentation-rails (~> 0.22.0)
+      opentelemetry-instrumentation-rdkafka (~> 0.2.0)
+      opentelemetry-instrumentation-redis (~> 0.23.0)
+      opentelemetry-instrumentation-resque (~> 0.3.0)
+      opentelemetry-instrumentation-restclient (~> 0.20.0)
+      opentelemetry-instrumentation-ruby_kafka (~> 0.19.0)
+      opentelemetry-instrumentation-sidekiq (~> 0.22.0)
+      opentelemetry-instrumentation-sinatra (~> 0.20.0)
+      opentelemetry-instrumentation-trilogy (~> 0.51.0)
+    opentelemetry-instrumentation-aws_sdk (0.3.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-base (0.21.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-registry (~> 0.1)
+    opentelemetry-instrumentation-bunny (0.19.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-concurrent_ruby (0.20.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-dalli (0.22.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.19.3)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-delayed_job (0.19.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-ethon (0.20.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.19.3)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-excon (0.20.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.19.3)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-faraday (0.21.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.19.3)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-graphql (0.20.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-http (0.20.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-http_client (0.20.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.19.3)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-koala (0.19.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.19.3)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-lmdb (0.21.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-mongo (0.20.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-mysql2 (0.21.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-net_http (0.20.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.19.3)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-pg (0.21.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-que (0.4.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-rack (0.21.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.19.3)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-rails (0.22.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-action_pack (~> 0.2.0)
+      opentelemetry-instrumentation-action_view (~> 0.3.0)
+      opentelemetry-instrumentation-active_record (~> 0.4.0)
+      opentelemetry-instrumentation-active_support (~> 0.2.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-rdkafka (0.2.0)
+      opentelemetry-api (~> 1.0.0)
+      opentelemetry-common (~> 0.19.3)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-redis (0.23.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.19.3)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-resque (0.3.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-restclient (0.20.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.19.3)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-ruby_kafka (0.19.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-sidekiq (0.22.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.19.3)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-sinatra (0.20.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.19.3)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+    opentelemetry-instrumentation-trilogy (0.51.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.21.0)
+      opentelemetry-semantic_conventions (>= 1.8.0)
+    opentelemetry-registry (0.1.0)
+      opentelemetry-api (~> 1.0.1)
+    opentelemetry-sdk (1.1.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.19.3)
+      opentelemetry-registry (~> 0.1)
+      opentelemetry-semantic_conventions
+    opentelemetry-semantic_conventions (1.8.0)
+      opentelemetry-api (~> 1.0)
+    rake (13.0.6)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    ruby2_keywords (0.0.5)
+
+PLATFORMS
+  x86_64-darwin-21
+
+DEPENDENCIES
+  codecov_opentelem!
+  opentelemetry-exporter-otlp
+  opentelemetry-instrumentation-all
+  opentelemetry-sdk
+  rake (~> 13.0)
+  rspec
+
+BUNDLED WITH
+   2.3.16

data/lib/codecov_opentelem/coverage_exporter.rb

@@ -20,21 +20,21 @@ class CodecovCoverageStorageManager
 
   def start_coverage_for_span(span)
     if !@filters[CoverageSpanFilter::REGEX_NAME].nil? && @filters[CoverageSpanFilter::REGEX_NAME].match(span.name)
+      puts 'returned false'
       return false
     end
 
-    Coverage.resume
+    Coverage.start unless Coverage.running?
     true
   end
 
-  def stop_coverage_for_span(_span)
+  def stop_coverage_for_span(span)
     span_id = span.context.span_id
-    Coverage.suspend
     @inner[span_id] = Coverage.result(stop: false, clear: true)
   end
 
-  def pop_coverage_for_span(_span)
-    span_id = span.context.span_id
+  def pop_coverage_for_span(span)
+    span_id = span.span_id
     @inner.delete(span_id)
   end
 end
@@ -47,10 +47,10 @@ class CodecovCoverageGenerator < OpenTelemetry::SDK::Trace::SpanProcessor
   end
 
   def on_start(span, _parent_context = nil)
-    @cov_storage.possibly_start_cov_for_span(span) if rand < @sample_rate
+    @cov_storage.start_coverage_for_span(span) if rand() < @sample_rate
   end
 
-  def on_end(span)
+  def on_finish(span)
     @cov_storage.stop_coverage_for_span(span)
   end
 end
@@ -65,32 +65,56 @@ class CoverageExporter < OpenTelemetry::SDK::Trace::Export::SpanExporter
     @untracked_export_rate = untracked_export_rate
   end
 
-  def export(spans)
+  def export(spans, timeout)
     tracked_spans = []
     untracked_spans = []
+
     spans.each do |span|
-      cov = cov_storage.pop_cov_for_span(span)
-      s = JSON.parse(span)
+      cov = @cov_storage.pop_coverage_for_span(span)
+
+      span_hash = Hash.new
+      span.to_h.each do |k, v|
+        v = v.dup.force_encoding("ISO-8859-1").encode("UTF-8") if v.is_a? String
+        span_hash[k] = v
+      end
+
       if !cov.nil?
-        s['codecov'] = { 'type' => 'bytes', 'coverage' => cov }
-        tracked_spans.append(s)
-      elsif rand < @untracked_export_rate
-        untracked_spans.append(s)
+        span_hash['codecov'] = {
+          'coverage': cov.to_json,
+          'type': 'json',
+        }
+        tracked_spans.append(span_hash.to_json)
+      elsif rand() < @untracked_export_rate
+        untracked_spans.append(span_hash.to_json)
       end
     end
-    return SpanExportResult.SUCCESS if !tracked_spans && !untracked_spans
-
-    res = Net::HTTP.post(URI.join(@codecov_url, '/profiling/uploads'),
-                         { 'code' => @code }.to_json,
-                         'Content-Type' => 'application/json',
-                         'Authorization' => "repotoken #{@repository_token}")
-    return SpanExportResult.FAILURE if res.is_a?(Net::HTTPError)
-
-    location = res.body.raw_upload_location
-    Net::HTTP.put(URI(location),
-                  { 'spans' => tracked_spans,
-                    'untracked' => untracked_spans }.to_json,
-                  'Content-Type' => 'text/plain')
-    SpanExportResult.SUCCESS
+
+    return OpenTelemetry::SDK::Trace::Export::SUCCESS if !tracked_spans && !untracked_spans
+
+    body = { 'profiling' => @code }.to_json
+    res = Net::HTTP.post(
+      URI.join(@codecov_url, '/profiling/uploads'),
+      { 'profiling' => @code }.to_json,
+      'Content-Type' => 'application/json',
+      'Authorization' => "repotoken #{@repository_token}"
+    )
+    return OpenTelemetry::SDK::Trace::Export::FAILURE if res.is_a?(Net::HTTPError)
+
+    location = JSON(res.body)['raw_upload_location']
+    uri = URI(location)
+    https = Net::HTTP.new(uri.host, uri.port)
+    https.use_ssl = true
+    req = Net::HTTP::Put.new(
+      location,
+      {
+        'Content-Type' => 'text/plain'
+      }
+    )
+    req.body = {
+      'spans' => tracked_spans,
+      'untracked' => untracked_spans
+    }.to_json
+    https.request(req)
+    OpenTelemetry::SDK::Trace::Export::SUCCESS
   end
 end

data/lib/codecov_opentelem/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CodecovOpentelem
-  VERSION = "0.1.2"
+  VERSION = "0.1.5"
 end

data/lib/codecov_opentelem.rb

@@ -40,9 +40,9 @@ def get_codecov_opentelemetry_instances(
                          'Authorization' => "repotoken #{repository_token}")
     raise UnableToStartProcessorException if res.is_a?(Net::HTTPError)
   end
-  manager = CodecovCoverageStorageManager(filters)
-  generator = CodecovCoverageGenerator(manager, sample_rate)
-  exporter = CoverageExporter(
+  manager = CodecovCoverageStorageManager.new(filters)
+  generator = CodecovCoverageGenerator.new(manager, sample_rate)
+  exporter = CoverageExporter.new(
     manager, repository_token, code, codecov_url, untracked_export_rate
   )
   [generator, exporter]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codecov_opentelem
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - Ahmed-Elghrbawy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-06-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -19,6 +19,7 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile