instana 1.201.0 → 1.202.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a12265a63ae5d07df74d4e8c1b81fe17559960726a5562c6c59b83571eb4f25
-  data.tar.gz: 2844f85c68a18ead499aef5ec6634d726305b824dada97d1e1e386e1c40774fb
+  metadata.gz: 3c72533e116e54ad36227ccdf76c02aaaeb3536f40c99ecf1009f0cf284ebf99
+  data.tar.gz: 3f748a84fed00443296d65340fc71e876a69c17d8698637356529d6d5980aa5e
 SHA512:
-  metadata.gz: 97c13b14a55c13d2e5e898711fee065699d817169cc39ab1b15c322bf075d1f4c3b715dc4fa1490f8cc7d53ef01e0ba348f7548cae400ab028c8da1fed607484
-  data.tar.gz: 0c4e03ef64a6273cbbf2f41bb2e57228a68b4a579298c4c26c3bd109b5002ba7e7fb1337609bc8a712e9fb7ff1902a0e46a2a0bdcd386fd13ca454172228032d
+  metadata.gz: '009d83c5f6a7d8a5f4da1903fb482c6fe5a5cb68de6c984c1a58f52b01559bae3bbf43a10f028deae5cabe73c41a07e625f5545037ca295d53108e03564efbe1'
+  data.tar.gz: 241d6f1b46de88f5e7933dc85530cc5f540f71f9d9ad26b0778ffb970645b2c5c2aa4d0b11f05d85033cb4232339e9e27b92bfcd386fe79a1e3d9578485c9bfc

data/.circleci/config.yml

@@ -132,12 +132,12 @@ commands:
           name: Install Depdendecies
           command: |
             bundle check || bundle install
-  run_tests:
+  run_sonarqube:
     steps:
       - run:
-          name: Run Tests
+          name: Install Java
           command: |
-            bundle exec rake
+            sudo apt-get install openjdk-11-jdk
       - run:
           name: Run SonarQube to capture coverage
           command: |
@@ -147,8 +147,16 @@ commands:
             -Dsonar.projectKey=ruby-sensor \
             -Dsonar.sources=. \
             -Dsonar.host.url="${SONARQUBE_URL}" \
-            -Dsonar.login="${SONARQUBE_LOGIN}" \
-            -Dsonar.ruby.coverage.reportPaths=coverage/coverage.json
+            -Dsonar.login="${SONARQUBE_LOGIN}"          
+  run_tests:
+    steps:
+      - run:
+          name: Run Tests
+          command: |
+            mkdir _junit
+            bundle exec rake
+      - store_test_results:
+          path: ~/_junit
   run_rubocop:
     steps:
       - run:
@@ -201,6 +209,7 @@ jobs:
       - checkout
       - setup
       - run_rubocop
+      - run_sonarqube
   publish:
     executor: ruby_27
     steps:

data/lib/instana/activator.rb

@@ -46,11 +46,13 @@ end
 Dir["#{__dir__}/activators/*.rb"]
   .sort
   .select do |f|
+  # :nocov:
   if ENV['INSTANA_ACTIVATE_SET']
     base = File.basename(f, '.rb')
     ENV.fetch('INSTANA_ACTIVATE_SET', '').split(',').include?(base)
   else
     true
   end
+  # :nocov:
 end
   .each { |f| require(f) }

data/lib/instana/config.rb

@@ -27,6 +27,9 @@ module Instana
       # Enable/disable tracing (default: enabled)
       @config[:tracing] = { :enabled => true }
 
+      # Enable/Disable logging
+      @config[:logging] = { :enabled => true }
+
       # Collector interval
       @config[:collector] = { :enabled => true, :interval => 1 }
 

data/lib/instana/frameworks/rails.rb

@@ -3,9 +3,6 @@
 
 if ::Rails::VERSION::MAJOR < 3
   ::Rails.configuration.after_initialize do
-    # In Rails, let's use the Rails logger
-    ::Instana.logger = ::Rails.logger if ::Rails.logger
-
     if ::Instana.config[:tracing][:enabled]
       ::Instana.logger.debug "Instrumenting Rack"
       ::Rails.configuration.middleware.insert 0, ::Instana::Rack
@@ -17,8 +14,11 @@ else
   module ::Instana
     class Railtie < ::Rails::Railtie
       initializer 'instana.rack' do |app|
-        # In Rails, let's use the Rails logger
-        ::Instana.logger = ::Rails.logger if ::Rails.logger
+        # Configure the Instrumented Logger
+        if ::Instana.config[:logging][:enabled] && !ENV.key?('INSTANA_TEST')
+          logger = ::Instana::InstrumentedLogger.new('/dev/null')
+          Rails.logger.extend(ActiveSupport::Logger.broadcast(logger))
+        end
 
         if ::Instana.config[:tracing][:enabled]
           ::Instana.logger.debug "Instrumenting Rack"

data/lib/instana/instrumented_logger.rb

@@ -0,0 +1,26 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  class InstrumentedLogger < Logger
+    LEVEL_LABELS = %w[Debug Info Warn Error Fatal Any].freeze
+
+    def instana_log_level
+      WARN
+    end
+
+    def add(severity, message = nil, progname = nil)
+      severity ||= UNKNOWN
+
+      if severity >= instana_log_level && ::Instana.tracer.tracing?
+        tags = {
+          level: LEVEL_LABELS[severity],
+          message: "#{message} #{progname}".strip
+        }
+        Instana::Tracer.trace(:log, {log: tags}) {}
+      end
+
+      super(severity, message, progname)
+    end
+  end
+end

data/lib/instana/setup.rb

@@ -1,10 +1,12 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2016
 
+require 'logger'
 require 'concurrent'
 require 'sys-proctable'
 
 require 'instana/logger_delegator'
+require 'instana/instrumented_logger'
 
 require "instana/base"
 require "instana/config"

data/lib/instana/tracing/span.rb

@@ -6,10 +6,10 @@ module Instana
     REGISTERED_SPANS = [ :actioncontroller, :actionview, :activerecord, :excon,
                          :memcache, :'net-http', :rack, :render, :'rpc-client',
                          :'rpc-server', :'sidekiq-client', :'sidekiq-worker',
-                         :redis, :'resque-client', :'resque-worker', :'graphql.server', :dynamodb, :s3, :sns, :sqs, :'aws.lambda.entry', :activejob  ].freeze
+                         :redis, :'resque-client', :'resque-worker', :'graphql.server', :dynamodb, :s3, :sns, :sqs, :'aws.lambda.entry', :activejob, :log  ].freeze
     ENTRY_SPANS = [ :rack, :'resque-worker', :'rpc-server', :'sidekiq-worker', :'graphql.server', :sqs, :'aws.lambda.entry' ].freeze
     EXIT_SPANS = [ :activerecord, :excon, :'net-http', :'resque-client',
-                   :'rpc-client', :'sidekiq-client', :redis, :dynamodb, :s3, :sns, :sqs ].freeze
+                   :'rpc-client', :'sidekiq-client', :redis, :dynamodb, :s3, :sns, :sqs, :log ].freeze
     HTTP_SPANS = [ :rack, :excon, :'net-http' ].freeze
 
     attr_accessor :parent

data/lib/instana/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "1.201.0"
+  VERSION = "1.202.0"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/test_helper.rb

@@ -50,5 +50,14 @@ WebMock.disable_net_connect!(
 
 Dir['test/support/*.rb'].each { |f| load(f) }
 
-Minitest::Reporters.use! MiniTest::Reporters::SpecReporter.new
+if ENV['CI']
+  Minitest::Reporters.use!([
+                             Minitest::Reporters::JUnitReporter.new('_junit', false),
+                             Minitest::Reporters::SpecReporter.new
+                           ])
+else
+  Minitest::Reporters.use!([
+                             MiniTest::Reporters::SpecReporter.new
+                           ])
+end
 Minitest::Test.include(Instana::TestHelpers)

data/test/tracing/instrumented_logger_test.rb

@@ -0,0 +1,39 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+class InstrumentedLoggerTest < Minitest::Test
+  def setup
+    clear_all!
+  end
+
+  def test_log_warn_error
+    subject = Instana::InstrumentedLogger.new('/dev/null')
+
+    Instana::Tracer.start_or_continue_trace(:test_logging) do
+      subject.warn('warn')
+      subject.debug('test')
+      subject.error('error')
+    end
+
+    spans = ::Instana.processor.queued_spans
+
+    warn_span, error_span, = *spans
+
+    assert_equal :log, warn_span[:n]
+    assert_equal 'warn', warn_span[:data][:log][:message]
+    assert_equal 'Warn', warn_span[:data][:log][:level]
+
+    assert_equal :log, error_span[:n]
+    assert_equal 'error', error_span[:data][:log][:message]
+    assert_equal 'Error', error_span[:data][:log][:level]
+  end
+
+  def test_no_trace
+    subject = Instana::InstrumentedLogger.new('/dev/null')
+    subject.warn('warn')
+
+    assert_equal [], ::Instana.processor.queued_spans
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.201.0
+  version: 1.202.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -244,6 +244,7 @@ files:
 - lib/instana/instrumentation/shoryuken.rb
 - lib/instana/instrumentation/sidekiq-client.rb
 - lib/instana/instrumentation/sidekiq-worker.rb
+- lib/instana/instrumented_logger.rb
 - lib/instana/logger_delegator.rb
 - lib/instana/open_tracing/carrier.rb
 - lib/instana/open_tracing/instana_tracer.rb
@@ -334,6 +335,7 @@ files:
 - test/test_helper.rb
 - test/tracing/custom_test.rb
 - test/tracing/id_management_test.rb
+- test/tracing/instrumented_logger_test.rb
 - test/tracing/opentracing_test.rb
 - test/tracing/processor_test.rb
 - test/tracing/span_context_test.rb
@@ -364,81 +366,82 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.6
 signing_key: 
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files:
+- test/config_test.rb
+- test/serverless_test.rb
 - test/activator_test.rb
-- test/backend/agent_test.rb
-- test/backend/gc_snapshot_test.rb
+- test/tracing/span_context_test.rb
+- test/tracing/span_test.rb
+- test/tracing/id_management_test.rb
+- test/tracing/tracer_test.rb
+- test/tracing/custom_test.rb
+- test/tracing/opentracing_test.rb
+- test/tracing/instrumented_logger_test.rb
+- test/tracing/tracer_async_test.rb
+- test/tracing/processor_test.rb
+- test/snapshot/docker_container_test.rb
+- test/snapshot/fargate_process_test.rb
+- test/snapshot/deltable_test.rb
+- test/snapshot/fargate_task_test.rb
+- test/snapshot/ruby_process_test.rb
+- test/snapshot/google_cloud_run_process_test.rb
+- test/snapshot/lambda_function_test.rb
+- test/snapshot/fargate_container_test.rb
+- test/snapshot/google_cloud_run_instance_test.rb
 - test/backend/host_agent_activation_observer_test.rb
-- test/backend/host_agent_lookup_test.rb
 - test/backend/host_agent_reporting_observer_test.rb
-- test/backend/host_agent_test.rb
+- test/backend/gc_snapshot_test.rb
+- test/backend/host_agent_lookup_test.rb
+- test/backend/serverless_agent_test.rb
 - test/backend/process_info_test.rb
+- test/backend/agent_test.rb
+- test/backend/host_agent_test.rb
 - test/backend/request_client_test.rb
-- test/backend/serverless_agent_test.rb
-- test/benchmarks/bench_id_generation.rb
-- test/benchmarks/bench_opentracing.rb
-- test/config_test.rb
-- test/frameworks/cuba_test.rb
-- test/frameworks/roda_test.rb
-- test/frameworks/sinatra_test.rb
-- test/instana_test.rb
-- test/instrumentation/aws_test.rb
-- test/instrumentation/dalli_test.rb
-- test/instrumentation/excon_test.rb
+- test/secrets_test.rb
 - test/instrumentation/graphql_test.rb
-- test/instrumentation/grpc_test.rb
-- test/instrumentation/net_http_test.rb
-- test/instrumentation/rack_instrumented_request_test.rb
-- test/instrumentation/rack_test.rb
-- test/instrumentation/rails_action_cable_test.rb
+- test/instrumentation/sidekiq-client_test.rb
 - test/instrumentation/rails_action_controller_test.rb
+- test/instrumentation/rest_client_test.rb
+- test/instrumentation/net_http_test.rb
+- test/instrumentation/resque_test.rb
+- test/instrumentation/sidekiq-worker_test.rb
 - test/instrumentation/rails_action_view_test.rb
 - test/instrumentation/rails_active_job_test.rb
+- test/instrumentation/rack_test.rb
+- test/instrumentation/rack_instrumented_request_test.rb
+- test/instrumentation/shoryuken_test.rb
 - test/instrumentation/rails_active_record_test.rb
 - test/instrumentation/redis_test.rb
-- test/instrumentation/resque_test.rb
-- test/instrumentation/rest_client_test.rb
-- test/instrumentation/shoryuken_test.rb
-- test/instrumentation/sidekiq-client_test.rb
-- test/instrumentation/sidekiq-worker_test.rb
-- test/secrets_test.rb
-- test/serverless_test.rb
-- test/snapshot/deltable_test.rb
-- test/snapshot/docker_container_test.rb
-- test/snapshot/fargate_container_test.rb
-- test/snapshot/fargate_process_test.rb
-- test/snapshot/fargate_task_test.rb
-- test/snapshot/google_cloud_run_instance_test.rb
-- test/snapshot/google_cloud_run_process_test.rb
-- test/snapshot/lambda_function_test.rb
-- test/snapshot/ruby_process_test.rb
-- test/support/apps/active_record/active_record.rb
+- test/instrumentation/dalli_test.rb
+- test/instrumentation/rails_action_cable_test.rb
+- test/instrumentation/excon_test.rb
+- test/instrumentation/grpc_test.rb
+- test/instrumentation/aws_test.rb
+- test/util_test.rb
+- test/support/helpers.rb
+- test/support/mock_timer.rb
+- test/support/apps/sidekiq/boot.rb
+- test/support/apps/sidekiq/jobs/sidekiq_job_2.rb
+- test/support/apps/sidekiq/jobs/sidekiq_job_1.rb
+- test/support/apps/sidekiq/worker.rb
 - test/support/apps/grpc/boot.rb
 - test/support/apps/grpc/grpc_server.rb
-- test/support/apps/http_endpoint/boot.rb
-- test/support/apps/rails/boot.rb
-- test/support/apps/rails/models/block.rb
-- test/support/apps/rails/models/block6.rb
+- test/support/apps/active_record/active_record.rb
 - test/support/apps/resque/boot.rb
 - test/support/apps/resque/jobs/resque_error_job.rb
 - test/support/apps/resque/jobs/resque_fast_job.rb
-- test/support/apps/sidekiq/boot.rb
-- test/support/apps/sidekiq/jobs/sidekiq_job_1.rb
-- test/support/apps/sidekiq/jobs/sidekiq_job_2.rb
-- test/support/apps/sidekiq/worker.rb
-- test/support/helpers.rb
-- test/support/mock_timer.rb
+- test/support/apps/http_endpoint/boot.rb
+- test/support/apps/rails/models/block.rb
+- test/support/apps/rails/models/block6.rb
+- test/support/apps/rails/boot.rb
+- test/benchmarks/bench_opentracing.rb
+- test/benchmarks/bench_id_generation.rb
 - test/test_helper.rb
-- test/tracing/custom_test.rb
-- test/tracing/id_management_test.rb
-- test/tracing/opentracing_test.rb
-- test/tracing/processor_test.rb
-- test/tracing/span_context_test.rb
-- test/tracing/span_test.rb
-- test/tracing/tracer_async_test.rb
-- test/tracing/tracer_test.rb
-- test/util_test.rb
+- test/frameworks/cuba_test.rb
+- test/frameworks/roda_test.rb
+- test/frameworks/sinatra_test.rb
+- test/instana_test.rb