ddtrace 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d52481c7b3f82c6d647612b13d8512436619bfb3b09c914c89b217c0e709e93a
-  data.tar.gz: 79fa3196d6d4f002450b5318f3defa51abab40641c05b4cfbb87a70560492375
+  metadata.gz: dd428e0433f158ee8b3a353082112f464f16e6f614c099c8bbe208540b736d63
+  data.tar.gz: 1cf0a646378f1d39ea248eca52e856116fef3aaab8bd8911560150b859ca8b58
 SHA512:
-  metadata.gz: 77a2fd2b76346a130b29c081bf5cb927e3df61d1fe1a606fbe0e89eb486edd0a77c6d64b366afc86b272c779fe26f0988e6f25fcd3a1713ee4ae052ea10964ca
-  data.tar.gz: 79204974341c3b42b4ebe9130b3ca121a1a4980b291cc04a075a7bbd32bbdb88df280b50a75c8f43537aea55c4d8febebf56d00bb0079dad1b2997b7ec76c3f5
+  metadata.gz: dd019f7bc2e5eea75da991b6fe13ac4e914ba53fa7ed993364d53d57bb60ae2ac2003746fcd9389e1b376938ab1e889cfa68ce3887bafd06d16b12750676140a
+  data.tar.gz: 1db4b25d3366fd810459764760147005de0d2dd4370263d84d77bc00d2515c530794c5d5a9d2f8e816b751d960e6b70f265ee6f568da4c9ab4016df7b5a44e02

data/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 ## [Unreleased (beta)]
 
+## [0.14.1] - 2018-08-21
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.14.1
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.14.0...v0.14.1
+
+### Changed
+
+- Reduce verbosity of connection errors in log (#515)
+
+### Fixed
+
+- Sequel 'not a valid integration' error (#514, #516) (@steveh)
+
 ## [0.14.0] - 2018-08-14
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.14.0
@@ -460,8 +474,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.14.0...master
-[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.14.0...0.15-dev
+[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.14.1...master
+[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.14.1...0.15-dev
+[0.14.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.14.0...v0.14.1
 [0.14.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.13.2...v0.14.0
 [0.14.0.rc1]: https://github.com/DataDog/dd-trace-rb/compare/v0.14.0.beta2...v0.14.0.rc1
 [0.14.0.beta2]: https://github.com/DataDog/dd-trace-rb/compare/v0.14.0.beta1...v0.14.0.beta2

data/lib/ddtrace.rb

@@ -44,29 +44,29 @@ module Datadog
 end
 
 require 'ddtrace/contrib/base'
-require 'ddtrace/contrib/integration'
-require 'ddtrace/contrib/rack/patcher'
-require 'ddtrace/contrib/rails/patcher'
 require 'ddtrace/contrib/active_model_serializers/patcher'
 require 'ddtrace/contrib/active_record/integration'
-require 'ddtrace/contrib/sequel/patcher'
+require 'ddtrace/contrib/aws/patcher'
+require 'ddtrace/contrib/dalli/patcher'
+require 'ddtrace/contrib/delayed_job/patcher'
 require 'ddtrace/contrib/elasticsearch/patcher'
+require 'ddtrace/contrib/excon/patcher'
 require 'ddtrace/contrib/faraday/patcher'
 require 'ddtrace/contrib/grape/patcher'
 require 'ddtrace/contrib/graphql/patcher'
 require 'ddtrace/contrib/grpc/patcher'
-require 'ddtrace/contrib/redis/patcher'
 require 'ddtrace/contrib/http/patcher'
-require 'ddtrace/contrib/aws/patcher'
-require 'ddtrace/contrib/sucker_punch/patcher'
-require 'ddtrace/contrib/rest_client/integration'
+require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/mongodb/patcher'
-require 'ddtrace/contrib/dalli/patcher'
+require 'ddtrace/contrib/mysql2/patcher'
+require 'ddtrace/contrib/racecar/patcher'
+require 'ddtrace/contrib/rack/patcher'
+require 'ddtrace/contrib/rails/patcher'
 require 'ddtrace/contrib/rake/patcher'
+require 'ddtrace/contrib/redis/patcher'
 require 'ddtrace/contrib/resque/patcher'
-require 'ddtrace/contrib/delayed_job/patcher'
-require 'ddtrace/contrib/racecar/patcher'
+require 'ddtrace/contrib/rest_client/integration'
+require 'ddtrace/contrib/sequel/integration'
 require 'ddtrace/contrib/sidekiq/patcher'
-require 'ddtrace/contrib/excon/patcher'
-require 'ddtrace/contrib/mysql2/patcher'
+require 'ddtrace/contrib/sucker_punch/patcher'
 require 'ddtrace/monkey'

data/lib/ddtrace/transport.rb

@@ -68,6 +68,7 @@ module Datadog
       @count_client_error = 0
       @count_server_error = 0
       @count_internal_error = 0
+      @count_consecutive_errors = 0
     end
 
     # route the send to the right endpoint
@@ -109,7 +110,7 @@ module Datadog
         response = Net::HTTP.start(@hostname, @port, read_timeout: TIMEOUT) { |http| http.request(request) }
         handle_response(response)
       rescue StandardError => e
-        Datadog::Tracer.log.error(e.message)
+        log_error_once(e.message)
         500
       end.tap do
         yield(response) if block_given?
@@ -170,21 +171,22 @@ module Datadog
 
       if success?(status_code)
         Datadog::Tracer.log.debug('Payload correctly sent to the trace agent.')
+        @mutex.synchronize { @count_consecutive_errors = 0 }
         @mutex.synchronize { @count_success += 1 }
       elsif downgrade?(status_code)
         Datadog::Tracer.log.debug("calling the endpoint but received #{status_code}; downgrading the API")
       elsif client_error?(status_code)
-        Datadog::Tracer.log.error("Client error: #{response.message}")
+        log_error_once("Client error: #{response.message}")
         @mutex.synchronize { @count_client_error += 1 }
       elsif server_error?(status_code)
-        Datadog::Tracer.log.error("Server error: #{response.message}")
-        @mutex.synchronize { @count_server_error += 1 }
+        log_error_once("Server error: #{response.message}")
       end
 
       status_code
     rescue StandardError => e
-      Datadog::Tracer.log.error(e.message)
+      log_error_once(e.message)
       @mutex.synchronize { @count_internal_error += 1 }
+
       500
     end
 
@@ -201,6 +203,16 @@ module Datadog
 
     private
 
+    def log_error_once(*args)
+      if @count_consecutive_errors > 0
+        Datadog::Tracer.log.debug(*args)
+      else
+        Datadog::Tracer.log.error(*args)
+      end
+
+      @mutex.synchronize { @count_consecutive_errors += 1 }
+    end
+
     def process_callback(action, response)
       return unless @response_callback && @response_callback.respond_to?(:call)
 

data/lib/ddtrace/version.rb

@@ -2,7 +2,7 @@ module Datadog
   module VERSION
     MAJOR = 0
     MINOR = 14
-    PATCH = 0
+    PATCH = 1
     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.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack