Merge branch 'feature/add-uuid-usage-ping' into 'master'

Add uuid to usage ping

Closes #1894

See merge request !1521

changelogs/unreleased-ee/feature-add-uuid-usage-ping.yml

+---
+title: Add uuid to usage ping
+merge_request:
+author:

db/migrate/20170328010804_add_uuid_to_application_settings.rb

+class AddUuidToApplicationSettings < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_column :application_settings, :uuid, :string
+    execute("UPDATE application_settings SET uuid = #{quote(SecureRandom.uuid)}")
+  end
+
+  def down
+    remove_column :application_settings, :uuid
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170317203554) do
+ActiveRecord::Schema.define(version: 20170328010804) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -129,6 +129,7 @@ ActiveRecord::Schema.define(version: 20170317203554) do
     t.string "elasticsearch_aws_access_key"
     t.string "elasticsearch_aws_secret_access_key"
     t.integer "geo_status_timeout", default: 10
+    t.string "uuid"
   end
 
   create_table "approvals", force: :cascade do |t|

lib/gitlab/usage_data.rb

 module Gitlab
   class UsageData
+    include Gitlab::CurrentSettings
+
     class << self
       def data(force_refresh: false)
         Rails.cache.fetch('usage_data', force: force_refresh, expires_in: 2.weeks) { uncached_data }
@@ -51,7 +53,8 @@ module Gitlab
       end
 
       def license_usage_data
-        usage_data = { version: Gitlab::VERSION,
+        usage_data = { uuid: current_application_settings.uuid,
+                       version: Gitlab::VERSION,
                        active_user_count: User.active.count,
                        mattermost_enabled: Gitlab.config.mattermost.enabled }
 

spec/lib/gitlab/usage_data_spec.rb

@@ -22,6 +22,7 @@ describe Gitlab::UsageData do
         recorded_at
         version
         mattermost_enabled
+        uuid
       ))
     end
 
@@ -72,6 +73,7 @@ describe Gitlab::UsageData do
     it "gathers license data" do
       license = ::License.current
 
+      expect(subject[:uuid]).to eq(current_application_settings.uuid)
       expect(subject[:license_md5]).to eq(Digest::MD5.hexdigest(license.data))
       expect(subject[:version]).to eq(Gitlab::VERSION)
       expect(subject[:licensee]).to eq(license.licensee)