Skip to content

Commit

Permalink
Merge pull request #471 from DataDog/0.13-dev
Browse files Browse the repository at this point in the history
0.13.0 to stable
  • Loading branch information
pawelchcki committed Jun 20, 2018
2 parents 3692677 + ede0772 commit 862314f
Show file tree
Hide file tree
Showing 130 changed files with 5,779 additions and 1,797 deletions.
12 changes: 12 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,28 @@ job_defaults: &job_defaults
ruby_containers: &ruby_containers
- &container-1_9
image: datadog/docker-library:ddtrace_rb_1_9_3
environment:
- BUNDLE_GEMFILE=/app/Gemfile
- &container-2_0
image: datadog/docker-library:ddtrace_rb_2_0_0
environment:
- BUNDLE_GEMFILE=/app/Gemfile
- &container-2_1
image: datadog/docker-library:ddtrace_rb_2_1_10
environment:
- BUNDLE_GEMFILE=/app/Gemfile
- &container-2_2
image: datadog/docker-library:ddtrace_rb_2_2_10
environment:
- BUNDLE_GEMFILE=/app/Gemfile
- &container-2_3
image: datadog/docker-library:ddtrace_rb_2_3_7
environment:
- BUNDLE_GEMFILE=/app/Gemfile
- &container-2_4
image: datadog/docker-library:ddtrace_rb_2_4_4
environment:
- BUNDLE_GEMFILE=/app/Gemfile

test_containers: &test_containers
- &container_postgres
Expand Down
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
gemfiles/*
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ build-iPhoneSimulator/

# lock files
Gemfile.lock
gemfiles/*.lock
gemfiles/*

# bundle config
gemfiles/.bundle
166 changes: 99 additions & 67 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
if RUBY_VERSION < '1.9.3'
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('1.9.3')
raise NotImplementedError, 'Ruby versions < 1.9.3 are not supported!'
elsif '1.9.3' <= RUBY_VERSION && RUBY_VERSION < '2.0.0'
elsif Gem::Version.new('1.9.3') <= Gem::Version.new(RUBY_VERSION) \
&& Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
if RUBY_PLATFORM != 'java'
appraise 'rails30-postgres' do
gem 'test-unit'
Expand Down Expand Up @@ -56,26 +57,31 @@ elsif '1.9.3' <= RUBY_VERSION && RUBY_VERSION < '2.0.0'
end

appraise 'contrib-old' do
gem 'active_model_serializers', '~> 0.9.0'
gem 'activerecord', '3.2.22.5'
gem 'activerecord-mysql-adapter', platform: :ruby
gem 'aws-sdk', '~> 2.0'
gem 'dalli'
gem 'elasticsearch-transport'
gem 'mongo', '< 2.5'
gem 'redis', '< 4.0'
gem 'excon'
gem 'hiredis'
gem 'mongo', '< 2.5'
gem 'mysql2', '0.3.21', platform: :ruby
gem 'rack', '1.4.7'
gem 'rack-test', '0.7.0'
gem 'rack-cache', '1.7.1'
gem 'rack-test', '0.7.0'
gem 'rake', '< 12.3'
gem 'redis', '< 4.0'
gem 'resque', '< 2.0'
gem 'sequel', '~> 4.0', '< 4.37'
gem 'sidekiq', '4.0.0'
gem 'sinatra', '1.4.5'
gem 'sqlite3'
gem 'activerecord', '3.2.22.5'
gem 'sidekiq', '4.0.0'
gem 'aws-sdk', '~> 2.0'
gem 'sucker_punch'
gem 'dalli'
gem 'resque', '< 2.0'
gem 'mysql2', '0.3.21', platform: :ruby
gem 'activerecord-mysql-adapter', platform: :ruby
end
end
elsif '2.0.0' <= RUBY_VERSION && RUBY_VERSION < '2.1.0'
elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
&& Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.1.0')
if RUBY_PLATFORM != 'java'
appraise 'rails30-postgres' do
gem 'test-unit'
Expand Down Expand Up @@ -131,26 +137,31 @@ elsif '2.0.0' <= RUBY_VERSION && RUBY_VERSION < '2.1.0'
end

appraise 'contrib-old' do
gem 'active_model_serializers', '~> 0.9.0'
gem 'activerecord', '3.2.22.5'
gem 'activerecord-mysql-adapter', platform: :ruby
gem 'aws-sdk', '~> 2.0'
gem 'dalli'
gem 'elasticsearch-transport'
gem 'mongo', '< 2.5'
gem 'redis', '< 4.0'
gem 'excon'
gem 'hiredis'
gem 'mongo', '< 2.5'
gem 'mysql2', '0.3.21', platform: :ruby
gem 'rack', '1.4.7'
gem 'rack-test', '0.7.0'
gem 'rack-cache', '1.7.1'
gem 'rack-test', '0.7.0'
gem 'rake', '< 12.3'
gem 'redis', '< 4.0'
gem 'resque', '< 2.0'
gem 'sequel', '~> 4.0', '< 4.37'
gem 'sidekiq', '4.0.0'
gem 'sinatra', '1.4.5'
gem 'sqlite3'
gem 'activerecord', '3.2.22.5'
gem 'sidekiq', '4.0.0'
gem 'aws-sdk', '~> 2.0'
gem 'sucker_punch'
gem 'dalli'
gem 'resque', '< 2.0'
gem 'mysql2', '0.3.21', platform: :ruby
gem 'activerecord-mysql-adapter', platform: :ruby
end
end
elsif '2.1.0' <= RUBY_VERSION && RUBY_VERSION < '2.2.0'
elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
&& Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
if RUBY_PLATFORM != 'java'
appraise 'rails30-postgres' do
gem 'test-unit'
Expand Down Expand Up @@ -226,26 +237,31 @@ elsif '2.1.0' <= RUBY_VERSION && RUBY_VERSION < '2.2.0'
end

appraise 'contrib-old' do
gem 'active_model_serializers', '~> 0.9.0'
gem 'activerecord', '3.2.22.5'
gem 'activerecord-mysql-adapter', platform: :ruby
gem 'aws-sdk', '~> 2.0'
gem 'dalli'
gem 'elasticsearch-transport'
gem 'mongo', '< 2.5'
gem 'redis', '< 4.0'
gem 'excon'
gem 'hiredis'
gem 'mongo', '< 2.5'
gem 'mysql2', '0.3.21', platform: :ruby
gem 'rack', '1.4.7'
gem 'rack-test', '0.7.0'
gem 'rack-cache', '1.7.1'
gem 'rack-test', '0.7.0'
gem 'rake', '< 12.3'
gem 'redis', '< 4.0'
gem 'resque', '< 2.0'
gem 'sequel', '~> 4.0', '< 4.37'
gem 'sidekiq', '4.0.0'
gem 'sinatra', '1.4.5'
gem 'sqlite3'
gem 'activerecord', '3.2.22.5'
gem 'sidekiq', '4.0.0'
gem 'aws-sdk', '~> 2.0'
gem 'sucker_punch'
gem 'dalli'
gem 'resque', '< 2.0'
gem 'mysql2', '0.3.21', platform: :ruby
gem 'activerecord-mysql-adapter', platform: :ruby
end
end
elsif '2.2.0' <= RUBY_VERSION && RUBY_VERSION < '2.3.0'
elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
&& Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
if RUBY_PLATFORM != 'java'
appraise 'rails30-postgres' do
gem 'test-unit'
Expand Down Expand Up @@ -353,27 +369,33 @@ elsif '2.2.0' <= RUBY_VERSION && RUBY_VERSION < '2.3.0'
end

appraise 'contrib' do
gem 'active_model_serializers', '>= 0.10.0'
gem 'activerecord', '< 5.1.5'
gem 'aws-sdk'
gem 'dalli'
gem 'elasticsearch-transport'
gem 'mongo', '< 2.5'
gem 'graphql'
gem 'excon'
gem 'grape'
gem 'graphql'
gem 'grpc'
gem 'hiredis'
gem 'mongo', '< 2.5'
gem 'mysql2', '< 0.5', platform: :ruby
gem 'racecar', '>= 0.3.5'
gem 'rack'
gem 'rack-test'
gem 'rake', '>= 12.3'
gem 'redis', '< 4.0'
gem 'hiredis'
gem 'resque', '< 2.0'
gem 'sequel'
gem 'sidekiq'
gem 'sinatra'
gem 'sqlite3'
gem 'activerecord', '< 5.1.5'
gem 'sidekiq'
gem 'aws-sdk'
gem 'sucker_punch'
gem 'dalli'
gem 'resque', '< 2.0'
gem 'racecar', '>= 0.3.5'
gem 'mysql2', '< 0.5', platform: :ruby
end
end
elsif '2.3.0' <= RUBY_VERSION && RUBY_VERSION < '2.4.0'
elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
&& Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.4.0')
if RUBY_PLATFORM != 'java'
appraise 'rails30-postgres' do
gem 'test-unit'
Expand Down Expand Up @@ -481,47 +503,57 @@ elsif '2.3.0' <= RUBY_VERSION && RUBY_VERSION < '2.4.0'
end

appraise 'contrib' do
gem 'active_model_serializers', '>= 0.10.0'
gem 'activerecord', '< 5.1.5'
gem 'aws-sdk'
gem 'dalli'
gem 'elasticsearch-transport'
gem 'mongo', '< 2.5'
gem 'graphql'
gem 'excon'
gem 'grape'
gem 'graphql'
gem 'grpc'
gem 'hiredis'
gem 'mongo', '< 2.5'
gem 'mysql2', '< 0.5', platform: :ruby
gem 'racecar', '>= 0.3.5'
gem 'rack'
gem 'rack-test'
gem 'rake', '>= 12.3'
gem 'redis', '< 4.0'
gem 'hiredis'
gem 'resque', '< 2.0'
gem 'sequel'
gem 'sidekiq'
gem 'sinatra'
gem 'sqlite3'
gem 'activerecord', '< 5.1.5'
gem 'sidekiq'
gem 'aws-sdk'
gem 'sucker_punch'
gem 'dalli'
gem 'resque', '< 2.0'
gem 'racecar', '>= 0.3.5'
gem 'mysql2', '< 0.5', platform: :ruby
end
end
elsif '2.4.0' <= RUBY_VERSION
elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION)
if RUBY_PLATFORM != 'java'
appraise 'contrib' do
gem 'active_model_serializers', '>= 0.10.0'
gem 'activerecord', '< 5.1.5'
gem 'aws-sdk'
gem 'dalli'
gem 'elasticsearch-transport'
gem 'mongo', '< 2.5'
gem 'graphql'
gem 'excon'
gem 'grape'
gem 'graphql'
gem 'grpc'
gem 'hiredis'
gem 'mongo', '< 2.5'
gem 'mysql2', '< 0.5', platform: :ruby
gem 'racecar', '>= 0.3.5'
gem 'rack'
gem 'rack-test'
gem 'rake', '>= 12.3'
gem 'redis', '< 4.0'
gem 'hiredis'
gem 'resque', '< 2.0'
gem 'sequel'
gem 'sidekiq'
gem 'sinatra'
gem 'sqlite3'
gem 'activerecord', '< 5.1.5'
gem 'sidekiq'
gem 'aws-sdk'
gem 'sucker_punch'
gem 'dalli'
gem 'resque', '< 2.0'
gem 'racecar', '>= 0.3.5'
gem 'mysql2', '< 0.5', platform: :ruby
end
end
end
59 changes: 57 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,59 @@

## [Unreleased (beta)]

## [0.13.0] - 2018-06-20

Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.13.0

Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.12.1...v0.13.0

### Added

- Sequel integration (supporting Ruby 2.0+) (#171, #367) (@randy-girard, @twe4ked, @palin)
- gRPC integration (supporting Ruby 2.2+) (#379, #403) (@Jared-Prime)
- ActiveModelSerializers integration (#340) (@sullimander)
- Excon integration (#211, #426) (@walterking, @jeffjo)
- Rake integration (supporting Ruby 2.0+, Rake 12.0+) (#409)
- Request queuing tracing to Rack (experimental) (#272)
- ActiveSupport::Notifications::Event helper for event tracing (#400)
- Request and response header tags to Rack (#389)
- Request and response header tags to Sinatra (#427, #375)
- MySQL2 integration (#453) (@jamiehodge)
- Sidekiq job delay tag (#443, #418) (@gottfrois)

### Fixed

- Elasticsearch quantization of ids (#458)
- MongoDB to allow quantization of collection name (#463)

### Refactored

- Hash quantization into core library (#410)
- MongoDB integration to use Hash quantization library (#463)

### Changed

- Hash quantization truncates arrays with nested objects (#463)

## [0.13.0.beta1] - 2018-05-09

Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.13.0.beta1

Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.12.0...v0.13.0.beta1

### Added
- Sequel integration (supporting Ruby 2.0+) (#171, #367) (@randy-girard, @twe4ked, @palin)
- gRPC integration (supporting Ruby 2.2+) (#379, #403) (@Jared-Prime)
- ActiveModelSerializers integration (#340) (@sullimander)
- Excon integration (#211) (@walterking)
- Rake integration (supporting Ruby 2.0+, Rake 12.0+) (#409)
- Request queuing tracing to Rack (experimental) (#272)
- ActiveSupport::Notifications::Event helper for event tracing (#400)
- Request and response header tags to Rack (#389)

### Refactored
- Hash quantization into core library (#410)

## [0.12.1] - 2018-06-12

Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.12.1
Expand Down Expand Up @@ -307,8 +360,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.12.1...master
[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.12.1...0.13-dev
[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.13.0...master
[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.13.0...0.14-dev
[0.13.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.12.1...v0.13.0
[0.13.0.beta1]: https://github.com/DataDog/dd-trace-rb/compare/v0.12.0...v0.13.0.beta1
[0.12.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.12.0...v0.12.1
[0.12.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.11.4...v0.12.0
[0.12.0.rc1]: https://github.com/DataDog/dd-trace-rb/compare/v0.11.4...v0.12.0.rc1
Expand Down
Loading

0 comments on commit 862314f

Please sign in to comment.