Skip to content

Commit a9f892f

Browse files
authored
Merge branch 'master' into di-loading
2 parents d3b854c + f3e66ea commit a9f892f

File tree

198 files changed

+999
-1088
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+999
-1088
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ save_bundle_checksum: &save_bundle_checksum
6565
command: |
6666
if [ "$CI_BUNDLE_CACHE_HIT" != 1 ]; then
6767
# Recompute gemfiles/*.lock checksum, as those files might have changed
68-
cat Gemfile Gemfile.lock Appraisals gemfiles/*.gemfile gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
68+
cat Gemfile Gemfile.lock ruby-*.gemfile gemfiles/*.gemfile gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
6969
fi
7070
cp .circleci/bundle_checksum /usr/local/bundle/bundle_checksum
7171
step_bundle_install: &step_bundle_install
@@ -96,7 +96,7 @@ step_compute_bundle_checksum: &step_compute_bundle_checksum
9696
# updating the gemset lock files produces extremely large commits.
9797
command: |
9898
bundle lock # Create Gemfile.lock
99-
cat Gemfile Gemfile.lock Appraisals gemfiles/*.gemfile gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
99+
cat Gemfile Gemfile.lock ruby-*.gemfile gemfiles/*.gemfile gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
100100
step_get_test_agent_trace_check_results: &step_get_test_agent_trace_check_results
101101
run:
102102
name: Get APM Test Agent Trace Check Results

.github/workflows/test-memory-leaks.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
- uses: actions/checkout@v4
88
- uses: ruby/setup-ruby@v1
99
with:
10-
ruby-version: 3.4.0-preview2 # TODO: Use stable version once 3.4 is out
10+
ruby-version: 3.4.1
1111
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
1212
bundler: latest
13-
cache-version: v1 # bump this to invalidate cache
13+
cache-version: v2 # bump this to invalidate cache
1414
- run: sudo apt-get update && (sudo apt-get install -y valgrind || sleep 5 && sudo apt-get install -y valgrind) && valgrind --version
1515
- run: gem update --system 3.5.23 # TODO: This is a workaround for a buggy rubygems in 3.4.0-preview2; remove once stable version 3.4 is out
1616
- run: bundle exec rake compile spec:profiling:memcheck

Steepfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ target :datadog do
8080
ignore 'lib/datadog/core/buffer/thread_safe.rb'
8181
ignore 'lib/datadog/core/chunker.rb'
8282
ignore 'lib/datadog/core/configuration.rb'
83-
ignore 'lib/datadog/core/configuration/agent_settings_resolver.rb'
8483
ignore 'lib/datadog/core/configuration/base.rb'
8584
ignore 'lib/datadog/core/configuration/components.rb'
8685
ignore 'lib/datadog/core/configuration/dependency_resolver.rb'

appraisal/ruby-3.3.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@
180180
gem 'dalli', '< 3.0.0'
181181
gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0
182182
gem 'qless', '0.12.0'
183-
184-
gem 'racc' # Remove this once graphql resolves issue for ruby 3.3 preview. https://github.com/rmosolgo/graphql-ruby/issues/4650
185183
end
186184

187185
appraise 'core-old' do

appraisal/ruby-3.4.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,6 @@
191191
gem 'dalli', '< 3.0.0'
192192
gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0
193193
gem 'qless', '0.12.0'
194-
195-
gem 'racc' # Remove this once graphql resolves issue for ruby 3.3 preview. https://github.com/rmosolgo/graphql-ruby/issues/4650
196194
end
197195

198196
appraise 'core-old' do

benchmarks/profiler_gc.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def create_profiler
1414

1515
# We take a dummy sample so that the context for the main thread is created, as otherwise the GC profiling methods do
1616
# not create it (because we don't want to do memory allocations in the middle of GC)
17-
Datadog::Profiling::Collectors::ThreadContext::Testing._native_sample(@collector, Thread.current)
17+
Datadog::Profiling::Collectors::ThreadContext::Testing._native_sample(@collector, Thread.current, false)
1818
end
1919

2020
def run_benchmark
@@ -29,7 +29,7 @@ def run_benchmark
2929
x.report('profiler gc') do
3030
Datadog::Profiling::Collectors::ThreadContext::Testing._native_on_gc_start(@collector)
3131
Datadog::Profiling::Collectors::ThreadContext::Testing._native_on_gc_finish(@collector)
32-
Datadog::Profiling::Collectors::ThreadContext::Testing._native_sample_after_gc(@collector, false)
32+
Datadog::Profiling::Collectors::ThreadContext::Testing._native_sample_after_gc(@collector, false, false)
3333
end
3434

3535
x.save! "#{File.basename(__FILE__)}-results.json" unless VALIDATE_BENCHMARK_MODE
@@ -52,7 +52,7 @@ def run_benchmark
5252
estimated_gc_per_minute.times do
5353
Datadog::Profiling::Collectors::ThreadContext::Testing._native_on_gc_start(@collector)
5454
Datadog::Profiling::Collectors::ThreadContext::Testing._native_on_gc_finish(@collector)
55-
Datadog::Profiling::Collectors::ThreadContext::Testing._native_sample_after_gc(@collector, false)
55+
Datadog::Profiling::Collectors::ThreadContext::Testing._native_sample_after_gc(@collector, false, false)
5656
end
5757

5858
@recorder.serialize

benchmarks/profiler_sample_gvl.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def initialize
2727
@target_thread = thread_with_very_deep_stack
2828

2929
# Sample once to trigger thread context creation for all threads (including @target_thread)
30-
Datadog::Profiling::Collectors::ThreadContext::Testing._native_sample(@collector, PROFILER_OVERHEAD_STACK_THREAD)
30+
Datadog::Profiling::Collectors::ThreadContext::Testing._native_sample(@collector, PROFILER_OVERHEAD_STACK_THREAD, false)
3131
end
3232

3333
def create_profiler

benchmarks/profiler_sample_loop_v2.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def run_benchmark
3737
)
3838

3939
x.report("stack collector #{ENV['CONFIG']}") do
40-
Datadog::Profiling::Collectors::ThreadContext::Testing._native_sample(@collector, PROFILER_OVERHEAD_STACK_THREAD)
40+
Datadog::Profiling::Collectors::ThreadContext::Testing._native_sample(@collector, PROFILER_OVERHEAD_STACK_THREAD, false)
4141
end
4242

4343
x.save! "#{File.basename(__FILE__)}-results.json" unless VALIDATE_BENCHMARK_MODE

benchmarks/profiler_sample_serialize.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def run_benchmark
3535
simulate_seconds = 60
3636

3737
(samples_per_second * simulate_seconds).times do
38-
Datadog::Profiling::Collectors::ThreadContext::Testing._native_sample(@collector, PROFILER_OVERHEAD_STACK_THREAD)
38+
Datadog::Profiling::Collectors::ThreadContext::Testing._native_sample(@collector, PROFILER_OVERHEAD_STACK_THREAD, false)
3939
end
4040

4141
@recorder.serialize

docs/Compatibility.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ The Ruby Datadog Trace library is open source. See the [dd-trace-rb][1] GitHub r
99

1010
| Type | Documentation | Version | Support type | Gem version support |
1111
|-------|----------------------------|-----------|---------------------------|---------------------|
12-
| MRI | https://www.ruby-lang.org/ | 3.3 | [latest](#support-latest) | Latest |
12+
| MRI | https://www.ruby-lang.org/ | 3.4 | [latest](#support-latest) | Latest |
13+
| | | 3.3 | [latest](#support-latest) | Latest |
1314
| | | 3.2 | [latest](#support-latest) | Latest |
1415
| | | 3.1 | [latest](#support-latest) | Latest |
1516
| | | 3.0 | [latest](#support-latest) | Latest |

0 commit comments

Comments
 (0)