Merge pull request #269 from instana/hm-open-issues-mar-28

Fix reported issues

Author: hmadison

.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://[email protected]: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:[email protected]: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"

lib/instana.rb

@@ -16,5 +16,7 @@
 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:

lib/instana/backend/host_agent_activation_observer.rb

@@ -34,6 +34,8 @@ def update(_time, _old_version, new_version)
           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.")

lib/instana/base.rb

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

test/backend/host_agent_activation_observer_test.rb

@@ -12,6 +12,7 @@ def test_standard_discovery
     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")