diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /lib/gitlab/tracking | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'lib/gitlab/tracking')
-rw-r--r-- | lib/gitlab/tracking/standard_context.rb | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/lib/gitlab/tracking/standard_context.rb b/lib/gitlab/tracking/standard_context.rb index 7902f96dfa6..fe5669be014 100644 --- a/lib/gitlab/tracking/standard_context.rb +++ b/lib/gitlab/tracking/standard_context.rb @@ -8,7 +8,8 @@ module Gitlab def initialize(namespace: nil, project: nil, user: nil, **extra) @namespace = namespace - @plan = @namespace&.actual_plan_name + @plan = namespace&.actual_plan_name + @project = project @extra = extra end @@ -34,14 +35,29 @@ module Gitlab private + attr_accessor :namespace, :project, :extra, :plan + def to_h { environment: environment, source: source, - plan: @plan, - extra: @extra + plan: plan, + extra: extra + }.merge(project_and_namespace) + end + + def project_and_namespace + return {} unless ::Feature.enabled?(:add_namespace_and_project_to_snowplow_tracking, default_enabled: :yaml) + + { + namespace_id: namespace&.id, + project_id: project_id } end + + def project_id + project.is_a?(Integer) ? project : project&.id + end end end end |