Commit adf91a36 authored by Matthias Käppler's avatar Matthias Käppler

Merge branch 'dz-remove-integrated-error-tracking-feature-flag' into 'master'

Remove integrated_error_tracking feature flag

See merge request gitlab-org/gitlab!69303
parents 567cb9b4 f9f246c6
...@@ -51,7 +51,7 @@ module ErrorTracking ...@@ -51,7 +51,7 @@ module ErrorTracking
end end
def integrated_client? def integrated_client?
integrated && ::Feature.enabled?(:integrated_error_tracking, project) integrated
end end
def api_url=(value) def api_url=(value)
......
---
name: integrated_error_tracking
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65767
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335846
milestone: '14.1'
type: development
group: group::monitor
default_enabled: false
...@@ -33,11 +33,6 @@ Gitlab::Seeder.quiet do ...@@ -33,11 +33,6 @@ Gitlab::Seeder.quiet do
Project.not_mass_generated.visible_to_user(admin_user).sample(1).each do |project| Project.not_mass_generated.visible_to_user(admin_user).sample(1).each do |project|
puts "\nActivating integrated error tracking for the '#{project.full_path}' project" puts "\nActivating integrated error tracking for the '#{project.full_path}' project"
unless Feature.enabled?(:integrated_error_tracking, project)
puts '- enabling feature flag'
Feature.enable(:integrated_error_tracking, project)
end
puts '- enabling in settings' puts '- enabling in settings'
project.error_tracking_setting || project.create_error_tracking_setting project.error_tracking_setting || project.create_error_tracking_setting
project.error_tracking_setting.update!(enabled: true, integrated: true) project.error_tracking_setting.update!(enabled: true, integrated: true)
......
...@@ -123,22 +123,6 @@ settings. By using a GitLab-provided DSN, your application connects to GitLab to ...@@ -123,22 +123,6 @@ settings. By using a GitLab-provided DSN, your application connects to GitLab to
Those errors are stored in the GitLab database and rendered by the GitLab UI, in the same way as Those errors are stored in the GitLab database and rendered by the GitLab UI, in the same way as
Sentry integration. Sentry integration.
### Feature flag
The integrated error tracking feature is behind a feature flag that is disabled by default.
To enable it:
```ruby
Feature.enable(:integrated_error_tracking)
```
To disable it:
```ruby
Feature.disable(:integrated_error_tracking)
```
### Project settings ### Project settings
The feature should be enabled on the project level. However, there is no UI to enable this feature yet. The feature should be enabled on the project level. However, there is no UI to enable this feature yet.
......
...@@ -478,18 +478,17 @@ RSpec.describe ErrorTracking::ProjectErrorTrackingSetting do ...@@ -478,18 +478,17 @@ RSpec.describe ErrorTracking::ProjectErrorTrackingSetting do
describe '#sentry_enabled' do describe '#sentry_enabled' do
using RSpec::Parameterized::TableSyntax using RSpec::Parameterized::TableSyntax
where(:enabled, :integrated, :feature_flag, :sentry_enabled) do where(:enabled, :integrated, :sentry_enabled) do
true | false | false | true true | false | true
true | true | false | true true | true | false
true | true | true | false true | true | false
false | false | false | false false | false | false
end end
with_them do with_them do
before do before do
subject.enabled = enabled subject.enabled = enabled
subject.integrated = integrated subject.integrated = integrated
stub_feature_flags(integrated_error_tracking: feature_flag)
end end
it { expect(subject.sentry_enabled).to eq(sentry_enabled) } it { expect(subject.sentry_enabled).to eq(sentry_enabled) }
......
...@@ -48,14 +48,6 @@ RSpec.describe API::ErrorTrackingCollector do ...@@ -48,14 +48,6 @@ RSpec.describe API::ErrorTrackingCollector do
it_behaves_like 'not found' it_behaves_like 'not found'
end end
context 'feature flag is disabled' do
before do
stub_feature_flags(integrated_error_tracking: false)
end
it_behaves_like 'not found'
end
context 'auth headers are missing' do context 'auth headers are missing' do
let(:headers) { {} } let(:headers) { {} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment