(maint) Clean up requires in pdk/analytics

Hexoplon · Sep 30, 2019 · 2d038fa · 2d038fa
1 parent 9f813e8
commit 2d038fa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/lib/pdk/analytics.rb b/lib/pdk/analytics.rb
@@ -1,10 +1,13 @@
-require 'securerandom'
-require 'pdk/analytics/util'
 require 'pdk/analytics/client/google_analytics'
 require 'pdk/analytics/client/noop'
 
 module PDK
   def self.analytics
+    require 'pdk/config'
+    require 'pdk/logger'
+    require 'pdk/util'
+    require 'pdk/version'
+
     @analytics ||= PDK::Analytics.build_client(
       logger:        PDK.logger,
       disabled:      ENV['PDK_DISABLE_ANALYTICS'] || PDK.config.user['analytics']['disabled'],

diff --git a/lib/pdk/analytics/client/google_analytics.rb b/lib/pdk/analytics/client/google_analytics.rb
@@ -25,6 +25,7 @@ def initialize(opts)
           require 'concurrent/future'
           require 'httpclient'
           require 'locale'
+          require 'pdk/analytics/util'
 
           @http = HTTPClient.new
           @user_id = opts[:user_id]
@@ -78,6 +79,8 @@ def submit(params)
           # Handle analytics submission in the background to avoid blocking the
           # app or polluting the log with errors
           Concurrent::Future.execute(executor: @executor) do
+            require 'json'
+
             logger.debug "Submitting analytics: #{JSON.pretty_generate(params)}"
             @http.post(TRACKING_URL, params)
             logger.debug 'Completed analytics submission'

diff --git a/spec/unit/pdk/analytics/util_spec.rb b/spec/unit/pdk/analytics/util_spec.rb
@@ -2,6 +2,7 @@
 require 'concurrent/configuration'
 require 'concurrent/future'
 require 'facter'
+require 'pdk/analytics/util'
 
 describe PDK::Analytics::Util do
   describe '.fetch_os_async' do