instana 1.208.0 → 1.209.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cec589ba39a110c9378497376585d47d2f968bd27c31cd1ccae259912a0d2b0
-  data.tar.gz: f9df2c3f6e1543e6e4bb3efaa44026e295f7ca03ef59add49c291a3218b04e4d
+  metadata.gz: 9b04d24f1fc18b31e2395cef51c4cd2753f440d098541e67065ce752496eb4b6
+  data.tar.gz: 38547b89fbaf64866ec0edd2cd7c0f048180b6fac4b595bb214eb26cba1850d6
 SHA512:
-  metadata.gz: b9907bdca2a8c40e46667e4b557765d83ce2c8846bb3b2e508fd59374890e54f8dc172bbff496d9f90f031a787db240d2cad3b84e4722efb4c33d9f1013f1c37
-  data.tar.gz: 889963622d3fc6d24b6e4a3ca402d401b66c4608e9ff4a48e61998d99d4e59fb7a933f97963013a97d8bb1012c6405ab7a8ee32bfc80fcdad0301b3cb5c2cc5a
+  metadata.gz: 4ff975c80068e7c3d174906f3bee7671528036124708cbc5b9128746396be36a279e49ed49d46a1ff31f2d7ffc77a8533b036eb12a992f0721549b8ac8a998f3
+  data.tar.gz: 60384c06197a3c4305e4a377e35fec1bc805b56fe5476c0eccdee59b18f8b0937edd87baa0f75020737def79999dfaa3bad87b77f826c7afc5369db54c2787d7

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/version.rb

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

data/lib/instana.rb

@@ -12,5 +12,11 @@ require 'instana/setup'
 # the thread of your choice.
 #
 
-::Instana::Activator.start
-::Instana.agent.spawn_background_thread
+# :nocov:
+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")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.208.0
+  version: 1.209.0.pre3
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2022-04-04 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: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: