use uds

DataDog · Oct 24, 2024 · f2b4b4b · f2b4b4b
1 parent dcda9d0
commit f2b4b4b
Showing 1 changed file with 20 additions and 25 deletions.
diff --git a/lib/datadog/core/configuration/agent_settings_resolver.rb b/lib/datadog/core/configuration/agent_settings_resolver.rb
@@ -232,7 +232,26 @@ def uds_fallback
         end
 
         def should_use_uds?
-          can_use_uds? && !mixed_http_and_uds?
+          # When we have mixed settings for http/https and uds, we print a warning
+          # and use the uds settings.
+          unless defined?(@mixed_http_and_uds)
+            @mixed_http_and_uds = (configured_hostname || configured_port) && can_use_uds?
+            if @mixed_http_and_uds
+              warn_if_configuration_mismatch(
+                [
+                  DetectedConfiguration.new(
+                    friendly_name: 'configuration of hostname/port for http/https use',
+                    value: "hostname: '#{hostname}', port: '#{port}'",
+                  ),
+                  DetectedConfiguration.new(
+                    friendly_name: 'configuration for unix domain socket',
+                    value: parsed_url.to_s,
+                  ),
+                ]
+              )
+            end
+          end
+          can_use_uds?
         end
 
         def can_use_uds?
@@ -307,30 +326,6 @@ def unix_scheme?(uri)
           uri.scheme == 'unix'
         end
 
-        # When we have mixed settings for http/https and uds, we print a warning and ignore the uds settings
-        def mixed_http_and_uds?
-          return @mixed_http_and_uds if defined?(@mixed_http_and_uds)
-
-          @mixed_http_and_uds = (configured_hostname || configured_port) && can_use_uds?
-
-          if @mixed_http_and_uds
-            warn_if_configuration_mismatch(
-              [
-                DetectedConfiguration.new(
-                  friendly_name: 'configuration of hostname/port for http/https use',
-                  value: "hostname: '#{hostname}', port: '#{port}'",
-                ),
-                DetectedConfiguration.new(
-                  friendly_name: 'configuration for unix domain socket',
-                  value: parsed_url.to_s,
-                ),
-              ]
-            )
-          end
-
-          @mixed_http_and_uds
-        end
-
         # Represents a given configuration value and where we got it from
         class DetectedConfiguration
           attr_reader :friendly_name, :value