1 files changed, 26 insertions, 8 deletions
diff --git a/config/initializers/macos.rb b/config/initializers/macos.rb
index 3b669a73f49..860167e12cd 100644
--- a/config/initializers/macos.rb
+++ b/config/initializers/macos.rb
@@ -1,13 +1,31 @@
 # frozen_string_literal: true
 
 if RUBY_PLATFORM.include?('darwin')
-  Gitlab::Cluster::LifecycleEvents.on_before_fork do
-    require 'fiddle'
-
-    # Dynamically load Foundation.framework, ~implicitly~ initialising
-    # the Objective-C runtime before any forking happens in webserver
-    #
-    # From https://bugs.ruby-lang.org/issues/14009
-    Fiddle.dlopen '/System/Library/Frameworks/Foundation.framework/Foundation'
+  require 'fiddle'
+  require 'ffi'
+
+  module CFTimeZone
+    extend FFI::Library
+
+    ffi_lib '/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation'
+    attach_function :CFTimeZoneCopyDefault, [], :pointer
+    attach_function :CFTimeZoneGetName, [:pointer], :pointer
+    attach_function :CFRelease, [:pointer], :void
   end
+
+  # Dynamically load Foundation.framework, ~implicitly~ initialising
+  # the Objective-C runtime before any forking happens in webserver
+  #
+  # From https://bugs.ruby-lang.org/issues/14009
+  Fiddle.dlopen '/System/Library/Frameworks/Foundation.framework/Foundation'
+
+  # grpc uses abseil-cpp to retrieve the local time zone via macOS APIs:
+  # https://github.com/abseil/abseil-cpp/blob/20230125.rc3/absl/time/internal/cctz/src/time_zone_lookup.cc#L139
+  #
+  # To ensure these APIs are not called in a forked process (https://github.com/grpc/grpc/issues/26257),
+  # load the required framework, retrieve the default time zone, and then release the resource.
+  default_time_zone = CFTimeZone.CFTimeZoneCopyDefault
+  time_zone_name = CFTimeZone.CFTimeZoneGetName(default_time_zone)
+  CFTimeZone.CFRelease(time_zone_name)
+  CFTimeZone.CFRelease(default_time_zone)
 end