ddtrace 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40d91156b9aa968ec8412ffaea02b727deb47660
-  data.tar.gz: f45dd35b50a8f8b9db17a0421d88ae5b50e4fbd5
+  metadata.gz: 583094c453fd00bbe1415cbda7ca72c14e455c71
+  data.tar.gz: 52c5f11dc8eda8f027f4a7b0837a6b112939db31
 SHA512:
-  metadata.gz: f122ec820458d5fd1f0fe4502846a9ce84f725a24d749118e63d67f16aae5a0408c2101eab79c5f30e97850e7530a15fd4af384c4ebcdd170704a501fd24ac09
-  data.tar.gz: a5e0d439791bca6b6c48caeb54db0bc113875e97dc3a2c7c4c9ee3e05041578b204cc0fae21b4e8ea7cc71ca117d9b877417d9f4d732d8fa265b23f26437e9a8
+  metadata.gz: 33d2fb397612dd3e61e36306b55d10c3eb6d8700a36874ae99b09657ab2f701195faf257896b219a7d7f8b3a2baee8612aa1f15f88778b16687f07dfb04296dc
+  data.tar.gz: 7a2adbd4fb324bd2ce46b584bacaf21437defc36f893f5c285e1c94f3cc3f6d0c67317ed42b44a87fe0e762966c54b8e55cf52a133c6fd5cde57964daa6376f3

data/CHANGELOG.md

@@ -4,6 +4,17 @@
 
 ## [Unreleased (beta)]
 
+## [0.18.2] - 2019-01-03
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.18.2
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.18.1...v0.18.2
+
+### Fixed
+
+- Unfinished Mongo spans when SASL configured (#658) (@zachmccormick)
+- Possible performance issue with unexpanded Rails cache keys (#630, #635) (@gingerlime)
+
 ## [0.18.1] - 2018-12-20
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.18.1
@@ -12,7 +23,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.18.0...v0.18.1
 
 ### Fixed
 
-- ActiveRecord `SystemStackError` with some 3rd party libraries. (@EpiFouloux, @tjgrathwell, @guizmaii)
+- ActiveRecord `SystemStackError` with some 3rd party libraries (#661, #662) (@EpiFouloux, @tjgrathwell, @guizmaii)
 
 ## [0.18.0] - 2018-12-18
 
@@ -604,8 +615,9 @@ Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.3.1
 
 Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 
-[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.1...master
-[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.1...0.19-dev
+[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.2...master
+[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.2...0.19-dev
+[0.18.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.1...v0.18.2
 [0.18.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.0...v0.18.1
 [0.18.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.17.3...v0.18.0
 [0.17.3]: https://github.com/DataDog/dd-trace-rb/compare/v0.17.2...v0.17.3

data/lib/ddtrace/contrib/mongodb/subscribers.rb

@@ -17,7 +17,8 @@ module Datadog
           # https://github.com/mongodb/mongo-ruby-driver/blob/master/lib/mongo/monitoring.rb#L70
           # https://github.com/mongodb/mongo-ruby-driver/blob/master/lib/mongo/monitoring/publishable.rb#L38-L56
           span = pin.tracer.trace(Ext::SPAN_COMMAND, service: pin.service, span_type: Ext::SPAN_TYPE_COMMAND)
-          Thread.current[:datadog_mongo_span] = span
+          Thread.current[:datadog_mongo_span] ||= {}
+          Thread.current[:datadog_mongo_span][event.request_id] = span
 
           # build a quantized Query using the Parser module
           query = MongoDB.query_builder(event.command_name, event.database_name, event.command)
@@ -37,7 +38,7 @@ module Datadog
         end
 
         def failed(event)
-          span = Thread.current[:datadog_mongo_span]
+          span = Thread.current[:datadog_mongo_span][event.request_id]
           return unless span
 
           # the failure is not a real exception because it's handled by
@@ -49,11 +50,11 @@ module Datadog
           # whatever happens, the Span must be removed from the local storage and
           # it must be finished to prevent any leak
           span.finish unless span.nil?
-          Thread.current[:datadog_mongo_span] = nil
+          Thread.current[:datadog_mongo_span].delete(event.request_id)
         end
 
         def succeeded(event)
-          span = Thread.current[:datadog_mongo_span]
+          span = Thread.current[:datadog_mongo_span][event.request_id]
           return unless span
 
           # add fields that are available only after executing the query
@@ -65,7 +66,7 @@ module Datadog
           # whatever happens, the Span must be removed from the local storage and
           # it must be finished to prevent any leak
           span.finish unless span.nil?
-          Thread.current[:datadog_mongo_span] = nil
+          Thread.current[:datadog_mongo_span].delete(event.request_id)
         end
       end
     end

data/lib/ddtrace/contrib/rails/active_support.rb

@@ -50,7 +50,8 @@ module Datadog
             # discard parameters from the cache_store configuration
             store, = *Array.wrap(::Rails.configuration.cache_store).flatten
             span.set_tag(Ext::TAG_CACHE_BACKEND, store)
-            cache_key = Datadog::Utils.truncate(payload.fetch(:key), Ext::QUANTIZE_CACHE_MAX_KEY_SIZE)
+            normalized_key = ::ActiveSupport::Cache.expand_cache_key(payload.fetch(:key))
+            cache_key = Datadog::Utils.truncate(normalized_key, Ext::QUANTIZE_CACHE_MAX_KEY_SIZE)
             span.set_tag(Ext::TAG_CACHE_KEY, cache_key)
             span.set_error(payload[:exception]) if payload[:exception]
           ensure

data/lib/ddtrace/version.rb

@@ -2,7 +2,7 @@ module Datadog
   module VERSION
     MAJOR = 0
     MINOR = 18
-    PATCH = 1
+    PATCH = 2
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2019-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack