From 642398ff057345359087dc7b74442a3df75c6ca0 Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Tue, 26 Jul 2022 19:04:03 -0600 Subject: [PATCH] Disable widget telemetry in most widgets These are all of the widgets that haven't had the new telemetry enabled, and so are reporting "unknown events". --- .../extensions/code_quality/index.js | 1 + .../extensions/terraform/index.js | 1 + .../extensions/browser_performance/index.js | 1 + .../extensions/license_compliance/index.js | 1 + .../extensions/load_performance/index.js | 1 + .../extensions/metrics/index.js | 1 + .../extensions/security_reports/index.js | 1 + .../extensions/status_checks/index.js | 1 + .../extentions/terraform/index_spec.js | 20 +++++++++++-------- 9 files changed, 20 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js b/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js index 2477429af5bef6..da3c6c940bcb87 100644 --- a/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js +++ b/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js @@ -7,6 +7,7 @@ import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; export default { name: 'WidgetCodeQuality', + telemetry: false, props: ['codeQuality', 'blobPath'], i18n: { label: s__('ciReport|Code Quality'), diff --git a/app/assets/javascripts/vue_merge_request_widget/extensions/terraform/index.js b/app/assets/javascripts/vue_merge_request_widget/extensions/terraform/index.js index 6611aedcb07df3..97cc9bb2e16a45 100644 --- a/app/assets/javascripts/vue_merge_request_widget/extensions/terraform/index.js +++ b/app/assets/javascripts/vue_merge_request_widget/extensions/terraform/index.js @@ -5,6 +5,7 @@ import { EXTENSION_ICONS } from '../../constants'; export default { name: 'WidgetTerraform', enablePolling: true, + telemetry: false, i18n: { label: s__('Terraform|Terraform reports'), loading: s__('Terraform|Loading Terraform reports...'), diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/extensions/browser_performance/index.js b/ee/app/assets/javascripts/vue_merge_request_widget/extensions/browser_performance/index.js index ea4039e62bdba0..b336245fbc1cf3 100644 --- a/ee/app/assets/javascripts/vue_merge_request_widget/extensions/browser_performance/index.js +++ b/ee/app/assets/javascripts/vue_merge_request_widget/extensions/browser_performance/index.js @@ -5,6 +5,7 @@ import { EXTENSION_ICONS } from '~/vue_merge_request_widget/constants'; export default { name: 'WidgetBrowserPerformance', + telemetry: false, props: ['browserPerformance'], i18n: { label: s__('ciReport|Browser Performance'), diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/extensions/license_compliance/index.js b/ee/app/assets/javascripts/vue_merge_request_widget/extensions/license_compliance/index.js index b6e3aff0936767..93f0529e8192b5 100644 --- a/ee/app/assets/javascripts/vue_merge_request_widget/extensions/license_compliance/index.js +++ b/ee/app/assets/javascripts/vue_merge_request_widget/extensions/license_compliance/index.js @@ -23,6 +23,7 @@ export default { props: ['licenseCompliance'], enablePolling: true, enableExpandedPolling: true, + telemetry: false, computed: { newLicenses() { return this.collapsedData.new_licenses || 0; diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/extensions/load_performance/index.js b/ee/app/assets/javascripts/vue_merge_request_widget/extensions/load_performance/index.js index d50f4cf4273ce5..48d2ec492113b6 100644 --- a/ee/app/assets/javascripts/vue_merge_request_widget/extensions/load_performance/index.js +++ b/ee/app/assets/javascripts/vue_merge_request_widget/extensions/load_performance/index.js @@ -5,6 +5,7 @@ import { EXTENSION_ICONS } from '~/vue_merge_request_widget/constants'; export default { name: 'WidgetLoadPerformance', + telemetry: false, i18n: { label: s__('ciReport|Load Performance'), loading: s__('ciReport|Load performance test metrics results are being parsed'), diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/extensions/metrics/index.js b/ee/app/assets/javascripts/vue_merge_request_widget/extensions/metrics/index.js index a96c283eb82a50..e0da21dee292ab 100644 --- a/ee/app/assets/javascripts/vue_merge_request_widget/extensions/metrics/index.js +++ b/ee/app/assets/javascripts/vue_merge_request_widget/extensions/metrics/index.js @@ -7,6 +7,7 @@ export default { name: 'WidgetMetrics', props: ['metricsReportsPath'], enablePolling: true, + telemetry: false, i18n: { loading: s__('Reports|Metrics reports are loading'), error: s__('Reports|Metrics reports failed to load results'), diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/extensions/security_reports/index.js b/ee/app/assets/javascripts/vue_merge_request_widget/extensions/security_reports/index.js index 86aa1b5e4a126d..ba37cb80ee3f4d 100644 --- a/ee/app/assets/javascripts/vue_merge_request_widget/extensions/security_reports/index.js +++ b/ee/app/assets/javascripts/vue_merge_request_widget/extensions/security_reports/index.js @@ -17,6 +17,7 @@ export default { }, props: ['securityReportPaths'], enablePolling: true, + telemetry: false, i18n: { new: __('New'), fixed: __('Fixed'), diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/extensions/status_checks/index.js b/ee/app/assets/javascripts/vue_merge_request_widget/extensions/status_checks/index.js index 55f51fc3757eda..3e761d71e3e245 100644 --- a/ee/app/assets/javascripts/vue_merge_request_widget/extensions/status_checks/index.js +++ b/ee/app/assets/javascripts/vue_merge_request_widget/extensions/status_checks/index.js @@ -9,6 +9,7 @@ import { PASSED, PENDING } from 'ee/reports/status_checks_report/constants'; export default { name: 'WidgetStatusChecks', + telemetry: false, i18n: { label: s__('StatusCheck|status checks'), loading: s__('StatusCheck|Status checks are being fetched'), diff --git a/spec/frontend/vue_mr_widget/extentions/terraform/index_spec.js b/spec/frontend/vue_mr_widget/extentions/terraform/index_spec.js index d9faa7b2d2599f..29cf743500509d 100644 --- a/spec/frontend/vue_mr_widget/extentions/terraform/index_spec.js +++ b/spec/frontend/vue_mr_widget/extentions/terraform/index_spec.js @@ -140,14 +140,18 @@ describe('Terraform extension', () => { findListItem(0).find('[data-testid="extension-actions-button"]').trigger('click'); - expect(api.trackRedisHllUserEvent).toHaveBeenCalledTimes(1); - expect(api.trackRedisHllUserEvent).toHaveBeenCalledWith( - 'i_code_review_merge_request_widget_terraform_click_full_report', - ); - expect(api.trackRedisCounterEvent).toHaveBeenCalledTimes(1); - expect(api.trackRedisCounterEvent).toHaveBeenCalledWith( - 'i_code_review_merge_request_widget_terraform_count_click_full_report', - ); + // Temporarily switch off telemetry until every event is instrumented + // https://gitlab.com/gitlab-org/gitlab/-/issues/368651#note_1039768185 + expect(api.trackRedisHllUserEvent).not.toHaveBeenCalled(); + expect(api.trackRedisCounterEvent).not.toHaveBeenCalled(); + // expect(api.trackRedisHllUserEvent).toHaveBeenCalledTimes(1); + // expect(api.trackRedisHllUserEvent).toHaveBeenCalledWith( + // 'i_code_review_merge_request_widget_terraform_click_full_report', + // ); + // expect(api.trackRedisCounterEvent).toHaveBeenCalledTimes(1); + // expect(api.trackRedisCounterEvent).toHaveBeenCalledWith( + // 'i_code_review_merge_request_widget_terraform_count_click_full_report', + // ); }); }); -- GitLab