Merge branch 'sh-revert-spring-typhoeus-workaround' into 'master'

Ensure libcurl is initialized for macOS before fork

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141315



Merged-by: Doug Stull <dstull@gitlab.com>
Approved-by: Terri Chu <tchu@gitlab.com>
Approved-by: Doug Stull <dstull@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>

config/initializers/macos.rb

@@ -28,4 +28,12 @@ module CFTimeZone
   time_zone_name = CFTimeZone.CFTimeZoneGetName(default_time_zone)
   CFTimeZone.CFRelease(time_zone_name)
   CFTimeZone.CFRelease(default_time_zone)
+
+  # With curl v8.2.0, the thread unsafe macOS API call to
+  # SCDynamicStoreCopyProxies has been moved to the global init function
+  # (https://github.com/curl/curl/issues/11252). The Elasticsearch
+  # gem uses Typhoeus, which uses Ethon to wrap libcurl.
+  # Init curl to ensure Spring works
+  # (https://github.com/elastic/elasticsearch-ruby/issues/2244).
+  Ethon::Curl.init
 end

ee/lib/gitlab/elastic/client.rb

@@ -41,18 +41,9 @@ def self.build(config)
       end
 
       def self.adapter
-        # We can't use Typhoeus with Spring on macOS because Typhoeus uses libcurl.
-        # Before libcurl resolves an IP address, it calls SCDynamicStoreCopyProxies,
-        # which appears to crash in a forked process with threads.
-        return :net_http if spring_on_macos?
-
         ::Feature.enabled?(:use_typhoeus_elasticsearch_adapter) ? :typhoeus : :net_http
       end
 
-      def self.spring_on_macos?
-        Rails.env.test? && defined?(::Spring) && RUBY_PLATFORM.include?('darwin')
-      end
-
       def self.debug?
         Gitlab.dev_or_test_env? && Gitlab::Utils.to_boolean(ENV['ELASTIC_CLIENT_DEBUG'])
       end

ee/spec/lib/gitlab/elastic/client_spec.rb

@@ -34,10 +34,6 @@
       end
 
       context 'with typhoeus adapter for keep-alive connections' do
-        before do
-          allow(described_class).to receive(:spring_on_macos?).and_return(false)
-        end
-
         it 'sets typhoeus as the adapter' do
           options = client.transport.options