coverband-service-client 0.0.7 → 0.0.12.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c91e07a6f8536e144c0cde767a20b91ae1aefcc2d5e1bcda5c9962c8d667de8f
-  data.tar.gz: ffc9bc012bb68be47b474d4c5b436ffbcc1e2e675e9616545ffb357e274b513b
+  metadata.gz: b21c24a8ca01191ebb807640f09555b360ba6f0333b86d6e0c109387832bb35a
+  data.tar.gz: 7657f2a6942d2474d196f470c1fbaca8b069ae49619c483e8e0e2c1787b39410
 SHA512:
-  metadata.gz: 9879add06ec81ced176e688e5bd5c40d9ae3848deb165437acc099cc3454fa33cf65a49cacc5df1433b496b86c12c169db975b8776969e981ff12388b346b102
-  data.tar.gz: 441d88a85a8e9d9afa7538c47a14fe028f58d817d65d642b22fdde963dd6f38ce123edc80518913369bf3b81091e34c81f5da2e3477c8323d3654f608052ebc8
+  metadata.gz: ef97e09b88610ae38f45295e650e8b79b5cdaf77e46d616753ffcc1aa98cb34f5f0267b30a1ca7dc3a859df55f9b4305b150e7412dc05ad1062504777be819d2
+  data.tar.gz: c4cae237dd5fbf03da3ddb8061ee76cc597e5fcc44d45b6351d2a2fad646bf6f4e3ff035dd9dba803e4cb70c421bfeeea1b09544dcb4d837b9ad9135d7bec1cc

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    coverband-service-client (0.0.7)
+    coverband-service-client (0.0.12.rc)
       coverband (~> 4.2.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coverband (4.2.4)
+    coverband (4.2.5)
       redis
     minitest (5.14.0)
     rake (13.0.1)
-    redis (4.1.3)
+    redis (4.1.4)
 
 PLATFORMS
   ruby

data/lib/coverband-service-client.rb

@@ -1,19 +1,32 @@
 # frozen_string_literal: true
+require 'socket'
 
+COVERBAND_ORIGINAL_START = ENV['COVERBAND_DISABLE_AUTO_START']
+ENV['COVERBAND_DISABLE_AUTO_START'] = 'true'
 require 'coverband'
 require 'coverband/service/client/version'
 require 'securerandom'
 
-COVERBAND_ENV = ENV['RACK_ENV'] || ENV['RAILS_ENV'] || (defined?(Rails) ? Rails.env : 'unknown')
-COVERBAND_SERVICE_URL = ENV['COVERBAND_URL'] ||
-  ((COVERBAND_ENV == 'development') ? 'http://127.0.0.1:3456' : 'https://coverband-service.herokuapp.com')
-COVERBAND_TIMEOUT = (COVERBAND_ENV == 'development') ? 5 : 1
-
 module Coverband
+  COVERBAND_ENV = ENV['RACK_ENV'] || ENV['RAILS_ENV'] || (defined?(Rails) ? Rails.env : 'unknown')
+  COVERBAND_SERVICE_URL = ENV['COVERBAND_URL'] || 'https://coverband.io'
+  COVERBAND_TIMEOUT = (COVERBAND_ENV == 'development') ? 5 : 1
+  COVERBAND_ENABLE_DEV_MODE = ENV['COVERBAND_ENABLE_DEV_MODE'] || false
+  COVERBAND_ENABLE_TEST_MODE = ENV['COVERBAND_ENABLE_TEST_MODE'] || false
+  COVERBAND_PROCESS_TYPE = ENV['PROCESS_TYPE'] || 'unknown'
+  COVERBAND_REPORT_PERIOD = (ENV['COVERBAND_REPORT_PERIOD'] || 600).to_i
+
+  def self.service_disabled_dev_test_env?
+    (COVERBAND_ENV == 'test' && !COVERBAND_ENABLE_TEST_MODE) ||
+      (COVERBAND_ENV == 'development' && !COVERBAND_ENABLE_DEV_MODE)
+  end
 
-  if COVERBAND_ENV == 'test' && !ENV['COVERBAND_ENABLE_TEST_MODE']
+  if service_disabled_dev_test_env?
     def self.report_coverage
-      # for now disable coverband reporting in test env by default
+      # for now disable coverband reporting in test & dev env by default
+      if Coverband.configuration.verbose
+        puts "Coverband: disabled for #{COVERBAND_ENV}, set COVERBAND_ENABLE_DEV_MODE or COVERBAND_ENABLE_TEST_MODE to enable" if Coverband.configuration.verbose || COVERBAND_ENABLE_DEV_MODE
+      end
     end
   end
 
@@ -23,18 +36,23 @@ module Coverband
       #
       # NOTES:
       # * uses net/http to avoid any dependencies
-      # * currently JSON, but likely better to move to something simpler / faster
+      # * currently JSON, but likely better to move to something faster
       ###
       class Service < Base
-        attr_reader :coverband_url, :process_type, :runtime_env
+        attr_reader :coverband_url, :process_type, :runtime_env, :hostname, :pid
 
         def initialize(coverband_url, opts = {})
           super()
           @coverband_url = coverband_url
-          @process_type = opts.fetch(:process_type) { 'unknown' }
+          @process_type = opts.fetch(:process_type) { $PROGRAM_NAME&.split('/')&.last || COVERBAND_PROCESS_TYPE }
+          @hostname = opts.fetch(:hostname) { ENV["DYNO"] || Socket.gethostname.force_encoding('utf-8').encode }
           @runtime_env = opts.fetch(:runtime_env) { COVERBAND_ENV }
         end
 
+        def logger
+          Coverband.configuration.logger
+        end
+
         def clear!
           # TBD
         end
@@ -48,28 +66,35 @@ module Coverband
           0
         end
 
-        # TODO: no longer get by type just get both reports in a single request
+        def api_key
+          ENV['COVERBAND_API_KEY'] || Coverband.configuration.api_key
+        end
+
+        ###
+        # Fetch coverband coverage via the API
+        ###
         def coverage(local_type = nil, opts = {})
           local_type ||= opts.key?(:override_type) ? opts[:override_type] : type
-          uri = URI("#{coverband_url}/api/coverage/#{ENV['COVERBAND_ID']}?type=#{local_type}")
-          req = Net::HTTP::Get.new(uri, 'Content-Type' => 'application/json', 'Coverband-Token' => ENV['COVERBAND_API_KEY'])
+          env_filter = opts.key?(:env_filter) ? opts[:env_filter] : 'production'
+          uri = URI("#{coverband_url}/api/coverage?type=#{local_type}&env_filter=#{env_filter}",)
+          req = Net::HTTP::Get.new(uri, 'Content-Type' => 'application/json', 'Coverband-Token' => api_key)
           res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
             http.request(req)
           end
           coverage_data = JSON.parse(res.body)
-          # puts "coverage data: "
-          # puts coverage_data
           coverage_data
         rescue StandardError => e
-          puts "Coverband: Error while retrieving coverage #{e}"
+          logger&.error "Coverband: Error while retrieving coverage #{e}" if Coverband.configuration.verbose || COVERBAND_ENABLE_DEV_MODE
         end
 
         def save_report(report)
-          #puts caller.join(',')
           return if report.empty?
 
+          # We set here vs initialize to avoid setting on the primary process vs child processes
+          @pid ||= ::Process.pid
+
           # TODO: do we need dup
-          # TODO: remove timestamps, server will track first_seen
+          # TODO: remove upstream timestamps, server will track first_seen
           Thread.new do
             data = expand_report(report.dup)
             full_package = {
@@ -78,7 +103,9 @@ module Coverband
                 tags: {
                   process_type: process_type,
                   app_loading: type == Coverband::EAGER_TYPE,
-                  runtime_env: runtime_env
+                  runtime_env: runtime_env,
+                  pid: pid,
+                  hostname: hostname,
                 },
                 file_coverage: data
               }
@@ -94,12 +121,18 @@ module Coverband
         private
 
         def save_coverage(data)
+          if api_key.nil?
+            puts "Coverband: Error: no Coverband API key was found!"
+            return
+          end
+
           uri = URI("#{coverband_url}/api/collector")
           req = Net::HTTP::Post.new(uri,
                                     'Content-Type' => 'application/json',
-                                    'Coverband-Token' => ENV['COVERBAND_API_KEY'])
-          # puts "sending #{data}"
+                                    'Coverband-Token' => api_key)
           req.body = { remote_uuid: SecureRandom.uuid, data: data }.to_json
+
+          logger&.info "Coverband: saving (#{uri}) #{req.body}" if Coverband.configuration.verbose
           res = Net::HTTP.start(
             uri.hostname,
             uri.port,
@@ -111,7 +144,51 @@ module Coverband
             http.request(req)
           end
         rescue StandardError => e
-          puts "Coverband: Error while saving coverage #{e}"
+          logger&.info "Coverband: Error while saving coverage #{e}" if Coverband.configuration.verbose || COVERBAND_ENABLE_DEV_MODE
+        end
+      end
+
+      class PersistentService < Service
+        attr_reader :http
+
+        def initialize(coverband_url, opts = {})
+          super
+          initiate_http
+        end
+
+        private
+
+        def initiate_http
+          @http = Net::HTTP::Persistent.new name: 'coverband_persistent'
+          @http.headers['Content-Type'] = 'application/json'
+          @http.headers['Coverband-Token'] = api_key
+          @http.open_timeout = COVERBAND_TIMEOUT
+          @http.read_timeout = COVERBAND_TIMEOUT
+          @http.ssl_timeout = COVERBAND_TIMEOUT
+        end
+
+        def save_coverage(data)
+          persistent_attempts = 0
+          begin
+            if api_key.nil?
+              puts "Coverband: Error: no Coverband API key was found!"
+              return
+            end
+
+            post_uri = URI("#{coverband_url}/api/collector")
+            post = Net::HTTP::Post.new post_uri.path
+            body = { remote_uuid: SecureRandom.uuid, data: data }.to_json
+            post.body = body
+            logger&.info "Coverband: saving (#{post_uri}) #{body}" if Coverband.configuration.verbose
+            res = http.request post_uri, post
+          rescue Net::HTTP::Persistent::Error => e
+            persistent_attempts += 1
+            http.shutdown
+            initiate_http
+            retry if persistent_attempts < 2
+          end
+        rescue StandardError => e
+          logger&.info "Coverband: Error while saving coverage #{e}" if Coverband.configuration.verbose || COVERBAND_ENABLE_DEV_MODE
         end
       end
     end
@@ -145,14 +222,22 @@ module Coverband
       rescue StandardError => e
         # we don't want to raise errors if Coverband can't reach redis.
         # This is a nice to have not a bring the system down
-        logger&.error "Coverband: view_tracker failed to store, error #{e.class.name}"
+        logger&.error "Coverband: view_tracker failed to store, error #{e.class.name}" if Coverband.configuration.verbose || COVERBAND_ENABLE_DEV_MODE
       end
 
       private
 
+      def api_key
+        ENV['COVERBAND_API_KEY'] || Coverband.configuration.api_key
+      end
+
+      def logger
+        Coverband.configuration.logger
+      end
+
       def save_tracked_views(views:, reported_time:)
         uri = URI("#{COVERBAND_SERVICE_URL}/api/collector")
-        req = Net::HTTP::Post.new(uri, 'Content-Type' => 'application/json', 'Coverband-Token' => ENV['COVERBAND_API_KEY'])
+        req = Net::HTTP::Post.new(uri, 'Content-Type' => 'application/json', 'Coverband-Token' => api_key)
         data = {
           collection_type: 'view_tracker_delta',
           collection_data: {
@@ -169,25 +254,53 @@ module Coverband
           http.request(req)
         end
       rescue StandardError => e
-        puts "Coverband: Error while saving coverage #{e}"
+        logger&.error "Coverband: Error while saving coverage #{e}" if Coverband.configuration.verbose || COVERBAND_ENABLE_DEV_MODE
       end
     end
   end
 end
 
+module Coverband
+  class Configuration
+    attr_accessor :api_key
+  end
+end
+
+ENV['COVERBAND_DISABLE_AUTO_START'] = COVERBAND_ORIGINAL_START
 Coverband.configure do |config|
-  # Use The Test Service Adapter
-  config.store = Coverband::Adapters::Service.new(COVERBAND_SERVICE_URL)
+  # Use the Service Adapter
+  if defined?(Net::HTTP::Persistent)
+    config.store = Coverband::Adapters::PersistentService.new(Coverband::COVERBAND_SERVICE_URL)
+  else
+    config.store = Coverband::Adapters::Service.new(Coverband::COVERBAND_SERVICE_URL)
+  end
 
   # default to tracking views true
-  config.track_views = ENV['COVERBAND_ENABLE_VIEW_TRACKER'] ? true : false
+  config.track_views = if ENV['COVERBAND_DISABLE_VIEW_TRACKER']
+      false
+    elsif Coverband.service_disabled_dev_test_env?
+      false
+    else
+      true
+    end
 
   # report every 10m by default
-  config.background_reporting_sleep_seconds = COVERBAND_ENV == 'production' ? 600 : 60
+  config.background_reporting_sleep_seconds = Coverband::COVERBAND_ENV == 'production' ? Coverband::COVERBAND_REPORT_PERIOD : 60
   # add a wiggle to avoid service stampede
-  config.reporting_wiggle = COVERBAND_ENV == 'production' ? 90 : 6
+  config.reporting_wiggle = Coverband::COVERBAND_ENV == 'production' ? 90 : 6
 
-  if COVERBAND_ENV == 'test'
+  if Coverband::COVERBAND_ENV == 'test'
     config.background_reporting_enabled = false
   end
 end
+
+# NOTE: it is really hard to bypass / overload our config we should fix this in Coverband
+# this hopefully detects anyone that has both gems and was trying to configure Coverband themselves.
+if File.exist?('./config/coverband.rb')
+  puts "Warning: config/coverband.rb found, this overrides coverband service allowing one to setup open source Coverband" if Coverband.configuration.verbose || COVERBAND_ENABLE_DEV_MODE
+end
+
+Coverband.configure('./config/coverband_service.rb') if File.exist?('./config/coverband_service.rb')
+Coverband.start
+require "coverband/utils/railtie" if defined? ::Rails::Railtie
+require "coverband/integrations/resque" if defined? ::Resque

data/lib/coverband/service/client/version.rb

@@ -1,7 +1,7 @@
 module Coverband
   module Service
     module Client
-      VERSION = '0.0.7'
+      VERSION = '0.0.12.rc'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coverband-service-client
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.12.rc
 platform: ruby
 authors:
 - Dan Mayer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,9 +106,9 @@ 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: []
 rubygems_version: 3.0.3
 signing_key: