ddtrace 0.21.1 → 0.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a09aedaed6a1aa22354f3c9c3696c6a3b9885f43
-  data.tar.gz: 35fdddc2a09fb5f57a9e21a67ccab6d26297583e
+  metadata.gz: 61acb994baa0c01a709084beac147a5c6052e92d
+  data.tar.gz: bd4846e16ff33ddd1e6b8a88b080ed79c0958190
 SHA512:
-  metadata.gz: 5851f49e14aa8e4b0be89723b84ee97f912583aac7ec5f66b7a7ef5c3f2962c43ca0a239e6ad44aa781df47339575eacd0d8f11d67d97e84bc0e639103fb3872
-  data.tar.gz: beb715b01e94b8e62ecac54dd46ba433beaeb19e905abe6d0b143550fe997a68c60eb88e9a40eae2f7a3269baf892fc980d668fbe5c4acfbf30c71ee09b52f9b
+  metadata.gz: a55674e8f2d82acd24ee34458af85d3555948854439cb84ab85d3f4c496235e28d14809aa10925fecc9af91e484d7b996f6d6de684351c22d4ef4f1be2e3ed5d
+  data.tar.gz: 90a143ebed788d5c90902866d126a40d2f5ba8f640eb98b66a2efa79e1eee1571c974d62aefd38192024c7836324de972a89b0bf90136125ef0e8c0ab6f6e358

data/Appraisals

@@ -401,10 +401,10 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'elasticsearch-transport'
       gem 'excon'
       gem 'grape'
-      gem 'graphql'
+      gem 'graphql', '< 1.9.4'
       gem 'grpc'
       gem 'hiredis'
-      gem 'mongo', '< 2.5'
+      gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
       gem 'racecar', '>= 0.3.5'
       gem 'rack'
@@ -543,7 +543,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'graphql'
       gem 'grpc'
       gem 'hiredis'
-      gem 'mongo', '< 2.5'
+      gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
       gem 'racecar', '>= 0.3.5'
       gem 'rack'
@@ -576,7 +576,7 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'graphql'
       gem 'grpc'
       gem 'hiredis'
-      gem 'mongo', '< 2.5'
+      gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
       gem 'racecar', '>= 0.3.5'
       gem 'rack'

data/CHANGELOG.md

@@ -4,6 +4,16 @@
 
 ## [Unreleased (beta)]
 
+## [0.21.2] - 2019-04-10
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.21.2
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.21.1...v0.21.2
+
+### Changed
+
+- Support Mongo gem 2.5+ (#729, #731) (@ricbartm)
+
 ## [0.21.1] - 2019-03-26
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.21.1
@@ -741,9 +751,10 @@ 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.21.1...master
-[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.21.1...0.22-dev
-[0.21.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.21.0...v0.21.1
+[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.21.2...master
+[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.21.2...0.22-dev
+[0.21.2]: https://github.com/DataDog/dd-trace-rb/compare/v0.21.1...v0.21.2
+[0.21.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.21.0...v0.21.1
 [0.21.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.20.0...v0.21.0
 [0.20.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.19.1...v0.20.0
 [0.19.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.19.0...v0.19.1

data/docker-compose.yml

@@ -1,9 +1,7 @@
 version: '3.2'
 services:
   tracer-1.9:
-    build:
-      context: ./.circleci/images/primary
-      dockerfile: Dockerfile-1.9.3
+    image: datadog/docker-library:ddtrace_rb_1_9_3
     command: /bin/bash
     depends_on:
       - ddagent
@@ -31,9 +29,7 @@ services:
       - bundle-1.9:/usr/local/bundle
       - gemfiles-1.9:/app/gemfiles
   tracer-2.0:
-    build:
-      context: ./.circleci/images/primary
-      dockerfile: Dockerfile-2.0.0
+    image: datadog/docker-library:ddtrace_rb_2_0_0
     command: /bin/bash
     depends_on:
       - ddagent
@@ -61,9 +57,7 @@ services:
       - bundle-2.0:/usr/local/bundle
       - gemfiles-2.0:/app/gemfiles
   tracer-2.1:
-    build:
-      context: ./.circleci/images/primary
-      dockerfile: Dockerfile-2.1.10
+    image: datadog/docker-library:ddtrace_rb_2_1_10
     command: /bin/bash
     depends_on:
       - ddagent
@@ -91,9 +85,7 @@ services:
       - bundle-2.1:/usr/local/bundle
       - gemfiles-2.1:/app/gemfiles
   tracer-2.2:
-    build:
-      context: ./.circleci/images/primary
-      dockerfile: Dockerfile-2.2.10
+    image: datadog/docker-library:ddtrace_rb_2_2_10
     command: /bin/bash
     depends_on:
       - ddagent
@@ -121,9 +113,7 @@ services:
       - bundle-2.2:/usr/local/bundle
       - gemfiles-2.2:/app/gemfiles
   tracer-2.3:
-    build:
-      context: ./.circleci/images/primary
-      dockerfile: Dockerfile-2.3.7
+    image: datadog/docker-library:ddtrace_rb_2_3_7
     command: /bin/bash
     depends_on:
       - ddagent
@@ -151,9 +141,7 @@ services:
       - bundle-2.3:/usr/local/bundle
       - gemfiles-2.3:/app/gemfiles
   tracer-2.4:
-    build:
-      context: ./.circleci/images/primary
-      dockerfile: Dockerfile-2.4.4
+    image: datadog/docker-library:ddtrace_rb_2_4_4
     command: /bin/bash
     depends_on:
       - ddagent

data/docs/GettingStarted.md

@@ -321,7 +321,7 @@ For a list of available integrations, and their configuration options, please re
 | Grape                    | `grape`                    | `>= 1.0`                 | *[Link](#grape)*                    | *[Link](https://github.com/ruby-grape/grape)*                                  |
 | GraphQL                  | `graphql`                  | `>= 1.7.9`               | *[Link](#graphql)*                  | *[Link](https://github.com/rmosolgo/graphql-ruby)*                             |
 | gRPC                     | `grpc`                     | `>= 1.10`                | *[Link](#grpc)*                     | *[Link](https://github.com/grpc/grpc/tree/master/src/rubyc)*                   |
-| MongoDB                  | `mongo`                    | `>= 2.0, < 2.5`          | *[Link](#mongodb)*                  | *[Link](https://github.com/mongodb/mongo-ruby-driver)*                         |
+| MongoDB                  | `mongo`                    | `>= 2.0`                 | *[Link](#mongodb)*                  | *[Link](https://github.com/mongodb/mongo-ruby-driver)*                         |
 | MySQL2                   | `mysql2`                   | `>= 0.3.21`              | *[Link](#mysql2)*                   | *[Link](https://github.com/brianmario/mysql2)*                                 |
 | Net/HTTP                 | `http`                     | *(Any supported Ruby)*   | *[Link](#nethttp)*                  | *[Link](https://ruby-doc.org/stdlib-2.4.0/libdoc/net/http/rdoc/Net/HTTP.html)* |
 | Racecar                  | `racecar`                  | `>= 0.3.5`               | *[Link](#racecar)*                  | *[Link](https://github.com/zendesk/racecar)*                                   |

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

@@ -8,67 +8,58 @@ require 'ddtrace/contrib/mongodb/subscribers'
 module Datadog
   module Contrib
     module MongoDB
-      # Instrumentation for Mongo::Client
+      # Instrumentation for Mongo integration
       module Instrumentation
-        def self.included(base)
-          if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
-            base.class_eval do
-              # Instance methods
-              include InstanceMethodsCompatibility
-              include InstanceMethods
-            end
-          else
-            base.send(:prepend, InstanceMethods)
+        # Instrumentation for Mongo::Client
+        module Client
+          def self.included(base)
+            base.send(:include, InstanceMethods)
           end
-        end
 
-        # Compatibility shim for Rubies not supporting `.prepend`
-        module InstanceMethodsCompatibility
-          def self.included(base)
-            base.class_eval do
-              alias_method :initialize_without_datadog, :initialize
-              remove_method :initialize
+          # Instance methods for Mongo::Client
+          module InstanceMethods
+            def datadog_pin
+              # safe-navigation to avoid crashes during each query
+              return unless respond_to? :cluster
+              return unless cluster.respond_to? :addresses
+              return unless cluster.addresses.respond_to? :first
+              Datadog::Pin.get_from(cluster.addresses.first)
             end
-          end
 
-          def initialize(*args, &block)
-            initialize_without_datadog(*args, &block)
+            def datadog_pin=(pin)
+              # safe-navigation to avoid crashes during each query
+              return unless respond_to? :cluster
+              return unless cluster.respond_to? :addresses
+              return unless cluster.addresses.respond_to? :each
+              # attach the PIN to all cluster addresses. One of them is used
+              # when executing a Command and it is attached to the Monitoring
+              # Event instance.
+              cluster.addresses.each { |x| pin.onto(x) }
+            end
           end
         end
 
-        # InstanceMethods - implementing instrumentation
-        module InstanceMethods
-          def initialize(*args, &blk)
-            # attach the Pin instance
-            super(*args, &blk)
-            tracer = Datadog.configuration[:mongo][:tracer]
-            service = Datadog.configuration[:mongo][:service_name]
-            pin = Datadog::Pin.new(
-              service,
-              app: Datadog::Contrib::MongoDB::Ext::APP,
-              app_type: Datadog::Ext::AppTypes::DB,
-              tracer: tracer
-            )
-            pin.onto(self)
+        # Instrumentation for Mongo::Address
+        module Address
+          def self.included(base)
+            base.send(:include, InstanceMethods)
           end
 
-          def datadog_pin
-            # safe-navigation to avoid crashes during each query
-            return unless respond_to? :cluster
-            return unless cluster.respond_to? :addresses
-            return unless cluster.addresses.respond_to? :first
-            Datadog::Pin.get_from(cluster.addresses.first)
-          end
+          # Instance methods for Mongo::Address
+          module InstanceMethods
+            def datadog_pin
+              @datadog_pin ||= begin
+                tracer = Datadog.configuration[:mongo][:tracer]
+                service = Datadog.configuration[:mongo][:service_name]
 
-          def datadog_pin=(pin)
-            # safe-navigation to avoid crashes during each query
-            return unless respond_to? :cluster
-            return unless cluster.respond_to? :addresses
-            return unless cluster.addresses.respond_to? :each
-            # attach the PIN to all cluster addresses. One of them is used
-            # when executing a Command and it is attached to the Monitoring
-            # Event instance.
-            cluster.addresses.each { |x| pin.onto(x) }
+                Datadog::Pin.new(
+                  service,
+                  app: Datadog::Contrib::MongoDB::Ext::APP,
+                  app_type: Datadog::Ext::AppTypes::DB,
+                  tracer: tracer
+                )
+              end
+            end
           end
         end
       end

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

@@ -18,7 +18,8 @@ module Datadog
         def patch
           do_once(:mongo) do
             begin
-              ::Mongo::Client.send(:include, Instrumentation)
+              ::Mongo::Address.send(:include, Instrumentation::Address)
+              ::Mongo::Client.send(:include, Instrumentation::Client)
               add_mongo_monitoring
             rescue StandardError => e
               Datadog::Tracer.log.error("Unable to apply MongoDB integration: #{e}")

data/lib/ddtrace/version.rb

@@ -2,7 +2,7 @@ module Datadog
   module VERSION
     MAJOR = 0
     MINOR = 21
-    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.21.1
+  version: 0.21.2
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack