From 278ee95ff0654156e45a975b7d544231f7ee3e13 Mon Sep 17 00:00:00 2001
From: Anshul Riyal <anshulriyal00@gmail.com>
Date: Fri, 17 Jun 2022 23:48:56 +0530
Subject: [PATCH] Tracing: Remove UI at Settings > Monitor > Tracing
See merge request
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87176
---
.../settings/operations/_tracing.html.haml | 24 -------------------
.../settings/operations/show.html.haml | 1 -
locale/gitlab.pot | 9 -------
.../operations/show.html.haml_spec.rb | 10 --------
4 files changed, 44 deletions(-)
delete mode 100644 app/views/projects/settings/operations/_tracing.html.haml
diff --git a/app/views/projects/settings/operations/_tracing.html.haml b/app/views/projects/settings/operations/_tracing.html.haml
deleted file mode 100644
index 3c8ebe3fb2059a..00000000000000
--- a/app/views/projects/settings/operations/_tracing.html.haml
+++ /dev/null
@@ -1,24 +0,0 @@
-- setting = tracing_setting
-
-%section.settings.border-0.no-animate
- .settings-header{ :class => 'border-top' }
- %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
- = _('Tracing')
- = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do
- = _('Expand')
- %p
- = _('Embed an image of your existing Jaeger server in GitLab.')
- = link_to _('Learn more.'), help_page_path('operations/tracing'), target: '_blank', rel: 'noopener noreferrer'
- .settings-content
- = form_for @project, url: project_settings_operations_path(@project), method: :patch do |f|
- = form_errors(@project)
- .form-group
- = f.fields_for :tracing_setting_attributes, setting do |form|
- = form.label :external_url, _('Jaeger URL'), class: 'label-bold'
- = form.url_field :external_url, class: 'form-control gl-form-input', placeholder: 'https://jaeger.example.com'
- %p.form-text.text-muted
- - jaeger_help_url = 'https://www.jaegertracing.io/docs/getting-started/'
- - link_start_tag = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: jaeger_help_url }
- - link_end_tag = "#{sprite_icon('external-link', css_class: 'gl-ml-2 gl-vertical-align-middle')}</a>".html_safe
- = _('Learn more about %{link_start_tag}Jaeger configuration%{link_end_tag}.').html_safe % { link_start_tag: link_start_tag, link_end_tag: link_end_tag }
- = f.submit _('Save changes'), class: 'gl-button btn btn-confirm'
diff --git a/app/views/projects/settings/operations/show.html.haml b/app/views/projects/settings/operations/show.html.haml
index 80c22604e49ff2..d6dd7fcc316089 100644
--- a/app/views/projects/settings/operations/show.html.haml
+++ b/app/views/projects/settings/operations/show.html.haml
@@ -20,7 +20,6 @@
= html_escape(s_('Deprecations|For information on a possible replacement, %{opstrace_link_start} learn more about Opstrace %{link_end}.')) % {opstrace_link_start: opstrace_link_start, link_end: link_end }
= render 'projects/settings/operations/metrics_dashboard'
-= render 'projects/settings/operations/tracing' if Feature.enabled?(:monitor_tracing, @project)
= render 'projects/settings/operations/error_tracking'
= render 'projects/settings/operations/alert_management'
= render 'projects/settings/operations/incidents'
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 59a53eadc09db2..3cc82d0891c2b3 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -13988,9 +13988,6 @@ msgstr ""
msgid "Embed"
msgstr ""
-msgid "Embed an image of your existing Jaeger server in GitLab."
-msgstr ""
-
msgid "Empty file"
msgstr ""
@@ -21715,9 +21712,6 @@ msgstr ""
msgid "Iteration|cannot be more than 500 years in the future"
msgstr ""
-msgid "Jaeger URL"
-msgstr ""
-
msgid "Jan"
msgstr ""
@@ -22629,9 +22623,6 @@ msgstr ""
msgid "Learn more"
msgstr ""
-msgid "Learn more about %{link_start_tag}Jaeger configuration%{link_end_tag}."
-msgstr ""
-
msgid "Learn more about %{username}"
msgstr ""
diff --git a/spec/views/projects/settings/operations/show.html.haml_spec.rb b/spec/views/projects/settings/operations/show.html.haml_spec.rb
index 8853b34074ab84..d7e91012ea38b4 100644
--- a/spec/views/projects/settings/operations/show.html.haml_spec.rb
+++ b/spec/views/projects/settings/operations/show.html.haml_spec.rb
@@ -51,14 +51,4 @@
end
end
end
-
- describe 'Operations > Tracing' do
- context 'Settings page ' do
- it 'renders the Tracing Settings page' do
- render
-
- expect(rendered).to have_content _('Embed an image of your existing Jaeger server in GitLab.')
- end
- end
- end
end
--
GitLab