Skip to content

Commit f7a92e6

Browse files
committed
[PROF-11405] Revert "Temporary disable benchmark to make CI happy", second try
**What does this PR do?** This reverts commit 569bf56. We had previously reverted that commit in #4376 but due to a bug had to undo all the heap profiling-related changes in #4409 . After #4460 gets merged, we can finally enable this benchmark again. **Motivation:** The benchmark was disabled for the reason mentioned in the comment. **Additional Notes:** I'm going to open this PR stacked on top of #4460, but this PR should only be merged after that other PR is merged to master. **How to test the change?** Validate this benchmark is now running in the benchmarking platform results page.
1 parent f850521 commit f7a92e6

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

benchmarks/profiler_string_storage_intern.rb

+3-8
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77

88
# This benchmark measures the performance of string storage-related APIs
99

10-
# Temporary hack to make CI happy. Our CI tries to compare benchmarks between master and branches, and if benchmarks
11-
# are not backwards-compatible between them (e.g. a new API was added...) it breaks. As a workaround, I'm disabling this
12-
# benchmark so we can merge it to master, and then I'll follow up with a micro-PR to re-enable it.
13-
TEMPORARY_DISABLE_BENCHMARK = true
14-
1510
class ProfilerStringStorageIntern
1611
def initialize
1712
@recorder = Datadog::Profiling::StackRecorder.for_testing(heap_samples_enabled: true)
@@ -24,7 +19,7 @@ def run_benchmark
2419
**benchmark_time,
2520
)
2621
x.report('intern_all 1000 repeated strings') do
27-
Datadog::Profiling::StackRecorder::Testing._native_benchmark_intern(@recorder, "hello, world!", 1000, true) unless TEMPORARY_DISABLE_BENCHMARK
22+
Datadog::Profiling::StackRecorder::Testing._native_benchmark_intern(@recorder, "hello, world!", 1000, true)
2823
end
2924

3025
x.save! "#{File.basename(__FILE__)}-1-results.json" unless VALIDATE_BENCHMARK_MODE
@@ -45,11 +40,11 @@ def run_benchmark
4540
new_strings = strings_to_intern - existing_strings
4641

4742
new_strings.times do |i|
48-
Datadog::Profiling::StackRecorder::Testing._native_benchmark_intern(recorder, ("%010d" % i), 1, false) unless TEMPORARY_DISABLE_BENCHMARK
43+
Datadog::Profiling::StackRecorder::Testing._native_benchmark_intern(recorder, ("%010d" % i), 1, false)
4944
end
5045

5146
existing_strings.times do |i|
52-
Datadog::Profiling::StackRecorder::Testing._native_benchmark_intern(recorder, "hello, world!", 1, false) unless TEMPORARY_DISABLE_BENCHMARK
47+
Datadog::Profiling::StackRecorder::Testing._native_benchmark_intern(recorder, "hello, world!", 1, false)
5348
end
5449
end
5550

0 commit comments

Comments
 (0)