instana 1.7.9 → 1.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af911c681182db8726372c73e8fd2560374b8508
-  data.tar.gz: 230dcaa3a019e7c571a1b10726fc33550092de54
+  metadata.gz: 5f90e1e4ae7da3c7caaa70ef2821ccad4f19aca4
+  data.tar.gz: 957496366e493d41f94b9f1c6f3121f877a9d792
 SHA512:
-  metadata.gz: 0b80e44dcdeaaed59c3b3f1ee2f4b8b7984b22a5b81ae17a1470de2d6c8a34a8b106ef9e07b2b46cc3a086ce292f10ffe40cc24e60a7530f2d16ea5dcae54dda
-  data.tar.gz: f62f4130454c5affedfcf5c322ed2cb83a2ca0ebf48fbd1c846529c2e9bacbe9fd1098a8feedcd5f9c1e0be45530ba91310defdbeacca909d3ec599be6a84875
+  metadata.gz: 04e93d561f250a404be45735f2d17fb9d478a0e69519706cc33179ad346f6983c20cc239b9b0d57997fe229757dbc518df337c3cf0c28ac4e96466bba031b17b
+  data.tar.gz: aa407bfd8267fc27a67ae68c3d212de483d84eb86ca559f43376ff205f21d247e4d0627db72a0f4d5774476bc25a4a1f87466440539fdd8990f37353e3a48fc4

data/.travis.yml

@@ -19,12 +19,14 @@ before_install:
 
 before_script:
   - psql -c 'create database travis_ci_test;' -U postgres
+  - mysql -e 'CREATE DATABASE travis_ci_test;'
 
 script: "bundle exec rake test"
 
 services:
   - memcached
   - redis
+  - mysql
 
 gemfile:
   - Gemfile

data/lib/instana/instrumentation/net-http.rb

@@ -5,6 +5,7 @@ if defined?(::Net::HTTP) && ::Instana.config[:nethttp][:enabled]
 
     def request_with_instana(*args, &block)
       if !Instana.tracer.tracing? || !started?
+        do_skip = true
         return request_without_instana(*args, &block)
       end
 
@@ -54,7 +55,7 @@ if defined?(::Net::HTTP) && ::Instana.config[:nethttp][:enabled]
       ::Instana.tracer.log_error(e)
       raise
     ensure
-      ::Instana.tracer.log_exit(:'net-http', kv_payload)
+      ::Instana.tracer.log_exit(:'net-http', kv_payload) unless do_skip
     end
 
     Instana.logger.info "Instrumenting Net::HTTP"

data/lib/instana/test.rb

@@ -12,13 +12,13 @@ module Instana
         ENV['TRAVIS_MYSQL_HOST']  ||= "127.0.0.1"
         ENV['TRAVIS_MYSQL_USER']  ||= "root"
 
-        if ENV['DB_FLAVOR'] == 'mysql2'
-          ENV['DATABASE_URL'] = "mysql2://#{ENV['TRAVIS_MYSQL_USER']}:#{ENV['TRAVIS_MYSQL_PASS']}@#{ENV['TRAVIS_MYSQL_HOST']}:3306/travis_ci_test"
+        if ENV['DB_FLAVOR'] == 'postgresql'
+          ENV['DATABASE_URL'] = "postgresql://#{ENV['TRAVIS_PSQL_USER']}:#{ENV['TRAVIS_PSQL_PASS']}@#{ENV['TRAVIS_PSQL_HOST']}:5432/travis_ci_test"
         elsif ENV['DB_FLAVOR'] == 'mysql'
           ENV['DATABASE_URL'] = "mysql://#{ENV['TRAVIS_MYSQL_USER']}:#{ENV['TRAVIS_MYSQL_PASS']}@#{ENV['TRAVIS_MYSQL_HOST']}:3306/travis_ci_test"
         else
-          ENV['DB_FLAVOR'] ||= 'postgresql'
-          ENV['DATABASE_URL'] = "postgresql://#{ENV['TRAVIS_PSQL_USER']}:#{ENV['TRAVIS_PSQL_PASS']}@#{ENV['TRAVIS_PSQL_HOST']}:5432/travis_ci_test"
+          ENV['DB_FLAVOR'] ||= 'mysql2'
+          ENV['DATABASE_URL'] = "mysql2://#{ENV['TRAVIS_MYSQL_USER']}:#{ENV['TRAVIS_MYSQL_PASS']}@#{ENV['TRAVIS_MYSQL_HOST']}:3306/travis_ci_test"
         end
 
         Instana.logger.warn "Database connect string configured to: #{ENV['DATABASE_URL']}"

data/lib/instana/version.rb

@@ -1,4 +1,4 @@
 module Instana
-  VERSION = "1.7.9"
+  VERSION = "1.7.10"
   VERSION_FULL = "instana-#{VERSION}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.7.9
+  version: 1.7.10
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler