ddtrace 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: e4c07e2d55c825aa80fda2d80abd0be7bce884c47a869d54fc5ca32f4e60653e
-  data.tar.gz: a58bd25922fa32c3c921395a9a00b37e5b0941399f3a48cf15735ef11935808f
+SHA1:
+  metadata.gz: 3a696ccc72f7c5d2895655641ac4bc7ac12119d2
+  data.tar.gz: 4cf548cf08fbd707e5c8f179225dc8cab4dbe0d4
 SHA512:
-  metadata.gz: cd1c737a23055b67ccd2a0c081bfd64cd6156d744ca9c6b982623406b04be282de3c7b0328757dafef0bd9916f822c8a59a742be37f04f3225e192574fd7f0b9
-  data.tar.gz: 9418e24136ab3721c4404cce92dbf637d86139b5d574356e6918a5cf618de2a881add70f1420ca419afe6a751b1fd9a58871e780d22294187a5327787e5ebba4
+  metadata.gz: 147f0cda95395942057e0f6431ab3e874a697f4cdd5a7f9875608979dcd8eba28d3dff315e759893f0dfdca62f075e0e379a9a539a0aa7894d173de7d232c630
+  data.tar.gz: e938522ba999a3258af991e71ba81d7125bc8c1b58573a0bfd774cd4d9507651e838954aef773eaf33161bce63b7d60e880403ceddb4f8d844b95bbecd261947

data/.circleci/config.yml

@@ -458,7 +458,7 @@ jobs:
           keys:
             - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.4-{{ checksum ".circleci/bundle_checksum" }}'
       - *step_run_all_tests
-  deploy-release:
+  "deploy release":
     <<: *job_defaults
     docker:
       - *container-2_4
@@ -470,81 +470,120 @@ jobs:
             apt-get -y -qq install awscli
       - *step_bundle_install
       - *step_release_docs
+      - run:
+          name: Upload release Gem and rebuild index
+          command: S3_DIR=release bundle exec rake release:gem
+      - store_artifacts:
+          path: pkg/
+          destination: gem
+  "deploy prerelease Gem":
+    <<: *job_defaults
+    docker:
+      - *container-2_4
+    steps:
+      - checkout
+      - run:
+          command: |
+            apt-get -y -qq update
+            apt-get -y -qq install awscli
+      - *step_bundle_install
+      - run:
+          name: Rename to pre-release version based on branch name and build number
+          command: |
+             # create safe version string
+             PRE=$(echo "${CIRCLE_BRANCH:-unknown}.${CIRCLE_BUILD_NUM:-R$RANDOM}" | sed -e 's/[^a-zA-Z0-9+]\{1,\}/./g')
+             echo PRE=$PRE
+             sed lib/ddtrace/version.rb -i -e "s/^\([\t ]*PRE\) *=*/\1 = \'${PRE}\' #/g"
+      - run:
+          name: Upload prereleas Gem and rebuild index
+          command: S3_DIR=prerelease bundle exec rake release:gem
+      - store_artifacts:
+          path: pkg/
+          destination: gem
 
 workflows:
   version: 2
   build-and-test:
     jobs:
-      - checkout-1.9:
-          <<: *filters_all_branches_and_tags
-      - build-1.9:
-          <<: *filters_all_branches_and_tags
-          requires:
-            - checkout-1.9
-      - test-1.9:
-          <<: *filters_all_branches_and_tags
-          requires:
-            - build-1.9
-      - checkout-2.0:
-          <<: *filters_all_branches_and_tags
-      - build-2.0:
-          <<: *filters_all_branches_and_tags
-          requires:
-            - checkout-2.0
-      - test-2.0:
-          <<: *filters_all_branches_and_tags
-          requires:
-            - build-2.0
-      - checkout-2.1:
-          <<: *filters_all_branches_and_tags
-      - build-2.1:
-          <<: *filters_all_branches_and_tags
-          requires:
-            - checkout-2.1
-      - test-2.1:
-          <<: *filters_all_branches_and_tags
-          requires:
-            - build-2.1
-      - checkout-2.2:
-          <<: *filters_all_branches_and_tags
-      - build-2.2:
-          <<: *filters_all_branches_and_tags
-          requires:
-            - checkout-2.2
-      - test-2.2:
-          <<: *filters_all_branches_and_tags
-          requires:
-            - build-2.2
-      - checkout-2.3:
-          <<: *filters_all_branches_and_tags
-      - build-2.3:
-          <<: *filters_all_branches_and_tags
-          requires:
-            - checkout-2.3
-      - test-2.3:
-          <<: *filters_all_branches_and_tags
-          requires:
-            - build-2.3
-      - benchmark-2.3:
-          <<: *filters_all_branches_and_tags
-          requires:
-            - build-2.3
-      - checkout-2.4:
-          <<: *filters_all_branches_and_tags
-      - build-2.4:
-          <<: *filters_all_branches_and_tags
-          requires:
-            - checkout-2.4
-      - test-2.4:
-          <<: *filters_all_branches_and_tags
-          requires:
-            - build-2.4
-      - deploy-release:
-          <<: *filters_only_release_tags
-          requires:
-            - test-1.9
-            - test-2.0
-            - test-2.1
-            - test-2.2
-            - test-2.3
-            - test-2.4
+       - checkout-1.9:
+           <<: *filters_all_branches_and_tags
+       - build-1.9:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - checkout-1.9
+       - test-1.9:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - build-1.9
+       - checkout-2.0:
+           <<: *filters_all_branches_and_tags
+       - build-2.0:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - checkout-2.0
+       - test-2.0:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - build-2.0
+       - checkout-2.1:
+           <<: *filters_all_branches_and_tags
+       - build-2.1:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - checkout-2.1
+       - test-2.1:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - build-2.1
+       - checkout-2.2:
+           <<: *filters_all_branches_and_tags
+       - build-2.2:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - checkout-2.2
+       - test-2.2:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - build-2.2
+       - checkout-2.3:
+           <<: *filters_all_branches_and_tags
+       - build-2.3:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - checkout-2.3
+       - test-2.3:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - build-2.3
+       - benchmark-2.3:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - build-2.3
+       - checkout-2.4:
+           <<: *filters_all_branches_and_tags
+       - build-2.4:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - checkout-2.4
+       - test-2.4:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - build-2.4
+       - "deploy prerelease Gem":
+           <<: *filters_all_branches_and_tags
+           requires:
+             - test-1.9
+             - test-2.0
+             - test-2.1
+             - test-2.2
+             - test-2.3
+             - test-2.4
+       - "deploy release":
+           <<: *filters_only_release_tags
+           requires:
+             - test-1.9
+             - test-2.0
+             - test-2.1
+             - test-2.2
+             - test-2.3
+             - test-2.4

data/CHANGELOG.md

@@ -4,6 +4,17 @@
 
 ## [Unreleased (beta)]
 
+## [0.16.1] - 2018-10-17
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.16.1
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.16.0...v0.16.1
+
+### Fixed
+
+- Priority sampling response being mishandled (#591)
+- HTTP open timeout to agent too long (#582)
+
 ## [0.16.0] - 2018-09-18
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.16.0
@@ -511,9 +522,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.16.0...master
-[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.16.0...0.17-dev
-[0.15.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.15.0...v0.16.0
+[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.16.1...master
+[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.16.1...0.17-dev
+[0.16.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.16.0...v0.16.1
+[0.16.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.15.0...v0.16.0
 [0.15.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.14.2...v0.15.0
 [0.14.2]: https://github.com/DataDog/dd-trace-rb/compare/v0.14.1...v0.14.2
 [0.14.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.14.0...v0.14.1

data/Rakefile

@@ -6,6 +6,8 @@ require 'rake/testtask'
 require 'appraisal'
 require 'yard'
 
+Dir.glob('tasks/*.rake').each { |r| import r }
+
 desc 'Run RSpec'
 # rubocop:disable Metrics/BlockLength
 namespace :spec do
@@ -170,40 +172,6 @@ end
 S3_BUCKET = 'gems.datadoghq.com'.freeze
 S3_DIR = ENV['S3_DIR']
 
-desc 'create a new indexed repository'
-task :'release:gem' do
-  raise 'Missing environment variable S3_DIR' if !S3_DIR || S3_DIR.empty?
-  # load existing deployed gems
-  sh "aws s3 cp --exclude 'docs/*' --recursive s3://#{S3_BUCKET}/#{S3_DIR}/ ./rubygems/"
-
-  # create folders
-  sh 'mkdir -p ./gems'
-  sh 'mkdir -p ./rubygems/gems/'
-  sh 'mkdir -p ./rubygems/quick/'
-
-  # copy previous builds
-  sh 'cp ./rubygems/gems/* ./gems/'
-
-  # build the gem
-  Rake::Task['build'].execute
-
-  # copy the output in the indexed folder
-  sh 'cp pkg/*.gem ./gems/'
-
-  # generate the gems index
-  sh 'gem generate_index'
-
-  # namespace everything under ./rubygems/
-  sh 'cp -r ./gems/* ./rubygems/gems/'
-  sh 'cp -r specs.* ./rubygems/'
-  sh 'cp -r latest_specs.* ./rubygems/'
-  sh 'cp -r prerelease_specs.* ./rubygems/'
-  sh 'cp -r ./quick/* ./rubygems/quick/'
-
-  # deploy a static gem registry
-  sh "aws s3 cp --recursive ./rubygems/ s3://#{S3_BUCKET}/#{S3_DIR}/"
-end
-
 desc 'release the docs website'
 task :'release:docs' => :docs do
   raise 'Missing environment variable S3_DIR' if !S3_DIR || S3_DIR.empty?

data/lib/ddtrace/transport.rb

@@ -107,7 +107,9 @@ module Datadog
         request = Net::HTTP::Post.new(url, headers)
         request.body = data
 
-        response = Net::HTTP.start(@hostname, @port, read_timeout: TIMEOUT) { |http| http.request(request) }
+        response = Net::HTTP.start(@hostname, @port, open_timeout: TIMEOUT, read_timeout: TIMEOUT) do |http|
+          http.request(request)
+        end
         handle_response(response)
       rescue StandardError => e
         log_error_once(e.message)
@@ -219,6 +221,7 @@ module Datadog
       @response_callback.call(action, response, @api)
     rescue => e
       Tracer.log.debug("Error processing callback: #{e}")
+      @mutex.synchronize { @count_internal_error += 1 }
     end
   end
 end

data/lib/ddtrace/version.rb

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

data/lib/ddtrace/writer.rb

@@ -120,8 +120,10 @@ module Datadog
       return unless action == :traces && response.is_a?(Net::HTTPOK)
 
       if api[:version] == HTTPTransport::V4
-        service_rates = JSON.parse(response.body)
-        @priority_sampler.update(service_rates)
+        body = JSON.parse(response.body)
+        if body.is_a?(Hash) && body.key?('rate_by_service')
+          @priority_sampler.update(body['rate_by_service'])
+        end
         true
       else
         false

data/tasks/release_gem.rake

@@ -0,0 +1,28 @@
+desc 'create a new indexed repository'
+task :'release:gem' do
+  raise 'Missing environment variable S3_DIR' if !S3_DIR || S3_DIR.empty?
+  # load existing deployed gems
+  sh "aws s3 cp --exclude 'docs/*' --recursive s3://#{S3_BUCKET}/#{S3_DIR}/ ./rubygems/"
+
+  # create folders
+  sh 'mkdir -p ./gems'
+  sh 'mkdir -p ./rubygems/gems'
+
+  # build the gem
+  Rake::Task['build'].execute
+
+  # copy the output in the indexed folder
+  sh 'cp pkg/*.gem ./rubygems/gems/'
+
+  # generate the gems index
+  sh 'gem generate_index -v --no-modern -d ./rubygems'
+
+  # remove all local repository gems to limit files needed to be uploaded
+  sh 'rm -f ./rubygems/gems/*'
+
+  # re-add new gems
+  sh 'cp pkg/*.gem ./rubygems/gems/'
+
+  # deploy a static gem registry
+  sh "aws s3 cp --recursive ./rubygems/ s3://#{S3_BUCKET}/#{S3_DIR}/"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -454,6 +454,7 @@ files:
 - lib/ddtrace/version.rb
 - lib/ddtrace/workers.rb
 - lib/ddtrace/writer.rb
+- tasks/release_gem.rake
 homepage: https://github.com/DataDog/dd-trace-rb
 licenses:
 - BSD-3-Clause
@@ -475,7 +476,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications