instana 1.209.0.pre1 → 1.209.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5349214699526028c1dcda4a7ff88ee28e65632346bd76334907eb866a5eb28
-  data.tar.gz: f8ac6535197f7b4c0a89cc2884e1969b870edc296eeef64d4f0374d6c16b5e75
+  metadata.gz: ca275f47709b4255569b5186403965bed6293102b9c34dc30755f7d3cc7a33c9
+  data.tar.gz: 56eb79fa0c68185f8a7f43ae9755ac9b1a61c1f25c7650ff2ddbe918db316557
 SHA512:
-  metadata.gz: 5a834f90983c2940cb92c89416f413b328c33c3725c5f246b9a517b549c72e25e7b3369120a953750322e9d046246be61deff61ae5475f15351d82395a60853d
-  data.tar.gz: a88302d0c05921f95f1f221ca6a23e437d0a4055a194a362eee77f21c2d68ba6d2b750695740f20c2508283786b6ba0fc6d686165fcce7c7eb1060b47fbca34f
+  metadata.gz: 4a6f08be4599024dd084e53cabf66f11199934a0fb45b7fdd7c6f1e0ba5c9557cd65317b3a16d20a32af5e4cb0824bc8f587aeaea8602b5bb3f18231996524e9
+  data.tar.gz: 1f58b30352fa3e2587f7ea3d1da40bb6a52c162a0756fff2618dd6dabe7574f87def126d9c3cf413fcd65096c9fc9c5fb76174840cb7c10db95b2aa19e83c051

data/.circleci/config.yml

@@ -1,21 +1,6 @@
 version: 2.1
 
 executors:
-  ruby_25:
-    docker:
-      - image: circleci/ruby:2.5-node
-        environment:
-          MEMCACHED_HOST: '127.0.0.1:11211'
-          REDIS_URL: 'redis://127.0.0.1:6379'
-          DATABASE_URL: 'sqlite3::memory:'
-      - image: memcached
-      - image: redis
-      - image: circleci/dynamodb
-      - image: minio/minio:latest
-        command: ["server", "/data"]
-      - image: s12v/sns
-      - image: softwaremill/elasticmq-native
-      - image: circleci/mongo:5-focal-ram
   ruby_26:
     docker:
       - image: circleci/ruby:2.6-node
@@ -46,19 +31,6 @@ executors:
       - image: s12v/sns
       - image: softwaremill/elasticmq-native
       - image: circleci/mongo:5-focal-ram
-  ruby_25_mysql2:
-    docker:
-      - image: circleci/ruby:2.5-node
-        environment:
-          DATABASE_URL: "mysql2://root@127.0.0.1:3306/ci_test"
-      - image: mariadb
-        environment:
-          MYSQL_DATABASE: 'ci_test'
-          MYSQL_USER: 'root'
-          MYSQL_PASSWORD: ''
-          MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-          MYSQL_ROOT_PASSWORD: ''
-          MYSQL_ROOT_HOST: '%'
   ruby_26_mysql2:
     docker:
       - image: circleci/ruby:2.6-node
@@ -85,15 +57,6 @@ executors:
           MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
           MYSQL_ROOT_PASSWORD: ''
           MYSQL_ROOT_HOST: '%'
-  ruby_25_postgres:
-    docker:
-      - image: circleci/ruby:2.6-node
-        environment:
-          DATABASE_URL: "postgres://postgres:test@127.0.0.1:5432/ci_test"
-      - image: postgres
-        environment:
-          POSTGRES_PASSWORD: 'test'
-          POSTGRES_DB: 'ci_test'
   ruby_26_postgres:
     docker:
       - image: circleci/ruby:2.6-node
@@ -251,7 +214,6 @@ workflows:
               stack:
                 - ruby_27
                 - ruby_26
-                - ruby_25
   libraries:
     jobs:
       - test_apprisal:
@@ -260,7 +222,6 @@ workflows:
               stack:
                 - ruby_27
                 - ruby_26
-                - ruby_25
               gemfile:
                 - "./gemfiles/aws_30.gemfile"
                 - "./gemfiles/cuba_30.gemfile"
@@ -292,13 +253,10 @@ workflows:
               stack:
                 - ruby_27
                 - ruby_26
-                - ruby_25
                 - ruby_27_postgres
                 - ruby_26_postgres
-                - ruby_25_postgres
                 - ruby_27_mysql2
                 - ruby_26_mysql2
-                - ruby_25_mysql2
               gemfile:
                 - "./gemfiles/rails_60.gemfile"
                 - "./gemfiles/rails_52.gemfile"

data/lib/instana/activators/sinatra.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class Sinatra < Activator
       def can_instrument?
-        defined?(::Instana::Rack) && defined?(::Sinatra)
+        defined?(::Instana::Rack) && defined?(::Sinatra) && defined?(::Sinatra::Base)
       end
 
       def instrument

data/lib/instana/backend/host_agent_activation_observer.rb

@@ -34,6 +34,8 @@ module Instana
           raise DiscoveryError, "Discovery response was #{discovery_response.code} with `#{payload}`." unless discovery_response.ok?
 
           discovery = discovery_response.json
+          raise DiscoveryError, "Expected discovery to be a Hash, not a `#{discovery.class}`." unless discovery.is_a?(Hash)
+
           @logger.debug("Discovery complete (`#{discovery}`). Waiting for agent.")
           wait_for_backend(discovery['pid'])
           @logger.debug("Agent ready.")

data/lib/instana/base.rb

@@ -38,5 +38,3 @@ module Instana
     end
   end
 end
-
-::Instana.logger.info "Stan is on the scene.  Starting Instana instrumentation version #{::Instana::VERSION}"

data/lib/instana/tracing/span.rb

@@ -82,6 +82,9 @@ module Instana
     # @param limit [Integer] Limit the backtrace to the top <limit> frames
     #
     def add_stack(limit: 30, stack: Kernel.caller)
+      cleaner = ::Instana.config[:backtrace_cleaner]
+      stack = cleaner.call(stack) if cleaner
+
       @data[:stack] = stack
                       .map do |call|
         file, line, *method = call.split(':')

data/lib/instana/version.rb

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

data/lib/instana.rb

@@ -16,5 +16,7 @@ require 'instana/setup'
 unless ENV.fetch('INSTANA_DISABLE', false)
   ::Instana::Activator.start
   ::Instana.agent.spawn_background_thread
+
+  ::Instana.logger.info "Stan is on the scene.  Starting Instana instrumentation version #{::Instana::VERSION}"
 end
 # :nocov:

data/test/backend/host_agent_activation_observer_test.rb

@@ -12,6 +12,7 @@ class HostAgentActivationObserverTest < Minitest::Test
     stub_request(:put, "http://10.10.10.10:9292/com.instana.plugin.ruby.discovery")
       .and_timeout
       .and_return(status: 500, body: '{"ok": false}')
+      .and_return(status: 200, body: '[{"pid": 1234}]')
       .and_return(status: 200, body: '{"pid": 1234}')
 
     stub_request(:head, "http://10.10.10.10:9292/com.instana.plugin.ruby.1234")

data/test/tracing/span_test.rb

@@ -63,6 +63,18 @@ class SpanTest < Minitest::Test
     Instana.config[:collect_backtraces] = false
   end
 
+  def test_span_backtrace_cleaner
+    Instana.config[:collect_backtraces] = true
+    Instana.config[:backtrace_cleaner] =
+      ->(trace) { trace.filter { |line| line.include?("lib/instana") } }
+    span = Instana::Span.new(:excon)
+
+    assert_equal 1, span[:stack].size
+  ensure
+    Instana.config[:backtrace_cleaner] = nil
+    Instana.config[:collect_backtraces] = false
+  end
+
   def test_span_stack_over_limit
     def inner(depth = 50, &blk) # rubocop:disable Lint/NestedMethodDefinition
       return blk.call if depth.zero?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.209.0.pre1
+  version: 1.209.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -375,9 +375,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: