Skip to content

Commit 47f6f12

Browse files
committed
Add WaterDrop to test matrix & docs
1 parent 8725d0c commit 47f6f12

File tree

9 files changed

+35
-8
lines changed

9 files changed

+35
-8
lines changed

Matrixfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@
125125
'karafka-latest' => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
126126
# karafka 2.0.41 contains broken dependency of karafka-core 2.2.4, which depends on Ruby (>= 2.6.0)
127127
'karafka-min' => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
128+
'waterdrop' => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
128129
},
129130
'lograge' => {
130131
'activesupport' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'

appraisal/jruby-9.4.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
build_coverage_matrix('mongo', min: '2.1.0')
8383
build_coverage_matrix('dalli', [2])
8484
build_coverage_matrix('karafka', min: '2.3.0')
85+
build_coverage_matrix('waterdrop', min: '2.6.12')
8586

8687
appraise 'karafka-min' do
8788
gem 'karafka', '= 2.3.0'

appraisal/ruby-3.0.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,10 @@
9797
build_coverage_matrix('rest-client')
9898
build_coverage_matrix('mongo', min: '2.1.0')
9999
build_coverage_matrix('dalli', [2])
100+
build_coverage_matrix('karafka', min: '2.3.0')
101+
build_coverage_matrix('waterdrop', min: '2.6.12')
100102
build_coverage_matrix('devise', min: '3.2.1')
101103

102-
appraise 'karafka-min' do
103-
gem 'karafka', '= 2.3.0'
104-
end
105-
106104
appraise 'relational_db' do
107105
gem 'activerecord', '~> 7'
108106
gem 'delayed_job'

appraisal/ruby-3.1.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
build_coverage_matrix('mongo', min: '2.1.0')
9999
build_coverage_matrix('dalli', [2])
100100
build_coverage_matrix('karafka', min: '2.3.0')
101+
build_coverage_matrix('waterdrop', min: '2.6.12')
101102
build_coverage_matrix('devise', min: '3.2.1')
102103

103104
appraise 'relational_db' do

appraisal/ruby-3.2.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
build_coverage_matrix('mongo', min: '2.1.0')
144144
build_coverage_matrix('dalli', [2])
145145
build_coverage_matrix('karafka', min: '2.3.0')
146+
build_coverage_matrix('waterdrop', min: '2.6.12')
146147
build_coverage_matrix('devise', min: '3.2.1')
147148

148149
appraise 'relational_db' do

appraisal/ruby-3.3.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@
145145
build_coverage_matrix('mongo', min: '2.1.0')
146146
build_coverage_matrix('dalli', [2])
147147
build_coverage_matrix('karafka', min: '2.3.0')
148+
build_coverage_matrix('waterdrop', min: '2.6.12')
148149
build_coverage_matrix('devise', min: '3.2.1')
149150

150151
appraise 'relational_db' do

appraisal/ruby-3.4.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
build_coverage_matrix('mongo', min: '2.1.0')
145145
build_coverage_matrix('dalli', [2])
146146
build_coverage_matrix('karafka', min: '2.3.0')
147+
build_coverage_matrix('waterdrop', min: '2.6.12')
147148
build_coverage_matrix('devise', min: '3.2.1')
148149

149150
appraise 'relational_db' do

docs/Compatibility.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ For a list of available integrations, and their configuration options, refer to
115115
| Sneakers | `sneakers` | `>= 2.12.0` | `>= 2.12.0` | [Link][46] | [Link](https://github.com/jondot/sneakers) |
116116
| Stripe | `stripe` | `>= 5.15.0` | `>= 5.15.0` | [Link][47] | [Link](https://github.com/stripe/stripe-ruby) |
117117
| Sucker Punch | `sucker_punch` | `>= 2.0` | `>= 2.0` | [Link][48] | [Link](https://github.com/brandonhilkert/sucker_punch) |
118+
| WaterDrop | `waterdrop` | `>= 2.6.12` | `>= 2.6.12` | [Link][55] | [Link](https://github.com/karafka/waterdrop) |
118119

119120
### Support Policy
120121

docs/GettingStarted.md

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,10 +1158,32 @@ end
11581158
```
11591159
`options` are the following keyword arguments:
11601160

1161-
| Key | Env Var | Type | Description | Default |
1162-
| --------------------- | ------------------------ | ------ | --------------------------------------------------- | ------- |
1163-
| `enabled` | `DD_TRACE_KARAFKA_ENABLED` | `Bool` | Specifies whether the integration should create spans. | `true` |
1164-
| `distributed_tracing` | | `Bool` | Enables [distributed tracing](#distributed-tracing). | `false` |
1161+
| Key | Env Var | Type | Description | Default |
1162+
| --------------------- | -------------------------- | ------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
1163+
| `enabled` | `DD_TRACE_KARAFKA_ENABLED` | `Bool` | Specifies whether the integration should create spans. | `true` |
1164+
| `distributed_tracing` | | `Bool` | Enables [distributed tracing](#distributed-tracing) (when iterating through the kafka messages, each of the messages' traces will be resumed for the duration of the block). | `false` |
1165+
1166+
### WaterDrop
1167+
1168+
The WaterDrop integration provides tracing of the `waterdrop` gem (a dependency of `karafka`, but also can be used standalone).
1169+
1170+
This integration is automatically activated with the Karafka framework. If you're not using Karafka (e.g.: your app _produce_ messages for a different app _consume_), enable it through `Datadog.configure`:
1171+
1172+
```ruby
1173+
require 'waterdrop'
1174+
require 'datadog'
1175+
1176+
Datadog.configure do |c|
1177+
c.tracing.instrument :waterdrop, **options
1178+
end
1179+
1180+
```
1181+
`options` are the following keyword arguments:
1182+
1183+
| Key | Env Var | Type | Description | Default |
1184+
| --------------------- | ---------------------------- | ------ | -------------------------------------------------------------------------------------------------------------------- | ------- |
1185+
| `enabled` | `DD_TRACE_WATERDROP_ENABLED` | `Bool` | Specifies whether the integration should create spans. | `true` |
1186+
| `distributed_tracing` | | `Bool` | Enables [distributed tracing](#distributed-tracing) (the trace context will be injected onto the produced messages). | `false` |
11651187

11661188
### MongoDB
11671189

0 commit comments

Comments
 (0)