common: Split out metrics utils from utils.cc.
The utility functions to convert error codes and network settings to
the types defined by the metrics framework are split out the utils.cc
file. These tools are only used by the update_engine daemon to report
back metrics on an update check.
Bug: 25197634
Test: FEATURES=test emerge-link update_engine; mma
Change-Id: I589dc9f6056fb1399fa84ca4f44076ed3a6b5365
diff --git a/Android.mk b/Android.mk
index 9b6e771..29afd3c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -256,6 +256,7 @@
image_properties_android.cc \
libcros_proxy.cc \
metrics.cc \
+ metrics_utils.cc \
omaha_request_action.cc \
omaha_request_params.cc \
omaha_response_handler_action.cc \
diff --git a/common/utils.cc b/common/utils.cc
index dd08a89..788efc8 100644
--- a/common/utils.cc
+++ b/common/utils.cc
@@ -1004,233 +1004,6 @@
return base_code;
}
-metrics::AttemptResult GetAttemptResult(ErrorCode code) {
- ErrorCode base_code = static_cast<ErrorCode>(
- static_cast<int>(code) & ~static_cast<int>(ErrorCode::kSpecialFlags));
-
- switch (base_code) {
- case ErrorCode::kSuccess:
- return metrics::AttemptResult::kUpdateSucceeded;
-
- case ErrorCode::kDownloadTransferError:
- return metrics::AttemptResult::kPayloadDownloadError;
-
- case ErrorCode::kDownloadInvalidMetadataSize:
- case ErrorCode::kDownloadInvalidMetadataMagicString:
- case ErrorCode::kDownloadMetadataSignatureError:
- case ErrorCode::kDownloadMetadataSignatureVerificationError:
- case ErrorCode::kPayloadMismatchedType:
- case ErrorCode::kUnsupportedMajorPayloadVersion:
- case ErrorCode::kUnsupportedMinorPayloadVersion:
- case ErrorCode::kDownloadNewPartitionInfoError:
- case ErrorCode::kDownloadSignatureMissingInManifest:
- case ErrorCode::kDownloadManifestParseError:
- case ErrorCode::kDownloadOperationHashMissingError:
- return metrics::AttemptResult::kMetadataMalformed;
-
- case ErrorCode::kDownloadOperationHashMismatch:
- case ErrorCode::kDownloadOperationHashVerificationError:
- return metrics::AttemptResult::kOperationMalformed;
-
- case ErrorCode::kDownloadOperationExecutionError:
- case ErrorCode::kInstallDeviceOpenError:
- case ErrorCode::kKernelDeviceOpenError:
- case ErrorCode::kDownloadWriteError:
- case ErrorCode::kFilesystemCopierError:
- case ErrorCode::kFilesystemVerifierError:
- return metrics::AttemptResult::kOperationExecutionError;
-
- case ErrorCode::kDownloadMetadataSignatureMismatch:
- return metrics::AttemptResult::kMetadataVerificationFailed;
-
- case ErrorCode::kPayloadSizeMismatchError:
- case ErrorCode::kPayloadHashMismatchError:
- case ErrorCode::kDownloadPayloadVerificationError:
- case ErrorCode::kSignedDeltaPayloadExpectedError:
- case ErrorCode::kDownloadPayloadPubKeyVerificationError:
- return metrics::AttemptResult::kPayloadVerificationFailed;
-
- case ErrorCode::kNewRootfsVerificationError:
- case ErrorCode::kNewKernelVerificationError:
- return metrics::AttemptResult::kVerificationFailed;
-
- case ErrorCode::kPostinstallRunnerError:
- case ErrorCode::kPostinstallBootedFromFirmwareB:
- case ErrorCode::kPostinstallFirmwareRONotUpdatable:
- return metrics::AttemptResult::kPostInstallFailed;
-
- // We should never get these errors in the update-attempt stage so
- // return internal error if this happens.
- case ErrorCode::kError:
- case ErrorCode::kOmahaRequestXMLParseError:
- case ErrorCode::kOmahaRequestError:
- case ErrorCode::kOmahaResponseHandlerError:
- case ErrorCode::kDownloadStateInitializationError:
- case ErrorCode::kOmahaRequestEmptyResponseError:
- case ErrorCode::kDownloadInvalidMetadataSignature:
- case ErrorCode::kOmahaResponseInvalid:
- case ErrorCode::kOmahaUpdateIgnoredPerPolicy:
- case ErrorCode::kOmahaUpdateDeferredPerPolicy:
- case ErrorCode::kOmahaErrorInHTTPResponse:
- case ErrorCode::kDownloadMetadataSignatureMissingError:
- case ErrorCode::kOmahaUpdateDeferredForBackoff:
- case ErrorCode::kPostinstallPowerwashError:
- case ErrorCode::kUpdateCanceledByChannelChange:
- case ErrorCode::kOmahaRequestXMLHasEntityDecl:
- return metrics::AttemptResult::kInternalError;
-
- // Special flags. These can't happen (we mask them out above) but
- // the compiler doesn't know that. Just break out so we can warn and
- // return |kInternalError|.
- case ErrorCode::kUmaReportedMax:
- case ErrorCode::kOmahaRequestHTTPResponseBase:
- case ErrorCode::kDevModeFlag:
- case ErrorCode::kResumedFlag:
- case ErrorCode::kTestImageFlag:
- case ErrorCode::kTestOmahaUrlFlag:
- case ErrorCode::kSpecialFlags:
- break;
- }
-
- LOG(ERROR) << "Unexpected error code " << base_code;
- return metrics::AttemptResult::kInternalError;
-}
-
-
-metrics::DownloadErrorCode GetDownloadErrorCode(ErrorCode code) {
- ErrorCode base_code = static_cast<ErrorCode>(
- static_cast<int>(code) & ~static_cast<int>(ErrorCode::kSpecialFlags));
-
- if (base_code >= ErrorCode::kOmahaRequestHTTPResponseBase) {
- int http_status =
- static_cast<int>(base_code) -
- static_cast<int>(ErrorCode::kOmahaRequestHTTPResponseBase);
- if (http_status >= 200 && http_status <= 599) {
- return static_cast<metrics::DownloadErrorCode>(
- static_cast<int>(metrics::DownloadErrorCode::kHttpStatus200) +
- http_status - 200);
- } else if (http_status == 0) {
- // The code is using HTTP Status 0 for "Unable to get http
- // response code."
- return metrics::DownloadErrorCode::kDownloadError;
- }
- LOG(WARNING) << "Unexpected HTTP status code " << http_status;
- return metrics::DownloadErrorCode::kHttpStatusOther;
- }
-
- switch (base_code) {
- // Unfortunately, ErrorCode::kDownloadTransferError is returned for a wide
- // variety of errors (proxy errors, host not reachable, timeouts etc.).
- //
- // For now just map that to kDownloading. See http://crbug.com/355745
- // for how we plan to add more detail in the future.
- case ErrorCode::kDownloadTransferError:
- return metrics::DownloadErrorCode::kDownloadError;
-
- // All of these error codes are not related to downloading so break
- // out so we can warn and return InputMalformed.
- case ErrorCode::kSuccess:
- case ErrorCode::kError:
- case ErrorCode::kOmahaRequestError:
- case ErrorCode::kOmahaResponseHandlerError:
- case ErrorCode::kFilesystemCopierError:
- case ErrorCode::kPostinstallRunnerError:
- case ErrorCode::kPayloadMismatchedType:
- case ErrorCode::kInstallDeviceOpenError:
- case ErrorCode::kKernelDeviceOpenError:
- case ErrorCode::kPayloadHashMismatchError:
- case ErrorCode::kPayloadSizeMismatchError:
- case ErrorCode::kDownloadPayloadVerificationError:
- case ErrorCode::kDownloadNewPartitionInfoError:
- case ErrorCode::kDownloadWriteError:
- case ErrorCode::kNewRootfsVerificationError:
- case ErrorCode::kNewKernelVerificationError:
- case ErrorCode::kSignedDeltaPayloadExpectedError:
- case ErrorCode::kDownloadPayloadPubKeyVerificationError:
- case ErrorCode::kPostinstallBootedFromFirmwareB:
- case ErrorCode::kDownloadStateInitializationError:
- case ErrorCode::kDownloadInvalidMetadataMagicString:
- case ErrorCode::kDownloadSignatureMissingInManifest:
- case ErrorCode::kDownloadManifestParseError:
- case ErrorCode::kDownloadMetadataSignatureError:
- case ErrorCode::kDownloadMetadataSignatureVerificationError:
- case ErrorCode::kDownloadMetadataSignatureMismatch:
- case ErrorCode::kDownloadOperationHashVerificationError:
- case ErrorCode::kDownloadOperationExecutionError:
- case ErrorCode::kDownloadOperationHashMismatch:
- case ErrorCode::kOmahaRequestEmptyResponseError:
- case ErrorCode::kOmahaRequestXMLParseError:
- case ErrorCode::kDownloadInvalidMetadataSize:
- case ErrorCode::kDownloadInvalidMetadataSignature:
- case ErrorCode::kOmahaResponseInvalid:
- case ErrorCode::kOmahaUpdateIgnoredPerPolicy:
- case ErrorCode::kOmahaUpdateDeferredPerPolicy:
- case ErrorCode::kOmahaErrorInHTTPResponse:
- case ErrorCode::kDownloadOperationHashMissingError:
- case ErrorCode::kDownloadMetadataSignatureMissingError:
- case ErrorCode::kOmahaUpdateDeferredForBackoff:
- case ErrorCode::kPostinstallPowerwashError:
- case ErrorCode::kUpdateCanceledByChannelChange:
- case ErrorCode::kPostinstallFirmwareRONotUpdatable:
- case ErrorCode::kUnsupportedMajorPayloadVersion:
- case ErrorCode::kUnsupportedMinorPayloadVersion:
- case ErrorCode::kOmahaRequestXMLHasEntityDecl:
- case ErrorCode::kFilesystemVerifierError:
- break;
-
- // Special flags. These can't happen (we mask them out above) but
- // the compiler doesn't know that. Just break out so we can warn and
- // return |kInputMalformed|.
- case ErrorCode::kUmaReportedMax:
- case ErrorCode::kOmahaRequestHTTPResponseBase:
- case ErrorCode::kDevModeFlag:
- case ErrorCode::kResumedFlag:
- case ErrorCode::kTestImageFlag:
- case ErrorCode::kTestOmahaUrlFlag:
- case ErrorCode::kSpecialFlags:
- LOG(ERROR) << "Unexpected error code " << base_code;
- break;
- }
-
- return metrics::DownloadErrorCode::kInputMalformed;
-}
-
-metrics::ConnectionType GetConnectionType(
- NetworkConnectionType type,
- NetworkTethering tethering) {
- switch (type) {
- case NetworkConnectionType::kUnknown:
- return metrics::ConnectionType::kUnknown;
-
- case NetworkConnectionType::kEthernet:
- if (tethering == NetworkTethering::kConfirmed)
- return metrics::ConnectionType::kTetheredEthernet;
- else
- return metrics::ConnectionType::kEthernet;
-
- case NetworkConnectionType::kWifi:
- if (tethering == NetworkTethering::kConfirmed)
- return metrics::ConnectionType::kTetheredWifi;
- else
- return metrics::ConnectionType::kWifi;
-
- case NetworkConnectionType::kWimax:
- return metrics::ConnectionType::kWimax;
-
- case NetworkConnectionType::kBluetooth:
- return metrics::ConnectionType::kBluetooth;
-
- case NetworkConnectionType::kCellular:
- return metrics::ConnectionType::kCellular;
- }
-
- LOG(ERROR) << "Unexpected network connection type: type="
- << static_cast<int>(type)
- << ", tethering=" << static_cast<int>(tethering);
-
- return metrics::ConnectionType::kUnknown;
-}
-
string CodeToString(ErrorCode code) {
// If the given code has both parts (i.e. the error code part and the flags
// part) then strip off the flags part since the switch statement below
diff --git a/common/utils.h b/common/utils.h
index b50cabf..482b67e 100644
--- a/common/utils.h
+++ b/common/utils.h
@@ -38,7 +38,6 @@
#include "update_engine/common/action_processor.h"
#include "update_engine/common/constants.h"
#include "update_engine/connection_manager_interface.h"
-#include "update_engine/metrics.h"
#include "update_engine/payload_consumer/file_descriptor.h"
#include "update_engine/update_metadata.pb.h"
@@ -317,22 +316,6 @@
// it'll return the same value again.
ErrorCode GetBaseErrorCode(ErrorCode code);
-// Transforms a ErrorCode value into a metrics::DownloadErrorCode.
-// This obviously only works for errors related to downloading so if |code|
-// is e.g. |ErrorCode::kFilesystemCopierError| then
-// |kDownloadErrorCodeInputMalformed| is returned.
-metrics::DownloadErrorCode GetDownloadErrorCode(ErrorCode code);
-
-// Transforms a ErrorCode value into a metrics::AttemptResult.
-//
-// If metrics::AttemptResult::kPayloadDownloadError is returned, you
-// can use utils::GetDownloadError() to get more detail.
-metrics::AttemptResult GetAttemptResult(ErrorCode code);
-
-// Calculates the internet connection type given |type| and |tethering|.
-metrics::ConnectionType GetConnectionType(NetworkConnectionType type,
- NetworkTethering tethering);
-
// Returns a string representation of the ErrorCodes (either the base
// error codes or the bit flags) for logging purposes.
std::string CodeToString(ErrorCode code);
diff --git a/common/utils_unittest.cc b/common/utils_unittest.cc
index 2fd58e9..f22e528 100644
--- a/common/utils_unittest.cc
+++ b/common/utils_unittest.cc
@@ -635,56 +635,6 @@
EXPECT_EQ(duration.InSeconds(), 0);
}
-TEST(UtilsTest, GetConnectionType) {
- // Check that expected combinations map to the right value.
- EXPECT_EQ(metrics::ConnectionType::kUnknown,
- utils::GetConnectionType(NetworkConnectionType::kUnknown,
- NetworkTethering::kUnknown));
- EXPECT_EQ(metrics::ConnectionType::kEthernet,
- utils::GetConnectionType(NetworkConnectionType::kEthernet,
- NetworkTethering::kUnknown));
- EXPECT_EQ(metrics::ConnectionType::kWifi,
- utils::GetConnectionType(NetworkConnectionType::kWifi,
- NetworkTethering::kUnknown));
- EXPECT_EQ(metrics::ConnectionType::kWimax,
- utils::GetConnectionType(NetworkConnectionType::kWimax,
- NetworkTethering::kUnknown));
- EXPECT_EQ(metrics::ConnectionType::kBluetooth,
- utils::GetConnectionType(NetworkConnectionType::kBluetooth,
- NetworkTethering::kUnknown));
- EXPECT_EQ(metrics::ConnectionType::kCellular,
- utils::GetConnectionType(NetworkConnectionType::kCellular,
- NetworkTethering::kUnknown));
- EXPECT_EQ(metrics::ConnectionType::kTetheredEthernet,
- utils::GetConnectionType(NetworkConnectionType::kEthernet,
- NetworkTethering::kConfirmed));
- EXPECT_EQ(metrics::ConnectionType::kTetheredWifi,
- utils::GetConnectionType(NetworkConnectionType::kWifi,
- NetworkTethering::kConfirmed));
-
- // Ensure that we don't report tethered ethernet unless it's confirmed.
- EXPECT_EQ(metrics::ConnectionType::kEthernet,
- utils::GetConnectionType(NetworkConnectionType::kEthernet,
- NetworkTethering::kNotDetected));
- EXPECT_EQ(metrics::ConnectionType::kEthernet,
- utils::GetConnectionType(NetworkConnectionType::kEthernet,
- NetworkTethering::kSuspected));
- EXPECT_EQ(metrics::ConnectionType::kEthernet,
- utils::GetConnectionType(NetworkConnectionType::kEthernet,
- NetworkTethering::kUnknown));
-
- // Ditto for tethered wifi.
- EXPECT_EQ(metrics::ConnectionType::kWifi,
- utils::GetConnectionType(NetworkConnectionType::kWifi,
- NetworkTethering::kNotDetected));
- EXPECT_EQ(metrics::ConnectionType::kWifi,
- utils::GetConnectionType(NetworkConnectionType::kWifi,
- NetworkTethering::kSuspected));
- EXPECT_EQ(metrics::ConnectionType::kWifi,
- utils::GetConnectionType(NetworkConnectionType::kWifi,
- NetworkTethering::kUnknown));
-}
-
TEST(UtilsTest, GetMinorVersion) {
// Test GetMinorVersion by verifying that it parses the conf file and returns
// the correct value.
diff --git a/metrics_utils.cc b/metrics_utils.cc
new file mode 100644
index 0000000..354d137
--- /dev/null
+++ b/metrics_utils.cc
@@ -0,0 +1,248 @@
+//
+// Copyright (C) 2015 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#include "update_engine/metrics_utils.h"
+
+namespace chromeos_update_engine {
+namespace metrics_utils {
+
+metrics::AttemptResult GetAttemptResult(ErrorCode code) {
+ ErrorCode base_code = static_cast<ErrorCode>(
+ static_cast<int>(code) & ~static_cast<int>(ErrorCode::kSpecialFlags));
+
+ switch (base_code) {
+ case ErrorCode::kSuccess:
+ return metrics::AttemptResult::kUpdateSucceeded;
+
+ case ErrorCode::kDownloadTransferError:
+ return metrics::AttemptResult::kPayloadDownloadError;
+
+ case ErrorCode::kDownloadInvalidMetadataSize:
+ case ErrorCode::kDownloadInvalidMetadataMagicString:
+ case ErrorCode::kDownloadMetadataSignatureError:
+ case ErrorCode::kDownloadMetadataSignatureVerificationError:
+ case ErrorCode::kPayloadMismatchedType:
+ case ErrorCode::kUnsupportedMajorPayloadVersion:
+ case ErrorCode::kUnsupportedMinorPayloadVersion:
+ case ErrorCode::kDownloadNewPartitionInfoError:
+ case ErrorCode::kDownloadSignatureMissingInManifest:
+ case ErrorCode::kDownloadManifestParseError:
+ case ErrorCode::kDownloadOperationHashMissingError:
+ return metrics::AttemptResult::kMetadataMalformed;
+
+ case ErrorCode::kDownloadOperationHashMismatch:
+ case ErrorCode::kDownloadOperationHashVerificationError:
+ return metrics::AttemptResult::kOperationMalformed;
+
+ case ErrorCode::kDownloadOperationExecutionError:
+ case ErrorCode::kInstallDeviceOpenError:
+ case ErrorCode::kKernelDeviceOpenError:
+ case ErrorCode::kDownloadWriteError:
+ case ErrorCode::kFilesystemCopierError:
+ case ErrorCode::kFilesystemVerifierError:
+ return metrics::AttemptResult::kOperationExecutionError;
+
+ case ErrorCode::kDownloadMetadataSignatureMismatch:
+ return metrics::AttemptResult::kMetadataVerificationFailed;
+
+ case ErrorCode::kPayloadSizeMismatchError:
+ case ErrorCode::kPayloadHashMismatchError:
+ case ErrorCode::kDownloadPayloadVerificationError:
+ case ErrorCode::kSignedDeltaPayloadExpectedError:
+ case ErrorCode::kDownloadPayloadPubKeyVerificationError:
+ return metrics::AttemptResult::kPayloadVerificationFailed;
+
+ case ErrorCode::kNewRootfsVerificationError:
+ case ErrorCode::kNewKernelVerificationError:
+ return metrics::AttemptResult::kVerificationFailed;
+
+ case ErrorCode::kPostinstallRunnerError:
+ case ErrorCode::kPostinstallBootedFromFirmwareB:
+ case ErrorCode::kPostinstallFirmwareRONotUpdatable:
+ return metrics::AttemptResult::kPostInstallFailed;
+
+ // We should never get these errors in the update-attempt stage so
+ // return internal error if this happens.
+ case ErrorCode::kError:
+ case ErrorCode::kOmahaRequestXMLParseError:
+ case ErrorCode::kOmahaRequestError:
+ case ErrorCode::kOmahaResponseHandlerError:
+ case ErrorCode::kDownloadStateInitializationError:
+ case ErrorCode::kOmahaRequestEmptyResponseError:
+ case ErrorCode::kDownloadInvalidMetadataSignature:
+ case ErrorCode::kOmahaResponseInvalid:
+ case ErrorCode::kOmahaUpdateIgnoredPerPolicy:
+ case ErrorCode::kOmahaUpdateDeferredPerPolicy:
+ case ErrorCode::kOmahaErrorInHTTPResponse:
+ case ErrorCode::kDownloadMetadataSignatureMissingError:
+ case ErrorCode::kOmahaUpdateDeferredForBackoff:
+ case ErrorCode::kPostinstallPowerwashError:
+ case ErrorCode::kUpdateCanceledByChannelChange:
+ case ErrorCode::kOmahaRequestXMLHasEntityDecl:
+ return metrics::AttemptResult::kInternalError;
+
+ // Special flags. These can't happen (we mask them out above) but
+ // the compiler doesn't know that. Just break out so we can warn and
+ // return |kInternalError|.
+ case ErrorCode::kUmaReportedMax:
+ case ErrorCode::kOmahaRequestHTTPResponseBase:
+ case ErrorCode::kDevModeFlag:
+ case ErrorCode::kResumedFlag:
+ case ErrorCode::kTestImageFlag:
+ case ErrorCode::kTestOmahaUrlFlag:
+ case ErrorCode::kSpecialFlags:
+ break;
+ }
+
+ LOG(ERROR) << "Unexpected error code " << base_code;
+ return metrics::AttemptResult::kInternalError;
+}
+
+metrics::DownloadErrorCode GetDownloadErrorCode(ErrorCode code) {
+ ErrorCode base_code = static_cast<ErrorCode>(
+ static_cast<int>(code) & ~static_cast<int>(ErrorCode::kSpecialFlags));
+
+ if (base_code >= ErrorCode::kOmahaRequestHTTPResponseBase) {
+ int http_status =
+ static_cast<int>(base_code) -
+ static_cast<int>(ErrorCode::kOmahaRequestHTTPResponseBase);
+ if (http_status >= 200 && http_status <= 599) {
+ return static_cast<metrics::DownloadErrorCode>(
+ static_cast<int>(metrics::DownloadErrorCode::kHttpStatus200) +
+ http_status - 200);
+ } else if (http_status == 0) {
+ // The code is using HTTP Status 0 for "Unable to get http
+ // response code."
+ return metrics::DownloadErrorCode::kDownloadError;
+ }
+ LOG(WARNING) << "Unexpected HTTP status code " << http_status;
+ return metrics::DownloadErrorCode::kHttpStatusOther;
+ }
+
+ switch (base_code) {
+ // Unfortunately, ErrorCode::kDownloadTransferError is returned for a wide
+ // variety of errors (proxy errors, host not reachable, timeouts etc.).
+ //
+ // For now just map that to kDownloading. See http://crbug.com/355745
+ // for how we plan to add more detail in the future.
+ case ErrorCode::kDownloadTransferError:
+ return metrics::DownloadErrorCode::kDownloadError;
+
+ // All of these error codes are not related to downloading so break
+ // out so we can warn and return InputMalformed.
+ case ErrorCode::kSuccess:
+ case ErrorCode::kError:
+ case ErrorCode::kOmahaRequestError:
+ case ErrorCode::kOmahaResponseHandlerError:
+ case ErrorCode::kFilesystemCopierError:
+ case ErrorCode::kPostinstallRunnerError:
+ case ErrorCode::kPayloadMismatchedType:
+ case ErrorCode::kInstallDeviceOpenError:
+ case ErrorCode::kKernelDeviceOpenError:
+ case ErrorCode::kPayloadHashMismatchError:
+ case ErrorCode::kPayloadSizeMismatchError:
+ case ErrorCode::kDownloadPayloadVerificationError:
+ case ErrorCode::kDownloadNewPartitionInfoError:
+ case ErrorCode::kDownloadWriteError:
+ case ErrorCode::kNewRootfsVerificationError:
+ case ErrorCode::kNewKernelVerificationError:
+ case ErrorCode::kSignedDeltaPayloadExpectedError:
+ case ErrorCode::kDownloadPayloadPubKeyVerificationError:
+ case ErrorCode::kPostinstallBootedFromFirmwareB:
+ case ErrorCode::kDownloadStateInitializationError:
+ case ErrorCode::kDownloadInvalidMetadataMagicString:
+ case ErrorCode::kDownloadSignatureMissingInManifest:
+ case ErrorCode::kDownloadManifestParseError:
+ case ErrorCode::kDownloadMetadataSignatureError:
+ case ErrorCode::kDownloadMetadataSignatureVerificationError:
+ case ErrorCode::kDownloadMetadataSignatureMismatch:
+ case ErrorCode::kDownloadOperationHashVerificationError:
+ case ErrorCode::kDownloadOperationExecutionError:
+ case ErrorCode::kDownloadOperationHashMismatch:
+ case ErrorCode::kOmahaRequestEmptyResponseError:
+ case ErrorCode::kOmahaRequestXMLParseError:
+ case ErrorCode::kDownloadInvalidMetadataSize:
+ case ErrorCode::kDownloadInvalidMetadataSignature:
+ case ErrorCode::kOmahaResponseInvalid:
+ case ErrorCode::kOmahaUpdateIgnoredPerPolicy:
+ case ErrorCode::kOmahaUpdateDeferredPerPolicy:
+ case ErrorCode::kOmahaErrorInHTTPResponse:
+ case ErrorCode::kDownloadOperationHashMissingError:
+ case ErrorCode::kDownloadMetadataSignatureMissingError:
+ case ErrorCode::kOmahaUpdateDeferredForBackoff:
+ case ErrorCode::kPostinstallPowerwashError:
+ case ErrorCode::kUpdateCanceledByChannelChange:
+ case ErrorCode::kPostinstallFirmwareRONotUpdatable:
+ case ErrorCode::kUnsupportedMajorPayloadVersion:
+ case ErrorCode::kUnsupportedMinorPayloadVersion:
+ case ErrorCode::kOmahaRequestXMLHasEntityDecl:
+ case ErrorCode::kFilesystemVerifierError:
+ break;
+
+ // Special flags. These can't happen (we mask them out above) but
+ // the compiler doesn't know that. Just break out so we can warn and
+ // return |kInputMalformed|.
+ case ErrorCode::kUmaReportedMax:
+ case ErrorCode::kOmahaRequestHTTPResponseBase:
+ case ErrorCode::kDevModeFlag:
+ case ErrorCode::kResumedFlag:
+ case ErrorCode::kTestImageFlag:
+ case ErrorCode::kTestOmahaUrlFlag:
+ case ErrorCode::kSpecialFlags:
+ LOG(ERROR) << "Unexpected error code " << base_code;
+ break;
+ }
+
+ return metrics::DownloadErrorCode::kInputMalformed;
+}
+
+metrics::ConnectionType GetConnectionType(NetworkConnectionType type,
+ NetworkTethering tethering) {
+ switch (type) {
+ case NetworkConnectionType::kUnknown:
+ return metrics::ConnectionType::kUnknown;
+
+ case NetworkConnectionType::kEthernet:
+ if (tethering == NetworkTethering::kConfirmed)
+ return metrics::ConnectionType::kTetheredEthernet;
+ else
+ return metrics::ConnectionType::kEthernet;
+
+ case NetworkConnectionType::kWifi:
+ if (tethering == NetworkTethering::kConfirmed)
+ return metrics::ConnectionType::kTetheredWifi;
+ else
+ return metrics::ConnectionType::kWifi;
+
+ case NetworkConnectionType::kWimax:
+ return metrics::ConnectionType::kWimax;
+
+ case NetworkConnectionType::kBluetooth:
+ return metrics::ConnectionType::kBluetooth;
+
+ case NetworkConnectionType::kCellular:
+ return metrics::ConnectionType::kCellular;
+ }
+
+ LOG(ERROR) << "Unexpected network connection type: type="
+ << static_cast<int>(type)
+ << ", tethering=" << static_cast<int>(tethering);
+
+ return metrics::ConnectionType::kUnknown;
+}
+
+} // namespace metrics_utils
+} // namespace chromeos_update_engine
diff --git a/metrics_utils.h b/metrics_utils.h
new file mode 100644
index 0000000..1b8d8ac
--- /dev/null
+++ b/metrics_utils.h
@@ -0,0 +1,45 @@
+//
+// Copyright (C) 2015 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#ifndef UPDATE_ENGINE_METRICS_UTILS_H_
+#define UPDATE_ENGINE_METRICS_UTILS_H_
+
+#include "update_engine/connection_manager.h"
+#include "update_engine/metrics.h"
+
+namespace chromeos_update_engine {
+namespace metrics_utils {
+
+// Transforms a ErrorCode value into a metrics::DownloadErrorCode.
+// This obviously only works for errors related to downloading so if |code|
+// is e.g. |ErrorCode::kFilesystemCopierError| then
+// |kDownloadErrorCodeInputMalformed| is returned.
+metrics::DownloadErrorCode GetDownloadErrorCode(ErrorCode code);
+
+// Transforms a ErrorCode value into a metrics::AttemptResult.
+//
+// If metrics::AttemptResult::kPayloadDownloadError is returned, you
+// can use utils::GetDownloadError() to get more detail.
+metrics::AttemptResult GetAttemptResult(ErrorCode code);
+
+// Calculates the internet connection type given |type| and |tethering|.
+metrics::ConnectionType GetConnectionType(NetworkConnectionType type,
+ NetworkTethering tethering);
+
+} // namespace metrics_utils
+} // namespace chromeos_update_engine
+
+#endif // UPDATE_ENGINE_METRICS_UTILS_H_
diff --git a/metrics_utils_unittest.cc b/metrics_utils_unittest.cc
new file mode 100644
index 0000000..97f0b46
--- /dev/null
+++ b/metrics_utils_unittest.cc
@@ -0,0 +1,77 @@
+//
+// Copyright (C) 2015 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#include "update_engine/metrics_utils.h"
+
+#include <gtest/gtest.h>
+
+namespace chromeos_update_engine {
+namespace metrics_utils {
+
+class MetricsUtilsTest : public ::testing::Test {};
+
+TEST(MetricsUtilsTest, GetConnectionType) {
+ // Check that expected combinations map to the right value.
+ EXPECT_EQ(metrics::ConnectionType::kUnknown,
+ GetConnectionType(NetworkConnectionType::kUnknown,
+ NetworkTethering::kUnknown));
+ EXPECT_EQ(metrics::ConnectionType::kEthernet,
+ GetConnectionType(NetworkConnectionType::kEthernet,
+ NetworkTethering::kUnknown));
+ EXPECT_EQ(metrics::ConnectionType::kWifi,
+ GetConnectionType(NetworkConnectionType::kWifi,
+ NetworkTethering::kUnknown));
+ EXPECT_EQ(metrics::ConnectionType::kWimax,
+ GetConnectionType(NetworkConnectionType::kWimax,
+ NetworkTethering::kUnknown));
+ EXPECT_EQ(metrics::ConnectionType::kBluetooth,
+ GetConnectionType(NetworkConnectionType::kBluetooth,
+ NetworkTethering::kUnknown));
+ EXPECT_EQ(metrics::ConnectionType::kCellular,
+ GetConnectionType(NetworkConnectionType::kCellular,
+ NetworkTethering::kUnknown));
+ EXPECT_EQ(metrics::ConnectionType::kTetheredEthernet,
+ GetConnectionType(NetworkConnectionType::kEthernet,
+ NetworkTethering::kConfirmed));
+ EXPECT_EQ(metrics::ConnectionType::kTetheredWifi,
+ GetConnectionType(NetworkConnectionType::kWifi,
+ NetworkTethering::kConfirmed));
+
+ // Ensure that we don't report tethered ethernet unless it's confirmed.
+ EXPECT_EQ(metrics::ConnectionType::kEthernet,
+ GetConnectionType(NetworkConnectionType::kEthernet,
+ NetworkTethering::kNotDetected));
+ EXPECT_EQ(metrics::ConnectionType::kEthernet,
+ GetConnectionType(NetworkConnectionType::kEthernet,
+ NetworkTethering::kSuspected));
+ EXPECT_EQ(metrics::ConnectionType::kEthernet,
+ GetConnectionType(NetworkConnectionType::kEthernet,
+ NetworkTethering::kUnknown));
+
+ // Ditto for tethered wifi.
+ EXPECT_EQ(metrics::ConnectionType::kWifi,
+ GetConnectionType(NetworkConnectionType::kWifi,
+ NetworkTethering::kNotDetected));
+ EXPECT_EQ(metrics::ConnectionType::kWifi,
+ GetConnectionType(NetworkConnectionType::kWifi,
+ NetworkTethering::kSuspected));
+ EXPECT_EQ(metrics::ConnectionType::kWifi,
+ GetConnectionType(NetworkConnectionType::kWifi,
+ NetworkTethering::kUnknown));
+}
+
+} // namespace metrics_utils
+} // namespace chromeos_update_engine
diff --git a/omaha_request_action.cc b/omaha_request_action.cc
index 7a269f8..17aa62b 100644
--- a/omaha_request_action.cc
+++ b/omaha_request_action.cc
@@ -40,6 +40,8 @@
#include "update_engine/common/prefs_interface.h"
#include "update_engine/common/utils.h"
#include "update_engine/connection_manager.h"
+#include "update_engine/metrics.h"
+#include "update_engine/metrics_utils.h"
#include "update_engine/omaha_request_params.h"
#include "update_engine/p2p_manager.h"
#include "update_engine/payload_state_interface.h"
@@ -1417,7 +1419,8 @@
// We report two flavors of errors, "Download errors" and "Parsing
// error". Try to convert to the former and if that doesn't work
// we know it's the latter.
- metrics::DownloadErrorCode tmp_error = utils::GetDownloadErrorCode(code);
+ metrics::DownloadErrorCode tmp_error =
+ metrics_utils::GetDownloadErrorCode(code);
if (tmp_error != metrics::DownloadErrorCode::kInputMalformed) {
result = metrics::CheckResult::kDownloadError;
download_error_code = tmp_error;
diff --git a/omaha_request_action_unittest.cc b/omaha_request_action_unittest.cc
index 56c7b7d..f4291e9 100644
--- a/omaha_request_action_unittest.cc
+++ b/omaha_request_action_unittest.cc
@@ -42,6 +42,7 @@
#include "update_engine/common/prefs.h"
#include "update_engine/common/test_utils.h"
#include "update_engine/common/utils.h"
+#include "update_engine/metrics.h"
#include "update_engine/mock_connection_manager.h"
#include "update_engine/mock_payload_state.h"
#include "update_engine/omaha_request_params.h"
diff --git a/payload_state.cc b/payload_state.cc
index 9160ccd..6b7b0fb 100644
--- a/payload_state.cc
+++ b/payload_state.cc
@@ -29,6 +29,7 @@
#include "update_engine/common/hardware_interface.h"
#include "update_engine/common/prefs.h"
#include "update_engine/common/utils.h"
+#include "update_engine/metrics_utils.h"
#include "update_engine/omaha_request_params.h"
#include "update_engine/payload_consumer/install_plan.h"
#include "update_engine/system_state.h"
@@ -191,7 +192,7 @@
LOG(ERROR) << "Failed to determine connection type.";
type = metrics::ConnectionType::kUnknown;
} else {
- type = utils::GetConnectionType(network_connection_type, tethering);
+ type = metrics_utils::GetConnectionType(network_connection_type, tethering);
}
attempt_connection_type_ = type;
@@ -578,12 +579,12 @@
metrics::DownloadErrorCode payload_download_error_code =
metrics::DownloadErrorCode::kUnset;
ErrorCode internal_error_code = ErrorCode::kSuccess;
- metrics::AttemptResult attempt_result = utils::GetAttemptResult(code);
+ metrics::AttemptResult attempt_result = metrics_utils::GetAttemptResult(code);
// Add additional detail to AttemptResult
switch (attempt_result) {
case metrics::AttemptResult::kPayloadDownloadError:
- payload_download_error_code = utils::GetDownloadErrorCode(code);
+ payload_download_error_code = metrics_utils::GetDownloadErrorCode(code);
break;
case metrics::AttemptResult::kInternalError:
diff --git a/update_engine.gyp b/update_engine.gyp
index 47727c8..3fcb706 100644
--- a/update_engine.gyp
+++ b/update_engine.gyp
@@ -259,6 +259,7 @@
'image_properties_chromeos.cc',
'libcros_proxy.cc',
'metrics.cc',
+ 'metrics_utils.cc',
'omaha_request_action.cc',
'omaha_request_params.cc',
'omaha_response_handler_action.cc',
@@ -460,6 +461,7 @@
'dbus_service_unittest.cc',
'fake_shill_proxy.cc',
'fake_system_state.cc',
+ 'metrics_utils_unittest.cc',
'omaha_request_action_unittest.cc',
'omaha_request_params_unittest.cc',
'omaha_response_handler_action_unittest.cc',