am a9f1ed16: Merge "metricsd: Use the metrics directory everywhere." (7fb08a74) · Commits · e / os / android_system_core

metricsd/constants.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -19,10 +19,10 @@

	namespace metrics {		namespace metrics {
	static const char kMetricsDirectory[] = "/data/misc/metrics/";		static const char kMetricsDirectory[] = "/data/misc/metrics/";
	static const char kMetricsEventsFilePath[] = "/data/misc/metrics/uma-events";		static const char kMetricsEventsFileName[] = "uma-events";
	static const char kMetricsGUIDFilePath[] = "/data/misc/metrics/Sysinfo.GUID";		static const char kMetricsGUIDFileName[] = "Sysinfo.GUID";
	static const char kMetricsServer[] = "https://clients4.google.com/uma/v2";		static const char kMetricsServer[] = "https://clients4.google.com/uma/v2";
	static const char kConsentFilePath[] = "/data/misc/metrics/enabled";		static const char kConsentFileName[] = "enabled";
	static const char kDefaultVersion[] = "0.0.0.0";		static const char kDefaultVersion[] = "0.0.0.0";

	// System properties used.		// System properties used.

metricsd/include/metrics/metrics_library.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@
	#include <unistd.h>		#include <unistd.h>

	#include <base/compiler_specific.h>		#include <base/compiler_specific.h>
			#include <base/files/file_path.h>
	#include <base/macros.h>		#include <base/macros.h>
	#include <base/memory/scoped_ptr.h>		#include <base/memory/scoped_ptr.h>
	#include <gtest/gtest_prod.h> // for FRIEND_TEST		#include <gtest/gtest_prod.h> // for FRIEND_TEST
	@@ -129,8 +130,7 @@ class MetricsLibrary : public MetricsLibraryInterface {
	FRIEND_TEST(MetricsLibraryTest, SendMessageToChrome);		FRIEND_TEST(MetricsLibraryTest, SendMessageToChrome);
	FRIEND_TEST(MetricsLibraryTest, SendMessageToChromeUMAEventsBadFileLocation);		FRIEND_TEST(MetricsLibraryTest, SendMessageToChromeUMAEventsBadFileLocation);

	void InitForTest(const std::string& uma_events_file,		void InitForTest(const base::FilePath& metrics_directory);
	const std::string& consent_file);

	// Sets \|*result\| to whether or not the \|mounts_file\| indicates that		// Sets \|*result\| to whether or not the \|mounts_file\| indicates that
	// the \|device_name\| is currently mounted. Uses \|buffer\| of		// the \|device_name\| is currently mounted. Uses \|buffer\| of
	@@ -146,8 +146,8 @@ class MetricsLibrary : public MetricsLibraryInterface {
	// Cached state of whether or not metrics were enabled.		// Cached state of whether or not metrics were enabled.
	static bool cached_enabled_;		static bool cached_enabled_;

	std::string uma_events_file_;		base::FilePath uma_events_file_;
	std::string consent_file_;		base::FilePath consent_file_;

	DISALLOW_COPY_AND_ASSIGN(MetricsLibrary);		DISALLOW_COPY_AND_ASSIGN(MetricsLibrary);
	};		};

metricsd/metrics_client.cc

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -140,11 +140,13 @@ static int IsGuestMode() {
	}		}

	static int DumpLogs() {		static int DumpLogs() {
	printf("Metrics from %s\n\n", metrics::kMetricsEventsFilePath);		base::FilePath events_file = base::FilePath(
			metrics::kMetricsDirectory).Append(metrics::kMetricsEventsFileName);
			printf("Metrics from %s\n\n", events_file.value().data());

	ScopedVector<metrics::MetricSample> metrics;		ScopedVector<metrics::MetricSample> metrics;
	metrics::SerializationUtils::ReadMetricsFromFile(		metrics::SerializationUtils::ReadMetricsFromFile(events_file.value(),
	metrics::kMetricsEventsFilePath, &metrics);		&metrics);

	for (ScopedVector<metrics::MetricSample>::const_iterator i = metrics.begin();		for (ScopedVector<metrics::MetricSample>::const_iterator i = metrics.begin();
	i != metrics.end(); ++i) {		i != metrics.end(); ++i) {

metricsd/metrics_daemon.cc

+5 −7

Original line number	Original line	Diff line number	Diff line
	@@ -187,10 +187,10 @@ int MetricsDaemon::Run() {

	void MetricsDaemon::RunUploaderTest() {		void MetricsDaemon::RunUploaderTest() {
	upload_service_.reset(new UploadService(		upload_service_.reset(new UploadService(
	new SystemProfileCache(true, base::FilePath(config_root_)),		new SystemProfileCache(true, metrics_directory_),
	metrics_lib_,		metrics_lib_,
	server_));		server_));
	upload_service_->Init(upload_interval_, metrics_file_);		upload_service_->Init(upload_interval_, metrics_directory_);
	upload_service_->UploadEvent();		upload_service_->UploadEvent();
	}		}

	@@ -223,18 +223,16 @@ void MetricsDaemon::Init(bool testing,
	const string& cpuinfo_max_freq_path,		const string& cpuinfo_max_freq_path,
	const base::TimeDelta& upload_interval,		const base::TimeDelta& upload_interval,
	const string& server,		const string& server,
	const string& metrics_file,		const base::FilePath& metrics_directory) {
	const string& config_root) {
	CHECK(metrics_lib);		CHECK(metrics_lib);
	testing_ = testing;		testing_ = testing;
	uploader_active_ = uploader_active;		uploader_active_ = uploader_active;
	dbus_enabled_ = dbus_enabled;		dbus_enabled_ = dbus_enabled;
	config_root_ = config_root;		metrics_directory_ = metrics_directory;
	metrics_lib_ = metrics_lib;		metrics_lib_ = metrics_lib;

	upload_interval_ = upload_interval;		upload_interval_ = upload_interval;
	server_ = server;		server_ = server;
	metrics_file_ = metrics_file;

	// Get ticks per second (HZ) on this system.		// Get ticks per second (HZ) on this system.
	// Sysconf cannot fail, so no sanity checks are needed.		// Sysconf cannot fail, so no sanity checks are needed.
	@@ -337,7 +335,7 @@ int MetricsDaemon::OnInit() {
	if (uploader_active_) {		if (uploader_active_) {
	upload_service_.reset(		upload_service_.reset(
	new UploadService(new SystemProfileCache(), metrics_lib_, server_));		new UploadService(new SystemProfileCache(), metrics_lib_, server_));
	upload_service_->Init(upload_interval_, metrics_file_);		upload_service_->Init(upload_interval_, metrics_directory_);
	}		}

	return EX_OK;		return EX_OK;

metricsd/metrics_daemon.h

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -50,8 +50,7 @@ class MetricsDaemon : public chromeos::DBusDaemon {
	const std::string& scaling_max_freq_path,		const std::string& scaling_max_freq_path,
	const base::TimeDelta& upload_interval,		const base::TimeDelta& upload_interval,
	const std::string& server,		const std::string& server,
	const std::string& metrics_file,		const base::FilePath& metrics_directory);
	const std::string& config_root);

	// Initializes DBus and MessageLoop variables before running the MessageLoop.		// Initializes DBus and MessageLoop variables before running the MessageLoop.
	int OnInit() override;		int OnInit() override;
	@@ -268,7 +267,7 @@ class MetricsDaemon : public chromeos::DBusDaemon {
	bool dbus_enabled_;		bool dbus_enabled_;

	// Root of the configuration files to use.		// Root of the configuration files to use.
	std::string config_root_;		base::FilePath metrics_directory_;

	// The metrics library handle.		// The metrics library handle.
	MetricsLibraryInterface* metrics_lib_;		MetricsLibraryInterface* metrics_lib_;
	@@ -331,7 +330,6 @@ class MetricsDaemon : public chromeos::DBusDaemon {

	base::TimeDelta upload_interval_;		base::TimeDelta upload_interval_;
	std::string server_;		std::string server_;
	std::string metrics_file_;

	scoped_ptr<UploadService> upload_service_;		scoped_ptr<UploadService> upload_service_;
	};		};