instana 1.7.9 → 1.7.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.travis.yml +2 -0
- data/lib/instana/instrumentation/net-http.rb +2 -1
- data/lib/instana/test.rb +4 -4
- data/lib/instana/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5f90e1e4ae7da3c7caaa70ef2821ccad4f19aca4
|
|
4
|
+
data.tar.gz: 957496366e493d41f94b9f1c6f3121f877a9d792
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 04e93d561f250a404be45735f2d17fb9d478a0e69519706cc33179ad346f6983c20cc239b9b0d57997fe229757dbc518df337c3cf0c28ac4e96466bba031b17b
|
|
7
|
+
data.tar.gz: aa407bfd8267fc27a67ae68c3d212de483d84eb86ca559f43376ff205f21d247e4d0627db72a0f4d5774476bc25a4a1f87466440539fdd8990f37353e3a48fc4
|
data/.travis.yml
CHANGED
|
@@ -19,12 +19,14 @@ before_install:
|
|
|
19
19
|
|
|
20
20
|
before_script:
|
|
21
21
|
- psql -c 'create database travis_ci_test;' -U postgres
|
|
22
|
+
- mysql -e 'CREATE DATABASE travis_ci_test;'
|
|
22
23
|
|
|
23
24
|
script: "bundle exec rake test"
|
|
24
25
|
|
|
25
26
|
services:
|
|
26
27
|
- memcached
|
|
27
28
|
- redis
|
|
29
|
+
- mysql
|
|
28
30
|
|
|
29
31
|
gemfile:
|
|
30
32
|
- Gemfile
|
|
@@ -5,6 +5,7 @@ if defined?(::Net::HTTP) && ::Instana.config[:nethttp][:enabled]
|
|
|
5
5
|
|
|
6
6
|
def request_with_instana(*args, &block)
|
|
7
7
|
if !Instana.tracer.tracing? || !started?
|
|
8
|
+
do_skip = true
|
|
8
9
|
return request_without_instana(*args, &block)
|
|
9
10
|
end
|
|
10
11
|
|
|
@@ -54,7 +55,7 @@ if defined?(::Net::HTTP) && ::Instana.config[:nethttp][:enabled]
|
|
|
54
55
|
::Instana.tracer.log_error(e)
|
|
55
56
|
raise
|
|
56
57
|
ensure
|
|
57
|
-
::Instana.tracer.log_exit(:'net-http', kv_payload)
|
|
58
|
+
::Instana.tracer.log_exit(:'net-http', kv_payload) unless do_skip
|
|
58
59
|
end
|
|
59
60
|
|
|
60
61
|
Instana.logger.info "Instrumenting Net::HTTP"
|
data/lib/instana/test.rb
CHANGED
|
@@ -12,13 +12,13 @@ module Instana
|
|
|
12
12
|
ENV['TRAVIS_MYSQL_HOST'] ||= "127.0.0.1"
|
|
13
13
|
ENV['TRAVIS_MYSQL_USER'] ||= "root"
|
|
14
14
|
|
|
15
|
-
if ENV['DB_FLAVOR'] == '
|
|
16
|
-
ENV['DATABASE_URL'] = "
|
|
15
|
+
if ENV['DB_FLAVOR'] == 'postgresql'
|
|
16
|
+
ENV['DATABASE_URL'] = "postgresql://#{ENV['TRAVIS_PSQL_USER']}:#{ENV['TRAVIS_PSQL_PASS']}@#{ENV['TRAVIS_PSQL_HOST']}:5432/travis_ci_test"
|
|
17
17
|
elsif ENV['DB_FLAVOR'] == 'mysql'
|
|
18
18
|
ENV['DATABASE_URL'] = "mysql://#{ENV['TRAVIS_MYSQL_USER']}:#{ENV['TRAVIS_MYSQL_PASS']}@#{ENV['TRAVIS_MYSQL_HOST']}:3306/travis_ci_test"
|
|
19
19
|
else
|
|
20
|
-
ENV['DB_FLAVOR'] ||= '
|
|
21
|
-
ENV['DATABASE_URL'] = "
|
|
20
|
+
ENV['DB_FLAVOR'] ||= 'mysql2'
|
|
21
|
+
ENV['DATABASE_URL'] = "mysql2://#{ENV['TRAVIS_MYSQL_USER']}:#{ENV['TRAVIS_MYSQL_PASS']}@#{ENV['TRAVIS_MYSQL_HOST']}:3306/travis_ci_test"
|
|
22
22
|
end
|
|
23
23
|
|
|
24
24
|
Instana.logger.warn "Database connect string configured to: #{ENV['DATABASE_URL']}"
|
data/lib/instana/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: instana
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.7.
|
|
4
|
+
version: 1.7.10
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Peter Giacomo Lombardo
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-01-
|
|
11
|
+
date: 2018-01-17 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|