Merge "Fix bug: metricIds are truncated" (683fe3ea) · Commits · e / os / android_frameworks_base

cmds/statsd/src/guardrail/StatsdStats.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -423,37 +423,37 @@ void StatsdStats::noteEmptyData(int atomId) {
		mPulledAtomStats[atomId].emptyData++;
		}

		void StatsdStats::noteHardDimensionLimitReached(int metricId) {
		void StatsdStats::noteHardDimensionLimitReached(int64_t metricId) {
		lock_guard<std::mutex> lock(mLock);
		getAtomMetricStats(metricId).hardDimensionLimitReached++;
		}

		void StatsdStats::noteLateLogEventSkipped(int metricId) {
		void StatsdStats::noteLateLogEventSkipped(int64_t metricId) {
		lock_guard<std::mutex> lock(mLock);
		getAtomMetricStats(metricId).lateLogEventSkipped++;
		}

		void StatsdStats::noteSkippedForwardBuckets(int metricId) {
		void StatsdStats::noteSkippedForwardBuckets(int64_t metricId) {
		lock_guard<std::mutex> lock(mLock);
		getAtomMetricStats(metricId).skippedForwardBuckets++;
		}

		void StatsdStats::noteBadValueType(int metricId) {
		void StatsdStats::noteBadValueType(int64_t metricId) {
		lock_guard<std::mutex> lock(mLock);
		getAtomMetricStats(metricId).badValueType++;
		}

		void StatsdStats::noteBucketDropped(int metricId) {
		void StatsdStats::noteBucketDropped(int64_t metricId) {
		lock_guard<std::mutex> lock(mLock);
		getAtomMetricStats(metricId).bucketDropped++;
		}

		void StatsdStats::noteConditionChangeInNextBucket(int metricId) {
		void StatsdStats::noteConditionChangeInNextBucket(int64_t metricId) {
		lock_guard<std::mutex> lock(mLock);
		getAtomMetricStats(metricId).conditionChangeInNextBucket++;
		}

		void StatsdStats::noteInvalidatedBucket(int metricId) {
		void StatsdStats::noteInvalidatedBucket(int64_t metricId) {
		lock_guard<std::mutex> lock(mLock);
		getAtomMetricStats(metricId).invalidatedBucket++;
		}

cmds/statsd/src/guardrail/StatsdStats.h

+7 −7

Original line number	Diff line number	Diff line
		@@ -342,37 +342,37 @@ public:
		/**
		* Hard limit was reached in the cardinality of an atom
		*/
		void noteHardDimensionLimitReached(int atomId);
		void noteHardDimensionLimitReached(int64_t metricId);

		/**
		* A log event was too late, arrived in the wrong bucket and was skipped
		*/
		void noteLateLogEventSkipped(int atomId);
		void noteLateLogEventSkipped(int64_t metricId);

		/**
		* Buckets were skipped as time elapsed without any data for them
		*/
		void noteSkippedForwardBuckets(int atomId);
		void noteSkippedForwardBuckets(int64_t metricId);

		/**
		* An unsupported value type was received
		*/
		void noteBadValueType(int atomId);
		void noteBadValueType(int64_t metricId);

		/**
		* Buckets were dropped due to reclaim memory.
		*/
		void noteBucketDropped(int metricId);
		void noteBucketDropped(int64_t metricId);

		/**
		* A condition change was too late, arrived in the wrong bucket and was skipped
		*/
		void noteConditionChangeInNextBucket(int atomId);
		void noteConditionChangeInNextBucket(int64_t metricId);

		/**
		* A bucket has been tagged as invalid.
		*/
		void noteInvalidatedBucket(int metricId);
		void noteInvalidatedBucket(int64_t metricId);

		/**
		* Reset the historical stats. Including all stats in icebox, and the tracked stats about