Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ca876916
Commit
ca876916
authored
Feb 05, 2022
by
Catalin Irimie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove Geo proxying metrics feature flag
Changelog: other EE: true
parent
7ac35d76
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
39 deletions
+16
-39
config/feature_flags/development/track_geo_proxy_events.yml
config/feature_flags/development/track_geo_proxy_events.yml
+0
-8
ee/app/controllers/concerns/geo_instrumentation.rb
ee/app/controllers/concerns/geo_instrumentation.rb
+1
-2
ee/spec/controllers/concerns/geo_instrumentation_spec.rb
ee/spec/controllers/concerns/geo_instrumentation_spec.rb
+15
-28
lib/gitlab/usage_data_counters/known_events/common.yml
lib/gitlab/usage_data_counters/known_events/common.yml
+0
-1
No files found.
config/feature_flags/development/track_geo_proxy_events.yml
deleted
100644 → 0
View file @
7ac35d76
---
name
:
track_geo_proxy_events
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76587
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/348414
milestone
:
'
14.7'
type
:
development
group
:
group::geo
default_enabled
:
true
ee/app/controllers/concerns/geo_instrumentation.rb
View file @
ca876916
...
@@ -8,8 +8,7 @@ module GeoInstrumentation
...
@@ -8,8 +8,7 @@ module GeoInstrumentation
end
end
def
track_geo_proxy_event
def
track_geo_proxy_event
return
unless
Feature
.
enabled?
(
:track_geo_proxy_events
,
default_enabled: :yaml
)
&&
::
Gitlab
::
Geo
.
proxied_request?
(
request
.
env
)
return
unless
::
Gitlab
::
Geo
.
proxied_request?
(
request
.
env
)
&&
current_user
return
unless
current_user
Gitlab
::
UsageDataCounters
::
HLLRedisCounter
.
track_event
(
'g_geo_proxied_requests'
,
values:
current_user
.
id
)
Gitlab
::
UsageDataCounters
::
HLLRedisCounter
.
track_event
(
'g_geo_proxied_requests'
,
values:
current_user
.
id
)
end
end
...
...
ee/spec/controllers/concerns/geo_instrumentation_spec.rb
View file @
ca876916
...
@@ -19,9 +19,9 @@ RSpec.describe GeoInstrumentation do
...
@@ -19,9 +19,9 @@ RSpec.describe GeoInstrumentation do
end
end
describe
'.track_geo_proxy_event'
do
describe
'.track_geo_proxy_event'
do
context
'when the
track_geo_proxy feature flag is disabl
ed'
do
context
'when the
request is not proxi
ed'
do
before
do
before
do
stub_feature_flags
(
track_geo_proxy_events:
false
)
allow
(
::
Gitlab
::
Geo
).
to
receive
(
:proxied_request?
).
and_return
(
false
)
end
end
it
'does not track an event'
do
it
'does not track an event'
do
...
@@ -30,38 +30,25 @@ RSpec.describe GeoInstrumentation do
...
@@ -30,38 +30,25 @@ RSpec.describe GeoInstrumentation do
end
end
end
end
context
'when the track_geo_proxy feature flag is enabled'
do
context
'when the request is proxied'
do
context
'when the request is not proxied'
do
before
do
before
do
allow
(
::
Gitlab
::
Geo
).
to
receive
(
:proxied_request?
).
and_return
(
true
)
allow
(
::
Gitlab
::
Geo
).
to
receive
(
:proxied_request?
).
and_return
(
false
)
end
end
it
'does not track an event'
do
context
'when logged in'
do
expect
(
Gitlab
::
UsageDataCounters
::
HLLRedisCounter
).
not_to
receive
(
:track_event
)
it
'tracks a HLL event for unique geo proxied requests'
do
expect
(
Gitlab
::
UsageDataCounters
::
HLLRedisCounter
)
.
to
receive
(
:track_event
).
with
(
'g_geo_proxied_requests'
,
values:
user
.
id
)
get
:show
get
:show
end
end
end
end
context
'when the request is proxied'
do
context
'when not logged in'
do
before
do
let
(
:user
)
{
nil
}
allow
(
::
Gitlab
::
Geo
).
to
receive
(
:proxied_request?
).
and_return
(
true
)
end
context
'when logged in'
do
it
'tracks a HLL event for unique geo proxied requests'
do
expect
(
Gitlab
::
UsageDataCounters
::
HLLRedisCounter
)
.
to
receive
(
:track_event
).
with
(
'g_geo_proxied_requests'
,
values:
user
.
id
)
get
:show
end
end
context
'when not logged in'
do
let
(
:user
)
{
nil
}
it
'does not track an event'
do
it
'does not track an event'
do
expect
(
Gitlab
::
UsageDataCounters
::
HLLRedisCounter
).
not_to
receive
(
:track_event
)
expect
(
Gitlab
::
UsageDataCounters
::
HLLRedisCounter
).
not_to
receive
(
:track_event
)
get
:show
get
:show
end
end
end
end
end
end
end
...
...
lib/gitlab/usage_data_counters/known_events/common.yml
View file @
ca876916
...
@@ -382,7 +382,6 @@
...
@@ -382,7 +382,6 @@
category
:
geo
category
:
geo
redis_slot
:
geo
redis_slot
:
geo
aggregation
:
daily
aggregation
:
daily
feature_flag
:
track_geo_proxy_events
# Growth
# Growth
-
name
:
users_clicking_registration_features_offer
-
name
:
users_clicking_registration_features_offer
category
:
growth
category
:
growth
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment