instana 1.205.0 → 1.206.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c3c7c5fc1b71dc144d09c38b3bc7d581aafda4cb2eb8e2cd6ee4e49da8d57e8
-  data.tar.gz: da8350cc78acff8b7d01856eb1e2e9cf91654fc9fa74622db909fa566ac3de33
+  metadata.gz: bc4bc258b5a217883b3267436a0b70adaef7f270718cd2ab97fc9204c9adab76
+  data.tar.gz: 77e8b1317b0c6739211bee22c63cfdeb2fa4e9a44b21ec43e6ba76c55440e180
 SHA512:
-  metadata.gz: 2c2a0b858a3d838892d58980dd7b95909e7b7606ea23d64862f771adc3b097a2096787d4173ac1c4f12062dc8029de65247a27081f28d8ece7b70dc5fb360c8a
-  data.tar.gz: 89d697026a6d1f34192caa240ff2f058b370595e40feb0e00e428ac343c5fb0af6a81a7c9766f67f4bef1cd9b3c3e9f7c18842fdbbfa66adb65aafa9a3fe810e
+  metadata.gz: ebe6816e014418efb136c4b96c73eb186453e1324da065a5a6943c43677ae91a9816d81e2fc1896c33037b13f7958556164adecbf00f5b993787c956e9e2b2ef
+  data.tar.gz: b69393f258edb339153b60f980b168c585c57b364070a90cb97e119b2ed0931ebbdee913353d5761ce383c9eb6bc7eb054e0a471e7fa8b04dd6470fdcac80db0

data/.circleci/config.yml

@@ -113,6 +113,10 @@ executors:
 commands:
   setup:
     steps:
+      - run:
+          name: Install iproute2
+          command: |
+            sudo apt-get install iproute2
       - run:
           name: Install Java
           command: |
@@ -141,13 +145,20 @@ commands:
       - run:
           name: Run SonarQube to capture coverage
           command: |
-            wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.5.0.2216.zip
+            wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip
             unzip -d /tmp /tmp/sonar-scanner-cli.zip
-            /tmp/sonar-scanner-4.5.0.2216/bin/sonar-scanner \
-            -Dsonar.projectKey=ruby-sensor \
-            -Dsonar.sources=. \
-            -Dsonar.host.url="${SONARQUBE_URL}" \
-            -Dsonar.login="${SONARQUBE_LOGIN}"          
+            if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
+              /tmp/sonar-scanner-4.6.2.2472/bin/sonar-scanner \
+                -Dsonar.host.url="${SONARQUBE_URL}" \
+                -Dsonar.login="${SONARQUBE_LOGIN}" \
+                -Dsonar.pullrequest.key="${CIRCLE_PR_NUMBER}" \
+                -Dsonar.pullrequest.branch="${CIRCLE_BRANCH}"
+            else
+              /tmp/sonar-scanner-4.6.2.2472/bin/sonar-scanner \
+                -Dsonar.host.url="${SONARQUBE_URL}" \
+                -Dsonar.login="${SONARQUBE_LOGIN}" \
+                -Dsonar.branch.name="${CIRCLE_BRANCH}"
+            fi
   run_tests:
     steps:
       - run:
@@ -156,7 +167,7 @@ commands:
             mkdir _junit
             bundle exec rake
       - store_test_results:
-          path: ~/_junit
+          path: ~/project/_junit
   run_rubocop:
     steps:
       - run:
@@ -171,11 +182,11 @@ commands:
             mkdir -p ~/.gem
             echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
             chmod 0600 /home/circleci/.gem/credentials
-      - run: 
+      - run:
           name: Publish Gem
           command: |
             bundle exec rake release[origin]
-            
+
 jobs:
   test_core:
     parameters:

data/lib/instana/backend/host_agent_reporting_observer.rb

@@ -111,7 +111,7 @@ module Instana
           exec_args: process.arguments,
           gc: GCSnapshot.instance.report,
           thread: {count: ::Thread.list.count},
-          memory: {rss_size: proc_table.rss / 1024} # Bytes to Kilobytes
+          memory: {rss_size: process.memory_used}
         }
       end
     end

data/lib/instana/backend/process_info.rb

@@ -47,6 +47,14 @@ module Instana
         File.read(path).match(/\d+/).to_s.to_i
       end
 
+      def memory_used
+        if RbConfig::CONFIG['host_os'].include?('darwin')
+          rss / 1024
+        else
+          rss * 4096
+        end
+      end
+
       private
 
       def clean_arguments(arguments)

data/lib/instana/version.rb

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

data/sonar-project.properties

@@ -0,0 +1,9 @@
+sonar.projectKey=ruby-sensor
+sonar.sources=lib
+sonar.tests=test
+sonar.exclusions=_junit/*
+sonar.ruby.coverage.reportPaths=coverage/coverage.json
+sonar.links.homepage=https://github.com/instana/ruby-sensor/
+sonar.links.ci=https://circleci.com/gh/instana/ruby-sensor
+sonar.links.issue=https://github.com/instana/ruby-sensor/issues
+sonar.links.scm=https://github.com/instana/ruby-sensor/

data/test/backend/process_info_test.rb

@@ -60,4 +60,24 @@ class ProcessInfoTest < Minitest::Test
       assert_equal subject.sched_pid, subject.parent_pid
     end
   end
+
+  def test_osx_memory_used
+    host_os = RbConfig::CONFIG['host_os']
+    RbConfig::CONFIG['host_os'] = 'darwin'
+
+    subject = Instana::Backend::ProcessInfo.new(OpenStruct.new(rss: 1024))
+    assert_equal 1, subject.memory_used
+  ensure
+    RbConfig::CONFIG['host_os'] = host_os
+  end
+
+  def test_linux_memory_used
+    host_os = RbConfig::CONFIG['host_os']
+    RbConfig::CONFIG['host_os'] = 'linux'
+
+    subject = Instana::Backend::ProcessInfo.new(OpenStruct.new(rss: 1))
+    assert_equal 4096, subject.memory_used
+  ensure
+    RbConfig::CONFIG['host_os'] = host_os
+  end
 end

data/test/support/apps/resque/jobs/resque_error_job.rb

@@ -10,8 +10,6 @@ class ErrorJob
   def self.perform
     if ENV.key?('REDIS_URL')
       redis = Redis.new(:url => ENV['REDIS_URL'])
-    elsif ENV.key?('REDIS_URL')
-      redis = Redis.new(:url => ENV['REDIS_URL'])
     else
       redis = Redis.new(:url => 'localhost:6379')
     end
@@ -20,6 +18,5 @@ class ErrorJob
     redis.set('ts', dt)
 
     raise Exception.new("Silly Rabbit, Trix are for kids.")
-    redis.set(:nb_id, 2)
   end
 end

data/test/support/apps/resque/jobs/resque_fast_job.rb

@@ -12,8 +12,6 @@ class FastJob
 
     if ENV.key?('REDIS_URL')
       redis = Redis.new(:url => ENV['REDIS_URL'])
-    elsif ENV.key?('REDIS_URL')
-      redis = Redis.new(:url => ENV['REDIS_URL'])
     else
       redis = Redis.new(:url => 'redis://localhost:6379')
     end

data/test/tracing/custom_test.rb

@@ -111,7 +111,6 @@ class CustomTracingTest < Minitest::Test
 
       ::Instana.tracer.log_entry(:custom_span, kvs)
       raise "custom tracing error.  This is only a test"
-      ::Instana.tracer.log_info({:on_info_kv => 1})
     rescue => e
       ::Instana.tracer.log_error(e)
     ensure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.205.0
+  version: 1.206.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -275,6 +275,7 @@ files:
 - lib/instana/version.rb
 - lib/opentracing.rb
 - log/.keep
+- sonar-project.properties
 - test/activator_test.rb
 - test/backend/agent_test.rb
 - test/backend/gc_snapshot_test.rb