Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 2 deletions

diff --git a/lib/gitlab/tracking/destinations/snowplow_micro.rb b/lib/gitlab/tracking/destinations/snowplow_micro.rb
index 3553efba1e1..c7a95e88d0b 100644
--- a/lib/gitlab/tracking/destinations/snowplow_micro.rb
+++ b/lib/gitlab/tracking/destinations/snowplow_micro.rb
@@ -30,8 +30,9 @@ module Gitlab
 
         def uri
           strong_memoize(:snowplow_uri) do
-            uri = URI(ENV['SNOWPLOW_MICRO_URI'] || DEFAULT_URI)
-            uri = URI("http://#{ENV['SNOWPLOW_MICRO_URI']}") unless %w[http https].include?(uri.scheme)
+            base = base_uri
+            uri = URI(base)
+            uri = URI("http://#{base}") unless %w[http https].include?(uri.scheme)
             uri
           end
         end
@@ -47,6 +48,14 @@ module Gitlab
         def protocol
           uri.scheme
         end
+
+        def base_uri
+          url = Gitlab.config.snowplow_micro.address
+          scheme = Gitlab.config.gitlab.https ? 'https' : 'http'
+          "#{scheme}://#{url}"
+        rescue Settingslogic::MissingSetting
+          ENV['SNOWPLOW_MICRO_URI'] || DEFAULT_URI
+        end
       end
     end
   end