Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

1 files changed, 17 insertions, 19 deletions

diff --git a/lib/gitlab/tracking/standard_context.rb b/lib/gitlab/tracking/standard_context.rb
index 71dfe27dd5a..92fdd008249 100644
--- a/lib/gitlab/tracking/standard_context.rb
+++ b/lib/gitlab/tracking/standard_context.rb
@@ -3,38 +3,36 @@
 module Gitlab
   module Tracking
     class StandardContext
-      GITLAB_STANDARD_SCHEMA_URL = 'iglu:com.gitlab/gitlab_standard/jsonschema/1-0-1'.freeze
+      GITLAB_STANDARD_SCHEMA_URL = 'iglu:com.gitlab/gitlab_standard/jsonschema/1-0-3'.freeze
+      GITLAB_RAILS_SOURCE = 'gitlab-rails'.freeze
 
-      def initialize(namespace: nil, project: nil, **data)
-        @namespace = namespace
-        @project = project
+      def initialize(namespace: nil, project: nil, user: nil, **data)
         @data = data
       end
 
-      def namespace_id
-        namespace&.id
+      def to_context
+        SnowplowTracker::SelfDescribingJson.new(GITLAB_STANDARD_SCHEMA_URL, to_h)
       end
 
-      def project_id
-        @project&.id
+      def environment
+        return 'production' if Gitlab.com_and_canary?
+
+        return 'staging' if Gitlab.staging?
+
+        'development'
       end
 
-      def to_context
-        SnowplowTracker::SelfDescribingJson.new(GITLAB_STANDARD_SCHEMA_URL, to_h)
+      def source
+        GITLAB_RAILS_SOURCE
       end
 
       private
 
-      def namespace
-        @namespace || @project&.namespace
-      end
-
       def to_h
-        public_methods(false).each_with_object({}) do |method, hash|
-          next if method == :to_context
-
-          hash[method] = public_send(method) # rubocop:disable GitlabSecurity/PublicSend
-        end.merge(@data)
+        {
+          environment: environment,
+          source: source
+        }.merge(@data)
       end
     end
   end