diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index d7a5eb59de8..19c39f398d9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -65,7 +65,7 @@ body:
 
   - type: textarea
     attributes:
-      label: How does Datadog Help You
+      label: How does Datadog help you?
       description: "Optionally, tell us why and how you're using datadog, and what your overall experience with it is!"
     validations:
       required: false
diff --git a/docs/DevelopmentGuide.md b/docs/DevelopmentGuide.md
index 087695e1e30..f3f07ec21b2 100644
--- a/docs/DevelopmentGuide.md
+++ b/docs/DevelopmentGuide.md
@@ -223,12 +223,31 @@ https://github.com/datadog/dd-apm-test-agent#readme
 
 **Linting**
 
-The trace library uses Rubocop to enforce [code style](https://github.com/bbatsov/ruby-style-guide) and quality. To check, run:
+Most of the library uses Rubocop to enforce [code style](https://github.com/bbatsov/ruby-style-guide) and quality. To check, run:
 
 ```
 $ bundle exec rake rubocop
 ```
 
+To change your code to the version that rubocop wants, run:
+
+```
+$ bundle exec rake rubocop -A
+```
+
+Profiling and Dynamic Instrumentation use [standard](https://github.com/standardrb/standard)
+instead of Rubocop. To check files with standard, run:
+
+```
+$ bundle exec rake standard
+```
+
+To change your code to the version that standard wants, run:
+
+```
+$ bundle exec rake standard:fix
+```
+
 ## Appendix
 
 ### Writing new integrations
diff --git a/ext/datadog_profiling_native_extension/clock_id.h b/ext/datadog_profiling_native_extension/clock_id.h
index b302380eab7..f02bcd5bd1b 100644
--- a/ext/datadog_profiling_native_extension/clock_id.h
+++ b/ext/datadog_profiling_native_extension/clock_id.h
@@ -5,13 +5,13 @@
 #include <ruby.h>
 
 // Contains the operating-system specific identifier needed to fetch CPU-time, and a flag to indicate if we failed to fetch it
-typedef struct thread_cpu_time_id {
+typedef struct {
   bool valid;
   clockid_t clock_id;
 } thread_cpu_time_id;
 
 // Contains the current cpu time, and a flag to indicate if we failed to fetch it
-typedef struct thread_cpu_time {
+typedef struct {
   bool valid;
   long result_ns;
 } thread_cpu_time;
diff --git a/ext/datadog_profiling_native_extension/collectors_cpu_and_wall_time_worker.c b/ext/datadog_profiling_native_extension/collectors_cpu_and_wall_time_worker.c
index 723e2d93b33..e40c2a1a14e 100644
--- a/ext/datadog_profiling_native_extension/collectors_cpu_and_wall_time_worker.c
+++ b/ext/datadog_profiling_native_extension/collectors_cpu_and_wall_time_worker.c
@@ -92,7 +92,7 @@ unsigned int MAX_ALLOC_WEIGHT = 10000;
 #endif
 
 // Contains state for a single CpuAndWallTimeWorker instance
-struct cpu_and_wall_time_worker_state {
+typedef struct {
   // These are immutable after initialization
 
   bool gc_profiling_enabled;
@@ -187,7 +187,7 @@ struct cpu_and_wall_time_worker_state {
     uint64_t gvl_sampling_time_ns_max;
     uint64_t gvl_sampling_time_ns_total;
   } stats;
-};
+} cpu_and_wall_time_worker_state;
 
 static VALUE _native_new(VALUE klass);
 static VALUE _native_initialize(int argc, VALUE *argv, DDTRACE_UNUSED VALUE _self);
@@ -195,7 +195,7 @@ static void cpu_and_wall_time_worker_typed_data_mark(void *state_ptr);
 static VALUE _native_sampling_loop(VALUE self, VALUE instance);
 static VALUE _native_stop(DDTRACE_UNUSED VALUE _self, VALUE self_instance, VALUE worker_thread);
 static VALUE stop(VALUE self_instance, VALUE optional_exception);
-static void stop_state(struct cpu_and_wall_time_worker_state *state, VALUE optional_exception);
+static void stop_state(cpu_and_wall_time_worker_state *state, VALUE optional_exception);
 static void handle_sampling_signal(DDTRACE_UNUSED int _signal, DDTRACE_UNUSED siginfo_t *_info, DDTRACE_UNUSED void *_ucontext);
 static void *run_sampling_trigger_loop(void *state_ptr);
 static void interrupt_sampling_trigger_loop(void *state_ptr);
@@ -221,14 +221,14 @@ static VALUE _native_stats(DDTRACE_UNUSED VALUE self, VALUE instance);
 static VALUE _native_stats_reset_not_thread_safe(DDTRACE_UNUSED VALUE self, VALUE instance);
 void *simulate_sampling_signal_delivery(DDTRACE_UNUSED void *_unused);
 static void grab_gvl_and_sample(void);
-static void reset_stats_not_thread_safe(struct cpu_and_wall_time_worker_state *state);
+static void reset_stats_not_thread_safe(cpu_and_wall_time_worker_state *state);
 static void sleep_for(uint64_t time_ns);
 static VALUE _native_allocation_count(DDTRACE_UNUSED VALUE self);
 static void on_newobj_event(DDTRACE_UNUSED VALUE unused1, DDTRACE_UNUSED void *unused2);
-static void disable_tracepoints(struct cpu_and_wall_time_worker_state *state);
+static void disable_tracepoints(cpu_and_wall_time_worker_state *state);
 static VALUE _native_with_blocked_sigprof(DDTRACE_UNUSED VALUE self);
 static VALUE rescued_sample_allocation(VALUE tracepoint_data);
-static void delayed_error(struct cpu_and_wall_time_worker_state *state, const char *error);
+static void delayed_error(cpu_and_wall_time_worker_state *state, const char *error);
 static VALUE _native_delayed_error(DDTRACE_UNUSED VALUE self, VALUE instance, VALUE error_msg);
 static VALUE _native_hold_signals(DDTRACE_UNUSED VALUE self);
 static VALUE _native_resume_signals(DDTRACE_UNUSED VALUE self);
@@ -262,7 +262,7 @@ static VALUE _native_gvl_profiling_hook_active(DDTRACE_UNUSED VALUE self, VALUE
 // This global state is needed because a bunch of functions on this file need to access it from situations
 // (e.g. signal handler) where it's impossible or just awkward to pass it as an argument.
 static VALUE active_sampler_instance = Qnil;
-static struct cpu_and_wall_time_worker_state *active_sampler_instance_state = NULL;
+static cpu_and_wall_time_worker_state *active_sampler_instance_state = NULL;
 
 // See handle_sampling_signal for details on what this does
 #ifdef NO_POSTPONED_TRIGGER
@@ -334,7 +334,7 @@ void collectors_cpu_and_wall_time_worker_init(VALUE profiling_module) {
   rb_define_singleton_method(testing_module, "_native_gvl_profiling_hook_active", _native_gvl_profiling_hook_active, 1);
 }
 
-// This structure is used to define a Ruby object that stores a pointer to a struct cpu_and_wall_time_worker_state
+// This structure is used to define a Ruby object that stores a pointer to a cpu_and_wall_time_worker_state
 // See also https://github.com/ruby/ruby/blob/master/doc/extension.rdoc for how this works
 static const rb_data_type_t cpu_and_wall_time_worker_typed_data = {
   .wrap_struct_name = "Datadog::Profiling::Collectors::CpuAndWallTimeWorker",
@@ -350,7 +350,7 @@ static const rb_data_type_t cpu_and_wall_time_worker_typed_data = {
 static VALUE _native_new(VALUE klass) {
   long now = monotonic_wall_time_now_ns(RAISE_ON_FAILURE);
 
-  struct cpu_and_wall_time_worker_state *state = ruby_xcalloc(1, sizeof(struct cpu_and_wall_time_worker_state));
+  cpu_and_wall_time_worker_state *state = ruby_xcalloc(1, sizeof(cpu_and_wall_time_worker_state));
 
   // Note: Any exceptions raised from this note until the TypedData_Wrap_Struct call will lead to the state memory
   // being leaked.
@@ -414,8 +414,8 @@ static VALUE _native_initialize(int argc, VALUE *argv, DDTRACE_UNUSED VALUE _sel
   ENFORCE_BOOLEAN(gvl_profiling_enabled);
   ENFORCE_BOOLEAN(skip_idle_samples_for_testing)
 
-  struct cpu_and_wall_time_worker_state *state;
-  TypedData_Get_Struct(self_instance, struct cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
+  cpu_and_wall_time_worker_state *state;
+  TypedData_Get_Struct(self_instance, cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
 
   state->gc_profiling_enabled = (gc_profiling_enabled == Qtrue);
   state->no_signals_workaround_enabled = (no_signals_workaround_enabled == Qtrue);
@@ -445,7 +445,7 @@ static VALUE _native_initialize(int argc, VALUE *argv, DDTRACE_UNUSED VALUE _sel
 
 // Since our state contains references to Ruby objects, we need to tell the Ruby GC about them
 static void cpu_and_wall_time_worker_typed_data_mark(void *state_ptr) {
-  struct cpu_and_wall_time_worker_state *state = (struct cpu_and_wall_time_worker_state *) state_ptr;
+  cpu_and_wall_time_worker_state *state = (cpu_and_wall_time_worker_state *) state_ptr;
 
   rb_gc_mark(state->thread_context_collector_instance);
   rb_gc_mark(state->idle_sampling_helper_instance);
@@ -457,8 +457,8 @@ static void cpu_and_wall_time_worker_typed_data_mark(void *state_ptr) {
 
 // Called in a background thread created in CpuAndWallTimeWorker#start
 static VALUE _native_sampling_loop(DDTRACE_UNUSED VALUE _self, VALUE instance) {
-  struct cpu_and_wall_time_worker_state *state;
-  TypedData_Get_Struct(instance, struct cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
+  cpu_and_wall_time_worker_state *state;
+  TypedData_Get_Struct(instance, cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
 
   // If we already got a delayed exception registered even before starting, raise before starting
   if (state->failure_exception != Qnil) {
@@ -466,7 +466,7 @@ static VALUE _native_sampling_loop(DDTRACE_UNUSED VALUE _self, VALUE instance) {
     rb_exc_raise(state->failure_exception);
   }
 
-  struct cpu_and_wall_time_worker_state *old_state = active_sampler_instance_state;
+  cpu_and_wall_time_worker_state *old_state = active_sampler_instance_state;
   if (old_state != NULL) {
     if (is_thread_alive(old_state->owner_thread)) {
       rb_raise(
@@ -546,15 +546,15 @@ static VALUE _native_sampling_loop(DDTRACE_UNUSED VALUE _self, VALUE instance) {
 }
 
 static VALUE _native_stop(DDTRACE_UNUSED VALUE _self, VALUE self_instance, VALUE worker_thread) {
-  struct cpu_and_wall_time_worker_state *state;
-  TypedData_Get_Struct(self_instance, struct cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
+  cpu_and_wall_time_worker_state *state;
+  TypedData_Get_Struct(self_instance, cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
 
   state->stop_thread = worker_thread;
 
   return stop(self_instance, /* optional_exception: */ Qnil);
 }
 
-static void stop_state(struct cpu_and_wall_time_worker_state *state, VALUE optional_exception) {
+static void stop_state(cpu_and_wall_time_worker_state *state, VALUE optional_exception) {
   atomic_store(&state->should_run, false);
   state->failure_exception = optional_exception;
 
@@ -563,8 +563,8 @@ static void stop_state(struct cpu_and_wall_time_worker_state *state, VALUE optio
 }
 
 static VALUE stop(VALUE self_instance, VALUE optional_exception) {
-  struct cpu_and_wall_time_worker_state *state;
-  TypedData_Get_Struct(self_instance, struct cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
+  cpu_and_wall_time_worker_state *state;
+  TypedData_Get_Struct(self_instance, cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
 
   stop_state(state, optional_exception);
 
@@ -575,7 +575,7 @@ static VALUE stop(VALUE self_instance, VALUE optional_exception) {
 // We need to be careful not to change any state that may be observed OR to restore it if we do. For instance, if anything
 // we do here can set `errno`, then we must be careful to restore the old `errno` after the fact.
 static void handle_sampling_signal(DDTRACE_UNUSED int _signal, DDTRACE_UNUSED siginfo_t *_info, DDTRACE_UNUSED void *_ucontext) {
-  struct cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
+  cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
 
   // This can potentially happen if the CpuAndWallTimeWorker was stopped while the signal delivery was happening; nothing to do
   if (state == NULL) return;
@@ -650,7 +650,7 @@ static void handle_sampling_signal(DDTRACE_UNUSED int _signal, DDTRACE_UNUSED si
 
 // The actual sampling trigger loop always runs **without** the global vm lock.
 static void *run_sampling_trigger_loop(void *state_ptr) {
-  struct cpu_and_wall_time_worker_state *state = (struct cpu_and_wall_time_worker_state *) state_ptr;
+  cpu_and_wall_time_worker_state *state = (cpu_and_wall_time_worker_state *) state_ptr;
 
   uint64_t minimum_time_between_signals = MILLIS_AS_NS(10);
 
@@ -709,13 +709,13 @@ static void *run_sampling_trigger_loop(void *state_ptr) {
 
 // This is called by the Ruby VM when it wants to shut down the background thread
 static void interrupt_sampling_trigger_loop(void *state_ptr) {
-  struct cpu_and_wall_time_worker_state *state = (struct cpu_and_wall_time_worker_state *) state_ptr;
+  cpu_and_wall_time_worker_state *state = (cpu_and_wall_time_worker_state *) state_ptr;
 
   atomic_store(&state->should_run, false);
 }
 
 static void sample_from_postponed_job(DDTRACE_UNUSED void *_unused) {
-  struct cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
+  cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
 
   // This can potentially happen if the CpuAndWallTimeWorker was stopped while the postponed job was waiting to be executed; nothing to do
   if (state == NULL) return;
@@ -735,8 +735,8 @@ static void sample_from_postponed_job(DDTRACE_UNUSED void *_unused) {
 }
 
 static VALUE rescued_sample_from_postponed_job(VALUE self_instance) {
-  struct cpu_and_wall_time_worker_state *state;
-  TypedData_Get_Struct(self_instance, struct cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
+  cpu_and_wall_time_worker_state *state;
+  TypedData_Get_Struct(self_instance, cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
 
   long wall_time_ns_before_sample = monotonic_wall_time_now_ns(RAISE_ON_FAILURE);
 
@@ -791,8 +791,8 @@ static VALUE _native_current_sigprof_signal_handler(DDTRACE_UNUSED VALUE self) {
 }
 
 static VALUE release_gvl_and_run_sampling_trigger_loop(VALUE instance) {
-  struct cpu_and_wall_time_worker_state *state;
-  TypedData_Get_Struct(instance, struct cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
+  cpu_and_wall_time_worker_state *state;
+  TypedData_Get_Struct(instance, cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
 
   // Final preparations: Setup signal handler and enable tracepoints. We run these here and not in `_native_sampling_loop`
   // because they may raise exceptions.
@@ -842,7 +842,7 @@ static VALUE release_gvl_and_run_sampling_trigger_loop(VALUE instance) {
 // This method exists only to enable testing Datadog::Profiling::Collectors::CpuAndWallTimeWorker behavior using RSpec.
 // It SHOULD NOT be used for other purposes.
 static VALUE _native_is_running(DDTRACE_UNUSED VALUE self, VALUE instance) {
-  struct cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
+  cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
 
   return (state != NULL && is_thread_alive(state->owner_thread) && state->self_instance == instance) ? Qtrue : Qfalse;
 }
@@ -875,8 +875,8 @@ static VALUE _native_trigger_sample(DDTRACE_UNUSED VALUE self) {
 // This method exists only to enable testing Datadog::Profiling::Collectors::CpuAndWallTimeWorker behavior using RSpec.
 // It SHOULD NOT be used for other purposes.
 static VALUE _native_gc_tracepoint(DDTRACE_UNUSED VALUE self, VALUE instance) {
-  struct cpu_and_wall_time_worker_state *state;
-  TypedData_Get_Struct(instance, struct cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
+  cpu_and_wall_time_worker_state *state;
+  TypedData_Get_Struct(instance, cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
 
   return state->gc_tracepoint;
 }
@@ -902,7 +902,7 @@ static void on_gc_event(VALUE tracepoint_data, DDTRACE_UNUSED void *unused) {
   int event = rb_tracearg_event_flag(rb_tracearg_from_tracepoint(tracepoint_data));
   if (event != RUBY_INTERNAL_EVENT_GC_ENTER && event != RUBY_INTERNAL_EVENT_GC_EXIT) return; // Unknown event
 
-  struct cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
+  cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
 
   // This should not happen in a normal situation because the tracepoint is always enabled after the instance is set
   // and disabled before it is cleared, but just in case...
@@ -926,7 +926,7 @@ static void on_gc_event(VALUE tracepoint_data, DDTRACE_UNUSED void *unused) {
 }
 
 static void after_gc_from_postponed_job(DDTRACE_UNUSED void *_unused) {
-  struct cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
+  cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
 
   // This can potentially happen if the CpuAndWallTimeWorker was stopped while the postponed job was waiting to be executed; nothing to do
   if (state == NULL) return;
@@ -981,8 +981,8 @@ static VALUE _native_simulate_sample_from_postponed_job(DDTRACE_UNUSED VALUE sel
 // In the future, if we add more other components with tracepoints, we will need to coordinate stopping all such
 // tracepoints before doing the other cleaning steps.
 static VALUE _native_reset_after_fork(DDTRACE_UNUSED VALUE self, VALUE instance) {
-  struct cpu_and_wall_time_worker_state *state;
-  TypedData_Get_Struct(instance, struct cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
+  cpu_and_wall_time_worker_state *state;
+  TypedData_Get_Struct(instance, cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
 
   // Disable all tracepoints, so that there are no more attempts to mutate the profile
   disable_tracepoints(state);
@@ -1000,8 +1000,8 @@ static VALUE _native_is_sigprof_blocked_in_current_thread(DDTRACE_UNUSED VALUE s
 }
 
 static VALUE _native_stats(DDTRACE_UNUSED VALUE self, VALUE instance) {
-  struct cpu_and_wall_time_worker_state *state;
-  TypedData_Get_Struct(instance, struct cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
+  cpu_and_wall_time_worker_state *state;
+  TypedData_Get_Struct(instance, cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
 
   unsigned long total_cpu_samples_attempted = state->stats.cpu_sampled + state->stats.cpu_skipped;
   VALUE effective_cpu_sample_rate =
@@ -1059,14 +1059,14 @@ static VALUE _native_stats(DDTRACE_UNUSED VALUE self, VALUE instance) {
 }
 
 static VALUE _native_stats_reset_not_thread_safe(DDTRACE_UNUSED VALUE self, VALUE instance) {
-  struct cpu_and_wall_time_worker_state *state;
-  TypedData_Get_Struct(instance, struct cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
+  cpu_and_wall_time_worker_state *state;
+  TypedData_Get_Struct(instance, cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
   reset_stats_not_thread_safe(state);
   return Qnil;
 }
 
 void *simulate_sampling_signal_delivery(DDTRACE_UNUSED void *_unused) {
-  struct cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
+  cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
 
   // This can potentially happen if the CpuAndWallTimeWorker was stopped while the IdleSamplingHelper was trying to execute this action
   if (state == NULL) return NULL;
@@ -1082,7 +1082,7 @@ void *simulate_sampling_signal_delivery(DDTRACE_UNUSED void *_unused) {
 
 static void grab_gvl_and_sample(void) { rb_thread_call_with_gvl(simulate_sampling_signal_delivery, NULL); }
 
-static void reset_stats_not_thread_safe(struct cpu_and_wall_time_worker_state *state) {
+static void reset_stats_not_thread_safe(cpu_and_wall_time_worker_state *state) {
   // NOTE: This is not really thread safe so ongoing sampling operations that are concurrent with a reset can have their stats:
   //       * Lost (writes after stats retrieval but before reset).
   //       * Included in the previous stats window (writes before stats retrieval and reset).
@@ -1116,7 +1116,7 @@ static void sleep_for(uint64_t time_ns) {
 }
 
 static VALUE _native_allocation_count(DDTRACE_UNUSED VALUE self) {
-  struct cpu_and_wall_time_worker_state *state = active_sampler_instance_state;
+  cpu_and_wall_time_worker_state *state = active_sampler_instance_state;
 
   bool are_allocations_being_tracked = state != NULL && state->allocation_profiling_enabled && state->allocation_counting_enabled;
 
@@ -1149,7 +1149,7 @@ static VALUE _native_allocation_count(DDTRACE_UNUSED VALUE self) {
 // call `rb_tracearg_from_tracepoint(anything)` anywhere during this function or its callees to get the data, so that's
 // why it's not being passed as an argument.
 static void on_newobj_event(DDTRACE_UNUSED VALUE unused1, DDTRACE_UNUSED void *unused2) {
-  struct cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
+  cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
 
   // This should not happen in a normal situation because the tracepoint is always enabled after the instance is set
   // and disabled before it is cleared, but just in case...
@@ -1235,7 +1235,7 @@ static void on_newobj_event(DDTRACE_UNUSED VALUE unused1, DDTRACE_UNUSED void *u
   state->during_sample = false;
 }
 
-static void disable_tracepoints(struct cpu_and_wall_time_worker_state *state) {
+static void disable_tracepoints(cpu_and_wall_time_worker_state *state) {
   if (state->gc_tracepoint != Qnil) {
     rb_tracepoint_disable(state->gc_tracepoint);
   }
@@ -1264,7 +1264,7 @@ static VALUE _native_with_blocked_sigprof(DDTRACE_UNUSED VALUE self) {
 }
 
 static VALUE rescued_sample_allocation(DDTRACE_UNUSED VALUE unused) {
-  struct cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
+  cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
 
   // This should not happen in a normal situation because on_newobj_event already checked for this, but just in case...
   if (state == NULL) return Qnil;
@@ -1293,7 +1293,7 @@ static VALUE rescued_sample_allocation(DDTRACE_UNUSED VALUE unused) {
   return Qnil;
 }
 
-static void delayed_error(struct cpu_and_wall_time_worker_state *state, const char *error) {
+static void delayed_error(cpu_and_wall_time_worker_state *state, const char *error) {
   // If we can't raise an immediate exception at the calling site, use the asynchronous flow through the main worker loop.
   stop_state(state, rb_exc_new_cstr(rb_eRuntimeError, error));
 }
@@ -1301,8 +1301,8 @@ static void delayed_error(struct cpu_and_wall_time_worker_state *state, const ch
 static VALUE _native_delayed_error(DDTRACE_UNUSED VALUE self, VALUE instance, VALUE error_msg) {
   ENFORCE_TYPE(error_msg, T_STRING);
 
-  struct cpu_and_wall_time_worker_state *state;
-  TypedData_Get_Struct(instance, struct cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
+  cpu_and_wall_time_worker_state *state;
+  TypedData_Get_Struct(instance, cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
 
   delayed_error(state, rb_string_value_cstr(&error_msg));
 
@@ -1355,7 +1355,7 @@ static VALUE _native_resume_signals(DDTRACE_UNUSED VALUE self) {
           rb_postponed_job_register_one(0, after_gvl_running_from_postponed_job, NULL);
         #endif
       } else if (result == ON_GVL_RUNNING_DONT_SAMPLE) {
-        struct cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
+        cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
 
         if (state == NULL) return; // This should not happen, but just in case...
 
@@ -1368,7 +1368,7 @@ static VALUE _native_resume_signals(DDTRACE_UNUSED VALUE self) {
   }
 
   static void after_gvl_running_from_postponed_job(DDTRACE_UNUSED void *_unused) {
-    struct cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
+    cpu_and_wall_time_worker_state *state = active_sampler_instance_state; // Read from global variable, see "sampler global state safety" note above
 
     // This can potentially happen if the CpuAndWallTimeWorker was stopped while the postponed job was waiting to be executed; nothing to do
     if (state == NULL) return;
@@ -1382,8 +1382,8 @@ static VALUE _native_resume_signals(DDTRACE_UNUSED VALUE self) {
   }
 
   static VALUE rescued_after_gvl_running_from_postponed_job(VALUE self_instance) {
-    struct cpu_and_wall_time_worker_state *state;
-    TypedData_Get_Struct(self_instance, struct cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
+    cpu_and_wall_time_worker_state *state;
+    TypedData_Get_Struct(self_instance, cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
 
     long wall_time_ns_before_sample = monotonic_wall_time_now_ns(RAISE_ON_FAILURE);
     thread_context_collector_sample_after_gvl_running(state->thread_context_collector_instance, rb_thread_current(), wall_time_ns_before_sample);
@@ -1404,8 +1404,8 @@ static VALUE _native_resume_signals(DDTRACE_UNUSED VALUE self) {
   }
 
   static VALUE _native_gvl_profiling_hook_active(DDTRACE_UNUSED VALUE self, VALUE instance) {
-    struct cpu_and_wall_time_worker_state *state;
-    TypedData_Get_Struct(instance, struct cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
+    cpu_and_wall_time_worker_state *state;
+    TypedData_Get_Struct(instance, cpu_and_wall_time_worker_state, &cpu_and_wall_time_worker_typed_data, state);
 
     return state->gvl_profiling_hook != NULL ? Qtrue : Qfalse;
   }
diff --git a/ext/datadog_profiling_native_extension/collectors_discrete_dynamic_sampler.c b/ext/datadog_profiling_native_extension/collectors_discrete_dynamic_sampler.c
index 25fcb0b3dbe..d310d3ca993 100644
--- a/ext/datadog_profiling_native_extension/collectors_discrete_dynamic_sampler.c
+++ b/ext/datadog_profiling_native_extension/collectors_discrete_dynamic_sampler.c
@@ -333,7 +333,7 @@ static VALUE _native_should_sample(VALUE self, VALUE now);
 static VALUE _native_after_sample(VALUE self, VALUE now);
 static VALUE _native_state_snapshot(VALUE self);
 
-typedef struct sampler_state {
+typedef struct {
   discrete_dynamic_sampler sampler;
 } sampler_state;
 
diff --git a/ext/datadog_profiling_native_extension/collectors_discrete_dynamic_sampler.h b/ext/datadog_profiling_native_extension/collectors_discrete_dynamic_sampler.h
index 7e1edfb5c42..1c0b0aedb2c 100644
--- a/ext/datadog_profiling_native_extension/collectors_discrete_dynamic_sampler.h
+++ b/ext/datadog_profiling_native_extension/collectors_discrete_dynamic_sampler.h
@@ -16,7 +16,7 @@
 //       every event and is thus, in theory, susceptible to some pattern
 //       biases. In practice, the dynamic readjustment of sampling interval
 //       and randomized starting point should help with avoiding heavy biases.
-typedef struct discrete_dynamic_sampler {
+typedef struct {
   // --- Config ---
   // Name of this sampler for debug logs.
   const char *debug_name;
diff --git a/ext/datadog_profiling_native_extension/collectors_idle_sampling_helper.c b/ext/datadog_profiling_native_extension/collectors_idle_sampling_helper.c
index a34a81feaf2..fcbc42eaa94 100644
--- a/ext/datadog_profiling_native_extension/collectors_idle_sampling_helper.c
+++ b/ext/datadog_profiling_native_extension/collectors_idle_sampling_helper.c
@@ -21,15 +21,15 @@
 typedef enum { ACTION_WAIT, ACTION_RUN, ACTION_STOP } action;
 
 // Contains state for a single CpuAndWallTimeWorker instance
-struct idle_sampling_loop_state {
+typedef struct {
   pthread_mutex_t wakeup_mutex;
   pthread_cond_t wakeup;
   action requested_action;
   void (*run_action_function)(void);
-};
+} idle_sampling_loop_state;
 
 static VALUE _native_new(VALUE klass);
-static void reset_state(struct idle_sampling_loop_state *state);
+static void reset_state(idle_sampling_loop_state *state);
 static VALUE _native_idle_sampling_loop(DDTRACE_UNUSED VALUE self, VALUE self_instance);
 static VALUE _native_stop(DDTRACE_UNUSED VALUE self, VALUE self_instance);
 static void *run_idle_sampling_loop(void *state_ptr);
@@ -62,7 +62,7 @@ void collectors_idle_sampling_helper_init(VALUE profiling_module) {
   rb_define_singleton_method(testing_module, "_native_idle_sampling_helper_request_action", _native_idle_sampling_helper_request_action, 1);
 }
 
-// This structure is used to define a Ruby object that stores a pointer to a struct idle_sampling_loop_state
+// This structure is used to define a Ruby object that stores a pointer to a idle_sampling_loop_state
 // See also https://github.com/ruby/ruby/blob/master/doc/extension.rdoc for how this works
 static const rb_data_type_t idle_sampling_helper_typed_data = {
   .wrap_struct_name = "Datadog::Profiling::Collectors::IdleSamplingHelper",
@@ -76,7 +76,7 @@ static const rb_data_type_t idle_sampling_helper_typed_data = {
 };
 
 static VALUE _native_new(VALUE klass) {
-  struct idle_sampling_loop_state *state = ruby_xcalloc(1, sizeof(struct idle_sampling_loop_state));
+  idle_sampling_loop_state *state = ruby_xcalloc(1, sizeof(idle_sampling_loop_state));
 
   // Note: Any exceptions raised from this note until the TypedData_Wrap_Struct call will lead to the state memory
   // being leaked.
@@ -90,7 +90,7 @@ static VALUE _native_new(VALUE klass) {
   return TypedData_Wrap_Struct(klass, &idle_sampling_helper_typed_data, state);
 }
 
-static void reset_state(struct idle_sampling_loop_state *state) {
+static void reset_state(idle_sampling_loop_state *state) {
   state->wakeup_mutex = (pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER;
   state->wakeup = (pthread_cond_t) PTHREAD_COND_INITIALIZER;
   state->requested_action = ACTION_WAIT;
@@ -101,8 +101,8 @@ static void reset_state(struct idle_sampling_loop_state *state) {
 // a pristine state before recreating the worker thread (this includes resetting the mutex in case it was left
 // locked halfway through the VM forking)
 static VALUE _native_reset(DDTRACE_UNUSED VALUE self, VALUE self_instance) {
-  struct idle_sampling_loop_state *state;
-  TypedData_Get_Struct(self_instance, struct idle_sampling_loop_state, &idle_sampling_helper_typed_data, state);
+  idle_sampling_loop_state *state;
+  TypedData_Get_Struct(self_instance, idle_sampling_loop_state, &idle_sampling_helper_typed_data, state);
 
   reset_state(state);
 
@@ -110,8 +110,8 @@ static VALUE _native_reset(DDTRACE_UNUSED VALUE self, VALUE self_instance) {
 }
 
 static VALUE _native_idle_sampling_loop(DDTRACE_UNUSED VALUE self, VALUE self_instance) {
-  struct idle_sampling_loop_state *state;
-  TypedData_Get_Struct(self_instance, struct idle_sampling_loop_state, &idle_sampling_helper_typed_data, state);
+  idle_sampling_loop_state *state;
+  TypedData_Get_Struct(self_instance, idle_sampling_loop_state, &idle_sampling_helper_typed_data, state);
 
   // Release GVL and run the loop waiting for requests
   rb_thread_call_without_gvl(run_idle_sampling_loop, state, interrupt_idle_sampling_loop, state);
@@ -120,7 +120,7 @@ static VALUE _native_idle_sampling_loop(DDTRACE_UNUSED VALUE self, VALUE self_in
 }
 
 static void *run_idle_sampling_loop(void *state_ptr) {
-  struct idle_sampling_loop_state *state = (struct idle_sampling_loop_state *) state_ptr;
+  idle_sampling_loop_state *state = (idle_sampling_loop_state *) state_ptr;
   int error = 0;
 
   while (true) {
@@ -164,7 +164,7 @@ static void *run_idle_sampling_loop(void *state_ptr) {
 }
 
 static void interrupt_idle_sampling_loop(void *state_ptr) {
-  struct idle_sampling_loop_state *state = (struct idle_sampling_loop_state *) state_ptr;
+  idle_sampling_loop_state *state = (idle_sampling_loop_state *) state_ptr;
   int error = 0;
 
   // Note about the error handling in this situation: Something bad happening at this stage is really really awkward to
@@ -189,8 +189,8 @@ static void interrupt_idle_sampling_loop(void *state_ptr) {
 }
 
 static VALUE _native_stop(DDTRACE_UNUSED VALUE self, VALUE self_instance) {
-  struct idle_sampling_loop_state *state;
-  TypedData_Get_Struct(self_instance, struct idle_sampling_loop_state, &idle_sampling_helper_typed_data, state);
+  idle_sampling_loop_state *state;
+  TypedData_Get_Struct(self_instance, idle_sampling_loop_state, &idle_sampling_helper_typed_data, state);
 
   ENFORCE_SUCCESS_GVL(pthread_mutex_lock(&state->wakeup_mutex));
   state->requested_action = ACTION_STOP;
@@ -204,12 +204,12 @@ static VALUE _native_stop(DDTRACE_UNUSED VALUE self, VALUE self_instance) {
 
 // Assumption: Function gets called without the global VM lock
 void idle_sampling_helper_request_action(VALUE self_instance, void (*run_action_function)(void)) {
-  struct idle_sampling_loop_state *state;
+  idle_sampling_loop_state *state;
   if (!rb_typeddata_is_kind_of(self_instance, &idle_sampling_helper_typed_data)) {
     grab_gvl_and_raise(rb_eTypeError, "Wrong argument for idle_sampling_helper_request_action");
   }
   // This should never fail the the above check passes
-  TypedData_Get_Struct(self_instance, struct idle_sampling_loop_state, &idle_sampling_helper_typed_data, state);
+  TypedData_Get_Struct(self_instance, idle_sampling_loop_state, &idle_sampling_helper_typed_data, state);
 
   ENFORCE_SUCCESS_NO_GVL(pthread_mutex_lock(&state->wakeup_mutex));
   if (state->requested_action == ACTION_WAIT) {
diff --git a/ext/datadog_profiling_native_extension/collectors_stack.c b/ext/datadog_profiling_native_extension/collectors_stack.c
index c7445dfc9ca..201a548f388 100644
--- a/ext/datadog_profiling_native_extension/collectors_stack.c
+++ b/ext/datadog_profiling_native_extension/collectors_stack.c
@@ -14,11 +14,11 @@
 static VALUE missing_string = Qnil;
 
 // Used as scratch space during sampling
-struct sampling_buffer {
+struct sampling_buffer { // Note: typedef'd in the header to sampling_buffer
   uint16_t max_frames;
   ddog_prof_Location *locations;
   frame_info *stack_buffer;
-}; // Note: typedef'd in the header to sampling_buffer
+};
 
 static VALUE _native_sample(int argc, VALUE *argv, DDTRACE_UNUSED VALUE _self);
 static VALUE native_sample_do(VALUE args);
@@ -44,7 +44,7 @@ void collectors_stack_init(VALUE profiling_module) {
   rb_global_variable(&missing_string);
 }
 
-struct native_sample_args {
+typedef struct {
   VALUE in_gc;
   VALUE recorder_instance;
   sample_values values;
@@ -52,7 +52,7 @@ struct native_sample_args {
   VALUE thread;
   ddog_prof_Location *locations;
   sampling_buffer *buffer;
-};
+} native_sample_args;
 
 // This method exists only to enable testing Datadog::Profiling::Collectors::Stack behavior using RSpec.
 // It SHOULD NOT be used for other purposes.
@@ -123,7 +123,7 @@ static VALUE _native_sample(int argc, VALUE *argv, DDTRACE_UNUSED VALUE _self) {
 
   ddog_prof_Slice_Label slice_labels = {.ptr = labels, .len = labels_count};
 
-  struct native_sample_args args_struct = {
+  native_sample_args args_struct = {
     .in_gc = in_gc,
     .recorder_instance = recorder_instance,
     .values = values,
@@ -137,7 +137,7 @@ static VALUE _native_sample(int argc, VALUE *argv, DDTRACE_UNUSED VALUE _self) {
 }
 
 static VALUE native_sample_do(VALUE args) {
-  struct native_sample_args *args_struct = (struct native_sample_args *) args;
+  native_sample_args *args_struct = (native_sample_args *) args;
 
   if (args_struct->in_gc == Qtrue) {
     record_placeholder_stack(
@@ -160,7 +160,7 @@ static VALUE native_sample_do(VALUE args) {
 }
 
 static VALUE native_sample_ensure(VALUE args) {
-  struct native_sample_args *args_struct = (struct native_sample_args *) args;
+  native_sample_args *args_struct = (native_sample_args *) args;
 
   ruby_xfree(args_struct->locations);
   sampling_buffer_free(args_struct->buffer);
diff --git a/ext/datadog_profiling_native_extension/collectors_thread_context.c b/ext/datadog_profiling_native_extension/collectors_thread_context.c
index 4afb23c5a9e..ba351b0c1fa 100644
--- a/ext/datadog_profiling_native_extension/collectors_thread_context.c
+++ b/ext/datadog_profiling_native_extension/collectors_thread_context.c
@@ -113,14 +113,14 @@ static uint32_t global_waiting_for_gvl_threshold_ns = MILLIS_AS_NS(10);
 typedef enum { OTEL_CONTEXT_ENABLED_FALSE, OTEL_CONTEXT_ENABLED_ONLY, OTEL_CONTEXT_ENABLED_BOTH } otel_context_enabled;
 
 // Contains state for a single ThreadContext instance
-struct thread_context_collector_state {
+typedef struct {
   // Note: Places in this file that usually need to be changed when this struct is changed are tagged with
   // "Update this when modifying state struct"
 
   // Required by Datadog::Profiling::Collectors::Stack as a scratch buffer during sampling
   ddog_prof_Location *locations;
   uint16_t max_frames;
-  // Hashmap <Thread Object, struct per_thread_context>
+  // Hashmap <Thread Object, per_thread_context>
   st_table *hash_map_per_thread_context;
   // Datadog::Profiling::StackRecorder instance
   VALUE recorder_instance;
@@ -163,10 +163,10 @@ struct thread_context_collector_state {
     long wall_time_at_previous_gc_ns; // Will be INVALID_TIME unless there's accumulated time above
     long wall_time_at_last_flushed_gc_event_ns; // Starts at 0 and then will always be valid
   } gc_tracking;
-};
+} thread_context_collector_state;
 
 // Tracks per-thread state
-struct per_thread_context {
+typedef struct {
   sampling_buffer *sampling_buffer;
   char thread_id[THREAD_ID_LIMIT_CHARS];
   ddog_CharSlice thread_id_char_slice;
@@ -182,21 +182,21 @@ struct per_thread_context {
     long cpu_time_at_start_ns;
     long wall_time_at_start_ns;
   } gc_tracking;
-};
+} per_thread_context;
 
 // Used to correlate profiles with traces
-struct trace_identifiers {
+typedef struct {
   bool valid;
   uint64_t local_root_span_id;
   uint64_t span_id;
   VALUE trace_endpoint;
-};
+} trace_identifiers;
 
-struct otel_span {
+typedef struct {
   VALUE span;
   VALUE span_id;
   VALUE trace_id;
-};
+} otel_span;
 
 static void thread_context_collector_typed_data_mark(void *state_ptr);
 static void thread_context_collector_typed_data_free(void *state_ptr);
@@ -209,19 +209,19 @@ static VALUE _native_on_gc_start(VALUE self, VALUE collector_instance);
 static VALUE _native_on_gc_finish(VALUE self, VALUE collector_instance);
 static VALUE _native_sample_after_gc(DDTRACE_UNUSED VALUE self, VALUE collector_instance, VALUE reset_monotonic_to_system_state, VALUE allow_exception);
 static void update_metrics_and_sample(
-  struct thread_context_collector_state *state,
+  thread_context_collector_state *state,
   VALUE thread_being_sampled,
   VALUE stack_from_thread,
-  struct per_thread_context *thread_context,
+  per_thread_context *thread_context,
   sampling_buffer* sampling_buffer,
   long current_cpu_time_ns,
   long current_monotonic_wall_time_ns
 );
 static void trigger_sample_for_thread(
-  struct thread_context_collector_state *state,
+  thread_context_collector_state *state,
   VALUE thread,
   VALUE stack_from_thread,
-  struct per_thread_context *thread_context,
+  per_thread_context *thread_context,
   sampling_buffer* sampling_buffer,
   sample_values values,
   long current_monotonic_wall_time_ns,
@@ -231,37 +231,37 @@ static void trigger_sample_for_thread(
   bool is_safe_to_allocate_objects
 );
 static VALUE _native_thread_list(VALUE self);
-static struct per_thread_context *get_or_create_context_for(VALUE thread, struct thread_context_collector_state *state);
-static struct per_thread_context *get_context_for(VALUE thread, struct thread_context_collector_state *state);
-static void initialize_context(VALUE thread, struct per_thread_context *thread_context, struct thread_context_collector_state *state);
-static void free_context(struct per_thread_context* thread_context);
+static per_thread_context *get_or_create_context_for(VALUE thread, thread_context_collector_state *state);
+static per_thread_context *get_context_for(VALUE thread, thread_context_collector_state *state);
+static void initialize_context(VALUE thread, per_thread_context *thread_context, thread_context_collector_state *state);
+static void free_context(per_thread_context* thread_context);
 static VALUE _native_inspect(VALUE self, VALUE collector_instance);
-static VALUE per_thread_context_st_table_as_ruby_hash(struct thread_context_collector_state *state);
+static VALUE per_thread_context_st_table_as_ruby_hash(thread_context_collector_state *state);
 static int per_thread_context_as_ruby_hash(st_data_t key_thread, st_data_t value_context, st_data_t result_hash);
-static VALUE stats_as_ruby_hash(struct thread_context_collector_state *state);
-static VALUE gc_tracking_as_ruby_hash(struct thread_context_collector_state *state);
-static void remove_context_for_dead_threads(struct thread_context_collector_state *state);
+static VALUE stats_as_ruby_hash(thread_context_collector_state *state);
+static VALUE gc_tracking_as_ruby_hash(thread_context_collector_state *state);
+static void remove_context_for_dead_threads(thread_context_collector_state *state);
 static int remove_if_dead_thread(st_data_t key_thread, st_data_t value_context, st_data_t _argument);
 static VALUE _native_per_thread_context(VALUE self, VALUE collector_instance);
 static long update_time_since_previous_sample(long *time_at_previous_sample_ns, long current_time_ns, long gc_start_time_ns, bool is_wall_time);
-static long cpu_time_now_ns(struct per_thread_context *thread_context);
+static long cpu_time_now_ns(per_thread_context *thread_context);
 static long thread_id_for(VALUE thread);
 static VALUE _native_stats(VALUE self, VALUE collector_instance);
 static VALUE _native_gc_tracking(VALUE self, VALUE collector_instance);
 static void trace_identifiers_for(
-  struct thread_context_collector_state *state,
+  thread_context_collector_state *state,
   VALUE thread,
-  struct trace_identifiers *trace_identifiers_result,
+  trace_identifiers *trace_identifiers_result,
   bool is_safe_to_allocate_objects
 );
 static bool should_collect_resource(VALUE root_span);
 static VALUE _native_reset_after_fork(DDTRACE_UNUSED VALUE self, VALUE collector_instance);
-static VALUE thread_list(struct thread_context_collector_state *state);
+static VALUE thread_list(thread_context_collector_state *state);
 static VALUE _native_sample_allocation(DDTRACE_UNUSED VALUE self, VALUE collector_instance, VALUE sample_weight, VALUE new_object);
 static VALUE _native_new_empty_thread(VALUE self);
 static ddog_CharSlice ruby_value_type_to_class_name(enum ruby_value_type type);
 static void ddtrace_otel_trace_identifiers_for(
-  struct thread_context_collector_state *state,
+  thread_context_collector_state *state,
   VALUE *active_trace,
   VALUE *root_span,
   VALUE *numeric_span_id,
@@ -271,10 +271,10 @@ static void ddtrace_otel_trace_identifiers_for(
 );
 static VALUE _native_sample_skipped_allocation_samples(DDTRACE_UNUSED VALUE self, VALUE collector_instance, VALUE skipped_samples);
 static bool handle_gvl_waiting(
-  struct thread_context_collector_state *state,
+  thread_context_collector_state *state,
   VALUE thread_being_sampled,
   VALUE stack_from_thread,
-  struct per_thread_context *thread_context,
+  per_thread_context *thread_context,
   sampling_buffer* sampling_buffer,
   long current_cpu_time_ns
 );
@@ -284,12 +284,12 @@ static VALUE _native_on_gvl_running(DDTRACE_UNUSED VALUE self, VALUE thread);
 static VALUE _native_sample_after_gvl_running(DDTRACE_UNUSED VALUE self, VALUE collector_instance, VALUE thread);
 static VALUE _native_apply_delta_to_cpu_time_at_previous_sample_ns(DDTRACE_UNUSED VALUE self, VALUE collector_instance, VALUE thread, VALUE delta_ns);
 static void otel_without_ddtrace_trace_identifiers_for(
-  struct thread_context_collector_state *state,
+  thread_context_collector_state *state,
   VALUE thread,
-  struct trace_identifiers *trace_identifiers_result,
+  trace_identifiers *trace_identifiers_result,
   bool is_safe_to_allocate_objects
 );
-static struct otel_span otel_span_from(VALUE otel_context, VALUE otel_current_span_key);
+static otel_span otel_span_from(VALUE otel_context, VALUE otel_current_span_key);
 static uint64_t otel_span_id_to_uint(VALUE otel_span_id);
 static VALUE safely_lookup_hash_without_going_into_ruby_code(VALUE hash, VALUE key);
 
@@ -357,7 +357,7 @@ void collectors_thread_context_init(VALUE profiling_module) {
   gc_profiling_init();
 }
 
-// This structure is used to define a Ruby object that stores a pointer to a struct thread_context_collector_state
+// This structure is used to define a Ruby object that stores a pointer to a thread_context_collector_state
 // See also https://github.com/ruby/ruby/blob/master/doc/extension.rdoc for how this works
 static const rb_data_type_t thread_context_collector_typed_data = {
   .wrap_struct_name = "Datadog::Profiling::Collectors::ThreadContext",
@@ -373,7 +373,7 @@ static const rb_data_type_t thread_context_collector_typed_data = {
 // This function is called by the Ruby GC to give us a chance to mark any Ruby objects that we're holding on to,
 // so that they don't get garbage collected
 static void thread_context_collector_typed_data_mark(void *state_ptr) {
-  struct thread_context_collector_state *state = (struct thread_context_collector_state *) state_ptr;
+  thread_context_collector_state *state = (thread_context_collector_state *) state_ptr;
 
   // Update this when modifying state struct
   rb_gc_mark(state->recorder_instance);
@@ -384,7 +384,7 @@ static void thread_context_collector_typed_data_mark(void *state_ptr) {
 }
 
 static void thread_context_collector_typed_data_free(void *state_ptr) {
-  struct thread_context_collector_state *state = (struct thread_context_collector_state *) state_ptr;
+  thread_context_collector_state *state = (thread_context_collector_state *) state_ptr;
 
   // Update this when modifying state struct
 
@@ -409,13 +409,13 @@ static int hash_map_per_thread_context_mark(st_data_t key_thread, DDTRACE_UNUSED
 
 // Used to clear each of the per_thread_contexts inside the hash_map_per_thread_context
 static int hash_map_per_thread_context_free_values(DDTRACE_UNUSED st_data_t _thread, st_data_t value_per_thread_context, DDTRACE_UNUSED st_data_t _argument) {
-  struct per_thread_context *thread_context = (struct per_thread_context*) value_per_thread_context;
+  per_thread_context *thread_context = (per_thread_context*) value_per_thread_context;
   free_context(thread_context);
   return ST_CONTINUE;
 }
 
 static VALUE _native_new(VALUE klass) {
-  struct thread_context_collector_state *state = ruby_xcalloc(1, sizeof(struct thread_context_collector_state));
+  thread_context_collector_state *state = ruby_xcalloc(1, sizeof(thread_context_collector_state));
 
   // Note: Any exceptions raised from this note until the TypedData_Wrap_Struct call will lead to the state memory
   // being leaked.
@@ -471,8 +471,8 @@ static VALUE _native_initialize(int argc, VALUE *argv, DDTRACE_UNUSED VALUE _sel
   ENFORCE_BOOLEAN(timeline_enabled);
   ENFORCE_TYPE(waiting_for_gvl_threshold_ns, T_FIXNUM);
 
-  struct thread_context_collector_state *state;
-  TypedData_Get_Struct(self_instance, struct thread_context_collector_state, &thread_context_collector_typed_data, state);
+  thread_context_collector_state *state;
+  TypedData_Get_Struct(self_instance, thread_context_collector_state, &thread_context_collector_typed_data, state);
 
   // Update this when modifying state struct
   state->max_frames = sampling_buffer_check_max_frames(NUM2INT(max_frames));
@@ -550,8 +550,8 @@ static VALUE _native_sample_after_gc(DDTRACE_UNUSED VALUE self, VALUE collector_
   ENFORCE_BOOLEAN(reset_monotonic_to_system_state);
   ENFORCE_BOOLEAN(allow_exception);
 
-  struct thread_context_collector_state *state;
-  TypedData_Get_Struct(collector_instance, struct thread_context_collector_state, &thread_context_collector_typed_data, state);
+  thread_context_collector_state *state;
+  TypedData_Get_Struct(collector_instance, thread_context_collector_state, &thread_context_collector_typed_data, state);
 
   if (reset_monotonic_to_system_state == Qtrue) {
     state->time_converter_state = (monotonic_to_system_epoch_state) MONOTONIC_TO_SYSTEM_EPOCH_INITIALIZER;
@@ -577,11 +577,11 @@ static VALUE _native_sample_after_gc(DDTRACE_UNUSED VALUE self, VALUE collector_
 // The `profiler_overhead_stack_thread` is used to attribute the profiler overhead to a stack borrowed from a different thread
 // (belonging to ddtrace), so that the overhead is visible in the profile rather than blamed on user code.
 void thread_context_collector_sample(VALUE self_instance, long current_monotonic_wall_time_ns, VALUE profiler_overhead_stack_thread) {
-  struct thread_context_collector_state *state;
-  TypedData_Get_Struct(self_instance, struct thread_context_collector_state, &thread_context_collector_typed_data, state);
+  thread_context_collector_state *state;
+  TypedData_Get_Struct(self_instance, thread_context_collector_state, &thread_context_collector_typed_data, state);
 
   VALUE current_thread = rb_thread_current();
-  struct per_thread_context *current_thread_context = get_or_create_context_for(current_thread, state);
+  per_thread_context *current_thread_context = get_or_create_context_for(current_thread, state);
   long cpu_time_at_sample_start_for_current_thread = cpu_time_now_ns(current_thread_context);
 
   VALUE threads = thread_list(state);
@@ -589,7 +589,7 @@ void thread_context_collector_sample(VALUE self_instance, long current_monotonic
   const long thread_count = RARRAY_LEN(threads);
   for (long i = 0; i < thread_count; i++) {
     VALUE thread = RARRAY_AREF(threads, i);
-    struct per_thread_context *thread_context = get_or_create_context_for(thread, state);
+    per_thread_context *thread_context = get_or_create_context_for(thread, state);
 
     // We account for cpu-time for the current thread in a different way -- we use the cpu-time at sampling start, to avoid
     // blaming the time the profiler took on whatever's running on the thread right now
@@ -625,10 +625,10 @@ void thread_context_collector_sample(VALUE self_instance, long current_monotonic
 }
 
 static void update_metrics_and_sample(
-  struct thread_context_collector_state *state,
+  thread_context_collector_state *state,
   VALUE thread_being_sampled,
   VALUE stack_from_thread, // This can be different when attributing profiler overhead using a different stack
-  struct per_thread_context *thread_context,
+  per_thread_context *thread_context,
   sampling_buffer* sampling_buffer,
   long current_cpu_time_ns,
   long current_monotonic_wall_time_ns
@@ -696,12 +696,12 @@ static void update_metrics_and_sample(
 // Assumption 1: This function is called in a thread that is holding the Global VM Lock. Caller is responsible for enforcing this.
 // Assumption 2: This function is called from the main Ractor (if Ruby has support for Ractors).
 void thread_context_collector_on_gc_start(VALUE self_instance) {
-  struct thread_context_collector_state *state;
+  thread_context_collector_state *state;
   if (!rb_typeddata_is_kind_of(self_instance, &thread_context_collector_typed_data)) return;
   // This should never fail the the above check passes
-  TypedData_Get_Struct(self_instance, struct thread_context_collector_state, &thread_context_collector_typed_data, state);
+  TypedData_Get_Struct(self_instance, thread_context_collector_state, &thread_context_collector_typed_data, state);
 
-  struct per_thread_context *thread_context = get_context_for(rb_thread_current(), state);
+  per_thread_context *thread_context = get_context_for(rb_thread_current(), state);
 
   // If there was no previously-existing context for this thread, we won't allocate one (see safety). For now we just drop
   // the GC sample, under the assumption that "a thread that is so new that we never sampled it even once before it triggers
@@ -729,12 +729,12 @@ void thread_context_collector_on_gc_start(VALUE self_instance) {
 // Assumption 2: This function is called from the main Ractor (if Ruby has support for Ractors).
 __attribute__((warn_unused_result))
 bool thread_context_collector_on_gc_finish(VALUE self_instance) {
-  struct thread_context_collector_state *state;
+  thread_context_collector_state *state;
   if (!rb_typeddata_is_kind_of(self_instance, &thread_context_collector_typed_data)) return false;
   // This should never fail the the above check passes
-  TypedData_Get_Struct(self_instance, struct thread_context_collector_state, &thread_context_collector_typed_data, state);
+  TypedData_Get_Struct(self_instance, thread_context_collector_state, &thread_context_collector_typed_data, state);
 
-  struct per_thread_context *thread_context = get_context_for(rb_thread_current(), state);
+  per_thread_context *thread_context = get_context_for(rb_thread_current(), state);
 
   // If there was no previously-existing context for this thread, we won't allocate one (see safety). We keep a metric for
   // how often this happens -- see on_gc_start.
@@ -807,8 +807,8 @@ bool thread_context_collector_on_gc_finish(VALUE self_instance) {
 // Assumption 3: Unlike `on_gc_start` and `on_gc_finish`, this method is allowed to allocate memory as needed.
 // Assumption 4: This function is called from the main Ractor (if Ruby has support for Ractors).
 VALUE thread_context_collector_sample_after_gc(VALUE self_instance) {
-  struct thread_context_collector_state *state;
-  TypedData_Get_Struct(self_instance, struct thread_context_collector_state, &thread_context_collector_typed_data, state);
+  thread_context_collector_state *state;
+  TypedData_Get_Struct(self_instance, thread_context_collector_state, &thread_context_collector_typed_data, state);
 
   if (state->gc_tracking.wall_time_at_previous_gc_ns == INVALID_TIME) {
     rb_raise(rb_eRuntimeError, "BUG: Unexpected call to sample_after_gc without valid GC information available");
@@ -857,10 +857,10 @@ VALUE thread_context_collector_sample_after_gc(VALUE self_instance) {
 }
 
 static void trigger_sample_for_thread(
-  struct thread_context_collector_state *state,
+  thread_context_collector_state *state,
   VALUE thread,
   VALUE stack_from_thread, // This can be different when attributing profiler overhead using a different stack
-  struct per_thread_context *thread_context,
+  per_thread_context *thread_context,
   sampling_buffer* sampling_buffer,
   sample_values values,
   long current_monotonic_wall_time_ns,
@@ -908,7 +908,7 @@ static void trigger_sample_for_thread(
     };
   }
 
-  struct trace_identifiers trace_identifiers_result = {.valid = false, .trace_endpoint = Qnil};
+  trace_identifiers trace_identifiers_result = {.valid = false, .trace_endpoint = Qnil};
   trace_identifiers_for(state, thread, &trace_identifiers_result, is_safe_to_allocate_objects);
 
   if (!trace_identifiers_result.valid && state->otel_context_enabled != OTEL_CONTEXT_ENABLED_FALSE) {
@@ -1017,14 +1017,14 @@ static VALUE _native_thread_list(DDTRACE_UNUSED VALUE _self) {
   return result;
 }
 
-static struct per_thread_context *get_or_create_context_for(VALUE thread, struct thread_context_collector_state *state) {
-  struct per_thread_context* thread_context = NULL;
+static per_thread_context *get_or_create_context_for(VALUE thread, thread_context_collector_state *state) {
+  per_thread_context* thread_context = NULL;
   st_data_t value_context = 0;
 
   if (st_lookup(state->hash_map_per_thread_context, (st_data_t) thread, &value_context)) {
-    thread_context = (struct per_thread_context*) value_context;
+    thread_context = (per_thread_context*) value_context;
   } else {
-    thread_context = ruby_xcalloc(1, sizeof(struct per_thread_context));
+    thread_context = ruby_xcalloc(1, sizeof(per_thread_context));
     initialize_context(thread, thread_context, state);
     st_insert(state->hash_map_per_thread_context, (st_data_t) thread, (st_data_t) thread_context);
   }
@@ -1032,12 +1032,12 @@ static struct per_thread_context *get_or_create_context_for(VALUE thread, struct
   return thread_context;
 }
 
-static struct per_thread_context *get_context_for(VALUE thread, struct thread_context_collector_state *state) {
-  struct per_thread_context* thread_context = NULL;
+static per_thread_context *get_context_for(VALUE thread, thread_context_collector_state *state) {
+  per_thread_context* thread_context = NULL;
   st_data_t value_context = 0;
 
   if (st_lookup(state->hash_map_per_thread_context, (st_data_t) thread, &value_context)) {
-    thread_context = (struct per_thread_context*) value_context;
+    thread_context = (per_thread_context*) value_context;
   }
 
   return thread_context;
@@ -1064,7 +1064,7 @@ static bool is_logging_gem_monkey_patch(VALUE invoke_file_location) {
   return strncmp(invoke_file + invoke_file_len - logging_gem_path_len, LOGGING_GEM_PATH, logging_gem_path_len) == 0;
 }
 
-static void initialize_context(VALUE thread, struct per_thread_context *thread_context, struct thread_context_collector_state *state) {
+static void initialize_context(VALUE thread, per_thread_context *thread_context, thread_context_collector_state *state) {
   thread_context->sampling_buffer = sampling_buffer_new(state->max_frames, state->locations);
 
   snprintf(thread_context->thread_id, THREAD_ID_LIMIT_CHARS, "%"PRIu64" (%lu)", native_thread_id_for(thread), (unsigned long) thread_id_for(thread));
@@ -1121,14 +1121,14 @@ static void initialize_context(VALUE thread, struct per_thread_context *thread_c
   #endif
 }
 
-static void free_context(struct per_thread_context* thread_context) {
+static void free_context(per_thread_context* thread_context) {
   sampling_buffer_free(thread_context->sampling_buffer);
   ruby_xfree(thread_context);
 }
 
 static VALUE _native_inspect(DDTRACE_UNUSED VALUE _self, VALUE collector_instance) {
-  struct thread_context_collector_state *state;
-  TypedData_Get_Struct(collector_instance, struct thread_context_collector_state, &thread_context_collector_typed_data, state);
+  thread_context_collector_state *state;
+  TypedData_Get_Struct(collector_instance, thread_context_collector_state, &thread_context_collector_typed_data, state);
 
   VALUE result = rb_str_new2(" (native state)");
 
@@ -1156,7 +1156,7 @@ static VALUE _native_inspect(DDTRACE_UNUSED VALUE _self, VALUE collector_instanc
   return result;
 }
 
-static VALUE per_thread_context_st_table_as_ruby_hash(struct thread_context_collector_state *state) {
+static VALUE per_thread_context_st_table_as_ruby_hash(thread_context_collector_state *state) {
   VALUE result = rb_hash_new();
   st_foreach(state->hash_map_per_thread_context, per_thread_context_as_ruby_hash, result);
   return result;
@@ -1164,7 +1164,7 @@ static VALUE per_thread_context_st_table_as_ruby_hash(struct thread_context_coll
 
 static int per_thread_context_as_ruby_hash(st_data_t key_thread, st_data_t value_context, st_data_t result_hash) {
   VALUE thread = (VALUE) key_thread;
-  struct per_thread_context *thread_context = (struct per_thread_context*) value_context;
+  per_thread_context *thread_context = (per_thread_context*) value_context;
   VALUE result = (VALUE) result_hash;
   VALUE context_as_hash = rb_hash_new();
   rb_hash_aset(result, thread, context_as_hash);
@@ -1189,7 +1189,7 @@ static int per_thread_context_as_ruby_hash(st_data_t key_thread, st_data_t value
   return ST_CONTINUE;
 }
 
-static VALUE stats_as_ruby_hash(struct thread_context_collector_state *state) {
+static VALUE stats_as_ruby_hash(thread_context_collector_state *state) {
   // Update this when modifying state struct (stats inner struct)
   VALUE stats_as_hash = rb_hash_new();
   VALUE arguments[] = {
@@ -1200,7 +1200,7 @@ static VALUE stats_as_ruby_hash(struct thread_context_collector_state *state) {
   return stats_as_hash;
 }
 
-static VALUE gc_tracking_as_ruby_hash(struct thread_context_collector_state *state) {
+static VALUE gc_tracking_as_ruby_hash(thread_context_collector_state *state) {
   // Update this when modifying state struct (gc_tracking inner struct)
   VALUE result = rb_hash_new();
   VALUE arguments[] = {
@@ -1213,13 +1213,13 @@ static VALUE gc_tracking_as_ruby_hash(struct thread_context_collector_state *sta
   return result;
 }
 
-static void remove_context_for_dead_threads(struct thread_context_collector_state *state) {
+static void remove_context_for_dead_threads(thread_context_collector_state *state) {
   st_foreach(state->hash_map_per_thread_context, remove_if_dead_thread, 0 /* unused */);
 }
 
 static int remove_if_dead_thread(st_data_t key_thread, st_data_t value_context, DDTRACE_UNUSED st_data_t _argument) {
   VALUE thread = (VALUE) key_thread;
-  struct per_thread_context* thread_context = (struct per_thread_context*) value_context;
+  per_thread_context* thread_context = (per_thread_context*) value_context;
 
   if (is_thread_alive(thread)) return ST_CONTINUE;
 
@@ -1232,8 +1232,8 @@ static int remove_if_dead_thread(st_data_t key_thread, st_data_t value_context,
 //
 // Returns the whole contents of the per_thread_context structs being tracked.
 static VALUE _native_per_thread_context(DDTRACE_UNUSED VALUE _self, VALUE collector_instance) {
-  struct thread_context_collector_state *state;
-  TypedData_Get_Struct(collector_instance, struct thread_context_collector_state, &thread_context_collector_typed_data, state);
+  thread_context_collector_state *state;
+  TypedData_Get_Struct(collector_instance, thread_context_collector_state, &thread_context_collector_typed_data, state);
 
   return per_thread_context_st_table_as_ruby_hash(state);
 }
@@ -1278,7 +1278,7 @@ static long update_time_since_previous_sample(long *time_at_previous_sample_ns,
 }
 
 // Safety: This function is assumed never to raise exceptions by callers
-static long cpu_time_now_ns(struct per_thread_context *thread_context) {
+static long cpu_time_now_ns(per_thread_context *thread_context) {
   thread_cpu_time cpu_time = thread_cpu_time_for(thread_context->thread_cpu_time_id);
 
   if (!cpu_time.valid) {
@@ -1316,8 +1316,8 @@ VALUE enforce_thread_context_collector_instance(VALUE object) {
 // This method exists only to enable testing Datadog::Profiling::Collectors::ThreadContext behavior using RSpec.
 // It SHOULD NOT be used for other purposes.
 static VALUE _native_stats(DDTRACE_UNUSED VALUE _self, VALUE collector_instance) {
-  struct thread_context_collector_state *state;
-  TypedData_Get_Struct(collector_instance, struct thread_context_collector_state, &thread_context_collector_typed_data, state);
+  thread_context_collector_state *state;
+  TypedData_Get_Struct(collector_instance, thread_context_collector_state, &thread_context_collector_typed_data, state);
 
   return stats_as_ruby_hash(state);
 }
@@ -1325,17 +1325,17 @@ static VALUE _native_stats(DDTRACE_UNUSED VALUE _self, VALUE collector_instance)
 // This method exists only to enable testing Datadog::Profiling::Collectors::ThreadContext behavior using RSpec.
 // It SHOULD NOT be used for other purposes.
 static VALUE _native_gc_tracking(DDTRACE_UNUSED VALUE _self, VALUE collector_instance) {
-  struct thread_context_collector_state *state;
-  TypedData_Get_Struct(collector_instance, struct thread_context_collector_state, &thread_context_collector_typed_data, state);
+  thread_context_collector_state *state;
+  TypedData_Get_Struct(collector_instance, thread_context_collector_state, &thread_context_collector_typed_data, state);
 
   return gc_tracking_as_ruby_hash(state);
 }
 
 // Assumption 1: This function is called in a thread that is holding the Global VM Lock. Caller is responsible for enforcing this.
 static void trace_identifiers_for(
-  struct thread_context_collector_state *state,
+  thread_context_collector_state *state,
   VALUE thread,
-  struct trace_identifiers *trace_identifiers_result,
+  trace_identifiers *trace_identifiers_result,
   bool is_safe_to_allocate_objects
 ) {
   if (state->otel_context_enabled == OTEL_CONTEXT_ENABLED_ONLY) return;
@@ -1415,8 +1415,8 @@ static bool should_collect_resource(VALUE root_span) {
 // Assumption: This method gets called BEFORE restarting profiling -- e.g. there are no components attempting to
 // trigger samples at the same time.
 static VALUE _native_reset_after_fork(DDTRACE_UNUSED VALUE self, VALUE collector_instance) {
-  struct thread_context_collector_state *state;
-  TypedData_Get_Struct(collector_instance, struct thread_context_collector_state, &thread_context_collector_typed_data, state);
+  thread_context_collector_state *state;
+  TypedData_Get_Struct(collector_instance, thread_context_collector_state, &thread_context_collector_typed_data, state);
 
   // Release all context memory before clearing the existing context
   st_foreach(state->hash_map_per_thread_context, hash_map_per_thread_context_free_values, 0 /* unused */);
@@ -1430,7 +1430,7 @@ static VALUE _native_reset_after_fork(DDTRACE_UNUSED VALUE self, VALUE collector
   return Qtrue;
 }
 
-static VALUE thread_list(struct thread_context_collector_state *state) {
+static VALUE thread_list(thread_context_collector_state *state) {
   VALUE result = state->thread_list_buffer;
   rb_ary_clear(result);
   ddtrace_thread_list(result);
@@ -1438,8 +1438,8 @@ static VALUE thread_list(struct thread_context_collector_state *state) {
 }
 
 void thread_context_collector_sample_allocation(VALUE self_instance, unsigned int sample_weight, VALUE new_object) {
-  struct thread_context_collector_state *state;
-  TypedData_Get_Struct(self_instance, struct thread_context_collector_state, &thread_context_collector_typed_data, state);
+  thread_context_collector_state *state;
+  TypedData_Get_Struct(self_instance, thread_context_collector_state, &thread_context_collector_typed_data, state);
 
   VALUE current_thread = rb_thread_current();
 
@@ -1512,7 +1512,7 @@ void thread_context_collector_sample_allocation(VALUE self_instance, unsigned in
 
   track_object(state->recorder_instance, new_object, sample_weight, optional_class_name);
 
-  struct per_thread_context *thread_context = get_or_create_context_for(current_thread, state);
+  per_thread_context *thread_context = get_or_create_context_for(current_thread, state);
 
   trigger_sample_for_thread(
     state,
@@ -1585,7 +1585,7 @@ static VALUE read_otel_current_span_key_const(DDTRACE_UNUSED VALUE _unused) {
   return rb_const_get(trace_module, rb_intern("CURRENT_SPAN_KEY"));
 }
 
-static VALUE get_otel_current_span_key(struct thread_context_collector_state *state, bool is_safe_to_allocate_objects) {
+static VALUE get_otel_current_span_key(thread_context_collector_state *state, bool is_safe_to_allocate_objects) {
   if (state->otel_current_span_key == Qtrue) { // Qtrue means we haven't tried to extract it yet
     if (!is_safe_to_allocate_objects) {
       // Calling read_otel_current_span_key_const below can trigger exceptions and arbitrary Ruby code running (e.g.
@@ -1608,7 +1608,7 @@ static VALUE get_otel_current_span_key(struct thread_context_collector_state *st
 // This method gets used when ddtrace is being used indirectly via the opentelemetry APIs. Information gets stored slightly
 // differently, and this codepath handles it.
 static void ddtrace_otel_trace_identifiers_for(
-  struct thread_context_collector_state *state,
+  thread_context_collector_state *state,
   VALUE *active_trace,
   VALUE *root_span,
   VALUE *numeric_span_id,
@@ -1652,8 +1652,8 @@ static void ddtrace_otel_trace_identifiers_for(
 }
 
 void thread_context_collector_sample_skipped_allocation_samples(VALUE self_instance, unsigned int skipped_samples) {
-  struct thread_context_collector_state *state;
-  TypedData_Get_Struct(self_instance, struct thread_context_collector_state, &thread_context_collector_typed_data, state);
+  thread_context_collector_state *state;
+  TypedData_Get_Struct(self_instance, thread_context_collector_state, &thread_context_collector_typed_data, state);
 
   ddog_prof_Label labels[] = {
     // Providing .num = 0 should not be needed but the tracer-2.7 docker image ships a buggy gcc that complains about this
@@ -1707,9 +1707,9 @@ static VALUE _native_sample_skipped_allocation_samples(DDTRACE_UNUSED VALUE self
 //    root span id.
 //    This matches the semantics of how ddtrace tracing creates a TraceOperation and assigns a local root span to it.
 static void otel_without_ddtrace_trace_identifiers_for(
-  struct thread_context_collector_state *state,
+  thread_context_collector_state *state,
   VALUE thread,
-  struct trace_identifiers *trace_identifiers_result,
+  trace_identifiers *trace_identifiers_result,
   bool is_safe_to_allocate_objects
 ) {
   VALUE context_storage = rb_thread_local_aref(thread, otel_context_storage_id /* __opentelemetry_context_storage__ */);
@@ -1723,14 +1723,14 @@ static void otel_without_ddtrace_trace_identifiers_for(
   int active_context_index = RARRAY_LEN(context_storage) - 1;
   if (active_context_index < 0) return;
 
-  struct otel_span active_span = otel_span_from(rb_ary_entry(context_storage, active_context_index), otel_current_span_key);
+  otel_span active_span = otel_span_from(rb_ary_entry(context_storage, active_context_index), otel_current_span_key);
   if (active_span.span == Qnil) return;
 
-  struct otel_span local_root_span = active_span;
+  otel_span local_root_span = active_span;
 
   // Now find the oldest span starting from the active span that still has the same trace id as the active span
   for (int i = active_context_index - 1; i >= 0; i--) {
-    struct otel_span checking_span = otel_span_from(rb_ary_entry(context_storage, i), otel_current_span_key);
+    otel_span checking_span = otel_span_from(rb_ary_entry(context_storage, i), otel_current_span_key);
     if (checking_span.span == Qnil) return;
 
     if (rb_str_equal(active_span.trace_id, checking_span.trace_id) == Qfalse) break;
@@ -1758,8 +1758,8 @@ static void otel_without_ddtrace_trace_identifiers_for(
   trace_identifiers_result->trace_endpoint = trace_resource;
 }
 
-static struct otel_span otel_span_from(VALUE otel_context, VALUE otel_current_span_key) {
-  struct otel_span failed = {.span = Qnil, .span_id = Qnil, .trace_id = Qnil};
+static otel_span otel_span_from(VALUE otel_context, VALUE otel_current_span_key) {
+  otel_span failed = {.span = Qnil, .span_id = Qnil, .trace_id = Qnil};
 
   if (otel_context == Qnil) return failed;
 
@@ -1778,7 +1778,7 @@ static struct otel_span otel_span_from(VALUE otel_context, VALUE otel_current_sp
   VALUE trace_id = rb_ivar_get(span_context, at_trace_id_id /* @trace_id */);
   if (span_id == Qnil || trace_id == Qnil || !RB_TYPE_P(span_id, T_STRING) || !RB_TYPE_P(trace_id, T_STRING)) return failed;
 
-  return (struct otel_span) {.span = span, .span_id = span_id, .trace_id = trace_id};
+  return (otel_span) {.span = span, .span_id = span_id, .trace_id = trace_id};
 }
 
 // Otel span ids are represented as a big-endian 8-byte string
@@ -1880,8 +1880,8 @@ static uint64_t otel_span_id_to_uint(VALUE otel_span_id) {
   // NOTE: In normal use, current_thread is expected to be == rb_thread_current(); the `current_thread` parameter only
   // exists to enable testing.
   VALUE thread_context_collector_sample_after_gvl_running(VALUE self_instance, VALUE current_thread, long current_monotonic_wall_time_ns) {
-    struct thread_context_collector_state *state;
-    TypedData_Get_Struct(self_instance, struct thread_context_collector_state, &thread_context_collector_typed_data, state);
+    thread_context_collector_state *state;
+    TypedData_Get_Struct(self_instance, thread_context_collector_state, &thread_context_collector_typed_data, state);
 
     if (!state->timeline_enabled) rb_raise(rb_eRuntimeError, "GVL profiling requires timeline to be enabled");
 
@@ -1895,7 +1895,7 @@ static uint64_t otel_span_id_to_uint(VALUE otel_span_id) {
       return Qfalse;
     }
 
-    struct per_thread_context *thread_context = get_or_create_context_for(current_thread, state);
+    per_thread_context *thread_context = get_or_create_context_for(current_thread, state);
 
     // We don't actually account for cpu-time during Waiting for GVL. BUT, we may chose to push an
     // extra sample to represent the period prior to Waiting for GVL. To support that, we retrieve the current
@@ -1921,10 +1921,10 @@ static uint64_t otel_span_id_to_uint(VALUE otel_span_id) {
   // need to take when sampling cpu/wall-time for a thread that's in the "Waiting for GVL" state.
   __attribute__((warn_unused_result))
   static bool handle_gvl_waiting(
-    struct thread_context_collector_state *state,
+    thread_context_collector_state *state,
     VALUE thread_being_sampled,
     VALUE stack_from_thread,
-    struct per_thread_context *thread_context,
+    per_thread_context *thread_context,
     sampling_buffer* sampling_buffer,
     long current_cpu_time_ns
   ) {
@@ -2072,10 +2072,10 @@ static uint64_t otel_span_id_to_uint(VALUE otel_span_id) {
   static VALUE _native_apply_delta_to_cpu_time_at_previous_sample_ns(DDTRACE_UNUSED VALUE self, VALUE collector_instance, VALUE thread, VALUE delta_ns) {
     ENFORCE_THREAD(thread);
 
-    struct thread_context_collector_state *state;
-    TypedData_Get_Struct(collector_instance, struct thread_context_collector_state, &thread_context_collector_typed_data, state);
+    thread_context_collector_state *state;
+    TypedData_Get_Struct(collector_instance, thread_context_collector_state, &thread_context_collector_typed_data, state);
 
-    struct per_thread_context *thread_context = get_context_for(thread, state);
+    per_thread_context *thread_context = get_context_for(thread, state);
     if (thread_context == NULL) rb_raise(rb_eArgError, "Unexpected: This method cannot be used unless the per-thread context for the thread already exists");
 
     thread_context->cpu_time_at_previous_sample_ns += NUM2LONG(delta_ns);
@@ -2085,10 +2085,10 @@ static uint64_t otel_span_id_to_uint(VALUE otel_span_id) {
 
 #else
   static bool handle_gvl_waiting(
-    DDTRACE_UNUSED struct thread_context_collector_state *state,
+    DDTRACE_UNUSED thread_context_collector_state *state,
     DDTRACE_UNUSED VALUE thread_being_sampled,
     DDTRACE_UNUSED VALUE stack_from_thread,
-    DDTRACE_UNUSED struct per_thread_context *thread_context,
+    DDTRACE_UNUSED per_thread_context *thread_context,
     DDTRACE_UNUSED sampling_buffer* sampling_buffer,
     DDTRACE_UNUSED long current_cpu_time_ns
   ) { return false; }
diff --git a/ext/datadog_profiling_native_extension/heap_recorder.h b/ext/datadog_profiling_native_extension/heap_recorder.h
index bd298464e35..e59bf7d0187 100644
--- a/ext/datadog_profiling_native_extension/heap_recorder.h
+++ b/ext/datadog_profiling_native_extension/heap_recorder.h
@@ -17,7 +17,7 @@
 typedef struct heap_recorder heap_recorder;
 
 // Extra data associated with each live object being tracked.
-typedef struct live_object_data {
+typedef struct {
   // The weight of this object from a sampling perspective.
   //
   // A notion of weight is preserved for each tracked object to allow for an approximate
diff --git a/ext/datadog_profiling_native_extension/http_transport.c b/ext/datadog_profiling_native_extension/http_transport.c
index d41ab7a6b4c..0852e36d7b6 100644
--- a/ext/datadog_profiling_native_extension/http_transport.c
+++ b/ext/datadog_profiling_native_extension/http_transport.c
@@ -13,13 +13,13 @@ static VALUE error_symbol = Qnil; // :error in Ruby
 
 static VALUE library_version_string = Qnil;
 
-struct call_exporter_without_gvl_arguments {
+typedef struct {
   ddog_prof_Exporter *exporter;
   ddog_prof_Exporter_Request_BuildResult *build_result;
   ddog_CancellationToken *cancel_token;
   ddog_prof_Exporter_SendResult result;
   bool send_ran;
-};
+} call_exporter_without_gvl_arguments;
 
 static inline ddog_ByteSlice byte_slice_from_ruby_string(VALUE string);
 static VALUE _native_validate_exporter(VALUE self, VALUE exporter_configuration);
@@ -165,7 +165,7 @@ static VALUE perform_export(
 
   // We'll release the Global VM Lock while we're calling send, so that the Ruby VM can continue to work while this
   // is pending
-  struct call_exporter_without_gvl_arguments args =
+  call_exporter_without_gvl_arguments args =
     {.exporter = exporter, .build_result = &build_result, .cancel_token = cancel_token, .send_ran = false};
 
   // We use rb_thread_call_without_gvl2 instead of rb_thread_call_without_gvl as the gvl2 variant never raises any
@@ -300,7 +300,7 @@ static VALUE _native_do_export(
 }
 
 static void *call_exporter_without_gvl(void *call_args) {
-  struct call_exporter_without_gvl_arguments *args = (struct call_exporter_without_gvl_arguments*) call_args;
+  call_exporter_without_gvl_arguments *args = (call_exporter_without_gvl_arguments*) call_args;
 
   args->result = ddog_prof_Exporter_send(args->exporter, &args->build_result->ok, args->cancel_token);
   args->send_ran = true;
diff --git a/ext/datadog_profiling_native_extension/private_vm_api_access.h b/ext/datadog_profiling_native_extension/private_vm_api_access.h
index 3e412f51ea5..030ff1b5757 100644
--- a/ext/datadog_profiling_native_extension/private_vm_api_access.h
+++ b/ext/datadog_profiling_native_extension/private_vm_api_access.h
@@ -18,7 +18,7 @@ typedef struct {
   rb_nativethread_id_t owner;
 } current_gvl_owner;
 
-typedef struct frame_info {
+typedef struct {
   union {
     struct {
       VALUE iseq;
diff --git a/ext/datadog_profiling_native_extension/profiling.c b/ext/datadog_profiling_native_extension/profiling.c
index a7bfe0d466b..e26bbf897a3 100644
--- a/ext/datadog_profiling_native_extension/profiling.c
+++ b/ext/datadog_profiling_native_extension/profiling.c
@@ -85,16 +85,16 @@ static VALUE native_working_p(DDTRACE_UNUSED VALUE _self) {
   return Qtrue;
 }
 
-struct trigger_grab_gvl_and_raise_arguments {
+typedef struct {
   VALUE exception_class;
   char *test_message;
   int test_message_arg;
-};
+} trigger_grab_gvl_and_raise_arguments;
 
 static VALUE _native_grab_gvl_and_raise(DDTRACE_UNUSED VALUE _self, VALUE exception_class, VALUE test_message, VALUE test_message_arg, VALUE release_gvl) {
   ENFORCE_TYPE(test_message, T_STRING);
 
-  struct trigger_grab_gvl_and_raise_arguments args;
+  trigger_grab_gvl_and_raise_arguments args;
 
   args.exception_class = exception_class;
   args.test_message = StringValueCStr(test_message);
@@ -110,7 +110,7 @@ static VALUE _native_grab_gvl_and_raise(DDTRACE_UNUSED VALUE _self, VALUE except
 }
 
 static void *trigger_grab_gvl_and_raise(void *trigger_args) {
-  struct trigger_grab_gvl_and_raise_arguments *args = (struct trigger_grab_gvl_and_raise_arguments *) trigger_args;
+  trigger_grab_gvl_and_raise_arguments *args = (trigger_grab_gvl_and_raise_arguments *) trigger_args;
 
   if (args->test_message_arg >= 0) {
     grab_gvl_and_raise(args->exception_class, "%s%d", args->test_message, args->test_message_arg);
@@ -121,16 +121,16 @@ static void *trigger_grab_gvl_and_raise(void *trigger_args) {
   return NULL;
 }
 
-struct trigger_grab_gvl_and_raise_syserr_arguments {
+typedef struct {
   int syserr_errno;
   char *test_message;
   int test_message_arg;
-};
+} trigger_grab_gvl_and_raise_syserr_arguments;
 
 static VALUE _native_grab_gvl_and_raise_syserr(DDTRACE_UNUSED VALUE _self, VALUE syserr_errno, VALUE test_message, VALUE test_message_arg, VALUE release_gvl) {
   ENFORCE_TYPE(test_message, T_STRING);
 
-  struct trigger_grab_gvl_and_raise_syserr_arguments args;
+  trigger_grab_gvl_and_raise_syserr_arguments args;
 
   args.syserr_errno = NUM2INT(syserr_errno);
   args.test_message = StringValueCStr(test_message);
@@ -146,7 +146,7 @@ static VALUE _native_grab_gvl_and_raise_syserr(DDTRACE_UNUSED VALUE _self, VALUE
 }
 
 static void *trigger_grab_gvl_and_raise_syserr(void *trigger_args) {
-  struct trigger_grab_gvl_and_raise_syserr_arguments *args = (struct trigger_grab_gvl_and_raise_syserr_arguments *) trigger_args;
+  trigger_grab_gvl_and_raise_syserr_arguments *args = (trigger_grab_gvl_and_raise_syserr_arguments *) trigger_args;
 
   if (args->test_message_arg >= 0) {
     grab_gvl_and_raise_syserr(args->syserr_errno, "%s%d", args->test_message, args->test_message_arg);
diff --git a/ext/datadog_profiling_native_extension/ruby_helpers.c b/ext/datadog_profiling_native_extension/ruby_helpers.c
index 09b14d20855..34e9fa61c77 100644
--- a/ext/datadog_profiling_native_extension/ruby_helpers.c
+++ b/ext/datadog_profiling_native_extension/ruby_helpers.c
@@ -23,18 +23,18 @@ void ruby_helpers_init(void) {
 
 #define MAX_RAISE_MESSAGE_SIZE 256
 
-struct raise_arguments {
+typedef struct {
   VALUE exception_class;
   char exception_message[MAX_RAISE_MESSAGE_SIZE];
-};
+} raise_args;
 
 static void *trigger_raise(void *raise_arguments) {
-  struct raise_arguments *args = (struct raise_arguments *) raise_arguments;
+  raise_args *args = (raise_args *) raise_arguments;
   rb_raise(args->exception_class, "%s", args->exception_message);
 }
 
 void grab_gvl_and_raise(VALUE exception_class, const char *format_string, ...) {
-  struct raise_arguments args;
+  raise_args args;
 
   args.exception_class = exception_class;
 
@@ -55,18 +55,18 @@ void grab_gvl_and_raise(VALUE exception_class, const char *format_string, ...) {
   rb_bug("[ddtrace] Unexpected: Reached the end of grab_gvl_and_raise while raising '%s'\n", args.exception_message);
 }
 
-struct syserr_raise_arguments {
+typedef struct {
   int syserr_errno;
   char exception_message[MAX_RAISE_MESSAGE_SIZE];
-};
+} syserr_raise_args;
 
 static void *trigger_syserr_raise(void *syserr_raise_arguments) {
-  struct syserr_raise_arguments *args = (struct syserr_raise_arguments *) syserr_raise_arguments;
+  syserr_raise_args *args = (syserr_raise_args *) syserr_raise_arguments;
   rb_syserr_fail(args->syserr_errno, args->exception_message);
 }
 
 void grab_gvl_and_raise_syserr(int syserr_errno, const char *format_string, ...) {
-  struct syserr_raise_arguments args;
+  syserr_raise_args args;
 
   args.syserr_errno = syserr_errno;
 
diff --git a/ext/datadog_profiling_native_extension/stack_recorder.c b/ext/datadog_profiling_native_extension/stack_recorder.c
index 710b17356e2..349a9df89dd 100644
--- a/ext/datadog_profiling_native_extension/stack_recorder.c
+++ b/ext/datadog_profiling_native_extension/stack_recorder.c
@@ -173,18 +173,18 @@ static const uint8_t all_value_types_positions[] =
 
 // Struct for storing stats related to a profile in a particular slot.
 // These stats will share the same lifetime as the data in that profile slot.
-typedef struct slot_stats {
+typedef struct {
   // How many individual samples were recorded into this slot (un-weighted)
   uint64_t recorded_samples;
 } stats_slot;
 
-typedef struct profile_slot {
+typedef struct {
   ddog_prof_Profile profile;
   stats_slot stats;
 } profile_slot;
 
 // Contains native state for each instance
-struct stack_recorder_state {
+typedef struct {
   // Heap recorder instance
   heap_recorder *heap_recorder;
   bool heap_clean_after_gc_enabled;
@@ -210,17 +210,17 @@ struct stack_recorder_state {
     long serialization_time_ns_max;
     uint64_t serialization_time_ns_total;
   } stats_lifetime;
-};
+} stack_recorder_state;
 
 // Used to group mutex and the corresponding profile slot for easy unlocking after work is done.
-typedef struct locked_profile_slot {
+typedef struct {
   pthread_mutex_t *mutex;
   profile_slot *data;
 } locked_profile_slot;
 
-struct call_serialize_without_gvl_arguments {
+typedef struct {
   // Set by caller
-  struct stack_recorder_state *state;
+  stack_recorder_state *state;
   ddog_Timespec finish_timestamp;
 
   // Set by callee
@@ -231,26 +231,26 @@ struct call_serialize_without_gvl_arguments {
 
   // Set by both
   bool serialize_ran;
-};
+} call_serialize_without_gvl_arguments;
 
 static VALUE _native_new(VALUE klass);
-static void initialize_slot_concurrency_control(struct stack_recorder_state *state);
-static void initialize_profiles(struct stack_recorder_state *state, ddog_prof_Slice_ValueType sample_types);
+static void initialize_slot_concurrency_control(stack_recorder_state *state);
+static void initialize_profiles(stack_recorder_state *state, ddog_prof_Slice_ValueType sample_types);
 static void stack_recorder_typed_data_free(void *data);
 static VALUE _native_initialize(int argc, VALUE *argv, DDTRACE_UNUSED VALUE _self);
 static VALUE _native_serialize(VALUE self, VALUE recorder_instance);
 static VALUE ruby_time_from(ddog_Timespec ddprof_time);
 static void *call_serialize_without_gvl(void *call_args);
-static locked_profile_slot sampler_lock_active_profile(struct stack_recorder_state *state);
+static locked_profile_slot sampler_lock_active_profile(stack_recorder_state *state);
 static void sampler_unlock_active_profile(locked_profile_slot active_slot);
-static profile_slot* serializer_flip_active_and_inactive_slots(struct stack_recorder_state *state);
+static profile_slot* serializer_flip_active_and_inactive_slots(stack_recorder_state *state);
 static VALUE _native_active_slot(DDTRACE_UNUSED VALUE _self, VALUE recorder_instance);
 static VALUE _native_is_slot_one_mutex_locked(DDTRACE_UNUSED VALUE _self, VALUE recorder_instance);
 static VALUE _native_is_slot_two_mutex_locked(DDTRACE_UNUSED VALUE _self, VALUE recorder_instance);
 static VALUE test_slot_mutex_state(VALUE recorder_instance, int slot);
 static ddog_Timespec system_epoch_now_timespec(void);
 static VALUE _native_reset_after_fork(DDTRACE_UNUSED VALUE self, VALUE recorder_instance);
-static void serializer_set_start_timestamp_for_next_profile(struct stack_recorder_state *state, ddog_Timespec start_time);
+static void serializer_set_start_timestamp_for_next_profile(stack_recorder_state *state, ddog_Timespec start_time);
 static VALUE _native_record_endpoint(DDTRACE_UNUSED VALUE _self, VALUE recorder_instance, VALUE local_root_span_id, VALUE endpoint);
 static void reset_profile_slot(profile_slot *slot, ddog_Timespec *start_time /* Can be null */);
 static VALUE _native_track_object(DDTRACE_UNUSED VALUE _self, VALUE recorder_instance, VALUE new_obj, VALUE weight, VALUE alloc_class);
@@ -316,7 +316,7 @@ static const rb_data_type_t stack_recorder_typed_data = {
 };
 
 static VALUE _native_new(VALUE klass) {
-  struct stack_recorder_state *state = ruby_xcalloc(1, sizeof(struct stack_recorder_state));
+  stack_recorder_state *state = ruby_xcalloc(1, sizeof(stack_recorder_state));
 
   // Note: Any exceptions raised from this note until the TypedData_Wrap_Struct call will lead to the state memory
   // being leaked.
@@ -354,7 +354,7 @@ static VALUE _native_new(VALUE klass) {
   return stack_recorder;
 }
 
-static void initialize_slot_concurrency_control(struct stack_recorder_state *state) {
+static void initialize_slot_concurrency_control(stack_recorder_state *state) {
   state->mutex_slot_one = (pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER;
   state->mutex_slot_two = (pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER;
 
@@ -364,7 +364,7 @@ static void initialize_slot_concurrency_control(struct stack_recorder_state *sta
   state->active_slot = 1;
 }
 
-static void initialize_profiles(struct stack_recorder_state *state, ddog_prof_Slice_ValueType sample_types) {
+static void initialize_profiles(stack_recorder_state *state, ddog_prof_Slice_ValueType sample_types) {
   ddog_prof_Profile_NewResult slot_one_profile_result =
     ddog_prof_Profile_new(sample_types, NULL /* period is optional */, NULL /* start_time is optional */);
 
@@ -391,7 +391,7 @@ static void initialize_profiles(struct stack_recorder_state *state, ddog_prof_Sl
 }
 
 static void stack_recorder_typed_data_free(void *state_ptr) {
-  struct stack_recorder_state *state = (struct stack_recorder_state *) state_ptr;
+  stack_recorder_state *state = (stack_recorder_state *) state_ptr;
 
   pthread_mutex_destroy(&state->mutex_slot_one);
   ddog_prof_Profile_drop(&state->profile_slot_one.profile);
@@ -426,8 +426,8 @@ static VALUE _native_initialize(int argc, VALUE *argv, DDTRACE_UNUSED VALUE _sel
   ENFORCE_BOOLEAN(timeline_enabled);
   ENFORCE_BOOLEAN(heap_clean_after_gc_enabled);
 
-  struct stack_recorder_state *state;
-  TypedData_Get_Struct(recorder_instance, struct stack_recorder_state, &stack_recorder_typed_data, state);
+  stack_recorder_state *state;
+  TypedData_Get_Struct(recorder_instance, stack_recorder_state, &stack_recorder_typed_data, state);
 
   state->heap_clean_after_gc_enabled = (heap_clean_after_gc_enabled == Qtrue);
 
@@ -517,8 +517,8 @@ static VALUE _native_initialize(int argc, VALUE *argv, DDTRACE_UNUSED VALUE _sel
 }
 
 static VALUE _native_serialize(DDTRACE_UNUSED VALUE _self, VALUE recorder_instance) {
-  struct stack_recorder_state *state;
-  TypedData_Get_Struct(recorder_instance, struct stack_recorder_state, &stack_recorder_typed_data, state);
+  stack_recorder_state *state;
+  TypedData_Get_Struct(recorder_instance, stack_recorder_state, &stack_recorder_typed_data, state);
 
   ddog_Timespec finish_timestamp = system_epoch_now_timespec();
   // Need to do this while still holding on to the Global VM Lock; see comments on method for why
@@ -532,7 +532,7 @@ static VALUE _native_serialize(DDTRACE_UNUSED VALUE _self, VALUE recorder_instan
 
   // We'll release the Global VM Lock while we're calling serialize, so that the Ruby VM can continue to work while this
   // is pending
-  struct call_serialize_without_gvl_arguments args = {
+  call_serialize_without_gvl_arguments args = {
     .state = state,
     .finish_timestamp = finish_timestamp,
     .serialize_ran = false
@@ -597,8 +597,8 @@ static VALUE ruby_time_from(ddog_Timespec ddprof_time) {
 }
 
 void record_sample(VALUE recorder_instance, ddog_prof_Slice_Location locations, sample_values values, sample_labels labels) {
-  struct stack_recorder_state *state;
-  TypedData_Get_Struct(recorder_instance, struct stack_recorder_state, &stack_recorder_typed_data, state);
+  stack_recorder_state *state;
+  TypedData_Get_Struct(recorder_instance, stack_recorder_state, &stack_recorder_typed_data, state);
 
   locked_profile_slot active_slot = sampler_lock_active_profile(state);
 
@@ -652,8 +652,8 @@ void record_sample(VALUE recorder_instance, ddog_prof_Slice_Location locations,
 }
 
 void track_object(VALUE recorder_instance, VALUE new_object, unsigned int sample_weight, ddog_CharSlice *alloc_class) {
-  struct stack_recorder_state *state;
-  TypedData_Get_Struct(recorder_instance, struct stack_recorder_state, &stack_recorder_typed_data, state);
+  stack_recorder_state *state;
+  TypedData_Get_Struct(recorder_instance, stack_recorder_state, &stack_recorder_typed_data, state);
   // FIXME: Heap sampling currently has to be done in 2 parts because the construction of locations is happening
   //        very late in the allocation-sampling path (which is shared with the cpu sampling path). This can
   //        be fixed with some refactoring but for now this leads to a less impactful change.
@@ -661,8 +661,8 @@ void track_object(VALUE recorder_instance, VALUE new_object, unsigned int sample
 }
 
 void record_endpoint(VALUE recorder_instance, uint64_t local_root_span_id, ddog_CharSlice endpoint) {
-  struct stack_recorder_state *state;
-  TypedData_Get_Struct(recorder_instance, struct stack_recorder_state, &stack_recorder_typed_data, state);
+  stack_recorder_state *state;
+  TypedData_Get_Struct(recorder_instance, stack_recorder_state, &stack_recorder_typed_data, state);
 
   locked_profile_slot active_slot = sampler_lock_active_profile(state);
 
@@ -676,8 +676,8 @@ void record_endpoint(VALUE recorder_instance, uint64_t local_root_span_id, ddog_
 }
 
 void recorder_after_gc_step(VALUE recorder_instance) {
-  struct stack_recorder_state *state;
-  TypedData_Get_Struct(recorder_instance, struct stack_recorder_state, &stack_recorder_typed_data, state);
+  stack_recorder_state *state;
+  TypedData_Get_Struct(recorder_instance, stack_recorder_state, &stack_recorder_typed_data, state);
 
   if (state->heap_clean_after_gc_enabled) heap_recorder_update_young_objects(state->heap_recorder);
 }
@@ -687,7 +687,7 @@ void recorder_after_gc_step(VALUE recorder_instance) {
 // Heap recorder iteration context allows us access to stack recorder state and profile being serialized
 // during iteration of heap recorder live objects.
 typedef struct heap_recorder_iteration_context {
-  struct stack_recorder_state *state;
+  stack_recorder_state *state;
   profile_slot *slot;
 
   bool error;
@@ -749,7 +749,7 @@ static bool add_heap_sample_to_active_profile_without_gvl(heap_recorder_iteratio
   return true;
 }
 
-static void build_heap_profile_without_gvl(struct stack_recorder_state *state, profile_slot *slot) {
+static void build_heap_profile_without_gvl(stack_recorder_state *state, profile_slot *slot) {
   heap_recorder_iteration_context iteration_context = {
     .state = state,
     .slot = slot,
@@ -770,7 +770,7 @@ static void build_heap_profile_without_gvl(struct stack_recorder_state *state, p
 }
 
 static void *call_serialize_without_gvl(void *call_args) {
-  struct call_serialize_without_gvl_arguments *args = (struct call_serialize_without_gvl_arguments *) call_args;
+  call_serialize_without_gvl_arguments *args = (call_serialize_without_gvl_arguments *) call_args;
 
   long serialize_no_gvl_start_time_ns = monotonic_wall_time_now_ns(DO_NOT_RAISE_ON_FAILURE);
 
@@ -796,7 +796,7 @@ VALUE enforce_recorder_instance(VALUE object) {
   return object;
 }
 
-static locked_profile_slot sampler_lock_active_profile(struct stack_recorder_state *state) {
+static locked_profile_slot sampler_lock_active_profile(stack_recorder_state *state) {
   int error;
 
   for (int attempts = 0; attempts < 2; attempts++) {
@@ -823,7 +823,7 @@ static void sampler_unlock_active_profile(locked_profile_slot active_slot) {
   ENFORCE_SUCCESS_GVL(pthread_mutex_unlock(active_slot.mutex));
 }
 
-static profile_slot* serializer_flip_active_and_inactive_slots(struct stack_recorder_state *state) {
+static profile_slot* serializer_flip_active_and_inactive_slots(stack_recorder_state *state) {
   int previously_active_slot = state->active_slot;
 
   if (previously_active_slot != 1 && previously_active_slot != 2) {
@@ -849,8 +849,8 @@ static profile_slot* serializer_flip_active_and_inactive_slots(struct stack_reco
 // This method exists only to enable testing Datadog::Profiling::StackRecorder behavior using RSpec.
 // It SHOULD NOT be used for other purposes.
 static VALUE _native_active_slot(DDTRACE_UNUSED VALUE _self, VALUE recorder_instance) {
-  struct stack_recorder_state *state;
-  TypedData_Get_Struct(recorder_instance, struct stack_recorder_state, &stack_recorder_typed_data, state);
+  stack_recorder_state *state;
+  TypedData_Get_Struct(recorder_instance, stack_recorder_state, &stack_recorder_typed_data, state);
 
   return INT2NUM(state->active_slot);
 }
@@ -864,8 +864,8 @@ static VALUE _native_is_slot_one_mutex_locked(DDTRACE_UNUSED VALUE _self, VALUE
 static VALUE _native_is_slot_two_mutex_locked(DDTRACE_UNUSED VALUE _self, VALUE recorder_instance) { return test_slot_mutex_state(recorder_instance, 2); }
 
 static VALUE test_slot_mutex_state(VALUE recorder_instance, int slot) {
-  struct stack_recorder_state *state;
-  TypedData_Get_Struct(recorder_instance, struct stack_recorder_state, &stack_recorder_typed_data, state);
+  stack_recorder_state *state;
+  TypedData_Get_Struct(recorder_instance, stack_recorder_state, &stack_recorder_typed_data, state);
 
   pthread_mutex_t *slot_mutex = (slot == 1) ? &state->mutex_slot_one : &state->mutex_slot_two;
 
@@ -895,8 +895,8 @@ static ddog_Timespec system_epoch_now_timespec(void) {
 // Assumption: This method gets called BEFORE restarting profiling -- e.g. there are no components attempting to
 // trigger samples at the same time.
 static VALUE _native_reset_after_fork(DDTRACE_UNUSED VALUE self, VALUE recorder_instance) {
-  struct stack_recorder_state *state;
-  TypedData_Get_Struct(recorder_instance, struct stack_recorder_state, &stack_recorder_typed_data, state);
+  stack_recorder_state *state;
+  TypedData_Get_Struct(recorder_instance, stack_recorder_state, &stack_recorder_typed_data, state);
 
   // In case the fork happened halfway through `serializer_flip_active_and_inactive_slots` execution and the
   // resulting state is inconsistent, we make sure to reset it back to the initial state.
@@ -912,7 +912,7 @@ static VALUE _native_reset_after_fork(DDTRACE_UNUSED VALUE self, VALUE recorder_
 
 // Assumption 1: This method is called with the GVL being held, because `ddog_prof_Profile_reset` mutates the profile and must
 // not be interrupted part-way through by a VM fork.
-static void serializer_set_start_timestamp_for_next_profile(struct stack_recorder_state *state, ddog_Timespec start_time) {
+static void serializer_set_start_timestamp_for_next_profile(stack_recorder_state *state, ddog_Timespec start_time) {
   // Before making this profile active, we reset it so that it uses the correct start_time for its start
   profile_slot *next_profile_slot = (state->active_slot == 1) ? &state->profile_slot_two : &state->profile_slot_one;
   reset_profile_slot(next_profile_slot, &start_time);
@@ -972,8 +972,8 @@ static void reset_profile_slot(profile_slot *slot, ddog_Timespec *start_time /*
 // This method exists only to enable testing Datadog::Profiling::StackRecorder behavior using RSpec.
 // It SHOULD NOT be used for other purposes.
 static VALUE _native_start_fake_slow_heap_serialization(DDTRACE_UNUSED VALUE _self, VALUE recorder_instance) {
-  struct stack_recorder_state *state;
-  TypedData_Get_Struct(recorder_instance, struct stack_recorder_state, &stack_recorder_typed_data, state);
+  stack_recorder_state *state;
+  TypedData_Get_Struct(recorder_instance, stack_recorder_state, &stack_recorder_typed_data, state);
 
   heap_recorder_prepare_iteration(state->heap_recorder);
 
@@ -983,8 +983,8 @@ static VALUE _native_start_fake_slow_heap_serialization(DDTRACE_UNUSED VALUE _se
 // This method exists only to enable testing Datadog::Profiling::StackRecorder behavior using RSpec.
 // It SHOULD NOT be used for other purposes.
 static VALUE _native_end_fake_slow_heap_serialization(DDTRACE_UNUSED VALUE _self, VALUE recorder_instance) {
-  struct stack_recorder_state *state;
-  TypedData_Get_Struct(recorder_instance, struct stack_recorder_state, &stack_recorder_typed_data, state);
+  stack_recorder_state *state;
+  TypedData_Get_Struct(recorder_instance, stack_recorder_state, &stack_recorder_typed_data, state);
 
   heap_recorder_finish_iteration(state->heap_recorder);
 
@@ -994,15 +994,15 @@ static VALUE _native_end_fake_slow_heap_serialization(DDTRACE_UNUSED VALUE _self
 // This method exists only to enable testing Datadog::Profiling::StackRecorder behavior using RSpec.
 // It SHOULD NOT be used for other purposes.
 static VALUE _native_debug_heap_recorder(DDTRACE_UNUSED VALUE _self, VALUE recorder_instance) {
-  struct stack_recorder_state *state;
-  TypedData_Get_Struct(recorder_instance, struct stack_recorder_state, &stack_recorder_typed_data, state);
+  stack_recorder_state *state;
+  TypedData_Get_Struct(recorder_instance, stack_recorder_state, &stack_recorder_typed_data, state);
 
   return heap_recorder_testonly_debug(state->heap_recorder);
 }
 
 static VALUE _native_stats(DDTRACE_UNUSED VALUE self, VALUE recorder_instance) {
-  struct stack_recorder_state *state;
-  TypedData_Get_Struct(recorder_instance, struct stack_recorder_state, &stack_recorder_typed_data, state);
+  stack_recorder_state *state;
+  TypedData_Get_Struct(recorder_instance, stack_recorder_state, &stack_recorder_typed_data, state);
 
   uint64_t total_serializations = state->stats_lifetime.serialization_successes + state->stats_lifetime.serialization_failures;
 
@@ -1040,15 +1040,15 @@ static VALUE build_profile_stats(profile_slot *slot, long serialization_time_ns,
 static VALUE _native_is_object_recorded(DDTRACE_UNUSED VALUE _self, VALUE recorder_instance, VALUE obj_id) {
   ENFORCE_TYPE(obj_id, T_FIXNUM);
 
-  struct stack_recorder_state *state;
-  TypedData_Get_Struct(recorder_instance, struct stack_recorder_state, &stack_recorder_typed_data, state);
+  stack_recorder_state *state;
+  TypedData_Get_Struct(recorder_instance, stack_recorder_state, &stack_recorder_typed_data, state);
 
   return heap_recorder_testonly_is_object_recorded(state->heap_recorder, obj_id);
 }
 
 static VALUE _native_heap_recorder_reset_last_update(DDTRACE_UNUSED VALUE _self, VALUE recorder_instance) {
-  struct stack_recorder_state *state;
-  TypedData_Get_Struct(recorder_instance, struct stack_recorder_state, &stack_recorder_typed_data, state);
+  stack_recorder_state *state;
+  TypedData_Get_Struct(recorder_instance, stack_recorder_state, &stack_recorder_typed_data, state);
 
   heap_recorder_testonly_reset_last_update(state->heap_recorder);
 
diff --git a/ext/datadog_profiling_native_extension/stack_recorder.h b/ext/datadog_profiling_native_extension/stack_recorder.h
index 7a500c42c1b..38b228afc78 100644
--- a/ext/datadog_profiling_native_extension/stack_recorder.h
+++ b/ext/datadog_profiling_native_extension/stack_recorder.h
@@ -13,7 +13,7 @@ typedef struct {
   int64_t timeline_wall_time_ns;
 } sample_values;
 
-typedef struct sample_labels {
+typedef struct {
   ddog_prof_Slice_Label labels;
 
   // This is used to allow the `Collectors::Stack` to modify the existing label, if any. This MUST be NULL or point
diff --git a/ext/datadog_profiling_native_extension/time_helpers.h b/ext/datadog_profiling_native_extension/time_helpers.h
index 87bc5341fc9..08390cd8c11 100644
--- a/ext/datadog_profiling_native_extension/time_helpers.h
+++ b/ext/datadog_profiling_native_extension/time_helpers.h
@@ -39,7 +39,7 @@ static inline long system_epoch_time_now_ns(raise_on_failure_setting raise_on_fa
 // https://docs.redhat.com/en/documentation/red_hat_enterprise_linux_for_real_time/7/html/reference_guide/sect-posix_clocks#Using_clock_getres_to_compare_clock_resolution
 // We introduce here a separate type for it, so as to make it harder to misuse/more explicit when these timestamps are used
 
-typedef struct coarse_instant {
+typedef struct {
   long timestamp_ns;
 } coarse_instant;
 
diff --git a/gemfiles/jruby_9.2_activesupport.gemfile.lock b/gemfiles/jruby_9.2_activesupport.gemfile.lock
index 58b4e61fc55..1f37736408a 100644
--- a/gemfiles/jruby_9.2_activesupport.gemfile.lock
+++ b/gemfiles/jruby_9.2_activesupport.gemfile.lock
@@ -83,7 +83,7 @@ GEM
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     grape (1.7.0)
       activesupport
       builder
diff --git a/gemfiles/jruby_9.2_aws.gemfile.lock b/gemfiles/jruby_9.2_aws.gemfile.lock
index 937464612a9..b5010a2d76d 100644
--- a/gemfiles/jruby_9.2_aws.gemfile.lock
+++ b/gemfiles/jruby_9.2_aws.gemfile.lock
@@ -1454,7 +1454,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     jmespath (1.6.2)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.2_contrib.gemfile.lock b/gemfiles/jruby_9.2_contrib.gemfile.lock
index 8f976ad5ed5..8170f1b7ba8 100644
--- a/gemfiles/jruby_9.2_contrib.gemfile.lock
+++ b/gemfiles/jruby_9.2_contrib.gemfile.lock
@@ -40,7 +40,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     i18n (1.8.7)
       concurrent-ruby (~> 1.0)
diff --git a/gemfiles/jruby_9.2_contrib_old.gemfile.lock b/gemfiles/jruby_9.2_contrib_old.gemfile.lock
index 0e47d3a2342..66e746a8673 100644
--- a/gemfiles/jruby_9.2_contrib_old.gemfile.lock
+++ b/gemfiles/jruby_9.2_contrib_old.gemfile.lock
@@ -38,7 +38,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_core_old.gemfile.lock b/gemfiles/jruby_9.2_core_old.gemfile.lock
index 77a6aaf4457..e5f7c1e960f 100644
--- a/gemfiles/jruby_9.2_core_old.gemfile.lock
+++ b/gemfiles/jruby_9.2_core_old.gemfile.lock
@@ -33,7 +33,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (4.8.3)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock b/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock
index 5bb58b57c32..287047c262c 100644
--- a/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock
+++ b/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock
@@ -67,7 +67,7 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock b/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock
index 85899ece000..dffc23160cd 100644
--- a/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock
+++ b/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock
@@ -65,7 +65,7 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_elasticsearch_latest.gemfile.lock b/gemfiles/jruby_9.2_elasticsearch_latest.gemfile.lock
index c36be87792e..cd7ff91d60e 100644
--- a/gemfiles/jruby_9.2_elasticsearch_latest.gemfile.lock
+++ b/gemfiles/jruby_9.2_elasticsearch_latest.gemfile.lock
@@ -67,7 +67,7 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_graphql_2.0.gemfile.lock b/gemfiles/jruby_9.2_graphql_2.0.gemfile.lock
index ba1d8859ffe..83473fe7a75 100644
--- a/gemfiles/jruby_9.2_graphql_2.0.gemfile.lock
+++ b/gemfiles/jruby_9.2_graphql_2.0.gemfile.lock
@@ -98,7 +98,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.2.1)
       activesupport (>= 6.1)
     graphql (2.0.28)
diff --git a/gemfiles/jruby_9.2_http.gemfile.lock b/gemfiles/jruby_9.2_http.gemfile.lock
index eff1eb91e03..69da049a128 100644
--- a/gemfiles/jruby_9.2_http.gemfile.lock
+++ b/gemfiles/jruby_9.2_http.gemfile.lock
@@ -61,7 +61,7 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
diff --git a/gemfiles/jruby_9.2_opensearch_2.gemfile.lock b/gemfiles/jruby_9.2_opensearch_2.gemfile.lock
index 2b780aa3b94..b2691fe8c84 100644
--- a/gemfiles/jruby_9.2_opensearch_2.gemfile.lock
+++ b/gemfiles/jruby_9.2_opensearch_2.gemfile.lock
@@ -57,7 +57,7 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_opensearch_3.gemfile.lock b/gemfiles/jruby_9.2_opensearch_3.gemfile.lock
index e96582e849c..432115661b8 100644
--- a/gemfiles/jruby_9.2_opensearch_3.gemfile.lock
+++ b/gemfiles/jruby_9.2_opensearch_3.gemfile.lock
@@ -57,7 +57,7 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_opensearch_latest.gemfile.lock b/gemfiles/jruby_9.2_opensearch_latest.gemfile.lock
index c3ed52188b3..be60061472a 100644
--- a/gemfiles/jruby_9.2_opensearch_latest.gemfile.lock
+++ b/gemfiles/jruby_9.2_opensearch_latest.gemfile.lock
@@ -59,7 +59,7 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_rack_1.gemfile.lock b/gemfiles/jruby_9.2_rack_1.gemfile.lock
index 7af13990074..fc08acf68f1 100644
--- a/gemfiles/jruby_9.2_rack_1.gemfile.lock
+++ b/gemfiles/jruby_9.2_rack_1.gemfile.lock
@@ -33,7 +33,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_rack_2.gemfile.lock b/gemfiles/jruby_9.2_rack_2.gemfile.lock
index 779b6b03302..e70c1ffa419 100644
--- a/gemfiles/jruby_9.2_rack_2.gemfile.lock
+++ b/gemfiles/jruby_9.2_rack_2.gemfile.lock
@@ -33,7 +33,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_rack_3.gemfile.lock b/gemfiles/jruby_9.2_rack_3.gemfile.lock
index 2d2d880cf8b..6e40b093aae 100644
--- a/gemfiles/jruby_9.2_rack_3.gemfile.lock
+++ b/gemfiles/jruby_9.2_rack_3.gemfile.lock
@@ -33,7 +33,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_rack_latest.gemfile.lock b/gemfiles/jruby_9.2_rack_latest.gemfile.lock
index aef3569f16a..11060d7171f 100644
--- a/gemfiles/jruby_9.2_rack_latest.gemfile.lock
+++ b/gemfiles/jruby_9.2_rack_latest.gemfile.lock
@@ -36,7 +36,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.2)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_rails5_mysql2.gemfile.lock b/gemfiles/jruby_9.2_rails5_mysql2.gemfile.lock
index 98ef89a0d45..a59d47005cd 100644
--- a/gemfiles/jruby_9.2_rails5_mysql2.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails5_mysql2.gemfile.lock
@@ -83,7 +83,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_rails5_postgres.gemfile.lock b/gemfiles/jruby_9.2_rails5_postgres.gemfile.lock
index 3a10aa9a428..8e6fdfafad9 100644
--- a/gemfiles/jruby_9.2_rails5_postgres.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails5_postgres.gemfile.lock
@@ -84,7 +84,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_rails5_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2_rails5_postgres_redis.gemfile.lock
index 32c9bef65a8..2bef5b56ead 100644
--- a/gemfiles/jruby_9.2_rails5_postgres_redis.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails5_postgres_redis.gemfile.lock
@@ -85,7 +85,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.2_rails5_postgres_redis_activesupport.gemfile.lock
index ea2e232d083..4f4295aab55 100644
--- a/gemfiles/jruby_9.2_rails5_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails5_postgres_redis_activesupport.gemfile.lock
@@ -84,7 +84,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2_rails5_postgres_sidekiq.gemfile.lock
index 685218def61..42bc3254b6f 100644
--- a/gemfiles/jruby_9.2_rails5_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails5_postgres_sidekiq.gemfile.lock
@@ -85,7 +85,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_rails5_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2_rails5_semantic_logger.gemfile.lock
index 52f1e112258..71836358c22 100644
--- a/gemfiles/jruby_9.2_rails5_semantic_logger.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails5_semantic_logger.gemfile.lock
@@ -84,7 +84,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.2_rails61_mysql2.gemfile.lock
index b29df7238ae..5b88027a2d1 100644
--- a/gemfiles/jruby_9.2_rails61_mysql2.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails61_mysql2.gemfile.lock
@@ -100,7 +100,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.2_rails61_postgres.gemfile.lock
index 1fe92d98b46..84156f500a3 100644
--- a/gemfiles/jruby_9.2_rails61_postgres.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails61_postgres.gemfile.lock
@@ -101,7 +101,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2_rails61_postgres_redis.gemfile.lock
index 842a72226b1..455289fb4e3 100644
--- a/gemfiles/jruby_9.2_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails61_postgres_redis.gemfile.lock
@@ -102,7 +102,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2_rails61_postgres_sidekiq.gemfile.lock
index 7e77405d291..b5f5347c4cb 100644
--- a/gemfiles/jruby_9.2_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails61_postgres_sidekiq.gemfile.lock
@@ -102,7 +102,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2_rails61_semantic_logger.gemfile.lock
index 856960d2ed5..6b05b5e1805 100644
--- a/gemfiles/jruby_9.2_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails61_semantic_logger.gemfile.lock
@@ -101,7 +101,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_rails6_mysql2.gemfile.lock b/gemfiles/jruby_9.2_rails6_mysql2.gemfile.lock
index 662bc2668cf..6d3703d4832 100644
--- a/gemfiles/jruby_9.2_rails6_mysql2.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails6_mysql2.gemfile.lock
@@ -96,7 +96,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_rails6_postgres.gemfile.lock b/gemfiles/jruby_9.2_rails6_postgres.gemfile.lock
index 355bd0f8b27..c2958359820 100644
--- a/gemfiles/jruby_9.2_rails6_postgres.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails6_postgres.gemfile.lock
@@ -97,7 +97,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_rails6_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2_rails6_postgres_redis.gemfile.lock
index eb87d641e37..1fc442e286b 100644
--- a/gemfiles/jruby_9.2_rails6_postgres_redis.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails6_postgres_redis.gemfile.lock
@@ -98,7 +98,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.2_rails6_postgres_redis_activesupport.gemfile.lock
index 9e3afb268d1..ec916b932c1 100644
--- a/gemfiles/jruby_9.2_rails6_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails6_postgres_redis_activesupport.gemfile.lock
@@ -97,7 +97,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2_rails6_postgres_sidekiq.gemfile.lock
index cf6a10755d8..4e893ec937b 100644
--- a/gemfiles/jruby_9.2_rails6_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails6_postgres_sidekiq.gemfile.lock
@@ -98,7 +98,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_rails6_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2_rails6_semantic_logger.gemfile.lock
index a5a24948c6a..52c3fd53c1e 100644
--- a/gemfiles/jruby_9.2_rails6_semantic_logger.gemfile.lock
+++ b/gemfiles/jruby_9.2_rails6_semantic_logger.gemfile.lock
@@ -97,7 +97,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.2_redis_3.gemfile.lock b/gemfiles/jruby_9.2_redis_3.gemfile.lock
index f21beb9d170..6343e70c980 100644
--- a/gemfiles/jruby_9.2_redis_3.gemfile.lock
+++ b/gemfiles/jruby_9.2_redis_3.gemfile.lock
@@ -33,7 +33,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_redis_4.gemfile.lock b/gemfiles/jruby_9.2_redis_4.gemfile.lock
index 6bb2255d6d5..90e3620a513 100644
--- a/gemfiles/jruby_9.2_redis_4.gemfile.lock
+++ b/gemfiles/jruby_9.2_redis_4.gemfile.lock
@@ -33,7 +33,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_redis_5.gemfile.lock b/gemfiles/jruby_9.2_redis_5.gemfile.lock
index 9af3293bb13..de1502cf808 100644
--- a/gemfiles/jruby_9.2_redis_5.gemfile.lock
+++ b/gemfiles/jruby_9.2_redis_5.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_relational_db.gemfile.lock b/gemfiles/jruby_9.2_relational_db.gemfile.lock
index d74e73cb59d..2e7d061cfab 100644
--- a/gemfiles/jruby_9.2_relational_db.gemfile.lock
+++ b/gemfiles/jruby_9.2_relational_db.gemfile.lock
@@ -62,7 +62,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
diff --git a/gemfiles/jruby_9.2_resque2_redis3.gemfile.lock b/gemfiles/jruby_9.2_resque2_redis3.gemfile.lock
index 92dc61f86d0..b9dff458923 100644
--- a/gemfiles/jruby_9.2_resque2_redis3.gemfile.lock
+++ b/gemfiles/jruby_9.2_resque2_redis3.gemfile.lock
@@ -33,7 +33,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_resque2_redis4.gemfile.lock b/gemfiles/jruby_9.2_resque2_redis4.gemfile.lock
index fc58622cecd..c103c157190 100644
--- a/gemfiles/jruby_9.2_resque2_redis4.gemfile.lock
+++ b/gemfiles/jruby_9.2_resque2_redis4.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_sinatra_2.gemfile.lock b/gemfiles/jruby_9.2_sinatra_2.gemfile.lock
index cc994cfef6a..320bdbbdab8 100644
--- a/gemfiles/jruby_9.2_sinatra_2.gemfile.lock
+++ b/gemfiles/jruby_9.2_sinatra_2.gemfile.lock
@@ -36,7 +36,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.0)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_stripe_10.gemfile.lock b/gemfiles/jruby_9.2_stripe_10.gemfile.lock
index 2e6b817157b..89d1ec37f1c 100644
--- a/gemfiles/jruby_9.2_stripe_10.gemfile.lock
+++ b/gemfiles/jruby_9.2_stripe_10.gemfile.lock
@@ -36,7 +36,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_stripe_11.gemfile.lock b/gemfiles/jruby_9.2_stripe_11.gemfile.lock
index 1450cec3a41..8e1cd792b6d 100644
--- a/gemfiles/jruby_9.2_stripe_11.gemfile.lock
+++ b/gemfiles/jruby_9.2_stripe_11.gemfile.lock
@@ -36,7 +36,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_stripe_12.gemfile.lock b/gemfiles/jruby_9.2_stripe_12.gemfile.lock
index c8bea428847..d8150b4628f 100644
--- a/gemfiles/jruby_9.2_stripe_12.gemfile.lock
+++ b/gemfiles/jruby_9.2_stripe_12.gemfile.lock
@@ -36,7 +36,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_stripe_7.gemfile.lock b/gemfiles/jruby_9.2_stripe_7.gemfile.lock
index 21ca74a66f5..4f8bcc70492 100644
--- a/gemfiles/jruby_9.2_stripe_7.gemfile.lock
+++ b/gemfiles/jruby_9.2_stripe_7.gemfile.lock
@@ -36,7 +36,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_stripe_8.gemfile.lock b/gemfiles/jruby_9.2_stripe_8.gemfile.lock
index 668f99cef7c..92c0f0000e0 100644
--- a/gemfiles/jruby_9.2_stripe_8.gemfile.lock
+++ b/gemfiles/jruby_9.2_stripe_8.gemfile.lock
@@ -36,7 +36,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_stripe_9.gemfile.lock b/gemfiles/jruby_9.2_stripe_9.gemfile.lock
index fc7ee6855eb..5df16e5dbf8 100644
--- a/gemfiles/jruby_9.2_stripe_9.gemfile.lock
+++ b/gemfiles/jruby_9.2_stripe_9.gemfile.lock
@@ -36,7 +36,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_stripe_latest.gemfile.lock b/gemfiles/jruby_9.2_stripe_latest.gemfile.lock
index b6802cce920..802e2bcd643 100644
--- a/gemfiles/jruby_9.2_stripe_latest.gemfile.lock
+++ b/gemfiles/jruby_9.2_stripe_latest.gemfile.lock
@@ -36,7 +36,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.2_stripe_min.gemfile.lock b/gemfiles/jruby_9.2_stripe_min.gemfile.lock
index 7238383745a..b32ad3c432c 100644
--- a/gemfiles/jruby_9.2_stripe_min.gemfile.lock
+++ b/gemfiles/jruby_9.2_stripe_min.gemfile.lock
@@ -36,7 +36,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
diff --git a/gemfiles/jruby_9.3_activesupport.gemfile.lock b/gemfiles/jruby_9.3_activesupport.gemfile.lock
index 5fa2e50cea0..8c67f757ce5 100644
--- a/gemfiles/jruby_9.3_activesupport.gemfile.lock
+++ b/gemfiles/jruby_9.3_activesupport.gemfile.lock
@@ -85,7 +85,7 @@ GEM
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     grape (1.8.0)
       activesupport (>= 5)
       builder
diff --git a/gemfiles/jruby_9.3_aws.gemfile.lock b/gemfiles/jruby_9.3_aws.gemfile.lock
index 3d60c08e571..a2ab56c2531 100644
--- a/gemfiles/jruby_9.3_aws.gemfile.lock
+++ b/gemfiles/jruby_9.3_aws.gemfile.lock
@@ -1455,7 +1455,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     jmespath (1.6.2)
     json (2.6.3-java)
diff --git a/gemfiles/jruby_9.3_contrib.gemfile.lock b/gemfiles/jruby_9.3_contrib.gemfile.lock
index c519b3f350d..7e5f3dcb603 100644
--- a/gemfiles/jruby_9.3_contrib.gemfile.lock
+++ b/gemfiles/jruby_9.3_contrib.gemfile.lock
@@ -41,7 +41,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_contrib_old.gemfile.lock b/gemfiles/jruby_9.3_contrib_old.gemfile.lock
index 941ef597de2..fe2c3709e57 100644
--- a/gemfiles/jruby_9.3_contrib_old.gemfile.lock
+++ b/gemfiles/jruby_9.3_contrib_old.gemfile.lock
@@ -39,7 +39,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_core_old.gemfile.lock b/gemfiles/jruby_9.3_core_old.gemfile.lock
index 684364abdbc..5d149003505 100644
--- a/gemfiles/jruby_9.3_core_old.gemfile.lock
+++ b/gemfiles/jruby_9.3_core_old.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (4.8.3)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_elasticsearch_7.gemfile.lock b/gemfiles/jruby_9.3_elasticsearch_7.gemfile.lock
index 50c4c83f604..b0fa99a4e5b 100644
--- a/gemfiles/jruby_9.3_elasticsearch_7.gemfile.lock
+++ b/gemfiles/jruby_9.3_elasticsearch_7.gemfile.lock
@@ -50,7 +50,7 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_elasticsearch_8.gemfile.lock b/gemfiles/jruby_9.3_elasticsearch_8.gemfile.lock
index 41b0248490f..87e7bbc4d1e 100644
--- a/gemfiles/jruby_9.3_elasticsearch_8.gemfile.lock
+++ b/gemfiles/jruby_9.3_elasticsearch_8.gemfile.lock
@@ -49,7 +49,7 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_elasticsearch_latest.gemfile.lock b/gemfiles/jruby_9.3_elasticsearch_latest.gemfile.lock
index 579f69b55fc..cd92e849ecc 100644
--- a/gemfiles/jruby_9.3_elasticsearch_latest.gemfile.lock
+++ b/gemfiles/jruby_9.3_elasticsearch_latest.gemfile.lock
@@ -51,7 +51,7 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_graphql_1.13.gemfile.lock b/gemfiles/jruby_9.3_graphql_1.13.gemfile.lock
index f61df7ae3e2..101a8dc516d 100644
--- a/gemfiles/jruby_9.3_graphql_1.13.gemfile.lock
+++ b/gemfiles/jruby_9.3_graphql_1.13.gemfile.lock
@@ -99,7 +99,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.2.1)
       activesupport (>= 6.1)
     graphql (1.13.21)
diff --git a/gemfiles/jruby_9.3_graphql_2.0.gemfile.lock b/gemfiles/jruby_9.3_graphql_2.0.gemfile.lock
index 86e2debca04..c666092be52 100644
--- a/gemfiles/jruby_9.3_graphql_2.0.gemfile.lock
+++ b/gemfiles/jruby_9.3_graphql_2.0.gemfile.lock
@@ -99,7 +99,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.2.1)
       activesupport (>= 6.1)
     graphql (2.0.28)
diff --git a/gemfiles/jruby_9.3_http.gemfile.lock b/gemfiles/jruby_9.3_http.gemfile.lock
index faf21f0efaf..5d88d7f530b 100644
--- a/gemfiles/jruby_9.3_http.gemfile.lock
+++ b/gemfiles/jruby_9.3_http.gemfile.lock
@@ -43,7 +43,7 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
diff --git a/gemfiles/jruby_9.3_opensearch_2.gemfile.lock b/gemfiles/jruby_9.3_opensearch_2.gemfile.lock
index d83a453e612..46cd5d33e1d 100644
--- a/gemfiles/jruby_9.3_opensearch_2.gemfile.lock
+++ b/gemfiles/jruby_9.3_opensearch_2.gemfile.lock
@@ -41,7 +41,7 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_opensearch_3.gemfile.lock b/gemfiles/jruby_9.3_opensearch_3.gemfile.lock
index 7249358cb4d..5856baadd3e 100644
--- a/gemfiles/jruby_9.3_opensearch_3.gemfile.lock
+++ b/gemfiles/jruby_9.3_opensearch_3.gemfile.lock
@@ -41,7 +41,7 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_opensearch_latest.gemfile.lock b/gemfiles/jruby_9.3_opensearch_latest.gemfile.lock
index 16d22b48c0f..fdb09719818 100644
--- a/gemfiles/jruby_9.3_opensearch_latest.gemfile.lock
+++ b/gemfiles/jruby_9.3_opensearch_latest.gemfile.lock
@@ -43,7 +43,7 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_rack_1.gemfile.lock b/gemfiles/jruby_9.3_rack_1.gemfile.lock
index d8c90f51ae8..28f81bcc662 100644
--- a/gemfiles/jruby_9.3_rack_1.gemfile.lock
+++ b/gemfiles/jruby_9.3_rack_1.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_rack_2.gemfile.lock b/gemfiles/jruby_9.3_rack_2.gemfile.lock
index 2b2bcfe16da..1a5b9d71b94 100644
--- a/gemfiles/jruby_9.3_rack_2.gemfile.lock
+++ b/gemfiles/jruby_9.3_rack_2.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_rack_3.gemfile.lock b/gemfiles/jruby_9.3_rack_3.gemfile.lock
index 1a4b3c3ca98..cdb43ace357 100644
--- a/gemfiles/jruby_9.3_rack_3.gemfile.lock
+++ b/gemfiles/jruby_9.3_rack_3.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_rack_latest.gemfile.lock b/gemfiles/jruby_9.3_rack_latest.gemfile.lock
index 17f75b59b32..8e7de425e01 100644
--- a/gemfiles/jruby_9.3_rack_latest.gemfile.lock
+++ b/gemfiles/jruby_9.3_rack_latest.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.2)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_rails5_mysql2.gemfile.lock b/gemfiles/jruby_9.3_rails5_mysql2.gemfile.lock
index 01678e58ca8..5ae228949ad 100644
--- a/gemfiles/jruby_9.3_rails5_mysql2.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails5_mysql2.gemfile.lock
@@ -85,7 +85,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_rails5_postgres.gemfile.lock b/gemfiles/jruby_9.3_rails5_postgres.gemfile.lock
index e8e4e2a1512..eb1b33d1f72 100644
--- a/gemfiles/jruby_9.3_rails5_postgres.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails5_postgres.gemfile.lock
@@ -85,7 +85,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_rails5_postgres_redis.gemfile.lock b/gemfiles/jruby_9.3_rails5_postgres_redis.gemfile.lock
index 1bb1004d4c5..0c22a6702ff 100644
--- a/gemfiles/jruby_9.3_rails5_postgres_redis.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails5_postgres_redis.gemfile.lock
@@ -85,7 +85,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.3_rails5_postgres_redis_activesupport.gemfile.lock
index 3acbbec69d2..4cd20e2ddcf 100644
--- a/gemfiles/jruby_9.3_rails5_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails5_postgres_redis_activesupport.gemfile.lock
@@ -85,7 +85,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.3_rails5_postgres_sidekiq.gemfile.lock
index dc4ec2a618e..3768f1b6b70 100644
--- a/gemfiles/jruby_9.3_rails5_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails5_postgres_sidekiq.gemfile.lock
@@ -86,7 +86,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_rails5_semantic_logger.gemfile.lock b/gemfiles/jruby_9.3_rails5_semantic_logger.gemfile.lock
index 5f750c6f292..ffb002ebaa1 100644
--- a/gemfiles/jruby_9.3_rails5_semantic_logger.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails5_semantic_logger.gemfile.lock
@@ -85,7 +85,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.3_rails61_mysql2.gemfile.lock
index adbf4b058aa..136b3a36efb 100644
--- a/gemfiles/jruby_9.3_rails61_mysql2.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails61_mysql2.gemfile.lock
@@ -102,7 +102,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.3_rails61_postgres.gemfile.lock
index e4d2a7990bf..5ad044a1224 100644
--- a/gemfiles/jruby_9.3_rails61_postgres.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails61_postgres.gemfile.lock
@@ -102,7 +102,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.3_rails61_postgres_redis.gemfile.lock
index f7852b2be0c..ace5125f4e8 100644
--- a/gemfiles/jruby_9.3_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails61_postgres_redis.gemfile.lock
@@ -102,7 +102,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.3_rails61_postgres_sidekiq.gemfile.lock
index f25eed0531a..9122128d4ad 100644
--- a/gemfiles/jruby_9.3_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails61_postgres_sidekiq.gemfile.lock
@@ -103,7 +103,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.3_rails61_semantic_logger.gemfile.lock
index 40c1664c0ad..99af65286f9 100644
--- a/gemfiles/jruby_9.3_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails61_semantic_logger.gemfile.lock
@@ -102,7 +102,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_rails6_mysql2.gemfile.lock b/gemfiles/jruby_9.3_rails6_mysql2.gemfile.lock
index 4a6c441a047..a5034be0d00 100644
--- a/gemfiles/jruby_9.3_rails6_mysql2.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails6_mysql2.gemfile.lock
@@ -98,7 +98,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_rails6_postgres.gemfile.lock b/gemfiles/jruby_9.3_rails6_postgres.gemfile.lock
index 9fb2257d8b2..d275dba8721 100644
--- a/gemfiles/jruby_9.3_rails6_postgres.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails6_postgres.gemfile.lock
@@ -98,7 +98,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_rails6_postgres_redis.gemfile.lock b/gemfiles/jruby_9.3_rails6_postgres_redis.gemfile.lock
index 72832b02ad3..512c0a44002 100644
--- a/gemfiles/jruby_9.3_rails6_postgres_redis.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails6_postgres_redis.gemfile.lock
@@ -98,7 +98,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.3_rails6_postgres_redis_activesupport.gemfile.lock
index 4f6a8d8b3ea..be5440589b8 100644
--- a/gemfiles/jruby_9.3_rails6_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails6_postgres_redis_activesupport.gemfile.lock
@@ -98,7 +98,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.3_rails6_postgres_sidekiq.gemfile.lock
index 52553f8447a..b9b15ebcd8f 100644
--- a/gemfiles/jruby_9.3_rails6_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails6_postgres_sidekiq.gemfile.lock
@@ -99,7 +99,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_rails6_semantic_logger.gemfile.lock b/gemfiles/jruby_9.3_rails6_semantic_logger.gemfile.lock
index 8c9d96cd7dc..5ee6238f7e0 100644
--- a/gemfiles/jruby_9.3_rails6_semantic_logger.gemfile.lock
+++ b/gemfiles/jruby_9.3_rails6_semantic_logger.gemfile.lock
@@ -98,7 +98,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.3_redis_3.gemfile.lock b/gemfiles/jruby_9.3_redis_3.gemfile.lock
index d19aea4bbea..65ee0d4f084 100644
--- a/gemfiles/jruby_9.3_redis_3.gemfile.lock
+++ b/gemfiles/jruby_9.3_redis_3.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_redis_4.gemfile.lock b/gemfiles/jruby_9.3_redis_4.gemfile.lock
index 3b26f43fb54..d919ca368fe 100644
--- a/gemfiles/jruby_9.3_redis_4.gemfile.lock
+++ b/gemfiles/jruby_9.3_redis_4.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_redis_5.gemfile.lock b/gemfiles/jruby_9.3_redis_5.gemfile.lock
index f8ecc10dc1b..9db646edc53 100644
--- a/gemfiles/jruby_9.3_redis_5.gemfile.lock
+++ b/gemfiles/jruby_9.3_redis_5.gemfile.lock
@@ -35,7 +35,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_relational_db.gemfile.lock b/gemfiles/jruby_9.3_relational_db.gemfile.lock
index 93358bcd8ee..c1a16ce398f 100644
--- a/gemfiles/jruby_9.3_relational_db.gemfile.lock
+++ b/gemfiles/jruby_9.3_relational_db.gemfile.lock
@@ -59,7 +59,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
diff --git a/gemfiles/jruby_9.3_resque2_redis3.gemfile.lock b/gemfiles/jruby_9.3_resque2_redis3.gemfile.lock
index 431d7e58a57..30f3f0dabdc 100644
--- a/gemfiles/jruby_9.3_resque2_redis3.gemfile.lock
+++ b/gemfiles/jruby_9.3_resque2_redis3.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_resque2_redis4.gemfile.lock b/gemfiles/jruby_9.3_resque2_redis4.gemfile.lock
index 61460b22f4a..9ae96645ee1 100644
--- a/gemfiles/jruby_9.3_resque2_redis4.gemfile.lock
+++ b/gemfiles/jruby_9.3_resque2_redis4.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_sinatra_2.gemfile.lock b/gemfiles/jruby_9.3_sinatra_2.gemfile.lock
index 980f731092f..614813e0d48 100644
--- a/gemfiles/jruby_9.3_sinatra_2.gemfile.lock
+++ b/gemfiles/jruby_9.3_sinatra_2.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.0)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_sinatra_3.gemfile.lock b/gemfiles/jruby_9.3_sinatra_3.gemfile.lock
index 2269fcf70bf..309391b3670 100644
--- a/gemfiles/jruby_9.3_sinatra_3.gemfile.lock
+++ b/gemfiles/jruby_9.3_sinatra_3.gemfile.lock
@@ -38,7 +38,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.0)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_stripe_10.gemfile.lock b/gemfiles/jruby_9.3_stripe_10.gemfile.lock
index 42e23e9d0ef..24d0f2b07d7 100644
--- a/gemfiles/jruby_9.3_stripe_10.gemfile.lock
+++ b/gemfiles/jruby_9.3_stripe_10.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_stripe_11.gemfile.lock b/gemfiles/jruby_9.3_stripe_11.gemfile.lock
index fd18eecd360..df530970c11 100644
--- a/gemfiles/jruby_9.3_stripe_11.gemfile.lock
+++ b/gemfiles/jruby_9.3_stripe_11.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_stripe_12.gemfile.lock b/gemfiles/jruby_9.3_stripe_12.gemfile.lock
index 8b53eadae51..8ca39260a2f 100644
--- a/gemfiles/jruby_9.3_stripe_12.gemfile.lock
+++ b/gemfiles/jruby_9.3_stripe_12.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_stripe_7.gemfile.lock b/gemfiles/jruby_9.3_stripe_7.gemfile.lock
index 13c29b36a9b..d5f627e17ea 100644
--- a/gemfiles/jruby_9.3_stripe_7.gemfile.lock
+++ b/gemfiles/jruby_9.3_stripe_7.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_stripe_8.gemfile.lock b/gemfiles/jruby_9.3_stripe_8.gemfile.lock
index 6365dd9d59c..c0bb6bfdbf1 100644
--- a/gemfiles/jruby_9.3_stripe_8.gemfile.lock
+++ b/gemfiles/jruby_9.3_stripe_8.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_stripe_9.gemfile.lock b/gemfiles/jruby_9.3_stripe_9.gemfile.lock
index d7ea0681ecc..c0eeddfac33 100644
--- a/gemfiles/jruby_9.3_stripe_9.gemfile.lock
+++ b/gemfiles/jruby_9.3_stripe_9.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_stripe_latest.gemfile.lock b/gemfiles/jruby_9.3_stripe_latest.gemfile.lock
index be48d6015ac..25f00f1d02c 100644
--- a/gemfiles/jruby_9.3_stripe_latest.gemfile.lock
+++ b/gemfiles/jruby_9.3_stripe_latest.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.3_stripe_min.gemfile.lock b/gemfiles/jruby_9.3_stripe_min.gemfile.lock
index fdaf74f4bb4..1d6588ceb75 100644
--- a/gemfiles/jruby_9.3_stripe_min.gemfile.lock
+++ b/gemfiles/jruby_9.3_stripe_min.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_activesupport.gemfile.lock b/gemfiles/jruby_9.4_activesupport.gemfile.lock
index 08cb78a05f0..88570c691aa 100644
--- a/gemfiles/jruby_9.4_activesupport.gemfile.lock
+++ b/gemfiles/jruby_9.4_activesupport.gemfile.lock
@@ -80,7 +80,7 @@ GEM
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     grape (1.8.0)
       activesupport (>= 5)
       builder
diff --git a/gemfiles/jruby_9.4_aws.gemfile.lock b/gemfiles/jruby_9.4_aws.gemfile.lock
index bbe67eb7a19..afdcb51ba28 100644
--- a/gemfiles/jruby_9.4_aws.gemfile.lock
+++ b/gemfiles/jruby_9.4_aws.gemfile.lock
@@ -1455,7 +1455,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     jmespath (1.6.2)
     json (2.6.3-java)
diff --git a/gemfiles/jruby_9.4_contrib.gemfile.lock b/gemfiles/jruby_9.4_contrib.gemfile.lock
index dc8646b6ce0..a8d69572440 100644
--- a/gemfiles/jruby_9.4_contrib.gemfile.lock
+++ b/gemfiles/jruby_9.4_contrib.gemfile.lock
@@ -41,7 +41,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_contrib_old.gemfile.lock b/gemfiles/jruby_9.4_contrib_old.gemfile.lock
index 53103290f21..2b7c9815683 100644
--- a/gemfiles/jruby_9.4_contrib_old.gemfile.lock
+++ b/gemfiles/jruby_9.4_contrib_old.gemfile.lock
@@ -39,7 +39,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_core_old.gemfile.lock b/gemfiles/jruby_9.4_core_old.gemfile.lock
index aa8a5f8d268..ea1bc3179fc 100644
--- a/gemfiles/jruby_9.4_core_old.gemfile.lock
+++ b/gemfiles/jruby_9.4_core_old.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (4.8.3)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_elasticsearch_7.gemfile.lock b/gemfiles/jruby_9.4_elasticsearch_7.gemfile.lock
index d3da187035b..ca7aaf0976a 100644
--- a/gemfiles/jruby_9.4_elasticsearch_7.gemfile.lock
+++ b/gemfiles/jruby_9.4_elasticsearch_7.gemfile.lock
@@ -51,7 +51,7 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.9.1-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_elasticsearch_8.gemfile.lock b/gemfiles/jruby_9.4_elasticsearch_8.gemfile.lock
index 99944c060cc..263b6b31c7c 100644
--- a/gemfiles/jruby_9.4_elasticsearch_8.gemfile.lock
+++ b/gemfiles/jruby_9.4_elasticsearch_8.gemfile.lock
@@ -49,7 +49,7 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.9.1-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_elasticsearch_latest.gemfile.lock b/gemfiles/jruby_9.4_elasticsearch_latest.gemfile.lock
index 2523b28c887..cff57442807 100644
--- a/gemfiles/jruby_9.4_elasticsearch_latest.gemfile.lock
+++ b/gemfiles/jruby_9.4_elasticsearch_latest.gemfile.lock
@@ -51,7 +51,7 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.9.1-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_graphql_1.13.gemfile.lock b/gemfiles/jruby_9.4_graphql_1.13.gemfile.lock
index bd8a4994d66..3f71a77b491 100644
--- a/gemfiles/jruby_9.4_graphql_1.13.gemfile.lock
+++ b/gemfiles/jruby_9.4_graphql_1.13.gemfile.lock
@@ -99,7 +99,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.2.1)
       activesupport (>= 6.1)
     graphql (1.13.21)
diff --git a/gemfiles/jruby_9.4_graphql_2.0.gemfile.lock b/gemfiles/jruby_9.4_graphql_2.0.gemfile.lock
index 5b723d46e57..fcd891d4dbe 100644
--- a/gemfiles/jruby_9.4_graphql_2.0.gemfile.lock
+++ b/gemfiles/jruby_9.4_graphql_2.0.gemfile.lock
@@ -99,7 +99,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.2.1)
       activesupport (>= 6.1)
     graphql (2.0.28)
diff --git a/gemfiles/jruby_9.4_graphql_2.1.gemfile.lock b/gemfiles/jruby_9.4_graphql_2.1.gemfile.lock
index 2be2e76fa4c..3d7bf28fc5d 100644
--- a/gemfiles/jruby_9.4_graphql_2.1.gemfile.lock
+++ b/gemfiles/jruby_9.4_graphql_2.1.gemfile.lock
@@ -99,7 +99,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.2.1)
       activesupport (>= 6.1)
     graphql (2.1.11)
diff --git a/gemfiles/jruby_9.4_graphql_2.2.gemfile.lock b/gemfiles/jruby_9.4_graphql_2.2.gemfile.lock
index 21c8de210ee..592c958cab8 100644
--- a/gemfiles/jruby_9.4_graphql_2.2.gemfile.lock
+++ b/gemfiles/jruby_9.4_graphql_2.2.gemfile.lock
@@ -99,7 +99,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.2.1)
       activesupport (>= 6.1)
     graphql (2.2.6)
diff --git a/gemfiles/jruby_9.4_graphql_2.3.gemfile.lock b/gemfiles/jruby_9.4_graphql_2.3.gemfile.lock
index d4d82b927d6..853fe26856d 100644
--- a/gemfiles/jruby_9.4_graphql_2.3.gemfile.lock
+++ b/gemfiles/jruby_9.4_graphql_2.3.gemfile.lock
@@ -101,7 +101,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.2.1)
       activesupport (>= 6.1)
     graphql (2.3.6)
diff --git a/gemfiles/jruby_9.4_http.gemfile.lock b/gemfiles/jruby_9.4_http.gemfile.lock
index 2918baf2ca5..d11e37aeeec 100644
--- a/gemfiles/jruby_9.4_http.gemfile.lock
+++ b/gemfiles/jruby_9.4_http.gemfile.lock
@@ -43,7 +43,7 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
diff --git a/gemfiles/jruby_9.4_opensearch_2.gemfile.lock b/gemfiles/jruby_9.4_opensearch_2.gemfile.lock
index dab25836ebc..02ac2032d4c 100644
--- a/gemfiles/jruby_9.4_opensearch_2.gemfile.lock
+++ b/gemfiles/jruby_9.4_opensearch_2.gemfile.lock
@@ -41,7 +41,7 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.9.1-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_opensearch_3.gemfile.lock b/gemfiles/jruby_9.4_opensearch_3.gemfile.lock
index aee58dbad8f..83edc60d819 100644
--- a/gemfiles/jruby_9.4_opensearch_3.gemfile.lock
+++ b/gemfiles/jruby_9.4_opensearch_3.gemfile.lock
@@ -41,7 +41,7 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.9.1-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_opensearch_latest.gemfile.lock b/gemfiles/jruby_9.4_opensearch_latest.gemfile.lock
index baa665b1de5..24f7f816f93 100644
--- a/gemfiles/jruby_9.4_opensearch_latest.gemfile.lock
+++ b/gemfiles/jruby_9.4_opensearch_latest.gemfile.lock
@@ -43,7 +43,7 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.9.1-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_rack_1.gemfile.lock b/gemfiles/jruby_9.4_rack_1.gemfile.lock
index b9d2bc1576d..ed12c7492fd 100644
--- a/gemfiles/jruby_9.4_rack_1.gemfile.lock
+++ b/gemfiles/jruby_9.4_rack_1.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_rack_2.gemfile.lock b/gemfiles/jruby_9.4_rack_2.gemfile.lock
index 096db7043f9..0915c1bc8e9 100644
--- a/gemfiles/jruby_9.4_rack_2.gemfile.lock
+++ b/gemfiles/jruby_9.4_rack_2.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_rack_3.gemfile.lock b/gemfiles/jruby_9.4_rack_3.gemfile.lock
index d99cc1cc4c4..4b7a73aee08 100644
--- a/gemfiles/jruby_9.4_rack_3.gemfile.lock
+++ b/gemfiles/jruby_9.4_rack_3.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_rack_latest.gemfile.lock b/gemfiles/jruby_9.4_rack_latest.gemfile.lock
index c6580c46245..3124a815be2 100644
--- a/gemfiles/jruby_9.4_rack_latest.gemfile.lock
+++ b/gemfiles/jruby_9.4_rack_latest.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.2)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.4_rails61_mysql2.gemfile.lock
index 49697317069..001edbce30e 100644
--- a/gemfiles/jruby_9.4_rails61_mysql2.gemfile.lock
+++ b/gemfiles/jruby_9.4_rails61_mysql2.gemfile.lock
@@ -106,7 +106,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.2.1)
       activesupport (>= 6.1)
     hashdiff (1.1.0)
diff --git a/gemfiles/jruby_9.4_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.4_rails61_postgres.gemfile.lock
index eeb910a2a87..cca006b558e 100644
--- a/gemfiles/jruby_9.4_rails61_postgres.gemfile.lock
+++ b/gemfiles/jruby_9.4_rails61_postgres.gemfile.lock
@@ -102,7 +102,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.4_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.4_rails61_postgres_redis.gemfile.lock
index 7cf78615007..28fa0eb4997 100644
--- a/gemfiles/jruby_9.4_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/jruby_9.4_rails61_postgres_redis.gemfile.lock
@@ -102,7 +102,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.4_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.4_rails61_postgres_sidekiq.gemfile.lock
index 2b81024c3d0..a8e2f2be5b7 100644
--- a/gemfiles/jruby_9.4_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/jruby_9.4_rails61_postgres_sidekiq.gemfile.lock
@@ -103,7 +103,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.4_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.4_rails61_semantic_logger.gemfile.lock
index c0aa7acd502..ed778d9b04e 100644
--- a/gemfiles/jruby_9.4_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/jruby_9.4_rails61_semantic_logger.gemfile.lock
@@ -102,7 +102,7 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     globalid (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
diff --git a/gemfiles/jruby_9.4_redis_3.gemfile.lock b/gemfiles/jruby_9.4_redis_3.gemfile.lock
index d876913455c..c27b42e4ac3 100644
--- a/gemfiles/jruby_9.4_redis_3.gemfile.lock
+++ b/gemfiles/jruby_9.4_redis_3.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_redis_4.gemfile.lock b/gemfiles/jruby_9.4_redis_4.gemfile.lock
index 87299fe64f5..a318e140b2f 100644
--- a/gemfiles/jruby_9.4_redis_4.gemfile.lock
+++ b/gemfiles/jruby_9.4_redis_4.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_redis_5.gemfile.lock b/gemfiles/jruby_9.4_redis_5.gemfile.lock
index bfdf9b66e48..a7a42327dcd 100644
--- a/gemfiles/jruby_9.4_redis_5.gemfile.lock
+++ b/gemfiles/jruby_9.4_redis_5.gemfile.lock
@@ -35,7 +35,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_relational_db.gemfile.lock b/gemfiles/jruby_9.4_relational_db.gemfile.lock
index e488b3fd28d..49082bf5347 100644
--- a/gemfiles/jruby_9.4_relational_db.gemfile.lock
+++ b/gemfiles/jruby_9.4_relational_db.gemfile.lock
@@ -61,7 +61,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.0)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
diff --git a/gemfiles/jruby_9.4_resque2_redis3.gemfile.lock b/gemfiles/jruby_9.4_resque2_redis3.gemfile.lock
index 039d4fddade..74436533c24 100644
--- a/gemfiles/jruby_9.4_resque2_redis3.gemfile.lock
+++ b/gemfiles/jruby_9.4_resque2_redis3.gemfile.lock
@@ -34,7 +34,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_resque2_redis4.gemfile.lock b/gemfiles/jruby_9.4_resque2_redis4.gemfile.lock
index 1521918dc59..66a6b2b6707 100644
--- a/gemfiles/jruby_9.4_resque2_redis4.gemfile.lock
+++ b/gemfiles/jruby_9.4_resque2_redis4.gemfile.lock
@@ -35,7 +35,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.0.1)
     json (2.6.3-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_sinatra_2.gemfile.lock b/gemfiles/jruby_9.4_sinatra_2.gemfile.lock
index beb370fa1be..8b816583569 100644
--- a/gemfiles/jruby_9.4_sinatra_2.gemfile.lock
+++ b/gemfiles/jruby_9.4_sinatra_2.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.0)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_sinatra_3.gemfile.lock b/gemfiles/jruby_9.4_sinatra_3.gemfile.lock
index 80c3eecef35..a3dd5d624d4 100644
--- a/gemfiles/jruby_9.4_sinatra_3.gemfile.lock
+++ b/gemfiles/jruby_9.4_sinatra_3.gemfile.lock
@@ -38,7 +38,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.0)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_sinatra_4.gemfile.lock b/gemfiles/jruby_9.4_sinatra_4.gemfile.lock
index 516b0823a2a..41aad1024e1 100644
--- a/gemfiles/jruby_9.4_sinatra_4.gemfile.lock
+++ b/gemfiles/jruby_9.4_sinatra_4.gemfile.lock
@@ -38,7 +38,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.0)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_stripe_10.gemfile.lock b/gemfiles/jruby_9.4_stripe_10.gemfile.lock
index 592a77c1106..621396abeb6 100644
--- a/gemfiles/jruby_9.4_stripe_10.gemfile.lock
+++ b/gemfiles/jruby_9.4_stripe_10.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_stripe_11.gemfile.lock b/gemfiles/jruby_9.4_stripe_11.gemfile.lock
index b7484f30a47..d817730170f 100644
--- a/gemfiles/jruby_9.4_stripe_11.gemfile.lock
+++ b/gemfiles/jruby_9.4_stripe_11.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_stripe_12.gemfile.lock b/gemfiles/jruby_9.4_stripe_12.gemfile.lock
index 03dbc37f525..c09ca1319f9 100644
--- a/gemfiles/jruby_9.4_stripe_12.gemfile.lock
+++ b/gemfiles/jruby_9.4_stripe_12.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_stripe_7.gemfile.lock b/gemfiles/jruby_9.4_stripe_7.gemfile.lock
index 6e22f74ce14..cf3153e076e 100644
--- a/gemfiles/jruby_9.4_stripe_7.gemfile.lock
+++ b/gemfiles/jruby_9.4_stripe_7.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_stripe_8.gemfile.lock b/gemfiles/jruby_9.4_stripe_8.gemfile.lock
index 99e76503e3c..fc533d75440 100644
--- a/gemfiles/jruby_9.4_stripe_8.gemfile.lock
+++ b/gemfiles/jruby_9.4_stripe_8.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_stripe_9.gemfile.lock b/gemfiles/jruby_9.4_stripe_9.gemfile.lock
index 3a792854210..19bed334a61 100644
--- a/gemfiles/jruby_9.4_stripe_9.gemfile.lock
+++ b/gemfiles/jruby_9.4_stripe_9.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_stripe_latest.gemfile.lock b/gemfiles/jruby_9.4_stripe_latest.gemfile.lock
index 2f28c1ff44e..5d0c05fed25 100644
--- a/gemfiles/jruby_9.4_stripe_latest.gemfile.lock
+++ b/gemfiles/jruby_9.4_stripe_latest.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/jruby_9.4_stripe_min.gemfile.lock b/gemfiles/jruby_9.4_stripe_min.gemfile.lock
index 22797727717..451c8f4db3e 100644
--- a/gemfiles/jruby_9.4_stripe_min.gemfile.lock
+++ b/gemfiles/jruby_9.4_stripe_min.gemfile.lock
@@ -37,7 +37,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
-    ffi (1.17.0-java)
+    ffi (1.17.1-java)
     hashdiff (1.1.1)
     json (2.7.2-java)
     json-schema (2.8.1)
diff --git a/gemfiles/ruby_2.5_activesupport.gemfile.lock b/gemfiles/ruby_2.5_activesupport.gemfile.lock
index bd904dd308c..5f17ae88bba 100644
--- a/gemfiles/ruby_2.5_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.5_activesupport.gemfile.lock
@@ -87,8 +87,8 @@ GEM
       dry-logic (~> 1.0, >= 1.0.2)
     erubi (1.12.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     grape (1.7.0)
diff --git a/gemfiles/ruby_2.5_aws.gemfile.lock b/gemfiles/ruby_2.5_aws.gemfile.lock
index 7c8bfab3910..07989587beb 100644
--- a/gemfiles/ruby_2.5_aws.gemfile.lock
+++ b/gemfiles/ruby_2.5_aws.gemfile.lock
@@ -1458,8 +1458,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.5_contrib.gemfile.lock b/gemfiles/ruby_2.5_contrib.gemfile.lock
index cbc1f70fb89..fb48022b733 100644
--- a/gemfiles/ruby_2.5_contrib.gemfile.lock
+++ b/gemfiles/ruby_2.5_contrib.gemfile.lock
@@ -44,8 +44,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     googleapis-common-protos-types (1.3.2)
diff --git a/gemfiles/ruby_2.5_contrib_old.gemfile.lock b/gemfiles/ruby_2.5_contrib_old.gemfile.lock
index 6ab8edac32d..53dfbcf9433 100644
--- a/gemfiles/ruby_2.5_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_2.5_contrib_old.gemfile.lock
@@ -47,8 +47,8 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.5_core_old.gemfile.lock b/gemfiles/ruby_2.5_core_old.gemfile.lock
index dee4f0cdeb5..2ace7e7df70 100644
--- a/gemfiles/ruby_2.5_core_old.gemfile.lock
+++ b/gemfiles/ruby_2.5_core_old.gemfile.lock
@@ -37,8 +37,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (4.8.3)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.5_elasticsearch_7.gemfile.lock b/gemfiles/ruby_2.5_elasticsearch_7.gemfile.lock
index 1dcdb60f488..57d2e8e753e 100644
--- a/gemfiles/ruby_2.5_elasticsearch_7.gemfile.lock
+++ b/gemfiles/ruby_2.5_elasticsearch_7.gemfile.lock
@@ -71,8 +71,8 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.5_elasticsearch_8.gemfile.lock b/gemfiles/ruby_2.5_elasticsearch_8.gemfile.lock
index 33dfdea8b25..3436f2d9349 100644
--- a/gemfiles/ruby_2.5_elasticsearch_8.gemfile.lock
+++ b/gemfiles/ruby_2.5_elasticsearch_8.gemfile.lock
@@ -69,8 +69,8 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.5_elasticsearch_latest.gemfile.lock b/gemfiles/ruby_2.5_elasticsearch_latest.gemfile.lock
index c712643c1a1..326c8d51fec 100644
--- a/gemfiles/ruby_2.5_elasticsearch_latest.gemfile.lock
+++ b/gemfiles/ruby_2.5_elasticsearch_latest.gemfile.lock
@@ -71,8 +71,8 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.5_graphql_2.0.gemfile.lock b/gemfiles/ruby_2.5_graphql_2.0.gemfile.lock
index f3eccb99c53..18746b08995 100644
--- a/gemfiles/ruby_2.5_graphql_2.0.gemfile.lock
+++ b/gemfiles/ruby_2.5_graphql_2.0.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_hanami_1.gemfile.lock b/gemfiles/ruby_2.5_hanami_1.gemfile.lock
index cefbba4f5ac..b51bb18be9d 100644
--- a/gemfiles/ruby_2.5_hanami_1.gemfile.lock
+++ b/gemfiles/ruby_2.5_hanami_1.gemfile.lock
@@ -67,8 +67,8 @@ GEM
       dry-logic (~> 0.4.2)
       dry-types (~> 0.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hanami (1.3.5)
diff --git a/gemfiles/ruby_2.5_http.gemfile.lock b/gemfiles/ruby_2.5_http.gemfile.lock
index faf1bb05c34..60e876f907b 100644
--- a/gemfiles/ruby_2.5_http.gemfile.lock
+++ b/gemfiles/ruby_2.5_http.gemfile.lock
@@ -65,8 +65,8 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
diff --git a/gemfiles/ruby_2.5_opensearch_2.gemfile.lock b/gemfiles/ruby_2.5_opensearch_2.gemfile.lock
index faf171fa0ed..c7314c5f37e 100644
--- a/gemfiles/ruby_2.5_opensearch_2.gemfile.lock
+++ b/gemfiles/ruby_2.5_opensearch_2.gemfile.lock
@@ -61,8 +61,8 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.5_opensearch_3.gemfile.lock b/gemfiles/ruby_2.5_opensearch_3.gemfile.lock
index 536089c8374..f8dd34b6afc 100644
--- a/gemfiles/ruby_2.5_opensearch_3.gemfile.lock
+++ b/gemfiles/ruby_2.5_opensearch_3.gemfile.lock
@@ -61,8 +61,8 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.5_opensearch_latest.gemfile.lock b/gemfiles/ruby_2.5_opensearch_latest.gemfile.lock
index da610b4504b..be32d5c9d63 100644
--- a/gemfiles/ruby_2.5_opensearch_latest.gemfile.lock
+++ b/gemfiles/ruby_2.5_opensearch_latest.gemfile.lock
@@ -63,8 +63,8 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.5_rack_1.gemfile.lock b/gemfiles/ruby_2.5_rack_1.gemfile.lock
index 9dc66f70083..62b445f3f1f 100644
--- a/gemfiles/ruby_2.5_rack_1.gemfile.lock
+++ b/gemfiles/ruby_2.5_rack_1.gemfile.lock
@@ -37,8 +37,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.5_rack_2.gemfile.lock b/gemfiles/ruby_2.5_rack_2.gemfile.lock
index 1bee404aebd..2a9f3372bc3 100644
--- a/gemfiles/ruby_2.5_rack_2.gemfile.lock
+++ b/gemfiles/ruby_2.5_rack_2.gemfile.lock
@@ -37,8 +37,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.5_rack_3.gemfile.lock b/gemfiles/ruby_2.5_rack_3.gemfile.lock
index 790f9756416..1ac6a451c87 100644
--- a/gemfiles/ruby_2.5_rack_3.gemfile.lock
+++ b/gemfiles/ruby_2.5_rack_3.gemfile.lock
@@ -37,8 +37,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.5_rack_latest.gemfile.lock b/gemfiles/ruby_2.5_rack_latest.gemfile.lock
index 4c20ea3d0ac..680dc9e6049 100644
--- a/gemfiles/ruby_2.5_rack_latest.gemfile.lock
+++ b/gemfiles/ruby_2.5_rack_latest.gemfile.lock
@@ -40,8 +40,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.2)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.5_rails4_mysql2.gemfile.lock b/gemfiles/ruby_2.5_rails4_mysql2.gemfile.lock
index 98d5b07ca25..8f8cf2a131b 100644
--- a/gemfiles/ruby_2.5_rails4_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails4_mysql2.gemfile.lock
@@ -99,8 +99,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubis (2.7.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails4_postgres.gemfile.lock b/gemfiles/ruby_2.5_rails4_postgres.gemfile.lock
index c3d1cb19542..706f54e5188 100644
--- a/gemfiles/ruby_2.5_rails4_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails4_postgres.gemfile.lock
@@ -99,8 +99,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubis (2.7.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails4_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5_rails4_postgres_redis.gemfile.lock
index 3e7b46f77e6..67ad69571bd 100644
--- a/gemfiles/ruby_2.5_rails4_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails4_postgres_redis.gemfile.lock
@@ -99,8 +99,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubis (2.7.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails4_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5_rails4_postgres_sidekiq.gemfile.lock
index bf0ee719872..30b97e06f97 100644
--- a/gemfiles/ruby_2.5_rails4_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails4_postgres_sidekiq.gemfile.lock
@@ -100,8 +100,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubis (2.7.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails4_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5_rails4_semantic_logger.gemfile.lock
index 0cd7b760cf9..cb1b4a166db 100644
--- a/gemfiles/ruby_2.5_rails4_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails4_semantic_logger.gemfile.lock
@@ -99,8 +99,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubis (2.7.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.5_rails5_mysql2.gemfile.lock
index fa9a9ad4b41..711de169e39 100644
--- a/gemfiles/ruby_2.5_rails5_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails5_mysql2.gemfile.lock
@@ -82,8 +82,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.5_rails5_postgres.gemfile.lock
index 9c3866006db..d9197b5cb4b 100644
--- a/gemfiles/ruby_2.5_rails5_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails5_postgres.gemfile.lock
@@ -83,8 +83,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5_rails5_postgres_redis.gemfile.lock
index 6e16dbd9784..339c629c153 100644
--- a/gemfiles/ruby_2.5_rails5_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails5_postgres_redis.gemfile.lock
@@ -84,8 +84,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.5_rails5_postgres_redis_activesupport.gemfile.lock
index d21cec0cbb6..8e835669d50 100644
--- a/gemfiles/ruby_2.5_rails5_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails5_postgres_redis_activesupport.gemfile.lock
@@ -83,8 +83,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5_rails5_postgres_sidekiq.gemfile.lock
index e2190f3e66b..f33349ed653 100644
--- a/gemfiles/ruby_2.5_rails5_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails5_postgres_sidekiq.gemfile.lock
@@ -84,8 +84,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5_rails5_semantic_logger.gemfile.lock
index 7d2edd6c1eb..f71073e2009 100644
--- a/gemfiles/ruby_2.5_rails5_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails5_semantic_logger.gemfile.lock
@@ -83,8 +83,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails61_mysql2.gemfile.lock b/gemfiles/ruby_2.5_rails61_mysql2.gemfile.lock
index 7c62661712b..e34ff6f41a6 100644
--- a/gemfiles/ruby_2.5_rails61_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails61_mysql2.gemfile.lock
@@ -99,8 +99,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails61_postgres.gemfile.lock b/gemfiles/ruby_2.5_rails61_postgres.gemfile.lock
index e9cd62106e1..362e80f1afd 100644
--- a/gemfiles/ruby_2.5_rails61_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails61_postgres.gemfile.lock
@@ -100,8 +100,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5_rails61_postgres_redis.gemfile.lock
index 31b9f1af9a3..d5f8ca8e5f4 100644
--- a/gemfiles/ruby_2.5_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails61_postgres_redis.gemfile.lock
@@ -101,8 +101,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5_rails61_postgres_sidekiq.gemfile.lock
index 49c11dbbe5c..72899654fdb 100644
--- a/gemfiles/ruby_2.5_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails61_postgres_sidekiq.gemfile.lock
@@ -101,8 +101,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5_rails61_semantic_logger.gemfile.lock
index 43b03c017a5..b963236309b 100644
--- a/gemfiles/ruby_2.5_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails61_semantic_logger.gemfile.lock
@@ -100,8 +100,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails6_mysql2.gemfile.lock b/gemfiles/ruby_2.5_rails6_mysql2.gemfile.lock
index d3009f23132..33d0f290a7a 100644
--- a/gemfiles/ruby_2.5_rails6_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails6_mysql2.gemfile.lock
@@ -95,8 +95,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails6_postgres.gemfile.lock b/gemfiles/ruby_2.5_rails6_postgres.gemfile.lock
index 12267ed7939..19f4e422753 100644
--- a/gemfiles/ruby_2.5_rails6_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails6_postgres.gemfile.lock
@@ -96,8 +96,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails6_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5_rails6_postgres_redis.gemfile.lock
index 4d882855ea2..64c92531a53 100644
--- a/gemfiles/ruby_2.5_rails6_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails6_postgres_redis.gemfile.lock
@@ -97,8 +97,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.5_rails6_postgres_redis_activesupport.gemfile.lock
index a0f6b8886ba..10d4a7d01ef 100644
--- a/gemfiles/ruby_2.5_rails6_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails6_postgres_redis_activesupport.gemfile.lock
@@ -96,8 +96,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5_rails6_postgres_sidekiq.gemfile.lock
index d01c1775f35..666ee6e08e2 100644
--- a/gemfiles/ruby_2.5_rails6_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails6_postgres_sidekiq.gemfile.lock
@@ -97,8 +97,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_rails6_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5_rails6_semantic_logger.gemfile.lock
index e91f9b57ddb..0fb11344278 100644
--- a/gemfiles/ruby_2.5_rails6_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.5_rails6_semantic_logger.gemfile.lock
@@ -96,8 +96,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.5_redis_3.gemfile.lock b/gemfiles/ruby_2.5_redis_3.gemfile.lock
index f2f9106cad0..339b00ef46a 100644
--- a/gemfiles/ruby_2.5_redis_3.gemfile.lock
+++ b/gemfiles/ruby_2.5_redis_3.gemfile.lock
@@ -37,8 +37,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.5_redis_4.gemfile.lock b/gemfiles/ruby_2.5_redis_4.gemfile.lock
index f4ffec0f566..72a2c135888 100644
--- a/gemfiles/ruby_2.5_redis_4.gemfile.lock
+++ b/gemfiles/ruby_2.5_redis_4.gemfile.lock
@@ -37,8 +37,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.5_redis_5.gemfile.lock b/gemfiles/ruby_2.5_redis_5.gemfile.lock
index e6b52817d30..4572b1f6a01 100644
--- a/gemfiles/ruby_2.5_redis_5.gemfile.lock
+++ b/gemfiles/ruby_2.5_redis_5.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.5_relational_db.gemfile.lock b/gemfiles/ruby_2.5_relational_db.gemfile.lock
index f41c1fe7b3c..1e43ca2f328 100644
--- a/gemfiles/ruby_2.5_relational_db.gemfile.lock
+++ b/gemfiles/ruby_2.5_relational_db.gemfile.lock
@@ -55,8 +55,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.5_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.5_resque2_redis3.gemfile.lock
index f92b0fa93ea..28ae6ab1725 100644
--- a/gemfiles/ruby_2.5_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_2.5_resque2_redis3.gemfile.lock
@@ -37,8 +37,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.5_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.5_resque2_redis4.gemfile.lock
index b3843f0b5d6..d45b0cef799 100644
--- a/gemfiles/ruby_2.5_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_2.5_resque2_redis4.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.5_sinatra_2.gemfile.lock b/gemfiles/ruby_2.5_sinatra_2.gemfile.lock
index f6ac9af0873..051d70daa01 100644
--- a/gemfiles/ruby_2.5_sinatra_2.gemfile.lock
+++ b/gemfiles/ruby_2.5_sinatra_2.gemfile.lock
@@ -40,8 +40,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_2.5_stripe_10.gemfile.lock b/gemfiles/ruby_2.5_stripe_10.gemfile.lock
index 5f3e5df99e8..d573a983788 100644
--- a/gemfiles/ruby_2.5_stripe_10.gemfile.lock
+++ b/gemfiles/ruby_2.5_stripe_10.gemfile.lock
@@ -40,8 +40,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.5_stripe_11.gemfile.lock b/gemfiles/ruby_2.5_stripe_11.gemfile.lock
index 1b01f79eb74..1f4090efd05 100644
--- a/gemfiles/ruby_2.5_stripe_11.gemfile.lock
+++ b/gemfiles/ruby_2.5_stripe_11.gemfile.lock
@@ -40,8 +40,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.5_stripe_12.gemfile.lock b/gemfiles/ruby_2.5_stripe_12.gemfile.lock
index 8d8f68c4ca5..6baa0413510 100644
--- a/gemfiles/ruby_2.5_stripe_12.gemfile.lock
+++ b/gemfiles/ruby_2.5_stripe_12.gemfile.lock
@@ -40,8 +40,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.5_stripe_7.gemfile.lock b/gemfiles/ruby_2.5_stripe_7.gemfile.lock
index 21d488d5ff7..f772ff035b6 100644
--- a/gemfiles/ruby_2.5_stripe_7.gemfile.lock
+++ b/gemfiles/ruby_2.5_stripe_7.gemfile.lock
@@ -40,8 +40,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.5_stripe_8.gemfile.lock b/gemfiles/ruby_2.5_stripe_8.gemfile.lock
index e990b9f72d7..62130a60acc 100644
--- a/gemfiles/ruby_2.5_stripe_8.gemfile.lock
+++ b/gemfiles/ruby_2.5_stripe_8.gemfile.lock
@@ -40,8 +40,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.5_stripe_9.gemfile.lock b/gemfiles/ruby_2.5_stripe_9.gemfile.lock
index a9f4eeb3153..96bb62b76e2 100644
--- a/gemfiles/ruby_2.5_stripe_9.gemfile.lock
+++ b/gemfiles/ruby_2.5_stripe_9.gemfile.lock
@@ -40,8 +40,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.5_stripe_latest.gemfile.lock b/gemfiles/ruby_2.5_stripe_latest.gemfile.lock
index a7beba6ef22..a86f084f2fc 100644
--- a/gemfiles/ruby_2.5_stripe_latest.gemfile.lock
+++ b/gemfiles/ruby_2.5_stripe_latest.gemfile.lock
@@ -40,8 +40,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.5_stripe_min.gemfile.lock b/gemfiles/ruby_2.5_stripe_min.gemfile.lock
index 3ca5faa328c..da9397e8e6f 100644
--- a/gemfiles/ruby_2.5_stripe_min.gemfile.lock
+++ b/gemfiles/ruby_2.5_stripe_min.gemfile.lock
@@ -40,8 +40,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.6_activesupport.gemfile.lock b/gemfiles/ruby_2.6_activesupport.gemfile.lock
index 4d734fe6577..007706e59bd 100644
--- a/gemfiles/ruby_2.6_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.6_activesupport.gemfile.lock
@@ -90,8 +90,8 @@ GEM
       dry-logic (~> 1.0, >= 1.0.2)
     erubi (1.12.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     grape (1.8.0)
diff --git a/gemfiles/ruby_2.6_aws.gemfile.lock b/gemfiles/ruby_2.6_aws.gemfile.lock
index c1128ef2a7f..3c96fe1b541 100644
--- a/gemfiles/ruby_2.6_aws.gemfile.lock
+++ b/gemfiles/ruby_2.6_aws.gemfile.lock
@@ -1460,8 +1460,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_contrib.gemfile.lock b/gemfiles/ruby_2.6_contrib.gemfile.lock
index 9290fa6d458..670be6cb17e 100644
--- a/gemfiles/ruby_2.6_contrib.gemfile.lock
+++ b/gemfiles/ruby_2.6_contrib.gemfile.lock
@@ -46,8 +46,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     googleapis-common-protos-types (1.7.0)
diff --git a/gemfiles/ruby_2.6_contrib_old.gemfile.lock b/gemfiles/ruby_2.6_contrib_old.gemfile.lock
index ee3bb57e301..1f5b283560f 100644
--- a/gemfiles/ruby_2.6_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_2.6_contrib_old.gemfile.lock
@@ -49,8 +49,8 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_core_old.gemfile.lock b/gemfiles/ruby_2.6_core_old.gemfile.lock
index 9f852271ed1..d9a4bf1b21f 100644
--- a/gemfiles/ruby_2.6_core_old.gemfile.lock
+++ b/gemfiles/ruby_2.6_core_old.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (4.8.3)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_elasticsearch_7.gemfile.lock b/gemfiles/ruby_2.6_elasticsearch_7.gemfile.lock
index 4cea30faa65..a29fc91e410 100644
--- a/gemfiles/ruby_2.6_elasticsearch_7.gemfile.lock
+++ b/gemfiles/ruby_2.6_elasticsearch_7.gemfile.lock
@@ -55,8 +55,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_elasticsearch_8.gemfile.lock b/gemfiles/ruby_2.6_elasticsearch_8.gemfile.lock
index 453b543e584..6def7dd6ab4 100644
--- a/gemfiles/ruby_2.6_elasticsearch_8.gemfile.lock
+++ b/gemfiles/ruby_2.6_elasticsearch_8.gemfile.lock
@@ -54,8 +54,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_elasticsearch_latest.gemfile.lock b/gemfiles/ruby_2.6_elasticsearch_latest.gemfile.lock
index e793083ecad..dff86247bb3 100644
--- a/gemfiles/ruby_2.6_elasticsearch_latest.gemfile.lock
+++ b/gemfiles/ruby_2.6_elasticsearch_latest.gemfile.lock
@@ -56,8 +56,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.6_graphql_1.13.gemfile.lock b/gemfiles/ruby_2.6_graphql_1.13.gemfile.lock
index 27fe29f22ba..f92c2d9d115 100644
--- a/gemfiles/ruby_2.6_graphql_1.13.gemfile.lock
+++ b/gemfiles/ruby_2.6_graphql_1.13.gemfile.lock
@@ -104,8 +104,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_graphql_2.0.gemfile.lock b/gemfiles/ruby_2.6_graphql_2.0.gemfile.lock
index 396b6ab6381..f5d11fa0340 100644
--- a/gemfiles/ruby_2.6_graphql_2.0.gemfile.lock
+++ b/gemfiles/ruby_2.6_graphql_2.0.gemfile.lock
@@ -104,8 +104,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_hanami_1.gemfile.lock b/gemfiles/ruby_2.6_hanami_1.gemfile.lock
index 5b3a2e1519f..4cc8e6be2f2 100644
--- a/gemfiles/ruby_2.6_hanami_1.gemfile.lock
+++ b/gemfiles/ruby_2.6_hanami_1.gemfile.lock
@@ -69,8 +69,8 @@ GEM
       dry-logic (~> 0.4.2)
       dry-types (~> 0.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hanami (1.3.5)
diff --git a/gemfiles/ruby_2.6_http.gemfile.lock b/gemfiles/ruby_2.6_http.gemfile.lock
index 263581b8f2c..cfbfbe9f17a 100644
--- a/gemfiles/ruby_2.6_http.gemfile.lock
+++ b/gemfiles/ruby_2.6_http.gemfile.lock
@@ -48,8 +48,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
diff --git a/gemfiles/ruby_2.6_opensearch_2.gemfile.lock b/gemfiles/ruby_2.6_opensearch_2.gemfile.lock
index a2c93b728b0..298b66f389f 100644
--- a/gemfiles/ruby_2.6_opensearch_2.gemfile.lock
+++ b/gemfiles/ruby_2.6_opensearch_2.gemfile.lock
@@ -46,8 +46,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_opensearch_3.gemfile.lock b/gemfiles/ruby_2.6_opensearch_3.gemfile.lock
index dfd124a3cbd..d5aca8518f1 100644
--- a/gemfiles/ruby_2.6_opensearch_3.gemfile.lock
+++ b/gemfiles/ruby_2.6_opensearch_3.gemfile.lock
@@ -46,8 +46,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_opensearch_latest.gemfile.lock b/gemfiles/ruby_2.6_opensearch_latest.gemfile.lock
index bf4ffc42c52..d764f6519a4 100644
--- a/gemfiles/ruby_2.6_opensearch_latest.gemfile.lock
+++ b/gemfiles/ruby_2.6_opensearch_latest.gemfile.lock
@@ -48,8 +48,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.6_opentelemetry.gemfile.lock b/gemfiles/ruby_2.6_opentelemetry.gemfile.lock
index 1040200aab6..5fd5563348a 100755
--- a/gemfiles/ruby_2.6_opentelemetry.gemfile.lock
+++ b/gemfiles/ruby_2.6_opentelemetry.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_opentelemetry_otlp.gemfile.lock b/gemfiles/ruby_2.6_opentelemetry_otlp.gemfile.lock
index 7819077d47f..c961b165c02 100644
--- a/gemfiles/ruby_2.6_opentelemetry_otlp.gemfile.lock
+++ b/gemfiles/ruby_2.6_opentelemetry_otlp.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     googleapis-common-protos-types (1.12.0)
diff --git a/gemfiles/ruby_2.6_rack_1.gemfile.lock b/gemfiles/ruby_2.6_rack_1.gemfile.lock
index c0c4f47cc89..057a40e0b42 100644
--- a/gemfiles/ruby_2.6_rack_1.gemfile.lock
+++ b/gemfiles/ruby_2.6_rack_1.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_rack_2.gemfile.lock b/gemfiles/ruby_2.6_rack_2.gemfile.lock
index ed770a02bcc..3e66da62b55 100644
--- a/gemfiles/ruby_2.6_rack_2.gemfile.lock
+++ b/gemfiles/ruby_2.6_rack_2.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_rack_3.gemfile.lock b/gemfiles/ruby_2.6_rack_3.gemfile.lock
index 0f1fdb86c11..59096f03914 100644
--- a/gemfiles/ruby_2.6_rack_3.gemfile.lock
+++ b/gemfiles/ruby_2.6_rack_3.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_rack_latest.gemfile.lock b/gemfiles/ruby_2.6_rack_latest.gemfile.lock
index 6891c1bd984..241128453b4 100644
--- a/gemfiles/ruby_2.6_rack_latest.gemfile.lock
+++ b/gemfiles/ruby_2.6_rack_latest.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.2)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.6_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.6_rails5_mysql2.gemfile.lock
index 176418de4ae..22e580615c8 100644
--- a/gemfiles/ruby_2.6_rails5_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails5_mysql2.gemfile.lock
@@ -85,8 +85,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.6_rails5_postgres.gemfile.lock
index 84d937bee65..b56248cf371 100644
--- a/gemfiles/ruby_2.6_rails5_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails5_postgres.gemfile.lock
@@ -85,8 +85,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.6_rails5_postgres_redis.gemfile.lock
index 23c18f51d01..5a62196473f 100644
--- a/gemfiles/ruby_2.6_rails5_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails5_postgres_redis.gemfile.lock
@@ -85,8 +85,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.6_rails5_postgres_redis_activesupport.gemfile.lock
index ba81191983f..5588224c138 100644
--- a/gemfiles/ruby_2.6_rails5_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails5_postgres_redis_activesupport.gemfile.lock
@@ -85,8 +85,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.6_rails5_postgres_sidekiq.gemfile.lock
index 5e2b43f592f..84e85773041 100644
--- a/gemfiles/ruby_2.6_rails5_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails5_postgres_sidekiq.gemfile.lock
@@ -86,8 +86,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.6_rails5_semantic_logger.gemfile.lock
index ec24adf2eab..b001a7bf319 100644
--- a/gemfiles/ruby_2.6_rails5_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails5_semantic_logger.gemfile.lock
@@ -85,8 +85,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_rails61_mysql2.gemfile.lock b/gemfiles/ruby_2.6_rails61_mysql2.gemfile.lock
index 1147580099a..9ca8b22d8e6 100644
--- a/gemfiles/ruby_2.6_rails61_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails61_mysql2.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_rails61_postgres.gemfile.lock b/gemfiles/ruby_2.6_rails61_postgres.gemfile.lock
index 4b5972956f8..13373664ab2 100644
--- a/gemfiles/ruby_2.6_rails61_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails61_postgres.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_2.6_rails61_postgres_redis.gemfile.lock
index 938b3444aa2..b97184421cf 100644
--- a/gemfiles/ruby_2.6_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails61_postgres_redis.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.6_rails61_postgres_sidekiq.gemfile.lock
index ff3d9e1602f..11b16044cb9 100644
--- a/gemfiles/ruby_2.6_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails61_postgres_sidekiq.gemfile.lock
@@ -103,8 +103,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_2.6_rails61_semantic_logger.gemfile.lock
index b0221015b7e..e5b4c022915 100644
--- a/gemfiles/ruby_2.6_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails61_semantic_logger.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_rails6_mysql2.gemfile.lock b/gemfiles/ruby_2.6_rails6_mysql2.gemfile.lock
index 83b6198afd4..ef787f8184c 100644
--- a/gemfiles/ruby_2.6_rails6_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails6_mysql2.gemfile.lock
@@ -98,8 +98,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_rails6_postgres.gemfile.lock b/gemfiles/ruby_2.6_rails6_postgres.gemfile.lock
index 0319caa25a6..0112d262e6b 100644
--- a/gemfiles/ruby_2.6_rails6_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails6_postgres.gemfile.lock
@@ -98,8 +98,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_rails6_postgres_redis.gemfile.lock b/gemfiles/ruby_2.6_rails6_postgres_redis.gemfile.lock
index 99b15756cf0..07e8a196546 100644
--- a/gemfiles/ruby_2.6_rails6_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails6_postgres_redis.gemfile.lock
@@ -98,8 +98,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.6_rails6_postgres_redis_activesupport.gemfile.lock
index 606079fb6cc..eecd4e75761 100644
--- a/gemfiles/ruby_2.6_rails6_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails6_postgres_redis_activesupport.gemfile.lock
@@ -98,8 +98,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.6_rails6_postgres_sidekiq.gemfile.lock
index 861023349a3..4ca72a38f38 100644
--- a/gemfiles/ruby_2.6_rails6_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails6_postgres_sidekiq.gemfile.lock
@@ -99,8 +99,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_rails6_semantic_logger.gemfile.lock b/gemfiles/ruby_2.6_rails6_semantic_logger.gemfile.lock
index 40e0acf08a5..388bcb655fd 100644
--- a/gemfiles/ruby_2.6_rails6_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.6_rails6_semantic_logger.gemfile.lock
@@ -98,8 +98,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.19.1)
diff --git a/gemfiles/ruby_2.6_redis_3.gemfile.lock b/gemfiles/ruby_2.6_redis_3.gemfile.lock
index be17d708e7b..d0c2f711edf 100644
--- a/gemfiles/ruby_2.6_redis_3.gemfile.lock
+++ b/gemfiles/ruby_2.6_redis_3.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_redis_4.gemfile.lock b/gemfiles/ruby_2.6_redis_4.gemfile.lock
index ea0f0ece6d9..2333b4a4443 100644
--- a/gemfiles/ruby_2.6_redis_4.gemfile.lock
+++ b/gemfiles/ruby_2.6_redis_4.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_redis_5.gemfile.lock b/gemfiles/ruby_2.6_redis_5.gemfile.lock
index 0fd6f03857c..386221d7f19 100644
--- a/gemfiles/ruby_2.6_redis_5.gemfile.lock
+++ b/gemfiles/ruby_2.6_redis_5.gemfile.lock
@@ -40,8 +40,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_relational_db.gemfile.lock b/gemfiles/ruby_2.6_relational_db.gemfile.lock
index 0a020d6413a..60a1b8f55bd 100644
--- a/gemfiles/ruby_2.6_relational_db.gemfile.lock
+++ b/gemfiles/ruby_2.6_relational_db.gemfile.lock
@@ -56,8 +56,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.6_resque2_redis3.gemfile.lock
index 719906750be..396dfe3ad38 100644
--- a/gemfiles/ruby_2.6_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_2.6_resque2_redis3.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.6_resque2_redis4.gemfile.lock
index e807507d636..6366569972f 100644
--- a/gemfiles/ruby_2.6_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_2.6_resque2_redis4.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.6_sinatra_2.gemfile.lock b/gemfiles/ruby_2.6_sinatra_2.gemfile.lock
index 5d701cdbb16..3ac25560fc8 100644
--- a/gemfiles/ruby_2.6_sinatra_2.gemfile.lock
+++ b/gemfiles/ruby_2.6_sinatra_2.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_2.6_sinatra_3.gemfile.lock b/gemfiles/ruby_2.6_sinatra_3.gemfile.lock
index 0ab33f08332..43ba34c1071 100644
--- a/gemfiles/ruby_2.6_sinatra_3.gemfile.lock
+++ b/gemfiles/ruby_2.6_sinatra_3.gemfile.lock
@@ -43,8 +43,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_2.6_stripe_10.gemfile.lock b/gemfiles/ruby_2.6_stripe_10.gemfile.lock
index ea517434080..8cb669fce4f 100644
--- a/gemfiles/ruby_2.6_stripe_10.gemfile.lock
+++ b/gemfiles/ruby_2.6_stripe_10.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.6_stripe_11.gemfile.lock b/gemfiles/ruby_2.6_stripe_11.gemfile.lock
index 446126637e1..71e50315883 100644
--- a/gemfiles/ruby_2.6_stripe_11.gemfile.lock
+++ b/gemfiles/ruby_2.6_stripe_11.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.6_stripe_12.gemfile.lock b/gemfiles/ruby_2.6_stripe_12.gemfile.lock
index 257bf0f004b..340bb30376c 100644
--- a/gemfiles/ruby_2.6_stripe_12.gemfile.lock
+++ b/gemfiles/ruby_2.6_stripe_12.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.6_stripe_7.gemfile.lock b/gemfiles/ruby_2.6_stripe_7.gemfile.lock
index 85c4b6e29f8..30a87d0280f 100644
--- a/gemfiles/ruby_2.6_stripe_7.gemfile.lock
+++ b/gemfiles/ruby_2.6_stripe_7.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.6_stripe_8.gemfile.lock b/gemfiles/ruby_2.6_stripe_8.gemfile.lock
index 63919f732de..6ec58ff7903 100644
--- a/gemfiles/ruby_2.6_stripe_8.gemfile.lock
+++ b/gemfiles/ruby_2.6_stripe_8.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.6_stripe_9.gemfile.lock b/gemfiles/ruby_2.6_stripe_9.gemfile.lock
index 882eb9c619c..fd9c234e123 100644
--- a/gemfiles/ruby_2.6_stripe_9.gemfile.lock
+++ b/gemfiles/ruby_2.6_stripe_9.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.6_stripe_latest.gemfile.lock b/gemfiles/ruby_2.6_stripe_latest.gemfile.lock
index 129e917d21e..81011376f80 100644
--- a/gemfiles/ruby_2.6_stripe_latest.gemfile.lock
+++ b/gemfiles/ruby_2.6_stripe_latest.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.6_stripe_min.gemfile.lock b/gemfiles/ruby_2.6_stripe_min.gemfile.lock
index 318740b202e..a7c64aa1cc7 100644
--- a/gemfiles/ruby_2.6_stripe_min.gemfile.lock
+++ b/gemfiles/ruby_2.6_stripe_min.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.19.1)
     google-protobuf (3.19.1-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.7_activesupport.gemfile.lock b/gemfiles/ruby_2.7_activesupport.gemfile.lock
index 023a35bfef9..1de63558cae 100644
--- a/gemfiles/ruby_2.7_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.7_activesupport.gemfile.lock
@@ -86,8 +86,8 @@ GEM
       zeitwerk (~> 2.6)
     erubi (1.12.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     grape (1.8.0)
diff --git a/gemfiles/ruby_2.7_aws.gemfile.lock b/gemfiles/ruby_2.7_aws.gemfile.lock
index 7b7589a5336..c0198bb3428 100644
--- a/gemfiles/ruby_2.7_aws.gemfile.lock
+++ b/gemfiles/ruby_2.7_aws.gemfile.lock
@@ -1460,8 +1460,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.2-aarch64-linux)
     google-protobuf (3.24.2-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_contrib.gemfile.lock b/gemfiles/ruby_2.7_contrib.gemfile.lock
index 0e85f7b4491..4086bce8e80 100644
--- a/gemfiles/ruby_2.7_contrib.gemfile.lock
+++ b/gemfiles/ruby_2.7_contrib.gemfile.lock
@@ -46,8 +46,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     googleapis-common-protos-types (1.5.0)
diff --git a/gemfiles/ruby_2.7_contrib_old.gemfile.lock b/gemfiles/ruby_2.7_contrib_old.gemfile.lock
index 55982d3e455..53a21d21354 100644
--- a/gemfiles/ruby_2.7_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_2.7_contrib_old.gemfile.lock
@@ -49,8 +49,8 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_core_old.gemfile.lock b/gemfiles/ruby_2.7_core_old.gemfile.lock
index ed802d9732e..30b91105024 100644
--- a/gemfiles/ruby_2.7_core_old.gemfile.lock
+++ b/gemfiles/ruby_2.7_core_old.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (4.8.3)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_elasticsearch_7.gemfile.lock b/gemfiles/ruby_2.7_elasticsearch_7.gemfile.lock
index d22c7037269..af5a049b1e4 100644
--- a/gemfiles/ruby_2.7_elasticsearch_7.gemfile.lock
+++ b/gemfiles/ruby_2.7_elasticsearch_7.gemfile.lock
@@ -55,8 +55,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4-aarch64-linux)
     google-protobuf (3.24.4-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_elasticsearch_8.gemfile.lock b/gemfiles/ruby_2.7_elasticsearch_8.gemfile.lock
index fafee914163..f9d859fb930 100644
--- a/gemfiles/ruby_2.7_elasticsearch_8.gemfile.lock
+++ b/gemfiles/ruby_2.7_elasticsearch_8.gemfile.lock
@@ -54,8 +54,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4-aarch64-linux)
     google-protobuf (3.24.4-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_elasticsearch_latest.gemfile.lock b/gemfiles/ruby_2.7_elasticsearch_latest.gemfile.lock
index 08f6cc10a6e..f190b897b34 100644
--- a/gemfiles/ruby_2.7_elasticsearch_latest.gemfile.lock
+++ b/gemfiles/ruby_2.7_elasticsearch_latest.gemfile.lock
@@ -56,8 +56,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_2.7_graphql_1.13.gemfile.lock b/gemfiles/ruby_2.7_graphql_1.13.gemfile.lock
index 917866eae2c..fbb48ea5286 100644
--- a/gemfiles/ruby_2.7_graphql_1.13.gemfile.lock
+++ b/gemfiles/ruby_2.7_graphql_1.13.gemfile.lock
@@ -104,8 +104,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2-aarch64-linux)
diff --git a/gemfiles/ruby_2.7_graphql_2.0.gemfile.lock b/gemfiles/ruby_2.7_graphql_2.0.gemfile.lock
index ac87a1dcaf9..2425c91166d 100644
--- a/gemfiles/ruby_2.7_graphql_2.0.gemfile.lock
+++ b/gemfiles/ruby_2.7_graphql_2.0.gemfile.lock
@@ -104,8 +104,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2-aarch64-linux)
diff --git a/gemfiles/ruby_2.7_graphql_2.1.gemfile.lock b/gemfiles/ruby_2.7_graphql_2.1.gemfile.lock
index 23a664f5f3c..13e83b102b5 100644
--- a/gemfiles/ruby_2.7_graphql_2.1.gemfile.lock
+++ b/gemfiles/ruby_2.7_graphql_2.1.gemfile.lock
@@ -104,8 +104,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2-aarch64-linux)
diff --git a/gemfiles/ruby_2.7_graphql_2.2.gemfile.lock b/gemfiles/ruby_2.7_graphql_2.2.gemfile.lock
index 75b9ebc0882..ca0295254f9 100644
--- a/gemfiles/ruby_2.7_graphql_2.2.gemfile.lock
+++ b/gemfiles/ruby_2.7_graphql_2.2.gemfile.lock
@@ -104,8 +104,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2-aarch64-linux)
diff --git a/gemfiles/ruby_2.7_graphql_2.3.gemfile.lock b/gemfiles/ruby_2.7_graphql_2.3.gemfile.lock
index ad9e65e843b..e7189c48a58 100644
--- a/gemfiles/ruby_2.7_graphql_2.3.gemfile.lock
+++ b/gemfiles/ruby_2.7_graphql_2.3.gemfile.lock
@@ -106,8 +106,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.4)
diff --git a/gemfiles/ruby_2.7_hanami_1.gemfile.lock b/gemfiles/ruby_2.7_hanami_1.gemfile.lock
index 5a141a32aee..f4c86fe80a9 100644
--- a/gemfiles/ruby_2.7_hanami_1.gemfile.lock
+++ b/gemfiles/ruby_2.7_hanami_1.gemfile.lock
@@ -70,8 +70,8 @@ GEM
       dry-logic (~> 0.4.2)
       dry-types (~> 0.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hanami (1.3.5)
diff --git a/gemfiles/ruby_2.7_http.gemfile.lock b/gemfiles/ruby_2.7_http.gemfile.lock
index 5970a3e2e24..83254e3101f 100644
--- a/gemfiles/ruby_2.7_http.gemfile.lock
+++ b/gemfiles/ruby_2.7_http.gemfile.lock
@@ -48,8 +48,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
diff --git a/gemfiles/ruby_2.7_opensearch_2.gemfile.lock b/gemfiles/ruby_2.7_opensearch_2.gemfile.lock
index ef4e590bb08..3f14f4298ad 100644
--- a/gemfiles/ruby_2.7_opensearch_2.gemfile.lock
+++ b/gemfiles/ruby_2.7_opensearch_2.gemfile.lock
@@ -46,8 +46,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4-aarch64-linux)
     google-protobuf (3.24.4-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_opensearch_3.gemfile.lock b/gemfiles/ruby_2.7_opensearch_3.gemfile.lock
index b4559509c3d..18b3e764719 100644
--- a/gemfiles/ruby_2.7_opensearch_3.gemfile.lock
+++ b/gemfiles/ruby_2.7_opensearch_3.gemfile.lock
@@ -46,8 +46,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4-aarch64-linux)
     google-protobuf (3.24.4-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_opensearch_latest.gemfile.lock b/gemfiles/ruby_2.7_opensearch_latest.gemfile.lock
index a7df0f9e65f..b5b7e5235b1 100644
--- a/gemfiles/ruby_2.7_opensearch_latest.gemfile.lock
+++ b/gemfiles/ruby_2.7_opensearch_latest.gemfile.lock
@@ -48,8 +48,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_2.7_opentelemetry.gemfile.lock b/gemfiles/ruby_2.7_opentelemetry.gemfile.lock
index 523d02fc54c..4a841a3f35f 100755
--- a/gemfiles/ruby_2.7_opentelemetry.gemfile.lock
+++ b/gemfiles/ruby_2.7_opentelemetry.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_opentelemetry_otlp.gemfile.lock b/gemfiles/ruby_2.7_opentelemetry_otlp.gemfile.lock
index 070d22dad7d..b7b2140958a 100644
--- a/gemfiles/ruby_2.7_opentelemetry_otlp.gemfile.lock
+++ b/gemfiles/ruby_2.7_opentelemetry_otlp.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     googleapis-common-protos-types (1.13.0)
diff --git a/gemfiles/ruby_2.7_rack_1.gemfile.lock b/gemfiles/ruby_2.7_rack_1.gemfile.lock
index 9b8280ac4e7..5bdeb525cd7 100644
--- a/gemfiles/ruby_2.7_rack_1.gemfile.lock
+++ b/gemfiles/ruby_2.7_rack_1.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_rack_2.gemfile.lock b/gemfiles/ruby_2.7_rack_2.gemfile.lock
index 0a312a9308c..9b1fa4b909b 100644
--- a/gemfiles/ruby_2.7_rack_2.gemfile.lock
+++ b/gemfiles/ruby_2.7_rack_2.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_rack_3.gemfile.lock b/gemfiles/ruby_2.7_rack_3.gemfile.lock
index 9dab83702c5..f7844752f9f 100644
--- a/gemfiles/ruby_2.7_rack_3.gemfile.lock
+++ b/gemfiles/ruby_2.7_rack_3.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_rack_latest.gemfile.lock b/gemfiles/ruby_2.7_rack_latest.gemfile.lock
index 50fe15b0fa4..45509b23ead 100644
--- a/gemfiles/ruby_2.7_rack_latest.gemfile.lock
+++ b/gemfiles/ruby_2.7_rack_latest.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.2)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.5-aarch64-linux)
     google-protobuf (3.25.5-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_2.7_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.7_rails5_mysql2.gemfile.lock
index b127f037bfc..c65c2204823 100644
--- a/gemfiles/ruby_2.7_rails5_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails5_mysql2.gemfile.lock
@@ -85,8 +85,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.7_rails5_postgres.gemfile.lock
index a582c96a988..0d47a883d6e 100644
--- a/gemfiles/ruby_2.7_rails5_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails5_postgres.gemfile.lock
@@ -85,8 +85,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.7_rails5_postgres_redis.gemfile.lock
index 319541605f7..bcca4c3aa2b 100644
--- a/gemfiles/ruby_2.7_rails5_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails5_postgres_redis.gemfile.lock
@@ -85,8 +85,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.7_rails5_postgres_redis_activesupport.gemfile.lock
index 9c332cb3a5b..18e44a6c6d2 100644
--- a/gemfiles/ruby_2.7_rails5_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails5_postgres_redis_activesupport.gemfile.lock
@@ -85,8 +85,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.7_rails5_postgres_sidekiq.gemfile.lock
index 5f1c5046abe..1cd49acbae4 100644
--- a/gemfiles/ruby_2.7_rails5_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails5_postgres_sidekiq.gemfile.lock
@@ -86,8 +86,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.7_rails5_semantic_logger.gemfile.lock
index 6fdd5da849a..b6d7e5ef74c 100644
--- a/gemfiles/ruby_2.7_rails5_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails5_semantic_logger.gemfile.lock
@@ -85,8 +85,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_rails61_mysql2.gemfile.lock b/gemfiles/ruby_2.7_rails61_mysql2.gemfile.lock
index 8e63127b8f1..fa3cebaa870 100644
--- a/gemfiles/ruby_2.7_rails61_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails61_mysql2.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_rails61_postgres.gemfile.lock b/gemfiles/ruby_2.7_rails61_postgres.gemfile.lock
index 720c2e4650b..ac49ad69816 100644
--- a/gemfiles/ruby_2.7_rails61_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails61_postgres.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_2.7_rails61_postgres_redis.gemfile.lock
index 9f2e183a422..d72d13090a0 100644
--- a/gemfiles/ruby_2.7_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails61_postgres_redis.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.7_rails61_postgres_sidekiq.gemfile.lock
index d20b386733f..20f3dfb7f80 100644
--- a/gemfiles/ruby_2.7_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails61_postgres_sidekiq.gemfile.lock
@@ -103,8 +103,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_2.7_rails61_semantic_logger.gemfile.lock
index 0168bf020f1..e750f807cf1 100644
--- a/gemfiles/ruby_2.7_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails61_semantic_logger.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_rails6_mysql2.gemfile.lock b/gemfiles/ruby_2.7_rails6_mysql2.gemfile.lock
index abb77984b30..06690ebe40a 100644
--- a/gemfiles/ruby_2.7_rails6_mysql2.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails6_mysql2.gemfile.lock
@@ -98,8 +98,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_rails6_postgres.gemfile.lock b/gemfiles/ruby_2.7_rails6_postgres.gemfile.lock
index 45f17b94b1c..10170ce0ffb 100644
--- a/gemfiles/ruby_2.7_rails6_postgres.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails6_postgres.gemfile.lock
@@ -98,8 +98,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_rails6_postgres_redis.gemfile.lock b/gemfiles/ruby_2.7_rails6_postgres_redis.gemfile.lock
index 8d20fa116e9..ca4cbf5741a 100644
--- a/gemfiles/ruby_2.7_rails6_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails6_postgres_redis.gemfile.lock
@@ -98,8 +98,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.7_rails6_postgres_redis_activesupport.gemfile.lock
index fd1fd20475e..910388c45f3 100644
--- a/gemfiles/ruby_2.7_rails6_postgres_redis_activesupport.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails6_postgres_redis_activesupport.gemfile.lock
@@ -98,8 +98,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.7_rails6_postgres_sidekiq.gemfile.lock
index 21390c3506f..b6474f5cea6 100644
--- a/gemfiles/ruby_2.7_rails6_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails6_postgres_sidekiq.gemfile.lock
@@ -99,8 +99,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_rails6_semantic_logger.gemfile.lock b/gemfiles/ruby_2.7_rails6_semantic_logger.gemfile.lock
index 8721002e0cb..8d1c9b01447 100644
--- a/gemfiles/ruby_2.7_rails6_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_2.7_rails6_semantic_logger.gemfile.lock
@@ -98,8 +98,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_2.7_redis_3.gemfile.lock b/gemfiles/ruby_2.7_redis_3.gemfile.lock
index cbf3585a0cc..8e9e8e8067b 100644
--- a/gemfiles/ruby_2.7_redis_3.gemfile.lock
+++ b/gemfiles/ruby_2.7_redis_3.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_redis_4.gemfile.lock b/gemfiles/ruby_2.7_redis_4.gemfile.lock
index e3578c70a73..8a942d798da 100644
--- a/gemfiles/ruby_2.7_redis_4.gemfile.lock
+++ b/gemfiles/ruby_2.7_redis_4.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_redis_5.gemfile.lock b/gemfiles/ruby_2.7_redis_5.gemfile.lock
index b61588035c6..71d29591751 100644
--- a/gemfiles/ruby_2.7_redis_5.gemfile.lock
+++ b/gemfiles/ruby_2.7_redis_5.gemfile.lock
@@ -40,8 +40,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_relational_db.gemfile.lock b/gemfiles/ruby_2.7_relational_db.gemfile.lock
index 57b8d3f19c4..994f28165c8 100644
--- a/gemfiles/ruby_2.7_relational_db.gemfile.lock
+++ b/gemfiles/ruby_2.7_relational_db.gemfile.lock
@@ -56,8 +56,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.7_resque2_redis3.gemfile.lock
index 64c50feb2bf..a550f596869 100644
--- a/gemfiles/ruby_2.7_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_2.7_resque2_redis3.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.7_resque2_redis4.gemfile.lock
index 4a39ffc7df4..3fad0ae3a8d 100644
--- a/gemfiles/ruby_2.7_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_2.7_resque2_redis4.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_2.7_sinatra_2.gemfile.lock b/gemfiles/ruby_2.7_sinatra_2.gemfile.lock
index 3af9f16032d..f8c48cb8380 100644
--- a/gemfiles/ruby_2.7_sinatra_2.gemfile.lock
+++ b/gemfiles/ruby_2.7_sinatra_2.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_2.7_sinatra_3.gemfile.lock b/gemfiles/ruby_2.7_sinatra_3.gemfile.lock
index 91d13232b89..f61e6ea3632 100644
--- a/gemfiles/ruby_2.7_sinatra_3.gemfile.lock
+++ b/gemfiles/ruby_2.7_sinatra_3.gemfile.lock
@@ -43,8 +43,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_2.7_stripe_10.gemfile.lock b/gemfiles/ruby_2.7_stripe_10.gemfile.lock
index f1c8288f646..8533f777a41 100644
--- a/gemfiles/ruby_2.7_stripe_10.gemfile.lock
+++ b/gemfiles/ruby_2.7_stripe_10.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_2.7_stripe_11.gemfile.lock b/gemfiles/ruby_2.7_stripe_11.gemfile.lock
index 597e53bf40c..c1a81f54da8 100644
--- a/gemfiles/ruby_2.7_stripe_11.gemfile.lock
+++ b/gemfiles/ruby_2.7_stripe_11.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_2.7_stripe_12.gemfile.lock b/gemfiles/ruby_2.7_stripe_12.gemfile.lock
index 1f2628754d7..d71f5134154 100644
--- a/gemfiles/ruby_2.7_stripe_12.gemfile.lock
+++ b/gemfiles/ruby_2.7_stripe_12.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_2.7_stripe_7.gemfile.lock b/gemfiles/ruby_2.7_stripe_7.gemfile.lock
index 0e4f2bb5902..25e9a71cb14 100644
--- a/gemfiles/ruby_2.7_stripe_7.gemfile.lock
+++ b/gemfiles/ruby_2.7_stripe_7.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_2.7_stripe_8.gemfile.lock b/gemfiles/ruby_2.7_stripe_8.gemfile.lock
index 02bd976784a..322fbd56f9b 100644
--- a/gemfiles/ruby_2.7_stripe_8.gemfile.lock
+++ b/gemfiles/ruby_2.7_stripe_8.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_2.7_stripe_9.gemfile.lock b/gemfiles/ruby_2.7_stripe_9.gemfile.lock
index b38a88c6580..fde7e09b375 100644
--- a/gemfiles/ruby_2.7_stripe_9.gemfile.lock
+++ b/gemfiles/ruby_2.7_stripe_9.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_2.7_stripe_latest.gemfile.lock b/gemfiles/ruby_2.7_stripe_latest.gemfile.lock
index 83c9c3305ed..5195a06e334 100644
--- a/gemfiles/ruby_2.7_stripe_latest.gemfile.lock
+++ b/gemfiles/ruby_2.7_stripe_latest.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_2.7_stripe_min.gemfile.lock b/gemfiles/ruby_2.7_stripe_min.gemfile.lock
index 4a1554cb159..e0f7c268477 100644
--- a/gemfiles/ruby_2.7_stripe_min.gemfile.lock
+++ b/gemfiles/ruby_2.7_stripe_min.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.5-aarch64-linux)
     google-protobuf (3.25.5-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.0_activesupport.gemfile.lock b/gemfiles/ruby_3.0_activesupport.gemfile.lock
index f79e8db5bf0..191a75f7119 100644
--- a/gemfiles/ruby_3.0_activesupport.gemfile.lock
+++ b/gemfiles/ruby_3.0_activesupport.gemfile.lock
@@ -85,8 +85,8 @@ GEM
       zeitwerk (~> 2.6)
     erubi (1.12.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     grape (1.8.0)
diff --git a/gemfiles/ruby_3.0_aws.gemfile.lock b/gemfiles/ruby_3.0_aws.gemfile.lock
index 1074f886e6e..5edee22a147 100644
--- a/gemfiles/ruby_3.0_aws.gemfile.lock
+++ b/gemfiles/ruby_3.0_aws.gemfile.lock
@@ -1460,8 +1460,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.2-aarch64-linux)
     google-protobuf (3.24.2-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_contrib.gemfile.lock b/gemfiles/ruby_3.0_contrib.gemfile.lock
index 5313785d868..1dd185d15c8 100644
--- a/gemfiles/ruby_3.0_contrib.gemfile.lock
+++ b/gemfiles/ruby_3.0_contrib.gemfile.lock
@@ -46,8 +46,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     googleapis-common-protos-types (1.5.0)
diff --git a/gemfiles/ruby_3.0_contrib_old.gemfile.lock b/gemfiles/ruby_3.0_contrib_old.gemfile.lock
index 2a36f11745e..97bde2e5fa1 100644
--- a/gemfiles/ruby_3.0_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_3.0_contrib_old.gemfile.lock
@@ -49,8 +49,8 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_core_old.gemfile.lock b/gemfiles/ruby_3.0_core_old.gemfile.lock
index 742a57d9e16..0ff786680c1 100644
--- a/gemfiles/ruby_3.0_core_old.gemfile.lock
+++ b/gemfiles/ruby_3.0_core_old.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (4.8.3)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.0_elasticsearch_7.gemfile.lock
index c30113156d8..45b2f54dfd2 100644
--- a/gemfiles/ruby_3.0_elasticsearch_7.gemfile.lock
+++ b/gemfiles/ruby_3.0_elasticsearch_7.gemfile.lock
@@ -56,8 +56,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4-aarch64-linux)
     google-protobuf (3.24.4-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.0_elasticsearch_8.gemfile.lock
index 99690f81464..1bdfcf65424 100644
--- a/gemfiles/ruby_3.0_elasticsearch_8.gemfile.lock
+++ b/gemfiles/ruby_3.0_elasticsearch_8.gemfile.lock
@@ -54,8 +54,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4-aarch64-linux)
     google-protobuf (3.24.4-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_elasticsearch_latest.gemfile.lock b/gemfiles/ruby_3.0_elasticsearch_latest.gemfile.lock
index 8bf6fb97f7b..1abdfaf326f 100644
--- a/gemfiles/ruby_3.0_elasticsearch_latest.gemfile.lock
+++ b/gemfiles/ruby_3.0_elasticsearch_latest.gemfile.lock
@@ -56,8 +56,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.0_graphql_1.13.gemfile.lock b/gemfiles/ruby_3.0_graphql_1.13.gemfile.lock
index d63d86fa68d..3c5e1d1da6b 100644
--- a/gemfiles/ruby_3.0_graphql_1.13.gemfile.lock
+++ b/gemfiles/ruby_3.0_graphql_1.13.gemfile.lock
@@ -104,8 +104,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2-aarch64-linux)
diff --git a/gemfiles/ruby_3.0_graphql_2.0.gemfile.lock b/gemfiles/ruby_3.0_graphql_2.0.gemfile.lock
index d6bb8ab28ce..913ec5adec7 100644
--- a/gemfiles/ruby_3.0_graphql_2.0.gemfile.lock
+++ b/gemfiles/ruby_3.0_graphql_2.0.gemfile.lock
@@ -104,8 +104,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2-aarch64-linux)
diff --git a/gemfiles/ruby_3.0_graphql_2.1.gemfile.lock b/gemfiles/ruby_3.0_graphql_2.1.gemfile.lock
index a7b22ac00c1..6cd748d7702 100644
--- a/gemfiles/ruby_3.0_graphql_2.1.gemfile.lock
+++ b/gemfiles/ruby_3.0_graphql_2.1.gemfile.lock
@@ -104,8 +104,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2-aarch64-linux)
diff --git a/gemfiles/ruby_3.0_graphql_2.2.gemfile.lock b/gemfiles/ruby_3.0_graphql_2.2.gemfile.lock
index 2c72a63deba..3d921af658e 100644
--- a/gemfiles/ruby_3.0_graphql_2.2.gemfile.lock
+++ b/gemfiles/ruby_3.0_graphql_2.2.gemfile.lock
@@ -104,8 +104,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2-aarch64-linux)
diff --git a/gemfiles/ruby_3.0_graphql_2.3.gemfile.lock b/gemfiles/ruby_3.0_graphql_2.3.gemfile.lock
index 54d4bcca64b..8dd2bc0d550 100644
--- a/gemfiles/ruby_3.0_graphql_2.3.gemfile.lock
+++ b/gemfiles/ruby_3.0_graphql_2.3.gemfile.lock
@@ -106,8 +106,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3-aarch64-linux)
diff --git a/gemfiles/ruby_3.0_http.gemfile.lock b/gemfiles/ruby_3.0_http.gemfile.lock
index 58176d6f9de..d7c983fe9d2 100644
--- a/gemfiles/ruby_3.0_http.gemfile.lock
+++ b/gemfiles/ruby_3.0_http.gemfile.lock
@@ -48,8 +48,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
diff --git a/gemfiles/ruby_3.0_opensearch_2.gemfile.lock b/gemfiles/ruby_3.0_opensearch_2.gemfile.lock
index ee84248d798..b9d36b05e22 100644
--- a/gemfiles/ruby_3.0_opensearch_2.gemfile.lock
+++ b/gemfiles/ruby_3.0_opensearch_2.gemfile.lock
@@ -46,8 +46,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4-aarch64-linux)
     google-protobuf (3.24.4-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_opensearch_3.gemfile.lock b/gemfiles/ruby_3.0_opensearch_3.gemfile.lock
index b73385f5a00..9dea66650aa 100644
--- a/gemfiles/ruby_3.0_opensearch_3.gemfile.lock
+++ b/gemfiles/ruby_3.0_opensearch_3.gemfile.lock
@@ -46,8 +46,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4-aarch64-linux)
     google-protobuf (3.24.4-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_opensearch_latest.gemfile.lock b/gemfiles/ruby_3.0_opensearch_latest.gemfile.lock
index e8582b89645..9a1e1aff6ce 100644
--- a/gemfiles/ruby_3.0_opensearch_latest.gemfile.lock
+++ b/gemfiles/ruby_3.0_opensearch_latest.gemfile.lock
@@ -48,8 +48,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.0_opentelemetry.gemfile.lock b/gemfiles/ruby_3.0_opentelemetry.gemfile.lock
index 89352618097..580a2e1f049 100755
--- a/gemfiles/ruby_3.0_opentelemetry.gemfile.lock
+++ b/gemfiles/ruby_3.0_opentelemetry.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_opentelemetry_otlp.gemfile.lock b/gemfiles/ruby_3.0_opentelemetry_otlp.gemfile.lock
index 79a81af1a3e..d2e69ae4989 100644
--- a/gemfiles/ruby_3.0_opentelemetry_otlp.gemfile.lock
+++ b/gemfiles/ruby_3.0_opentelemetry_otlp.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     googleapis-common-protos-types (1.13.0)
diff --git a/gemfiles/ruby_3.0_rack_1.gemfile.lock b/gemfiles/ruby_3.0_rack_1.gemfile.lock
index 43424cb158b..22dcb1e6d84 100644
--- a/gemfiles/ruby_3.0_rack_1.gemfile.lock
+++ b/gemfiles/ruby_3.0_rack_1.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_rack_2.gemfile.lock b/gemfiles/ruby_3.0_rack_2.gemfile.lock
index 67e01d8daf8..d6dbefa1330 100644
--- a/gemfiles/ruby_3.0_rack_2.gemfile.lock
+++ b/gemfiles/ruby_3.0_rack_2.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_rack_3.gemfile.lock b/gemfiles/ruby_3.0_rack_3.gemfile.lock
index d98b6627e05..b581374a1ab 100644
--- a/gemfiles/ruby_3.0_rack_3.gemfile.lock
+++ b/gemfiles/ruby_3.0_rack_3.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_rack_latest.gemfile.lock b/gemfiles/ruby_3.0_rack_latest.gemfile.lock
index b992fbe17b8..deac6ab6011 100644
--- a/gemfiles/ruby_3.0_rack_latest.gemfile.lock
+++ b/gemfiles/ruby_3.0_rack_latest.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.2)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.5-aarch64-linux)
     google-protobuf (3.25.5-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.0_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.0_rails61_mysql2.gemfile.lock
index f488041f4b9..9e1c7f7c337 100644
--- a/gemfiles/ruby_3.0_rails61_mysql2.gemfile.lock
+++ b/gemfiles/ruby_3.0_rails61_mysql2.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_3.0_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.0_rails61_postgres.gemfile.lock
index 03e28dbcef3..f6459c0a737 100644
--- a/gemfiles/ruby_3.0_rails61_postgres.gemfile.lock
+++ b/gemfiles/ruby_3.0_rails61_postgres.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_3.0_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.0_rails61_postgres_redis.gemfile.lock
index 6e5eb77a1da..ec5290fdfc1 100644
--- a/gemfiles/ruby_3.0_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_3.0_rails61_postgres_redis.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_3.0_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.0_rails61_postgres_sidekiq.gemfile.lock
index 0d1be196484..4ee1d99d3b2 100644
--- a/gemfiles/ruby_3.0_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_3.0_rails61_postgres_sidekiq.gemfile.lock
@@ -103,8 +103,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_3.0_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.0_rails61_semantic_logger.gemfile.lock
index 0670f5d955c..6f6de925f44 100644
--- a/gemfiles/ruby_3.0_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_3.0_rails61_semantic_logger.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_3.0_rails61_trilogy.gemfile.lock b/gemfiles/ruby_3.0_rails61_trilogy.gemfile.lock
index 112f0729181..d5eefd5c090 100644
--- a/gemfiles/ruby_3.0_rails61_trilogy.gemfile.lock
+++ b/gemfiles/ruby_3.0_rails61_trilogy.gemfile.lock
@@ -106,8 +106,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.1-aarch64-linux)
diff --git a/gemfiles/ruby_3.0_rails7.gemfile.lock b/gemfiles/ruby_3.0_rails7.gemfile.lock
index d51ad375adc..b9ae253aa93 100644
--- a/gemfiles/ruby_3.0_rails7.gemfile.lock
+++ b/gemfiles/ruby_3.0_rails7.gemfile.lock
@@ -111,8 +111,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.4-aarch64-linux)
diff --git a/gemfiles/ruby_3.0_rails71.gemfile.lock b/gemfiles/ruby_3.0_rails71.gemfile.lock
index 2b3ca2cdf4d..3852d2183df 100644
--- a/gemfiles/ruby_3.0_rails71.gemfile.lock
+++ b/gemfiles/ruby_3.0_rails71.gemfile.lock
@@ -123,8 +123,8 @@ GEM
     drb (2.2.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.4-aarch64-linux)
diff --git a/gemfiles/ruby_3.0_redis_3.gemfile.lock b/gemfiles/ruby_3.0_redis_3.gemfile.lock
index 3f033353302..081eef7c2c0 100644
--- a/gemfiles/ruby_3.0_redis_3.gemfile.lock
+++ b/gemfiles/ruby_3.0_redis_3.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_redis_4.gemfile.lock b/gemfiles/ruby_3.0_redis_4.gemfile.lock
index c53da1b3f76..d4cfaf348bb 100644
--- a/gemfiles/ruby_3.0_redis_4.gemfile.lock
+++ b/gemfiles/ruby_3.0_redis_4.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_redis_5.gemfile.lock b/gemfiles/ruby_3.0_redis_5.gemfile.lock
index 98fa43caded..99c7f3e29e2 100644
--- a/gemfiles/ruby_3.0_redis_5.gemfile.lock
+++ b/gemfiles/ruby_3.0_redis_5.gemfile.lock
@@ -40,8 +40,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_relational_db.gemfile.lock b/gemfiles/ruby_3.0_relational_db.gemfile.lock
index 9e155b687f1..2cf52200506 100644
--- a/gemfiles/ruby_3.0_relational_db.gemfile.lock
+++ b/gemfiles/ruby_3.0_relational_db.gemfile.lock
@@ -55,8 +55,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.0_resque2_redis3.gemfile.lock
index 53ce42c2b4f..d1c3d7feb24 100644
--- a/gemfiles/ruby_3.0_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_3.0_resque2_redis3.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.0_resque2_redis4.gemfile.lock
index a8af46d0c47..b8e075be2bd 100644
--- a/gemfiles/ruby_3.0_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_3.0_resque2_redis4.gemfile.lock
@@ -40,8 +40,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.0_sinatra_2.gemfile.lock b/gemfiles/ruby_3.0_sinatra_2.gemfile.lock
index 73a63eabcc9..e049561308a 100644
--- a/gemfiles/ruby_3.0_sinatra_2.gemfile.lock
+++ b/gemfiles/ruby_3.0_sinatra_2.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_3.0_sinatra_3.gemfile.lock b/gemfiles/ruby_3.0_sinatra_3.gemfile.lock
index cf1ebc9fcde..0e2957b068c 100644
--- a/gemfiles/ruby_3.0_sinatra_3.gemfile.lock
+++ b/gemfiles/ruby_3.0_sinatra_3.gemfile.lock
@@ -43,8 +43,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_3.0_sinatra_4.gemfile.lock b/gemfiles/ruby_3.0_sinatra_4.gemfile.lock
index 7d4fddd2599..5a52dfed468 100644
--- a/gemfiles/ruby_3.0_sinatra_4.gemfile.lock
+++ b/gemfiles/ruby_3.0_sinatra_4.gemfile.lock
@@ -43,8 +43,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_3.0_stripe_10.gemfile.lock b/gemfiles/ruby_3.0_stripe_10.gemfile.lock
index cf93b688f26..bc7235679ed 100644
--- a/gemfiles/ruby_3.0_stripe_10.gemfile.lock
+++ b/gemfiles/ruby_3.0_stripe_10.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.0_stripe_11.gemfile.lock b/gemfiles/ruby_3.0_stripe_11.gemfile.lock
index 4cb28e70b49..c7232281ae3 100644
--- a/gemfiles/ruby_3.0_stripe_11.gemfile.lock
+++ b/gemfiles/ruby_3.0_stripe_11.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.0_stripe_12.gemfile.lock b/gemfiles/ruby_3.0_stripe_12.gemfile.lock
index 0a5dfb38f09..92b2b8dbb18 100644
--- a/gemfiles/ruby_3.0_stripe_12.gemfile.lock
+++ b/gemfiles/ruby_3.0_stripe_12.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.0_stripe_7.gemfile.lock b/gemfiles/ruby_3.0_stripe_7.gemfile.lock
index dce2b4064ed..5e3e35e6719 100644
--- a/gemfiles/ruby_3.0_stripe_7.gemfile.lock
+++ b/gemfiles/ruby_3.0_stripe_7.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.0_stripe_8.gemfile.lock b/gemfiles/ruby_3.0_stripe_8.gemfile.lock
index d932b9484b0..efda1eea060 100644
--- a/gemfiles/ruby_3.0_stripe_8.gemfile.lock
+++ b/gemfiles/ruby_3.0_stripe_8.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.0_stripe_9.gemfile.lock b/gemfiles/ruby_3.0_stripe_9.gemfile.lock
index 8771e44469b..8e53b2984f7 100644
--- a/gemfiles/ruby_3.0_stripe_9.gemfile.lock
+++ b/gemfiles/ruby_3.0_stripe_9.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.0_stripe_latest.gemfile.lock b/gemfiles/ruby_3.0_stripe_latest.gemfile.lock
index bd9ce9f0f2e..df6be9fa5b3 100644
--- a/gemfiles/ruby_3.0_stripe_latest.gemfile.lock
+++ b/gemfiles/ruby_3.0_stripe_latest.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.0_stripe_min.gemfile.lock b/gemfiles/ruby_3.0_stripe_min.gemfile.lock
index bd402f476cc..1247490b300 100644
--- a/gemfiles/ruby_3.0_stripe_min.gemfile.lock
+++ b/gemfiles/ruby_3.0_stripe_min.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.5-aarch64-linux)
     google-protobuf (3.25.5-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.1_activesupport.gemfile.lock b/gemfiles/ruby_3.1_activesupport.gemfile.lock
index f79e8db5bf0..191a75f7119 100644
--- a/gemfiles/ruby_3.1_activesupport.gemfile.lock
+++ b/gemfiles/ruby_3.1_activesupport.gemfile.lock
@@ -85,8 +85,8 @@ GEM
       zeitwerk (~> 2.6)
     erubi (1.12.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     grape (1.8.0)
diff --git a/gemfiles/ruby_3.1_aws.gemfile.lock b/gemfiles/ruby_3.1_aws.gemfile.lock
index 1074f886e6e..5edee22a147 100644
--- a/gemfiles/ruby_3.1_aws.gemfile.lock
+++ b/gemfiles/ruby_3.1_aws.gemfile.lock
@@ -1460,8 +1460,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.2-aarch64-linux)
     google-protobuf (3.24.2-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.1_contrib.gemfile.lock b/gemfiles/ruby_3.1_contrib.gemfile.lock
index 5313785d868..1dd185d15c8 100644
--- a/gemfiles/ruby_3.1_contrib.gemfile.lock
+++ b/gemfiles/ruby_3.1_contrib.gemfile.lock
@@ -46,8 +46,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     googleapis-common-protos-types (1.5.0)
diff --git a/gemfiles/ruby_3.1_contrib_old.gemfile.lock b/gemfiles/ruby_3.1_contrib_old.gemfile.lock
index 2a36f11745e..97bde2e5fa1 100644
--- a/gemfiles/ruby_3.1_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_3.1_contrib_old.gemfile.lock
@@ -49,8 +49,8 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.1_core_old.gemfile.lock b/gemfiles/ruby_3.1_core_old.gemfile.lock
index 742a57d9e16..0ff786680c1 100644
--- a/gemfiles/ruby_3.1_core_old.gemfile.lock
+++ b/gemfiles/ruby_3.1_core_old.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (4.8.3)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.1_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.1_elasticsearch_7.gemfile.lock
index c30113156d8..45b2f54dfd2 100644
--- a/gemfiles/ruby_3.1_elasticsearch_7.gemfile.lock
+++ b/gemfiles/ruby_3.1_elasticsearch_7.gemfile.lock
@@ -56,8 +56,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4-aarch64-linux)
     google-protobuf (3.24.4-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.1_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.1_elasticsearch_8.gemfile.lock
index 99690f81464..1bdfcf65424 100644
--- a/gemfiles/ruby_3.1_elasticsearch_8.gemfile.lock
+++ b/gemfiles/ruby_3.1_elasticsearch_8.gemfile.lock
@@ -54,8 +54,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4-aarch64-linux)
     google-protobuf (3.24.4-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.1_elasticsearch_latest.gemfile.lock b/gemfiles/ruby_3.1_elasticsearch_latest.gemfile.lock
index 8bf6fb97f7b..1abdfaf326f 100644
--- a/gemfiles/ruby_3.1_elasticsearch_latest.gemfile.lock
+++ b/gemfiles/ruby_3.1_elasticsearch_latest.gemfile.lock
@@ -56,8 +56,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.1_graphql_1.13.gemfile.lock b/gemfiles/ruby_3.1_graphql_1.13.gemfile.lock
index d63d86fa68d..3c5e1d1da6b 100644
--- a/gemfiles/ruby_3.1_graphql_1.13.gemfile.lock
+++ b/gemfiles/ruby_3.1_graphql_1.13.gemfile.lock
@@ -104,8 +104,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2-aarch64-linux)
diff --git a/gemfiles/ruby_3.1_graphql_2.0.gemfile.lock b/gemfiles/ruby_3.1_graphql_2.0.gemfile.lock
index d6bb8ab28ce..913ec5adec7 100644
--- a/gemfiles/ruby_3.1_graphql_2.0.gemfile.lock
+++ b/gemfiles/ruby_3.1_graphql_2.0.gemfile.lock
@@ -104,8 +104,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2-aarch64-linux)
diff --git a/gemfiles/ruby_3.1_graphql_2.1.gemfile.lock b/gemfiles/ruby_3.1_graphql_2.1.gemfile.lock
index a7b22ac00c1..6cd748d7702 100644
--- a/gemfiles/ruby_3.1_graphql_2.1.gemfile.lock
+++ b/gemfiles/ruby_3.1_graphql_2.1.gemfile.lock
@@ -104,8 +104,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2-aarch64-linux)
diff --git a/gemfiles/ruby_3.1_graphql_2.2.gemfile.lock b/gemfiles/ruby_3.1_graphql_2.2.gemfile.lock
index 2c72a63deba..3d921af658e 100644
--- a/gemfiles/ruby_3.1_graphql_2.2.gemfile.lock
+++ b/gemfiles/ruby_3.1_graphql_2.2.gemfile.lock
@@ -104,8 +104,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2-aarch64-linux)
diff --git a/gemfiles/ruby_3.1_graphql_2.3.gemfile.lock b/gemfiles/ruby_3.1_graphql_2.3.gemfile.lock
index 54d4bcca64b..8dd2bc0d550 100644
--- a/gemfiles/ruby_3.1_graphql_2.3.gemfile.lock
+++ b/gemfiles/ruby_3.1_graphql_2.3.gemfile.lock
@@ -106,8 +106,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3-aarch64-linux)
diff --git a/gemfiles/ruby_3.1_http.gemfile.lock b/gemfiles/ruby_3.1_http.gemfile.lock
index 58176d6f9de..d7c983fe9d2 100644
--- a/gemfiles/ruby_3.1_http.gemfile.lock
+++ b/gemfiles/ruby_3.1_http.gemfile.lock
@@ -48,8 +48,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
diff --git a/gemfiles/ruby_3.1_opensearch_2.gemfile.lock b/gemfiles/ruby_3.1_opensearch_2.gemfile.lock
index ee84248d798..b9d36b05e22 100644
--- a/gemfiles/ruby_3.1_opensearch_2.gemfile.lock
+++ b/gemfiles/ruby_3.1_opensearch_2.gemfile.lock
@@ -46,8 +46,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4-aarch64-linux)
     google-protobuf (3.24.4-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.1_opensearch_3.gemfile.lock b/gemfiles/ruby_3.1_opensearch_3.gemfile.lock
index b73385f5a00..9dea66650aa 100644
--- a/gemfiles/ruby_3.1_opensearch_3.gemfile.lock
+++ b/gemfiles/ruby_3.1_opensearch_3.gemfile.lock
@@ -46,8 +46,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4-aarch64-linux)
     google-protobuf (3.24.4-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.1_opensearch_latest.gemfile.lock b/gemfiles/ruby_3.1_opensearch_latest.gemfile.lock
index e8582b89645..9a1e1aff6ce 100644
--- a/gemfiles/ruby_3.1_opensearch_latest.gemfile.lock
+++ b/gemfiles/ruby_3.1_opensearch_latest.gemfile.lock
@@ -48,8 +48,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.1_opentelemetry.gemfile.lock b/gemfiles/ruby_3.1_opentelemetry.gemfile.lock
index f4b5b5ba7d3..ed619123a9e 100644
--- a/gemfiles/ruby_3.1_opentelemetry.gemfile.lock
+++ b/gemfiles/ruby_3.1_opentelemetry.gemfile.lock
@@ -39,9 +39,9 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-darwin)
     google-protobuf (3.22.0-x86_64-linux)
diff --git a/gemfiles/ruby_3.1_opentelemetry_otlp.gemfile.lock b/gemfiles/ruby_3.1_opentelemetry_otlp.gemfile.lock
index 79a81af1a3e..d2e69ae4989 100644
--- a/gemfiles/ruby_3.1_opentelemetry_otlp.gemfile.lock
+++ b/gemfiles/ruby_3.1_opentelemetry_otlp.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     googleapis-common-protos-types (1.13.0)
diff --git a/gemfiles/ruby_3.1_rack_1.gemfile.lock b/gemfiles/ruby_3.1_rack_1.gemfile.lock
index 43424cb158b..22dcb1e6d84 100644
--- a/gemfiles/ruby_3.1_rack_1.gemfile.lock
+++ b/gemfiles/ruby_3.1_rack_1.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.1_rack_2.gemfile.lock b/gemfiles/ruby_3.1_rack_2.gemfile.lock
index 67e01d8daf8..d6dbefa1330 100644
--- a/gemfiles/ruby_3.1_rack_2.gemfile.lock
+++ b/gemfiles/ruby_3.1_rack_2.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.1_rack_3.gemfile.lock b/gemfiles/ruby_3.1_rack_3.gemfile.lock
index d98b6627e05..b581374a1ab 100644
--- a/gemfiles/ruby_3.1_rack_3.gemfile.lock
+++ b/gemfiles/ruby_3.1_rack_3.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.1_rack_latest.gemfile.lock b/gemfiles/ruby_3.1_rack_latest.gemfile.lock
index b992fbe17b8..deac6ab6011 100644
--- a/gemfiles/ruby_3.1_rack_latest.gemfile.lock
+++ b/gemfiles/ruby_3.1_rack_latest.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.2)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.5-aarch64-linux)
     google-protobuf (3.25.5-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.1_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.1_rails61_mysql2.gemfile.lock
index f488041f4b9..9e1c7f7c337 100644
--- a/gemfiles/ruby_3.1_rails61_mysql2.gemfile.lock
+++ b/gemfiles/ruby_3.1_rails61_mysql2.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_3.1_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.1_rails61_postgres.gemfile.lock
index 03e28dbcef3..f6459c0a737 100644
--- a/gemfiles/ruby_3.1_rails61_postgres.gemfile.lock
+++ b/gemfiles/ruby_3.1_rails61_postgres.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_3.1_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.1_rails61_postgres_redis.gemfile.lock
index 6e5eb77a1da..ec5290fdfc1 100644
--- a/gemfiles/ruby_3.1_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_3.1_rails61_postgres_redis.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_3.1_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.1_rails61_postgres_sidekiq.gemfile.lock
index 0d1be196484..4ee1d99d3b2 100644
--- a/gemfiles/ruby_3.1_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_3.1_rails61_postgres_sidekiq.gemfile.lock
@@ -103,8 +103,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_3.1_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.1_rails61_semantic_logger.gemfile.lock
index 0670f5d955c..6f6de925f44 100644
--- a/gemfiles/ruby_3.1_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_3.1_rails61_semantic_logger.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_3.1_rails61_trilogy.gemfile.lock b/gemfiles/ruby_3.1_rails61_trilogy.gemfile.lock
index 112f0729181..d5eefd5c090 100644
--- a/gemfiles/ruby_3.1_rails61_trilogy.gemfile.lock
+++ b/gemfiles/ruby_3.1_rails61_trilogy.gemfile.lock
@@ -106,8 +106,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.1-aarch64-linux)
diff --git a/gemfiles/ruby_3.1_rails7.gemfile.lock b/gemfiles/ruby_3.1_rails7.gemfile.lock
index d51ad375adc..b9ae253aa93 100644
--- a/gemfiles/ruby_3.1_rails7.gemfile.lock
+++ b/gemfiles/ruby_3.1_rails7.gemfile.lock
@@ -111,8 +111,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.4-aarch64-linux)
diff --git a/gemfiles/ruby_3.1_rails71.gemfile.lock b/gemfiles/ruby_3.1_rails71.gemfile.lock
index 2b3ca2cdf4d..3852d2183df 100644
--- a/gemfiles/ruby_3.1_rails71.gemfile.lock
+++ b/gemfiles/ruby_3.1_rails71.gemfile.lock
@@ -123,8 +123,8 @@ GEM
     drb (2.2.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.4-aarch64-linux)
diff --git a/gemfiles/ruby_3.1_redis_3.gemfile.lock b/gemfiles/ruby_3.1_redis_3.gemfile.lock
index 3f033353302..081eef7c2c0 100644
--- a/gemfiles/ruby_3.1_redis_3.gemfile.lock
+++ b/gemfiles/ruby_3.1_redis_3.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.1_redis_4.gemfile.lock b/gemfiles/ruby_3.1_redis_4.gemfile.lock
index c53da1b3f76..d4cfaf348bb 100644
--- a/gemfiles/ruby_3.1_redis_4.gemfile.lock
+++ b/gemfiles/ruby_3.1_redis_4.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.1_redis_5.gemfile.lock b/gemfiles/ruby_3.1_redis_5.gemfile.lock
index 98fa43caded..99c7f3e29e2 100644
--- a/gemfiles/ruby_3.1_redis_5.gemfile.lock
+++ b/gemfiles/ruby_3.1_redis_5.gemfile.lock
@@ -40,8 +40,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.1_relational_db.gemfile.lock b/gemfiles/ruby_3.1_relational_db.gemfile.lock
index 9e155b687f1..2cf52200506 100644
--- a/gemfiles/ruby_3.1_relational_db.gemfile.lock
+++ b/gemfiles/ruby_3.1_relational_db.gemfile.lock
@@ -55,8 +55,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.1_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.1_resque2_redis3.gemfile.lock
index 53ce42c2b4f..d1c3d7feb24 100644
--- a/gemfiles/ruby_3.1_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_3.1_resque2_redis3.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.1_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.1_resque2_redis4.gemfile.lock
index a8af46d0c47..b8e075be2bd 100644
--- a/gemfiles/ruby_3.1_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_3.1_resque2_redis4.gemfile.lock
@@ -40,8 +40,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.1_sinatra_2.gemfile.lock b/gemfiles/ruby_3.1_sinatra_2.gemfile.lock
index 73a63eabcc9..e049561308a 100644
--- a/gemfiles/ruby_3.1_sinatra_2.gemfile.lock
+++ b/gemfiles/ruby_3.1_sinatra_2.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_3.1_sinatra_3.gemfile.lock b/gemfiles/ruby_3.1_sinatra_3.gemfile.lock
index cf1ebc9fcde..0e2957b068c 100644
--- a/gemfiles/ruby_3.1_sinatra_3.gemfile.lock
+++ b/gemfiles/ruby_3.1_sinatra_3.gemfile.lock
@@ -43,8 +43,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_3.1_sinatra_4.gemfile.lock b/gemfiles/ruby_3.1_sinatra_4.gemfile.lock
index 7d4fddd2599..5a52dfed468 100644
--- a/gemfiles/ruby_3.1_sinatra_4.gemfile.lock
+++ b/gemfiles/ruby_3.1_sinatra_4.gemfile.lock
@@ -43,8 +43,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_3.1_stripe_10.gemfile.lock b/gemfiles/ruby_3.1_stripe_10.gemfile.lock
index cf93b688f26..bc7235679ed 100644
--- a/gemfiles/ruby_3.1_stripe_10.gemfile.lock
+++ b/gemfiles/ruby_3.1_stripe_10.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.1_stripe_11.gemfile.lock b/gemfiles/ruby_3.1_stripe_11.gemfile.lock
index 4cb28e70b49..c7232281ae3 100644
--- a/gemfiles/ruby_3.1_stripe_11.gemfile.lock
+++ b/gemfiles/ruby_3.1_stripe_11.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.1_stripe_12.gemfile.lock b/gemfiles/ruby_3.1_stripe_12.gemfile.lock
index 0a5dfb38f09..92b2b8dbb18 100644
--- a/gemfiles/ruby_3.1_stripe_12.gemfile.lock
+++ b/gemfiles/ruby_3.1_stripe_12.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.1_stripe_7.gemfile.lock b/gemfiles/ruby_3.1_stripe_7.gemfile.lock
index dce2b4064ed..5e3e35e6719 100644
--- a/gemfiles/ruby_3.1_stripe_7.gemfile.lock
+++ b/gemfiles/ruby_3.1_stripe_7.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.1_stripe_8.gemfile.lock b/gemfiles/ruby_3.1_stripe_8.gemfile.lock
index d932b9484b0..efda1eea060 100644
--- a/gemfiles/ruby_3.1_stripe_8.gemfile.lock
+++ b/gemfiles/ruby_3.1_stripe_8.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.1_stripe_9.gemfile.lock b/gemfiles/ruby_3.1_stripe_9.gemfile.lock
index 8771e44469b..8e53b2984f7 100644
--- a/gemfiles/ruby_3.1_stripe_9.gemfile.lock
+++ b/gemfiles/ruby_3.1_stripe_9.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.1_stripe_latest.gemfile.lock b/gemfiles/ruby_3.1_stripe_latest.gemfile.lock
index bd9ce9f0f2e..df6be9fa5b3 100644
--- a/gemfiles/ruby_3.1_stripe_latest.gemfile.lock
+++ b/gemfiles/ruby_3.1_stripe_latest.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.1_stripe_min.gemfile.lock b/gemfiles/ruby_3.1_stripe_min.gemfile.lock
index bd402f476cc..1247490b300 100644
--- a/gemfiles/ruby_3.1_stripe_min.gemfile.lock
+++ b/gemfiles/ruby_3.1_stripe_min.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.5-aarch64-linux)
     google-protobuf (3.25.5-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.2_activesupport.gemfile.lock b/gemfiles/ruby_3.2_activesupport.gemfile.lock
index c8708b42387..2628e1f3598 100644
--- a/gemfiles/ruby_3.2_activesupport.gemfile.lock
+++ b/gemfiles/ruby_3.2_activesupport.gemfile.lock
@@ -84,8 +84,8 @@ GEM
       zeitwerk (~> 2.6)
     erubi (1.12.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     grape (1.8.0)
diff --git a/gemfiles/ruby_3.2_aws.gemfile.lock b/gemfiles/ruby_3.2_aws.gemfile.lock
index d11a4e10919..ae722a6ffc8 100644
--- a/gemfiles/ruby_3.2_aws.gemfile.lock
+++ b/gemfiles/ruby_3.2_aws.gemfile.lock
@@ -1459,8 +1459,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.2-aarch64-linux)
     google-protobuf (3.24.2-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_contrib.gemfile.lock b/gemfiles/ruby_3.2_contrib.gemfile.lock
index 089477925ba..ae02736c469 100644
--- a/gemfiles/ruby_3.2_contrib.gemfile.lock
+++ b/gemfiles/ruby_3.2_contrib.gemfile.lock
@@ -45,8 +45,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     googleapis-common-protos-types (1.5.0)
diff --git a/gemfiles/ruby_3.2_contrib_old.gemfile.lock b/gemfiles/ruby_3.2_contrib_old.gemfile.lock
index 4e8c631330d..19c0f0b67f6 100644
--- a/gemfiles/ruby_3.2_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_3.2_contrib_old.gemfile.lock
@@ -48,8 +48,8 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_core_old.gemfile.lock b/gemfiles/ruby_3.2_core_old.gemfile.lock
index f9b7bfdacf8..800e4187220 100644
--- a/gemfiles/ruby_3.2_core_old.gemfile.lock
+++ b/gemfiles/ruby_3.2_core_old.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (4.8.3)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.2_elasticsearch_7.gemfile.lock
index a001fb09347..f3c1274a16c 100644
--- a/gemfiles/ruby_3.2_elasticsearch_7.gemfile.lock
+++ b/gemfiles/ruby_3.2_elasticsearch_7.gemfile.lock
@@ -55,8 +55,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4-aarch64-linux)
     google-protobuf (3.24.4-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.2_elasticsearch_8.gemfile.lock
index 9c75f510fce..0209d29bbf6 100644
--- a/gemfiles/ruby_3.2_elasticsearch_8.gemfile.lock
+++ b/gemfiles/ruby_3.2_elasticsearch_8.gemfile.lock
@@ -53,8 +53,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4-aarch64-linux)
     google-protobuf (3.24.4-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_elasticsearch_latest.gemfile.lock b/gemfiles/ruby_3.2_elasticsearch_latest.gemfile.lock
index cf64d7f6180..defd85770ee 100644
--- a/gemfiles/ruby_3.2_elasticsearch_latest.gemfile.lock
+++ b/gemfiles/ruby_3.2_elasticsearch_latest.gemfile.lock
@@ -55,8 +55,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.2_graphql_1.13.gemfile.lock b/gemfiles/ruby_3.2_graphql_1.13.gemfile.lock
index 072f28ea3b7..7a895ea34a2 100644
--- a/gemfiles/ruby_3.2_graphql_1.13.gemfile.lock
+++ b/gemfiles/ruby_3.2_graphql_1.13.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2-aarch64-linux)
diff --git a/gemfiles/ruby_3.2_graphql_2.0.gemfile.lock b/gemfiles/ruby_3.2_graphql_2.0.gemfile.lock
index bde3a7df378..2f8cf94af30 100644
--- a/gemfiles/ruby_3.2_graphql_2.0.gemfile.lock
+++ b/gemfiles/ruby_3.2_graphql_2.0.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2-aarch64-linux)
diff --git a/gemfiles/ruby_3.2_graphql_2.1.gemfile.lock b/gemfiles/ruby_3.2_graphql_2.1.gemfile.lock
index 0d9f9a33817..4287e36bf5c 100644
--- a/gemfiles/ruby_3.2_graphql_2.1.gemfile.lock
+++ b/gemfiles/ruby_3.2_graphql_2.1.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2-aarch64-linux)
diff --git a/gemfiles/ruby_3.2_graphql_2.2.gemfile.lock b/gemfiles/ruby_3.2_graphql_2.2.gemfile.lock
index 609cf1a3704..2e5fe435e13 100644
--- a/gemfiles/ruby_3.2_graphql_2.2.gemfile.lock
+++ b/gemfiles/ruby_3.2_graphql_2.2.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2-aarch64-linux)
diff --git a/gemfiles/ruby_3.2_graphql_2.3.gemfile.lock b/gemfiles/ruby_3.2_graphql_2.3.gemfile.lock
index 1af7a475fc2..0421c5b4c26 100644
--- a/gemfiles/ruby_3.2_graphql_2.3.gemfile.lock
+++ b/gemfiles/ruby_3.2_graphql_2.3.gemfile.lock
@@ -105,8 +105,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3-aarch64-linux)
diff --git a/gemfiles/ruby_3.2_http.gemfile.lock b/gemfiles/ruby_3.2_http.gemfile.lock
index d475f2605a9..ec616d7abb3 100644
--- a/gemfiles/ruby_3.2_http.gemfile.lock
+++ b/gemfiles/ruby_3.2_http.gemfile.lock
@@ -47,8 +47,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
diff --git a/gemfiles/ruby_3.2_opensearch_2.gemfile.lock b/gemfiles/ruby_3.2_opensearch_2.gemfile.lock
index d7d755b15a2..35ce702fdfa 100644
--- a/gemfiles/ruby_3.2_opensearch_2.gemfile.lock
+++ b/gemfiles/ruby_3.2_opensearch_2.gemfile.lock
@@ -45,8 +45,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4-aarch64-linux)
     google-protobuf (3.24.4-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_opensearch_3.gemfile.lock b/gemfiles/ruby_3.2_opensearch_3.gemfile.lock
index 9eb57c54a8c..4f22b25651a 100644
--- a/gemfiles/ruby_3.2_opensearch_3.gemfile.lock
+++ b/gemfiles/ruby_3.2_opensearch_3.gemfile.lock
@@ -45,8 +45,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4-aarch64-linux)
     google-protobuf (3.24.4-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_opensearch_latest.gemfile.lock b/gemfiles/ruby_3.2_opensearch_latest.gemfile.lock
index d2bb8cf8d5f..2b33fd8f8f7 100644
--- a/gemfiles/ruby_3.2_opensearch_latest.gemfile.lock
+++ b/gemfiles/ruby_3.2_opensearch_latest.gemfile.lock
@@ -47,8 +47,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.2_opentelemetry.gemfile.lock b/gemfiles/ruby_3.2_opentelemetry.gemfile.lock
index 3389026486e..a4821bd70cd 100644
--- a/gemfiles/ruby_3.2_opentelemetry.gemfile.lock
+++ b/gemfiles/ruby_3.2_opentelemetry.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_opentelemetry_otlp.gemfile.lock b/gemfiles/ruby_3.2_opentelemetry_otlp.gemfile.lock
index be128eb20d2..43dbc52fe9a 100644
--- a/gemfiles/ruby_3.2_opentelemetry_otlp.gemfile.lock
+++ b/gemfiles/ruby_3.2_opentelemetry_otlp.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     googleapis-common-protos-types (1.13.0)
diff --git a/gemfiles/ruby_3.2_rack_1.gemfile.lock b/gemfiles/ruby_3.2_rack_1.gemfile.lock
index 9d404eb3457..bb12af61a5e 100644
--- a/gemfiles/ruby_3.2_rack_1.gemfile.lock
+++ b/gemfiles/ruby_3.2_rack_1.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_rack_2.gemfile.lock b/gemfiles/ruby_3.2_rack_2.gemfile.lock
index b4bd478e79a..e77065b8140 100644
--- a/gemfiles/ruby_3.2_rack_2.gemfile.lock
+++ b/gemfiles/ruby_3.2_rack_2.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_rack_3.gemfile.lock b/gemfiles/ruby_3.2_rack_3.gemfile.lock
index fa018713386..801ff399a4e 100644
--- a/gemfiles/ruby_3.2_rack_3.gemfile.lock
+++ b/gemfiles/ruby_3.2_rack_3.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_rack_latest.gemfile.lock b/gemfiles/ruby_3.2_rack_latest.gemfile.lock
index 481b4fd483b..22ebed57cbe 100644
--- a/gemfiles/ruby_3.2_rack_latest.gemfile.lock
+++ b/gemfiles/ruby_3.2_rack_latest.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.2)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.5-aarch64-linux)
     google-protobuf (3.25.5-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.2_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.2_rails61_mysql2.gemfile.lock
index 1e11a38a41c..9ac6c871a88 100644
--- a/gemfiles/ruby_3.2_rails61_mysql2.gemfile.lock
+++ b/gemfiles/ruby_3.2_rails61_mysql2.gemfile.lock
@@ -101,8 +101,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_3.2_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.2_rails61_postgres.gemfile.lock
index 7b5c0017fe9..162bc9c3593 100644
--- a/gemfiles/ruby_3.2_rails61_postgres.gemfile.lock
+++ b/gemfiles/ruby_3.2_rails61_postgres.gemfile.lock
@@ -101,8 +101,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_3.2_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.2_rails61_postgres_redis.gemfile.lock
index 8cdea59f519..3af72b7fab4 100644
--- a/gemfiles/ruby_3.2_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_3.2_rails61_postgres_redis.gemfile.lock
@@ -101,8 +101,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_3.2_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.2_rails61_postgres_sidekiq.gemfile.lock
index bc338cc7186..3d0e51d7846 100644
--- a/gemfiles/ruby_3.2_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_3.2_rails61_postgres_sidekiq.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_3.2_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.2_rails61_semantic_logger.gemfile.lock
index d84e4883104..a010a04923b 100644
--- a/gemfiles/ruby_3.2_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_3.2_rails61_semantic_logger.gemfile.lock
@@ -101,8 +101,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.22.0)
diff --git a/gemfiles/ruby_3.2_rails61_trilogy.gemfile.lock b/gemfiles/ruby_3.2_rails61_trilogy.gemfile.lock
index 3ea30f5304a..2256e718ac2 100644
--- a/gemfiles/ruby_3.2_rails61_trilogy.gemfile.lock
+++ b/gemfiles/ruby_3.2_rails61_trilogy.gemfile.lock
@@ -105,8 +105,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.1-aarch64-linux)
diff --git a/gemfiles/ruby_3.2_rails7.gemfile.lock b/gemfiles/ruby_3.2_rails7.gemfile.lock
index 96a5323f62e..85393b027e5 100644
--- a/gemfiles/ruby_3.2_rails7.gemfile.lock
+++ b/gemfiles/ruby_3.2_rails7.gemfile.lock
@@ -110,8 +110,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.4-aarch64-linux)
diff --git a/gemfiles/ruby_3.2_rails71.gemfile.lock b/gemfiles/ruby_3.2_rails71.gemfile.lock
index 1921bc6e914..e68534abf12 100644
--- a/gemfiles/ruby_3.2_rails71.gemfile.lock
+++ b/gemfiles/ruby_3.2_rails71.gemfile.lock
@@ -122,8 +122,8 @@ GEM
     drb (2.2.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.4-aarch64-linux)
diff --git a/gemfiles/ruby_3.2_redis_3.gemfile.lock b/gemfiles/ruby_3.2_redis_3.gemfile.lock
index 95d354efe2e..2baf69079aa 100644
--- a/gemfiles/ruby_3.2_redis_3.gemfile.lock
+++ b/gemfiles/ruby_3.2_redis_3.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_redis_4.gemfile.lock b/gemfiles/ruby_3.2_redis_4.gemfile.lock
index 706b2482f6d..4489e40a93d 100644
--- a/gemfiles/ruby_3.2_redis_4.gemfile.lock
+++ b/gemfiles/ruby_3.2_redis_4.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_redis_5.gemfile.lock b/gemfiles/ruby_3.2_redis_5.gemfile.lock
index 99df2ae4129..e10bf8cdfac 100644
--- a/gemfiles/ruby_3.2_redis_5.gemfile.lock
+++ b/gemfiles/ruby_3.2_redis_5.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_relational_db.gemfile.lock b/gemfiles/ruby_3.2_relational_db.gemfile.lock
index 5119a42cc10..8ba867eec20 100644
--- a/gemfiles/ruby_3.2_relational_db.gemfile.lock
+++ b/gemfiles/ruby_3.2_relational_db.gemfile.lock
@@ -54,8 +54,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3-aarch64-linux)
     google-protobuf (3.24.3-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.2_resque2_redis3.gemfile.lock
index 152191842bb..5766ff1dc87 100644
--- a/gemfiles/ruby_3.2_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_3.2_resque2_redis3.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.2_resque2_redis4.gemfile.lock
index cadb5388f59..58f0c7f71ef 100644
--- a/gemfiles/ruby_3.2_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_3.2_resque2_redis4.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.22.0)
     google-protobuf (3.22.0-x86_64-linux)
     hashdiff (1.0.1)
diff --git a/gemfiles/ruby_3.2_sinatra_2.gemfile.lock b/gemfiles/ruby_3.2_sinatra_2.gemfile.lock
index b36a3eb5884..fabb61e67b1 100644
--- a/gemfiles/ruby_3.2_sinatra_2.gemfile.lock
+++ b/gemfiles/ruby_3.2_sinatra_2.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_3.2_sinatra_3.gemfile.lock b/gemfiles/ruby_3.2_sinatra_3.gemfile.lock
index 6f5645a41b1..d77a3cbfca7 100644
--- a/gemfiles/ruby_3.2_sinatra_3.gemfile.lock
+++ b/gemfiles/ruby_3.2_sinatra_3.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_3.2_sinatra_4.gemfile.lock b/gemfiles/ruby_3.2_sinatra_4.gemfile.lock
index 703528887d0..909e7fc6c71 100644
--- a/gemfiles/ruby_3.2_sinatra_4.gemfile.lock
+++ b/gemfiles/ruby_3.2_sinatra_4.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_3.2_stripe_10.gemfile.lock b/gemfiles/ruby_3.2_stripe_10.gemfile.lock
index fb376f0740d..1607ed87575 100644
--- a/gemfiles/ruby_3.2_stripe_10.gemfile.lock
+++ b/gemfiles/ruby_3.2_stripe_10.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.2_stripe_11.gemfile.lock b/gemfiles/ruby_3.2_stripe_11.gemfile.lock
index 1e569f8d9ed..3a612068c4e 100644
--- a/gemfiles/ruby_3.2_stripe_11.gemfile.lock
+++ b/gemfiles/ruby_3.2_stripe_11.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.2_stripe_12.gemfile.lock b/gemfiles/ruby_3.2_stripe_12.gemfile.lock
index 4e37685019b..297668c2e78 100644
--- a/gemfiles/ruby_3.2_stripe_12.gemfile.lock
+++ b/gemfiles/ruby_3.2_stripe_12.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.2_stripe_7.gemfile.lock b/gemfiles/ruby_3.2_stripe_7.gemfile.lock
index 43a4b14e842..9bdd1cfc2c3 100644
--- a/gemfiles/ruby_3.2_stripe_7.gemfile.lock
+++ b/gemfiles/ruby_3.2_stripe_7.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.2_stripe_8.gemfile.lock b/gemfiles/ruby_3.2_stripe_8.gemfile.lock
index 8745811725f..cebf0ffd8aa 100644
--- a/gemfiles/ruby_3.2_stripe_8.gemfile.lock
+++ b/gemfiles/ruby_3.2_stripe_8.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.2_stripe_9.gemfile.lock b/gemfiles/ruby_3.2_stripe_9.gemfile.lock
index 68af5fbbf11..5df781aedd2 100644
--- a/gemfiles/ruby_3.2_stripe_9.gemfile.lock
+++ b/gemfiles/ruby_3.2_stripe_9.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.2_stripe_latest.gemfile.lock b/gemfiles/ruby_3.2_stripe_latest.gemfile.lock
index e236ddad855..e43304b637b 100644
--- a/gemfiles/ruby_3.2_stripe_latest.gemfile.lock
+++ b/gemfiles/ruby_3.2_stripe_latest.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.2_stripe_min.gemfile.lock b/gemfiles/ruby_3.2_stripe_min.gemfile.lock
index fccd509980f..91ed6faf882 100644
--- a/gemfiles/ruby_3.2_stripe_min.gemfile.lock
+++ b/gemfiles/ruby_3.2_stripe_min.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.5-aarch64-linux)
     google-protobuf (3.25.5-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.3_activesupport.gemfile.lock b/gemfiles/ruby_3.3_activesupport.gemfile.lock
index 5b18691d7a6..b87598ebe3f 100644
--- a/gemfiles/ruby_3.3_activesupport.gemfile.lock
+++ b/gemfiles/ruby_3.3_activesupport.gemfile.lock
@@ -84,8 +84,8 @@ GEM
       zeitwerk (~> 2.6)
     erubi (1.12.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3)
     grape (1.8.0)
       activesupport (>= 5)
diff --git a/gemfiles/ruby_3.3_aws.gemfile.lock b/gemfiles/ruby_3.3_aws.gemfile.lock
index 47eb6ef2eb6..537465c3330 100644
--- a/gemfiles/ruby_3.3_aws.gemfile.lock
+++ b/gemfiles/ruby_3.3_aws.gemfile.lock
@@ -1459,8 +1459,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.2)
     hashdiff (1.0.1)
     jmespath (1.6.2)
diff --git a/gemfiles/ruby_3.3_contrib.gemfile.lock b/gemfiles/ruby_3.3_contrib.gemfile.lock
index 584e5bbb826..2a0d0e12bd0 100644
--- a/gemfiles/ruby_3.3_contrib.gemfile.lock
+++ b/gemfiles/ruby_3.3_contrib.gemfile.lock
@@ -45,8 +45,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.5-aarch64-linux)
     google-protobuf (3.25.5-x86_64-linux)
     googleapis-common-protos-types (1.16.0)
diff --git a/gemfiles/ruby_3.3_contrib_old.gemfile.lock b/gemfiles/ruby_3.3_contrib_old.gemfile.lock
index 2b8fcbe894f..546783a204d 100644
--- a/gemfiles/ruby_3.3_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_3.3_contrib_old.gemfile.lock
@@ -48,8 +48,8 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.23.1)
     hashdiff (1.0.1)
     hitimes (1.3.1)
diff --git a/gemfiles/ruby_3.3_core_old.gemfile.lock b/gemfiles/ruby_3.3_core_old.gemfile.lock
index f6c72cba67a..21db79ab199 100644
--- a/gemfiles/ruby_3.3_core_old.gemfile.lock
+++ b/gemfiles/ruby_3.3_core_old.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (4.8.3)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.23.1)
     hashdiff (1.0.1)
     json (2.6.3)
diff --git a/gemfiles/ruby_3.3_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.3_elasticsearch_7.gemfile.lock
index 86429ca171f..ef7599b7d29 100644
--- a/gemfiles/ruby_3.3_elasticsearch_7.gemfile.lock
+++ b/gemfiles/ruby_3.3_elasticsearch_7.gemfile.lock
@@ -55,8 +55,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4)
     hashdiff (1.0.1)
     json (2.9.1)
diff --git a/gemfiles/ruby_3.3_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.3_elasticsearch_8.gemfile.lock
index fdd54302dc4..355a3f249a0 100644
--- a/gemfiles/ruby_3.3_elasticsearch_8.gemfile.lock
+++ b/gemfiles/ruby_3.3_elasticsearch_8.gemfile.lock
@@ -53,8 +53,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4)
     hashdiff (1.0.1)
     json (2.9.1)
diff --git a/gemfiles/ruby_3.3_elasticsearch_latest.gemfile.lock b/gemfiles/ruby_3.3_elasticsearch_latest.gemfile.lock
index cf64d7f6180..defd85770ee 100644
--- a/gemfiles/ruby_3.3_elasticsearch_latest.gemfile.lock
+++ b/gemfiles/ruby_3.3_elasticsearch_latest.gemfile.lock
@@ -55,8 +55,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.3_graphql_1.13.gemfile.lock b/gemfiles/ruby_3.3_graphql_1.13.gemfile.lock
index 0046116d95c..4de515a95a8 100644
--- a/gemfiles/ruby_3.3_graphql_1.13.gemfile.lock
+++ b/gemfiles/ruby_3.3_graphql_1.13.gemfile.lock
@@ -103,8 +103,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2)
diff --git a/gemfiles/ruby_3.3_graphql_2.0.gemfile.lock b/gemfiles/ruby_3.3_graphql_2.0.gemfile.lock
index f85ce27a55f..c7c2bdb71ab 100644
--- a/gemfiles/ruby_3.3_graphql_2.0.gemfile.lock
+++ b/gemfiles/ruby_3.3_graphql_2.0.gemfile.lock
@@ -103,8 +103,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2)
diff --git a/gemfiles/ruby_3.3_graphql_2.1.gemfile.lock b/gemfiles/ruby_3.3_graphql_2.1.gemfile.lock
index 47543a59e9e..eb5d0bef907 100644
--- a/gemfiles/ruby_3.3_graphql_2.1.gemfile.lock
+++ b/gemfiles/ruby_3.3_graphql_2.1.gemfile.lock
@@ -103,8 +103,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2)
diff --git a/gemfiles/ruby_3.3_graphql_2.2.gemfile.lock b/gemfiles/ruby_3.3_graphql_2.2.gemfile.lock
index d93e7442cdc..484485f14dc 100644
--- a/gemfiles/ruby_3.3_graphql_2.2.gemfile.lock
+++ b/gemfiles/ruby_3.3_graphql_2.2.gemfile.lock
@@ -103,8 +103,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.2)
diff --git a/gemfiles/ruby_3.3_graphql_2.3.gemfile.lock b/gemfiles/ruby_3.3_graphql_2.3.gemfile.lock
index 1af7a475fc2..0421c5b4c26 100644
--- a/gemfiles/ruby_3.3_graphql_2.3.gemfile.lock
+++ b/gemfiles/ruby_3.3_graphql_2.3.gemfile.lock
@@ -105,8 +105,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3-aarch64-linux)
diff --git a/gemfiles/ruby_3.3_http.gemfile.lock b/gemfiles/ruby_3.3_http.gemfile.lock
index 611dfb014e5..6d68c918e3e 100644
--- a/gemfiles/ruby_3.3_http.gemfile.lock
+++ b/gemfiles/ruby_3.3_http.gemfile.lock
@@ -47,8 +47,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
diff --git a/gemfiles/ruby_3.3_opensearch_2.gemfile.lock b/gemfiles/ruby_3.3_opensearch_2.gemfile.lock
index e8b86074744..cd8e915adde 100644
--- a/gemfiles/ruby_3.3_opensearch_2.gemfile.lock
+++ b/gemfiles/ruby_3.3_opensearch_2.gemfile.lock
@@ -45,8 +45,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4)
     hashdiff (1.0.1)
     json (2.9.1)
diff --git a/gemfiles/ruby_3.3_opensearch_3.gemfile.lock b/gemfiles/ruby_3.3_opensearch_3.gemfile.lock
index 4ea021ef1d3..52594de46cc 100644
--- a/gemfiles/ruby_3.3_opensearch_3.gemfile.lock
+++ b/gemfiles/ruby_3.3_opensearch_3.gemfile.lock
@@ -45,8 +45,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.4)
     hashdiff (1.0.1)
     json (2.9.1)
diff --git a/gemfiles/ruby_3.3_opensearch_latest.gemfile.lock b/gemfiles/ruby_3.3_opensearch_latest.gemfile.lock
index d2bb8cf8d5f..2b33fd8f8f7 100644
--- a/gemfiles/ruby_3.3_opensearch_latest.gemfile.lock
+++ b/gemfiles/ruby_3.3_opensearch_latest.gemfile.lock
@@ -47,8 +47,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.3_opentelemetry.gemfile.lock b/gemfiles/ruby_3.3_opentelemetry.gemfile.lock
index c18f307a5fe..db5dcd14f9f 100644
--- a/gemfiles/ruby_3.3_opentelemetry.gemfile.lock
+++ b/gemfiles/ruby_3.3_opentelemetry.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.23.1)
     hashdiff (1.0.1)
     json (2.6.3)
diff --git a/gemfiles/ruby_3.3_opentelemetry_otlp.gemfile.lock b/gemfiles/ruby_3.3_opentelemetry_otlp.gemfile.lock
index be128eb20d2..43dbc52fe9a 100644
--- a/gemfiles/ruby_3.3_opentelemetry_otlp.gemfile.lock
+++ b/gemfiles/ruby_3.3_opentelemetry_otlp.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     googleapis-common-protos-types (1.13.0)
diff --git a/gemfiles/ruby_3.3_rack_2.gemfile.lock b/gemfiles/ruby_3.3_rack_2.gemfile.lock
index 384f80aed37..d0d8992bf32 100644
--- a/gemfiles/ruby_3.3_rack_2.gemfile.lock
+++ b/gemfiles/ruby_3.3_rack_2.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3)
     hashdiff (1.0.1)
     json (2.6.3)
diff --git a/gemfiles/ruby_3.3_rack_3.gemfile.lock b/gemfiles/ruby_3.3_rack_3.gemfile.lock
index 44e4864c588..49b2f1b98c5 100644
--- a/gemfiles/ruby_3.3_rack_3.gemfile.lock
+++ b/gemfiles/ruby_3.3_rack_3.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3)
     hashdiff (1.0.1)
     json (2.6.3)
diff --git a/gemfiles/ruby_3.3_rack_latest.gemfile.lock b/gemfiles/ruby_3.3_rack_latest.gemfile.lock
index 481b4fd483b..22ebed57cbe 100644
--- a/gemfiles/ruby_3.3_rack_latest.gemfile.lock
+++ b/gemfiles/ruby_3.3_rack_latest.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.2)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.5-aarch64-linux)
     google-protobuf (3.25.5-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.3_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.3_rails61_mysql2.gemfile.lock
index af848e391d7..45e9c3bf47d 100644
--- a/gemfiles/ruby_3.3_rails61_mysql2.gemfile.lock
+++ b/gemfiles/ruby_3.3_rails61_mysql2.gemfile.lock
@@ -101,8 +101,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.23.1)
diff --git a/gemfiles/ruby_3.3_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.3_rails61_postgres.gemfile.lock
index 1e2bd0f65ab..156c0eaaa55 100644
--- a/gemfiles/ruby_3.3_rails61_postgres.gemfile.lock
+++ b/gemfiles/ruby_3.3_rails61_postgres.gemfile.lock
@@ -101,8 +101,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.23.1)
diff --git a/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile.lock
index 28d7c7a83ca..e5f77a69109 100644
--- a/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile.lock
@@ -101,8 +101,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.23.1)
diff --git a/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile.lock
index e61e95cdd34..6d75912d1fe 100644
--- a/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile.lock
@@ -102,8 +102,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.23.1)
diff --git a/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile.lock
index f7427098c44..b757c6568c9 100644
--- a/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile.lock
@@ -101,8 +101,8 @@ GEM
     dogstatsd-ruby (5.5.0)
     erubi (1.12.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-protobuf (3.23.1)
diff --git a/gemfiles/ruby_3.3_rails61_trilogy.gemfile.lock b/gemfiles/ruby_3.3_rails61_trilogy.gemfile.lock
index 90576186023..6c2d767d4d6 100644
--- a/gemfiles/ruby_3.3_rails61_trilogy.gemfile.lock
+++ b/gemfiles/ruby_3.3_rails61_trilogy.gemfile.lock
@@ -105,8 +105,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.12.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.1)
diff --git a/gemfiles/ruby_3.3_rails7.gemfile.lock b/gemfiles/ruby_3.3_rails7.gemfile.lock
index 96a5323f62e..85393b027e5 100644
--- a/gemfiles/ruby_3.3_rails7.gemfile.lock
+++ b/gemfiles/ruby_3.3_rails7.gemfile.lock
@@ -110,8 +110,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.4-aarch64-linux)
diff --git a/gemfiles/ruby_3.3_rails71.gemfile.lock b/gemfiles/ruby_3.3_rails71.gemfile.lock
index 1921bc6e914..e68534abf12 100644
--- a/gemfiles/ruby_3.3_rails71.gemfile.lock
+++ b/gemfiles/ruby_3.3_rails71.gemfile.lock
@@ -122,8 +122,8 @@ GEM
     drb (2.2.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.4-aarch64-linux)
diff --git a/gemfiles/ruby_3.3_redis_3.gemfile.lock b/gemfiles/ruby_3.3_redis_3.gemfile.lock
index 0a8c3b6a01d..dd7d045007a 100644
--- a/gemfiles/ruby_3.3_redis_3.gemfile.lock
+++ b/gemfiles/ruby_3.3_redis_3.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.23.1)
     hashdiff (1.0.1)
     json (2.6.3)
diff --git a/gemfiles/ruby_3.3_redis_4.gemfile.lock b/gemfiles/ruby_3.3_redis_4.gemfile.lock
index 0b4cd72910d..6eac77b8a77 100644
--- a/gemfiles/ruby_3.3_redis_4.gemfile.lock
+++ b/gemfiles/ruby_3.3_redis_4.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.23.1)
     hashdiff (1.0.1)
     json (2.6.3)
diff --git a/gemfiles/ruby_3.3_redis_5.gemfile.lock b/gemfiles/ruby_3.3_redis_5.gemfile.lock
index d97e5742910..a6292f47138 100644
--- a/gemfiles/ruby_3.3_redis_5.gemfile.lock
+++ b/gemfiles/ruby_3.3_redis_5.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.23.1)
     hashdiff (1.0.1)
     json (2.6.3)
diff --git a/gemfiles/ruby_3.3_relational_db.gemfile.lock b/gemfiles/ruby_3.3_relational_db.gemfile.lock
index eb2e94bf519..05865bded3e 100644
--- a/gemfiles/ruby_3.3_relational_db.gemfile.lock
+++ b/gemfiles/ruby_3.3_relational_db.gemfile.lock
@@ -54,8 +54,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.24.3)
     hashdiff (1.0.1)
     i18n (1.14.1)
diff --git a/gemfiles/ruby_3.3_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.3_resque2_redis3.gemfile.lock
index 68ebe3db28c..9c3bf24a7d9 100644
--- a/gemfiles/ruby_3.3_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_3.3_resque2_redis3.gemfile.lock
@@ -38,8 +38,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.23.1)
     hashdiff (1.0.1)
     json (2.6.3)
diff --git a/gemfiles/ruby_3.3_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.3_resque2_redis4.gemfile.lock
index c29ee7751f6..d15124aac59 100644
--- a/gemfiles/ruby_3.3_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_3.3_resque2_redis4.gemfile.lock
@@ -39,8 +39,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.5.0)
     extlz4 (0.3.3)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.23.1)
     hashdiff (1.0.1)
     json (2.6.3)
diff --git a/gemfiles/ruby_3.3_sinatra_2.gemfile.lock b/gemfiles/ruby_3.3_sinatra_2.gemfile.lock
index b36a3eb5884..fabb61e67b1 100644
--- a/gemfiles/ruby_3.3_sinatra_2.gemfile.lock
+++ b/gemfiles/ruby_3.3_sinatra_2.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_3.3_sinatra_3.gemfile.lock b/gemfiles/ruby_3.3_sinatra_3.gemfile.lock
index 6f5645a41b1..d77a3cbfca7 100644
--- a/gemfiles/ruby_3.3_sinatra_3.gemfile.lock
+++ b/gemfiles/ruby_3.3_sinatra_3.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_3.3_sinatra_4.gemfile.lock b/gemfiles/ruby_3.3_sinatra_4.gemfile.lock
index 703528887d0..909e7fc6c71 100644
--- a/gemfiles/ruby_3.3_sinatra_4.gemfile.lock
+++ b/gemfiles/ruby_3.3_sinatra_4.gemfile.lock
@@ -42,8 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-x86_64-linux)
     hashdiff (1.1.0)
diff --git a/gemfiles/ruby_3.3_stripe_10.gemfile.lock b/gemfiles/ruby_3.3_stripe_10.gemfile.lock
index fb376f0740d..1607ed87575 100644
--- a/gemfiles/ruby_3.3_stripe_10.gemfile.lock
+++ b/gemfiles/ruby_3.3_stripe_10.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.3_stripe_11.gemfile.lock b/gemfiles/ruby_3.3_stripe_11.gemfile.lock
index 1e569f8d9ed..3a612068c4e 100644
--- a/gemfiles/ruby_3.3_stripe_11.gemfile.lock
+++ b/gemfiles/ruby_3.3_stripe_11.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.3_stripe_12.gemfile.lock b/gemfiles/ruby_3.3_stripe_12.gemfile.lock
index 4e37685019b..297668c2e78 100644
--- a/gemfiles/ruby_3.3_stripe_12.gemfile.lock
+++ b/gemfiles/ruby_3.3_stripe_12.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.3_stripe_7.gemfile.lock b/gemfiles/ruby_3.3_stripe_7.gemfile.lock
index 43a4b14e842..9bdd1cfc2c3 100644
--- a/gemfiles/ruby_3.3_stripe_7.gemfile.lock
+++ b/gemfiles/ruby_3.3_stripe_7.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.3_stripe_8.gemfile.lock b/gemfiles/ruby_3.3_stripe_8.gemfile.lock
index 8745811725f..cebf0ffd8aa 100644
--- a/gemfiles/ruby_3.3_stripe_8.gemfile.lock
+++ b/gemfiles/ruby_3.3_stripe_8.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.3_stripe_9.gemfile.lock b/gemfiles/ruby_3.3_stripe_9.gemfile.lock
index 68af5fbbf11..5df781aedd2 100644
--- a/gemfiles/ruby_3.3_stripe_9.gemfile.lock
+++ b/gemfiles/ruby_3.3_stripe_9.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.3_stripe_latest.gemfile.lock b/gemfiles/ruby_3.3_stripe_latest.gemfile.lock
index e236ddad855..e43304b637b 100644
--- a/gemfiles/ruby_3.3_stripe_latest.gemfile.lock
+++ b/gemfiles/ruby_3.3_stripe_latest.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4-aarch64-linux)
     google-protobuf (3.25.4-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.3_stripe_min.gemfile.lock b/gemfiles/ruby_3.3_stripe_min.gemfile.lock
index fccd509980f..91ed6faf882 100644
--- a/gemfiles/ruby_3.3_stripe_min.gemfile.lock
+++ b/gemfiles/ruby_3.3_stripe_min.gemfile.lock
@@ -41,8 +41,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.5-aarch64-linux)
     google-protobuf (3.25.5-x86_64-linux)
     hashdiff (1.1.1)
diff --git a/gemfiles/ruby_3.4_activesupport.gemfile.lock b/gemfiles/ruby_3.4_activesupport.gemfile.lock
index c4a46291810..5b59f490f78 100644
--- a/gemfiles/ruby_3.4_activesupport.gemfile.lock
+++ b/gemfiles/ruby_3.4_activesupport.gemfile.lock
@@ -99,7 +99,8 @@ GEM
       zeitwerk (~> 2.6)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     grape (2.1.2)
       activesupport (>= 6)
diff --git a/gemfiles/ruby_3.4_aws.gemfile.lock b/gemfiles/ruby_3.4_aws.gemfile.lock
index 1a68c8be039..b9f7b275633 100644
--- a/gemfiles/ruby_3.4_aws.gemfile.lock
+++ b/gemfiles/ruby_3.4_aws.gemfile.lock
@@ -1590,7 +1590,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     jmespath (1.6.2)
diff --git a/gemfiles/ruby_3.4_contrib.gemfile.lock b/gemfiles/ruby_3.4_contrib.gemfile.lock
index df998e8e4bf..ded35903d3f 100644
--- a/gemfiles/ruby_3.4_contrib.gemfile.lock
+++ b/gemfiles/ruby_3.4_contrib.gemfile.lock
@@ -49,7 +49,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     googleapis-common-protos-types (1.15.0)
       google-protobuf (>= 3.18, < 5.a)
diff --git a/gemfiles/ruby_3.4_contrib_old.gemfile.lock b/gemfiles/ruby_3.4_contrib_old.gemfile.lock
index a47f824e3d3..6ae6ebc7d45 100644
--- a/gemfiles/ruby_3.4_contrib_old.gemfile.lock
+++ b/gemfiles/ruby_3.4_contrib_old.gemfile.lock
@@ -52,7 +52,8 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     hitimes (1.3.1)
diff --git a/gemfiles/ruby_3.4_core_old.gemfile.lock b/gemfiles/ruby_3.4_core_old.gemfile.lock
index 84b9fb016eb..c8c37244120 100644
--- a/gemfiles/ruby_3.4_core_old.gemfile.lock
+++ b/gemfiles/ruby_3.4_core_old.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (4.8.3)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.4_elasticsearch_7.gemfile.lock
index 518ba2bd4ea..13ddfa935f8 100644
--- a/gemfiles/ruby_3.4_elasticsearch_7.gemfile.lock
+++ b/gemfiles/ruby_3.4_elasticsearch_7.gemfile.lock
@@ -57,7 +57,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.9.1)
diff --git a/gemfiles/ruby_3.4_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.4_elasticsearch_8.gemfile.lock
index dd39d2036fb..e6d4ac857d5 100644
--- a/gemfiles/ruby_3.4_elasticsearch_8.gemfile.lock
+++ b/gemfiles/ruby_3.4_elasticsearch_8.gemfile.lock
@@ -56,7 +56,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.9.1)
diff --git a/gemfiles/ruby_3.4_elasticsearch_latest.gemfile.lock b/gemfiles/ruby_3.4_elasticsearch_latest.gemfile.lock
index a8efec5d19c..a70ec127b71 100644
--- a/gemfiles/ruby_3.4_elasticsearch_latest.gemfile.lock
+++ b/gemfiles/ruby_3.4_elasticsearch_latest.gemfile.lock
@@ -56,7 +56,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.9.1)
diff --git a/gemfiles/ruby_3.4_graphql_1.13.gemfile.lock b/gemfiles/ruby_3.4_graphql_1.13.gemfile.lock
index 41bc5e725dc..c35771eb843 100644
--- a/gemfiles/ruby_3.4_graphql_1.13.gemfile.lock
+++ b/gemfiles/ruby_3.4_graphql_1.13.gemfile.lock
@@ -105,7 +105,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
diff --git a/gemfiles/ruby_3.4_graphql_2.0.gemfile.lock b/gemfiles/ruby_3.4_graphql_2.0.gemfile.lock
index ab0390ad394..58754e1f45f 100644
--- a/gemfiles/ruby_3.4_graphql_2.0.gemfile.lock
+++ b/gemfiles/ruby_3.4_graphql_2.0.gemfile.lock
@@ -105,7 +105,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
diff --git a/gemfiles/ruby_3.4_graphql_2.1.gemfile.lock b/gemfiles/ruby_3.4_graphql_2.1.gemfile.lock
index 954ed12a904..95488eaa0b8 100644
--- a/gemfiles/ruby_3.4_graphql_2.1.gemfile.lock
+++ b/gemfiles/ruby_3.4_graphql_2.1.gemfile.lock
@@ -105,7 +105,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
diff --git a/gemfiles/ruby_3.4_graphql_2.2.gemfile.lock b/gemfiles/ruby_3.4_graphql_2.2.gemfile.lock
index abbb5921da2..b096b4776ad 100644
--- a/gemfiles/ruby_3.4_graphql_2.2.gemfile.lock
+++ b/gemfiles/ruby_3.4_graphql_2.2.gemfile.lock
@@ -105,7 +105,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
diff --git a/gemfiles/ruby_3.4_graphql_2.3.gemfile.lock b/gemfiles/ruby_3.4_graphql_2.3.gemfile.lock
index 9fd62652b3d..d1cc3fb86f9 100644
--- a/gemfiles/ruby_3.4_graphql_2.3.gemfile.lock
+++ b/gemfiles/ruby_3.4_graphql_2.3.gemfile.lock
@@ -105,7 +105,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
diff --git a/gemfiles/ruby_3.4_http.gemfile.lock b/gemfiles/ruby_3.4_http.gemfile.lock
index e3ccb3ab6a6..a8cfde20109 100644
--- a/gemfiles/ruby_3.4_http.gemfile.lock
+++ b/gemfiles/ruby_3.4_http.gemfile.lock
@@ -50,7 +50,8 @@ GEM
       faraday-net_http (>= 2.0, < 3.2)
     faraday-net_http (3.1.0)
       net-http
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
diff --git a/gemfiles/ruby_3.4_opensearch_2.gemfile.lock b/gemfiles/ruby_3.4_opensearch_2.gemfile.lock
index fbe94e88416..67f3f05b742 100644
--- a/gemfiles/ruby_3.4_opensearch_2.gemfile.lock
+++ b/gemfiles/ruby_3.4_opensearch_2.gemfile.lock
@@ -48,7 +48,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.9.1)
diff --git a/gemfiles/ruby_3.4_opensearch_3.gemfile.lock b/gemfiles/ruby_3.4_opensearch_3.gemfile.lock
index bd49940dd79..9b6d24d2213 100644
--- a/gemfiles/ruby_3.4_opensearch_3.gemfile.lock
+++ b/gemfiles/ruby_3.4_opensearch_3.gemfile.lock
@@ -48,7 +48,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.9.1)
diff --git a/gemfiles/ruby_3.4_opensearch_latest.gemfile.lock b/gemfiles/ruby_3.4_opensearch_latest.gemfile.lock
index b5252634c3f..4fb33d10c44 100644
--- a/gemfiles/ruby_3.4_opensearch_latest.gemfile.lock
+++ b/gemfiles/ruby_3.4_opensearch_latest.gemfile.lock
@@ -48,7 +48,8 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.9.1)
diff --git a/gemfiles/ruby_3.4_opentelemetry.gemfile.lock b/gemfiles/ruby_3.4_opentelemetry.gemfile.lock
index c8aef7ddd35..230650eb0a8 100644
--- a/gemfiles/ruby_3.4_opentelemetry.gemfile.lock
+++ b/gemfiles/ruby_3.4_opentelemetry.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_opentelemetry_otlp.gemfile.lock b/gemfiles/ruby_3.4_opentelemetry_otlp.gemfile.lock
index 78db044daa4..9a4ebc3f567 100644
--- a/gemfiles/ruby_3.4_opentelemetry_otlp.gemfile.lock
+++ b/gemfiles/ruby_3.4_opentelemetry_otlp.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.2)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.5)
     googleapis-common-protos-types (1.16.0)
       google-protobuf (>= 3.18, < 5.a)
diff --git a/gemfiles/ruby_3.4_rack_2.gemfile.lock b/gemfiles/ruby_3.4_rack_2.gemfile.lock
index bcfa63671f1..d7b262f02d1 100644
--- a/gemfiles/ruby_3.4_rack_2.gemfile.lock
+++ b/gemfiles/ruby_3.4_rack_2.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_rack_3.gemfile.lock b/gemfiles/ruby_3.4_rack_3.gemfile.lock
index 9af02fb4158..04298188eeb 100644
--- a/gemfiles/ruby_3.4_rack_3.gemfile.lock
+++ b/gemfiles/ruby_3.4_rack_3.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_rack_latest.gemfile.lock b/gemfiles/ruby_3.4_rack_latest.gemfile.lock
index ddbe1a2a65e..3e946ca83e9 100644
--- a/gemfiles/ruby_3.4_rack_latest.gemfile.lock
+++ b/gemfiles/ruby_3.4_rack_latest.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.2)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.5)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.4_rails61_mysql2.gemfile.lock
index 7f4dcac9b39..63b93e30555 100644
--- a/gemfiles/ruby_3.4_rails61_mysql2.gemfile.lock
+++ b/gemfiles/ruby_3.4_rails61_mysql2.gemfile.lock
@@ -105,7 +105,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
diff --git a/gemfiles/ruby_3.4_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.4_rails61_postgres.gemfile.lock
index d6472b2a812..2cd1b693f13 100644
--- a/gemfiles/ruby_3.4_rails61_postgres.gemfile.lock
+++ b/gemfiles/ruby_3.4_rails61_postgres.gemfile.lock
@@ -105,7 +105,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
diff --git a/gemfiles/ruby_3.4_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.4_rails61_postgres_redis.gemfile.lock
index 853fe2afe0b..84c99af15b3 100644
--- a/gemfiles/ruby_3.4_rails61_postgres_redis.gemfile.lock
+++ b/gemfiles/ruby_3.4_rails61_postgres_redis.gemfile.lock
@@ -105,7 +105,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
diff --git a/gemfiles/ruby_3.4_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.4_rails61_postgres_sidekiq.gemfile.lock
index a3795dddbcb..6073885e0fe 100644
--- a/gemfiles/ruby_3.4_rails61_postgres_sidekiq.gemfile.lock
+++ b/gemfiles/ruby_3.4_rails61_postgres_sidekiq.gemfile.lock
@@ -106,7 +106,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
diff --git a/gemfiles/ruby_3.4_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.4_rails61_semantic_logger.gemfile.lock
index 29776284dd4..de877f71354 100644
--- a/gemfiles/ruby_3.4_rails61_semantic_logger.gemfile.lock
+++ b/gemfiles/ruby_3.4_rails61_semantic_logger.gemfile.lock
@@ -105,7 +105,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
diff --git a/gemfiles/ruby_3.4_rails61_trilogy.gemfile.lock b/gemfiles/ruby_3.4_rails61_trilogy.gemfile.lock
index 3417f522d57..ab08653594e 100644
--- a/gemfiles/ruby_3.4_rails61_trilogy.gemfile.lock
+++ b/gemfiles/ruby_3.4_rails61_trilogy.gemfile.lock
@@ -108,7 +108,8 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.3)
diff --git a/gemfiles/ruby_3.4_rails7.gemfile.lock b/gemfiles/ruby_3.4_rails7.gemfile.lock
index 23e47c46e81..e199d2d3ccd 100644
--- a/gemfiles/ruby_3.4_rails7.gemfile.lock
+++ b/gemfiles/ruby_3.4_rails7.gemfile.lock
@@ -111,7 +111,9 @@ GEM
     dogstatsd-ruby (5.6.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.4)
diff --git a/gemfiles/ruby_3.4_rails71.gemfile.lock b/gemfiles/ruby_3.4_rails71.gemfile.lock
index 3bf31d83ce7..1924514ec68 100644
--- a/gemfiles/ruby_3.4_rails71.gemfile.lock
+++ b/gemfiles/ruby_3.4_rails71.gemfile.lock
@@ -122,7 +122,9 @@ GEM
     drb (2.2.1)
     erubi (1.13.0)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-protobuf (3.25.4)
diff --git a/gemfiles/ruby_3.4_redis_3.gemfile.lock b/gemfiles/ruby_3.4_redis_3.gemfile.lock
index 379c806e722..09552b04eea 100644
--- a/gemfiles/ruby_3.4_redis_3.gemfile.lock
+++ b/gemfiles/ruby_3.4_redis_3.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_redis_4.gemfile.lock b/gemfiles/ruby_3.4_redis_4.gemfile.lock
index 8786579f576..7690df3ffd0 100644
--- a/gemfiles/ruby_3.4_redis_4.gemfile.lock
+++ b/gemfiles/ruby_3.4_redis_4.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_redis_5.gemfile.lock b/gemfiles/ruby_3.4_redis_5.gemfile.lock
index 1d0286608d0..fb97f298ab7 100644
--- a/gemfiles/ruby_3.4_redis_5.gemfile.lock
+++ b/gemfiles/ruby_3.4_redis_5.gemfile.lock
@@ -43,7 +43,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_relational_db.gemfile.lock b/gemfiles/ruby_3.4_relational_db.gemfile.lock
index 0f9c10999b0..3656091e8c5 100644
--- a/gemfiles/ruby_3.4_relational_db.gemfile.lock
+++ b/gemfiles/ruby_3.4_relational_db.gemfile.lock
@@ -57,7 +57,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.3)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.5)
     hashdiff (1.1.2)
     i18n (1.14.6)
diff --git a/gemfiles/ruby_3.4_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.4_resque2_redis3.gemfile.lock
index 2181d0b81d1..2cd023229c8 100644
--- a/gemfiles/ruby_3.4_resque2_redis3.gemfile.lock
+++ b/gemfiles/ruby_3.4_resque2_redis3.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.4_resque2_redis4.gemfile.lock
index 8480cc29f1e..093599c7c0a 100644
--- a/gemfiles/ruby_3.4_resque2_redis4.gemfile.lock
+++ b/gemfiles/ruby_3.4_resque2_redis4.gemfile.lock
@@ -43,7 +43,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_sinatra_2.gemfile.lock b/gemfiles/ruby_3.4_sinatra_2.gemfile.lock
index 7dd32ba1e29..83790a8e472 100644
--- a/gemfiles/ruby_3.4_sinatra_2.gemfile.lock
+++ b/gemfiles/ruby_3.4_sinatra_2.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_sinatra_3.gemfile.lock b/gemfiles/ruby_3.4_sinatra_3.gemfile.lock
index 31412a6cf53..82f1f82ff8b 100644
--- a/gemfiles/ruby_3.4_sinatra_3.gemfile.lock
+++ b/gemfiles/ruby_3.4_sinatra_3.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_sinatra_4.gemfile.lock b/gemfiles/ruby_3.4_sinatra_4.gemfile.lock
index e85be404281..596e98f4f60 100644
--- a/gemfiles/ruby_3.4_sinatra_4.gemfile.lock
+++ b/gemfiles/ruby_3.4_sinatra_4.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.0)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_stripe_10.gemfile.lock b/gemfiles/ruby_3.4_stripe_10.gemfile.lock
index 6bb9b782b1b..18ae9c366b7 100644
--- a/gemfiles/ruby_3.4_stripe_10.gemfile.lock
+++ b/gemfiles/ruby_3.4_stripe_10.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_stripe_11.gemfile.lock b/gemfiles/ruby_3.4_stripe_11.gemfile.lock
index 090dc7b61d3..766ac2b427c 100644
--- a/gemfiles/ruby_3.4_stripe_11.gemfile.lock
+++ b/gemfiles/ruby_3.4_stripe_11.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_stripe_12.gemfile.lock b/gemfiles/ruby_3.4_stripe_12.gemfile.lock
index cad39c3e5f5..962ff5cccd5 100644
--- a/gemfiles/ruby_3.4_stripe_12.gemfile.lock
+++ b/gemfiles/ruby_3.4_stripe_12.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_stripe_7.gemfile.lock b/gemfiles/ruby_3.4_stripe_7.gemfile.lock
index 058c1577101..75b520d21cb 100644
--- a/gemfiles/ruby_3.4_stripe_7.gemfile.lock
+++ b/gemfiles/ruby_3.4_stripe_7.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_stripe_8.gemfile.lock b/gemfiles/ruby_3.4_stripe_8.gemfile.lock
index a81bba9fae0..c5040074f9f 100644
--- a/gemfiles/ruby_3.4_stripe_8.gemfile.lock
+++ b/gemfiles/ruby_3.4_stripe_8.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_stripe_9.gemfile.lock b/gemfiles/ruby_3.4_stripe_9.gemfile.lock
index e62a943ea07..b869b0882e2 100644
--- a/gemfiles/ruby_3.4_stripe_9.gemfile.lock
+++ b/gemfiles/ruby_3.4_stripe_9.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_stripe_latest.gemfile.lock b/gemfiles/ruby_3.4_stripe_latest.gemfile.lock
index 1aca6905be3..f96b793a9c0 100644
--- a/gemfiles/ruby_3.4_stripe_latest.gemfile.lock
+++ b/gemfiles/ruby_3.4_stripe_latest.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.4)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/gemfiles/ruby_3.4_stripe_min.gemfile.lock b/gemfiles/ruby_3.4_stripe_min.gemfile.lock
index a0db08d178c..530600e1941 100644
--- a/gemfiles/ruby_3.4_stripe_min.gemfile.lock
+++ b/gemfiles/ruby_3.4_stripe_min.gemfile.lock
@@ -42,7 +42,8 @@ GEM
     docile (1.4.1)
     dogstatsd-ruby (5.6.1)
     extlz4 (0.3.4)
-    ffi (1.17.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-gnu)
     google-protobuf (3.25.5)
     hashdiff (1.1.1)
     json (2.7.2)
diff --git a/integration/script/build-images b/integration/script/build-images
index 9a98f4f9516..d3a0f633a25 100755
--- a/integration/script/build-images
+++ b/integration/script/build-images
@@ -14,7 +14,7 @@ while getopts ":hv:" opt; do
       echo "Usage: ./script/build-images [-v RUBY_VERSION]"
       echo
       echo "If no Ruby version is specified, images are built for each of the"
-      echo "supported versions (currently 2.1 through 3.3)."
+      echo "supported versions (currently 2.5 through 3.4)."
       exit 0
       ;;
     v)
@@ -39,10 +39,6 @@ docker build -t datadog/dd-apm-demo:agent -f $INTEGRATION_DIR/images/agent/Docke
 if test -n "$APP_RUBY_VERSION"; then
   docker build -t datadog/dd-apm-demo:rb-$APP_RUBY_VERSION -f $INTEGRATION_DIR/images/ruby/$APP_RUBY_VERSION/Dockerfile $INTEGRATION_DIR/images
 else
-  docker build -t datadog/dd-apm-demo:rb-2.1 -f $INTEGRATION_DIR/images/ruby/2.1/Dockerfile $INTEGRATION_DIR/images
-  docker build -t datadog/dd-apm-demo:rb-2.2 -f $INTEGRATION_DIR/images/ruby/2.2/Dockerfile $INTEGRATION_DIR/images
-  docker build -t datadog/dd-apm-demo:rb-2.3 -f $INTEGRATION_DIR/images/ruby/2.3/Dockerfile $INTEGRATION_DIR/images
-  docker build -t datadog/dd-apm-demo:rb-2.4 -f $INTEGRATION_DIR/images/ruby/2.4/Dockerfile $INTEGRATION_DIR/images
   docker build -t datadog/dd-apm-demo:rb-2.5 -f $INTEGRATION_DIR/images/ruby/2.5/Dockerfile $INTEGRATION_DIR/images
   docker build -t datadog/dd-apm-demo:rb-2.6 -f $INTEGRATION_DIR/images/ruby/2.6/Dockerfile $INTEGRATION_DIR/images
   docker build -t datadog/dd-apm-demo:rb-2.7 -f $INTEGRATION_DIR/images/ruby/2.7/Dockerfile $INTEGRATION_DIR/images
diff --git a/lib/datadog/di/instrumenter.rb b/lib/datadog/di/instrumenter.rb
index b1f8f0f599a..96df68465f8 100644
--- a/lib/datadog/di/instrumenter.rb
+++ b/lib/datadog/di/instrumenter.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-# rubocop:disable Lint/AssignmentInCondition
+require_relative '../core/utils/time'
 
-require 'benchmark'
+# rubocop:disable Lint/AssignmentInCondition
 
 module Datadog
   module DI
@@ -115,22 +115,21 @@ def hook_method(probe, &block)
                   depth: probe.max_capture_depth || settings.dynamic_instrumentation.max_capture_depth,
                   attribute_count: probe.max_capture_attribute_count || settings.dynamic_instrumentation.max_capture_attribute_count)
               end
-              rv = nil
+              start_time = Core::Utils::Time.get_time
               # Under Ruby 2.6 we cannot just call super(*args, **kwargs)
               # for methods defined via method_missing.
-              duration = Benchmark.realtime do # steep:ignore
-                rv = if args.any?
-                  if kwargs.any?
-                    super(*args, **kwargs, &target_block)
-                  else
-                    super(*args, &target_block)
-                  end
-                elsif kwargs.any?
-                  super(**kwargs, &target_block)
+              rv = if args.any?
+                if kwargs.any?
+                  super(*args, **kwargs, &target_block)
                 else
-                  super(&target_block)
+                  super(*args, &target_block)
                 end
+              elsif kwargs.any?
+                super(**kwargs, &target_block)
+              else
+                super(&target_block)
               end
+              duration = Core::Utils::Time.get_time - start_time
               # The method itself is not part of the stack trace because
               # we are getting the stack trace from outside of the method.
               # Add the method in manually as the top frame.