instana 1.210.0 → 1.210.1
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/.circleci/config.yml +2 -0
- data/gemfiles/dalli_30.gemfile +15 -0
- data/gemfiles/dalli_32.gemfile +15 -0
- data/lib/instana/activators/dalli.rb +10 -4
- data/lib/instana/instrumentation/dalli.rb +2 -2
- data/lib/instana/version.rb +1 -1
- metadata +4 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7ebbf57e241468a0c39a150d3032f6d544c10263e54638a62e78b6b78bfcf176
|
|
4
|
+
data.tar.gz: a4a009b702fbb44d3769558edecc91305262bc0a08172ee0e6e6751cb6ded284
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: '07957983e122595a1e8c0e54babe3c832dda10bab8e4ca138a02868854e8dca861767f82196f01ed184883ac82c9c322c1dcb288b56869a818a64f3af9e8b33b'
|
|
7
|
+
data.tar.gz: 17479e49ec7dcd01153c11c85186b6ef17056c3bd5a5fc81c86ce1e09569737994dedce8286d7815651fe060e3ae1003efc39af85a1eb60facc252a794cfa82a
|
data/.circleci/config.yml
CHANGED
|
@@ -305,6 +305,8 @@ workflows:
|
|
|
305
305
|
- "./gemfiles/cuba_30.gemfile"
|
|
306
306
|
- "./gemfiles/cuba_40.gemfile"
|
|
307
307
|
- "./gemfiles/dalli_20.gemfile"
|
|
308
|
+
- "./gemfiles/dalli_30.gemfile"
|
|
309
|
+
- "./gemfiles/dalli_32.gemfile"
|
|
308
310
|
- "./gemfiles/excon_02.gemfile"
|
|
309
311
|
- "./gemfiles/excon_079.gemfile"
|
|
310
312
|
- "./gemfiles/excon_100.gemfile"
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
# (c) Copyright IBM Corp. 2023
|
|
2
|
+
|
|
3
|
+
source "https://rubygems.org"
|
|
4
|
+
|
|
5
|
+
gem "rake"
|
|
6
|
+
gem "minitest", "5.9.1"
|
|
7
|
+
gem "minitest-reporters"
|
|
8
|
+
gem "webmock"
|
|
9
|
+
gem "puma"
|
|
10
|
+
gem "rubocop", "~> 1.9"
|
|
11
|
+
gem "rack-test"
|
|
12
|
+
gem "simplecov", "~> 0.21.2"
|
|
13
|
+
gem "dalli", "< 3.1.3"
|
|
14
|
+
|
|
15
|
+
gemspec path: "../"
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
# (c) Copyright IBM Corp. 2023
|
|
2
|
+
|
|
3
|
+
source "https://rubygems.org"
|
|
4
|
+
|
|
5
|
+
gem "rake"
|
|
6
|
+
gem "minitest", "5.9.1"
|
|
7
|
+
gem "minitest-reporters"
|
|
8
|
+
gem "webmock"
|
|
9
|
+
gem "puma"
|
|
10
|
+
gem "rubocop", "~> 1.9"
|
|
11
|
+
gem "rack-test"
|
|
12
|
+
gem "simplecov", "~> 0.21.2"
|
|
13
|
+
gem "dalli", ">= 3.2.5"
|
|
14
|
+
|
|
15
|
+
gemspec path: "../"
|
|
@@ -5,16 +5,22 @@ module Instana
|
|
|
5
5
|
module Activators
|
|
6
6
|
class Dalli < Activator
|
|
7
7
|
def can_instrument?
|
|
8
|
-
defined?(::Dalli::
|
|
9
|
-
defined?(::Dalli::
|
|
8
|
+
defined?(::Dalli::Protocol::Base || defined?(::Dalli::Server)) &&
|
|
9
|
+
defined?(::Dalli::Client) &&
|
|
10
10
|
Instana.config[:dalli][:enabled]
|
|
11
11
|
end
|
|
12
12
|
|
|
13
13
|
def instrument
|
|
14
14
|
require 'instana/instrumentation/dalli'
|
|
15
|
-
|
|
15
|
+
dalli_version = Gem::Specification.find_by_name('dalli').version
|
|
16
16
|
::Dalli::Client.prepend ::Instana::Instrumentation::Dalli
|
|
17
|
-
::
|
|
17
|
+
if dalli_version < Gem::Version.new('3.0')
|
|
18
|
+
::Dalli::Server.prepend ::Instana::Instrumentation::DalliRequestHandler
|
|
19
|
+
elsif dalli_version >= Gem::Version.new('3.0') && dalli_version < Gem::Version.new('3.1.3')
|
|
20
|
+
::Dalli::Protocol::Binary.prepend ::Instana::Instrumentation::DalliRequestHandler
|
|
21
|
+
else
|
|
22
|
+
::Dalli::Protocol::Base.prepend ::Instana::Instrumentation::DalliRequestHandler
|
|
23
|
+
end
|
|
18
24
|
|
|
19
25
|
true
|
|
20
26
|
end
|
|
@@ -56,7 +56,7 @@ module Instana
|
|
|
56
56
|
end
|
|
57
57
|
end
|
|
58
58
|
|
|
59
|
-
module
|
|
59
|
+
module DalliRequestHandler
|
|
60
60
|
def self.included(klass)
|
|
61
61
|
::Instana::Util.method_alias(klass, :request)
|
|
62
62
|
end
|
|
@@ -64,7 +64,7 @@ module Instana
|
|
|
64
64
|
def request(op, *args)
|
|
65
65
|
if ::Instana.tracer.tracing? || ::Instana.tracer.tracing_span?(:memcache)
|
|
66
66
|
info_payload = { :memcache => {} }
|
|
67
|
-
info_payload[:memcache][:server] = "#{
|
|
67
|
+
info_payload[:memcache][:server] = "#{hostname}:#{port}"
|
|
68
68
|
::Instana.tracer.log_info(info_payload)
|
|
69
69
|
end
|
|
70
70
|
super(op, *args)
|
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.210.
|
|
4
|
+
version: 1.210.1
|
|
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: 2023-06-
|
|
11
|
+
date: 2023-06-23 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -159,6 +159,8 @@ files:
|
|
|
159
159
|
- gemfiles/cuba_30.gemfile
|
|
160
160
|
- gemfiles/cuba_40.gemfile
|
|
161
161
|
- gemfiles/dalli_20.gemfile
|
|
162
|
+
- gemfiles/dalli_30.gemfile
|
|
163
|
+
- gemfiles/dalli_32.gemfile
|
|
162
164
|
- gemfiles/excon_02.gemfile
|
|
163
165
|
- gemfiles/excon_021.gemfile
|
|
164
166
|
- gemfiles/excon_079.gemfile
|