From f2297eeb1f6ceb7242f26d2e365031c317e42040 Mon Sep 17 00:00:00 2001 From: Bertrand SIMONNET Date: Wed, 2 Dec 2015 15:52:26 -0800 Subject: [PATCH] metrics: Remove user action logic. User actions are no longer reported anywhere, we can remove the logic. Bug: 25818567 Change-Id: Ie8fee841bda6503a3f5781d73b0f879babe99b03 --- metricsd/c_metrics_library.cc | 8 -------- metricsd/include/metrics/c_metrics_library.h | 4 ---- metricsd/include/metrics/metrics_library.h | 13 ------------ .../include/metrics/metrics_library_mock.h | 1 - metricsd/metrics_client.cc | 20 +------------------ metricsd/metrics_library.cc | 7 ------- 6 files changed, 1 insertion(+), 52 deletions(-) diff --git a/metricsd/c_metrics_library.cc b/metricsd/c_metrics_library.cc index 05038766c..47a543e45 100644 --- a/metricsd/c_metrics_library.cc +++ b/metricsd/c_metrics_library.cc @@ -66,14 +66,6 @@ extern "C" int CMetricsLibrarySendSparseToUMA(CMetricsLibrary handle, return lib->SendSparseToUMA(std::string(name), sample); } -extern "C" int CMetricsLibrarySendUserActionToUMA(CMetricsLibrary handle, - const char* action) { - MetricsLibrary* lib = reinterpret_cast(handle); - if (lib == NULL) - return 0; - return lib->SendUserActionToUMA(std::string(action)); -} - extern "C" int CMetricsLibrarySendCrashToUMA(CMetricsLibrary handle, const char* crash_kind) { MetricsLibrary* lib = reinterpret_cast(handle); diff --git a/metricsd/include/metrics/c_metrics_library.h b/metricsd/include/metrics/c_metrics_library.h index 4e7e66683..1e597c2b7 100644 --- a/metricsd/include/metrics/c_metrics_library.h +++ b/metricsd/include/metrics/c_metrics_library.h @@ -44,10 +44,6 @@ int CMetricsLibrarySendEnumToUMA(CMetricsLibrary handle, int CMetricsLibrarySendSparseToUMA(CMetricsLibrary handle, const char* name, int sample); -// C wrapper for MetricsLibrary::SendUserActionToUMA. -int CMetricsLibrarySendUserActionToUMA(CMetricsLibrary handle, - const char* action); - // C wrapper for MetricsLibrary::SendCrashToUMA. int CMetricsLibrarySendCrashToUMA(CMetricsLibrary handle, const char* crash_kind); diff --git a/metricsd/include/metrics/metrics_library.h b/metricsd/include/metrics/metrics_library.h index 37dda509e..e160657a8 100644 --- a/metricsd/include/metrics/metrics_library.h +++ b/metricsd/include/metrics/metrics_library.h @@ -44,7 +44,6 @@ class MetricsLibraryInterface { virtual bool SendEnumToUMA(const std::string& name, int sample, int max) = 0; virtual bool SendBoolToUMA(const std::string& name, bool sample) = 0; virtual bool SendSparseToUMA(const std::string& name, int sample) = 0; - virtual bool SendUserActionToUMA(const std::string& action) = 0; virtual ~MetricsLibraryInterface() {} }; @@ -114,18 +113,6 @@ class MetricsLibrary : public MetricsLibraryInterface { // |sample| is the 32-bit integer value to be recorded. bool SendSparseToUMA(const std::string& name, int sample) override; - // Sends a user action to Chrome for transport to UMA and returns true on - // success. This method results in the equivalent of an asynchronous - // non-blocking RPC to UserMetrics::RecordAction. The new metric must be - // added to chrome/tools/extract_actions.py in the Chromium repository, which - // should then be run to generate a hash for the new action. - // - // Until http://crosbug.com/11125 is fixed, the metric must also be added to - // chrome/browser/chromeos/external_metrics.cc. - // - // |action| is the user-generated event (e.g., "MuteKeyPressed"). - bool SendUserActionToUMA(const std::string& action) override; - // Sends a signal to UMA that a crash of the given |crash_kind| // has occurred. Used by UMA to generate stability statistics. bool SendCrashToUMA(const char *crash_kind); diff --git a/metricsd/include/metrics/metrics_library_mock.h b/metricsd/include/metrics/metrics_library_mock.h index db56f9e50..3b0b24d03 100644 --- a/metricsd/include/metrics/metrics_library_mock.h +++ b/metricsd/include/metrics/metrics_library_mock.h @@ -34,7 +34,6 @@ class MetricsLibraryMock : public MetricsLibraryInterface { int max)); MOCK_METHOD2(SendBoolToUMA, bool(const std::string& name, bool sample)); MOCK_METHOD2(SendSparseToUMA, bool(const std::string& name, int sample)); - MOCK_METHOD1(SendUserActionToUMA, bool(const std::string& action)); bool AreMetricsEnabled() override {return metrics_enabled_;}; }; diff --git a/metricsd/metrics_client.cc b/metricsd/metrics_client.cc index 5d7355582..a2cc38f68 100644 --- a/metricsd/metrics_client.cc +++ b/metricsd/metrics_client.cc @@ -26,7 +26,6 @@ enum Mode { kModeSendSample, kModeSendEnumSample, kModeSendSparseSample, - kModeSendUserAction, kModeSendCrosEvent, kModeHasConsent, kModeIsGuestMode, @@ -38,7 +37,6 @@ void ShowUsage() { " metrics_client -e name sample max\n" " metrics_client -s name sample\n" " metrics_client -v event\n" - " metrics_client -u action\n" " metrics_client [-cdg]\n" "\n" " default: send metric with integer values \n" @@ -49,7 +47,6 @@ void ShowUsage() { " -g: return exit status 0 if machine in guest mode, 1 otherwise\n" " -s: send a sparse histogram sample\n" " -t: convert sample from double seconds to int milliseconds\n" - " -u: send a user action to Chrome\n" " -v: send a Platform.CrOSEvent enum histogram sample\n"); exit(1); } @@ -102,14 +99,6 @@ static int SendStats(char* argv[], return 0; } -static int SendUserAction(char* argv[], int action_index) { - const char* action = argv[action_index]; - MetricsLibrary metrics_lib; - metrics_lib.Init(); - metrics_lib.SendUserActionToUMA(action); - return 0; -} - static int SendCrosEvent(char* argv[], int action_index) { const char* event = argv[action_index]; bool result; @@ -141,7 +130,7 @@ int main(int argc, char** argv) { // Parse arguments int flag; - while ((flag = getopt(argc, argv, "abcegstuv")) != -1) { + while ((flag = getopt(argc, argv, "abcegstv")) != -1) { switch (flag) { case 'c': mode = kModeHasConsent; @@ -158,9 +147,6 @@ int main(int argc, char** argv) { case 't': secs_to_msecs = true; break; - case 'u': - mode = kModeSendUserAction; - break; case 'v': mode = kModeSendCrosEvent; break; @@ -178,8 +164,6 @@ int main(int argc, char** argv) { expected_args = 3; else if (mode == kModeSendSparseSample) expected_args = 2; - else if (mode == kModeSendUserAction) - expected_args = 1; else if (mode == kModeSendCrosEvent) expected_args = 1; @@ -198,8 +182,6 @@ int main(int argc, char** argv) { arg_index, mode, secs_to_msecs); - case kModeSendUserAction: - return SendUserAction(argv, arg_index); case kModeSendCrosEvent: return SendCrosEvent(argv, arg_index); case kModeHasConsent: diff --git a/metricsd/metrics_library.cc b/metricsd/metrics_library.cc index bc0aadd60..263c310dc 100644 --- a/metricsd/metrics_library.cc +++ b/metricsd/metrics_library.cc @@ -200,13 +200,6 @@ bool MetricsLibrary::SendSparseToUMA(const std::string& name, int sample) { .isOk(); } -bool MetricsLibrary::SendUserActionToUMA(const std::string& action) { - // Deprecated. - // TODO(bsimonnet): Delete this method entirely once all the callers are - // removed (b/25818567). - return true; -} - bool MetricsLibrary::SendCrashToUMA(const char* crash_kind) { return CheckService() && metricsd_proxy_->recordCrash(String16(crash_kind)).isOk();