diff --git a/cmds/statsd/src/FieldValue.h b/cmds/statsd/src/FieldValue.h index ba4cf11b84f1a..fd86e36839704 100644 --- a/cmds/statsd/src/FieldValue.h +++ b/cmds/statsd/src/FieldValue.h @@ -27,7 +27,6 @@ struct Matcher; struct Field; struct FieldValue; -const int32_t kAttributionField = 1; const int32_t kMaxLogDepth = 2; const int32_t kLastBitMask = 0x80; const int32_t kClearLastBitDeco = 0x7f; diff --git a/cmds/statsd/src/StatsLogProcessor.cpp b/cmds/statsd/src/StatsLogProcessor.cpp index 062fcf9c9dae7..60e259be95580 100644 --- a/cmds/statsd/src/StatsLogProcessor.cpp +++ b/cmds/statsd/src/StatsLogProcessor.cpp @@ -138,14 +138,13 @@ void StatsLogProcessor::onPeriodicAlarmFired( } void StatsLogProcessor::mapIsolatedUidToHostUidIfNecessaryLocked(LogEvent* event) const { - if (event->getAttributionChainIndex() != -1) { - for (auto& value : *(event->getMutableValues())) { - if (value.mField.getPosAtDepth(0) > kAttributionField) { - break; - } - if (isAttributionUidField(value)) { - const int hostUid = mUidMap->getHostUidOrSelf(value.mValue.int_value); - value.mValue.setInt(hostUid); + if (std::pair indexRange; event->hasAttributionChain(&indexRange)) { + vector* const fieldValues = event->getMutableValues(); + for (int i = indexRange.first; i <= indexRange.second; i++) { + FieldValue& fieldValue = fieldValues->at(i); + if (isAttributionUidField(fieldValue)) { + const int hostUid = mUidMap->getHostUidOrSelf(fieldValue.mValue.int_value); + fieldValue.mValue.setInt(hostUid); } } } else { diff --git a/cmds/statsd/src/external/puller_util.cpp b/cmds/statsd/src/external/puller_util.cpp index 84bc68402723a..aa99d0082bdda 100644 --- a/cmds/statsd/src/external/puller_util.cpp +++ b/cmds/statsd/src/external/puller_util.cpp @@ -50,7 +50,8 @@ void mapAndMergeIsolatedUidsToHostUid(vector>& data, const int tagId, const vector& additiveFieldsVec) { // Check the first LogEvent for attribution chain or a uid field as either all atoms with this // tagId have them or none of them do. - const bool hasAttributionChain = data[0]->getAttributionChainIndex() != -1; + std::pair attrIndexRange; + const bool hasAttributionChain = data[0]->hasAttributionChain(&attrIndexRange); bool hasUidField = (data[0]->getUidFieldIndex() != -1); if (!hasAttributionChain && !hasUidField) { @@ -64,14 +65,13 @@ void mapAndMergeIsolatedUidsToHostUid(vector>& data, const ALOGE("Wrong atom. Expecting %d, got %d", tagId, event->GetTagId()); return; } - if (event->getAttributionChainIndex() != -1) { - for (auto& value : *(event->getMutableValues())) { - if (value.mField.getPosAtDepth(0) > kAttributionField) { - break; - } - if (isAttributionUidField(value)) { - const int hostUid = uidMap->getHostUidOrSelf(value.mValue.int_value); - value.mValue.setInt(hostUid); + if (hasAttributionChain) { + vector* const fieldValues = event->getMutableValues(); + for (int i = attrIndexRange.first; i <= attrIndexRange.second; i++) { + FieldValue& fieldValue = fieldValues->at(i); + if (isAttributionUidField(fieldValue)) { + const int hostUid = uidMap->getHostUidOrSelf(fieldValue.mValue.int_value); + fieldValue.mValue.setInt(hostUid); } } } else { diff --git a/cmds/statsd/src/logd/LogEvent.cpp b/cmds/statsd/src/logd/LogEvent.cpp index eb830e114b407..10b1059796a02 100644 --- a/cmds/statsd/src/logd/LogEvent.cpp +++ b/cmds/statsd/src/logd/LogEvent.cpp @@ -211,8 +211,8 @@ void LogEvent::parseKeyValuePairs(int32_t* pos, int32_t depth, bool* last, uint8 void LogEvent::parseAttributionChain(int32_t* pos, int32_t depth, bool* last, uint8_t numAnnotations) { - int firstUidInChainIndex = mValues.size(); - int32_t numNodes = readNextValue(); + const unsigned int firstUidInChainIndex = mValues.size(); + const int32_t numNodes = readNextValue(); for (pos[1] = 1; pos[1] <= numNodes; pos[1]++) { last[1] = (pos[1] == numNodes); @@ -225,6 +225,11 @@ void LogEvent::parseAttributionChain(int32_t* pos, int32_t depth, bool* last, last[2] = true; parseString(pos, /*depth=*/2, last, /*numAnnotations=*/0); } + // Check if at least one node was successfully parsed. + if (mValues.size() - 1 > firstUidInChainIndex) { + mAttributionChainStartIndex = firstUidInChainIndex; + mAttributionChainEndIndex = mValues.size() - 1; + } parseAnnotations(numAnnotations, firstUidInChainIndex); @@ -401,7 +406,6 @@ bool LogEvent::parseBuffer(uint8_t* buf, size_t len) { break; case ATTRIBUTION_CHAIN_TYPE: parseAttributionChain(pos, /*depth=*/0, last, getNumAnnotations(typeInfo)); - if (mAttributionChainIndex == -1) mAttributionChainIndex = pos[0]; break; case ERROR_TYPE: mErrorBitmask = readNextValue(); @@ -567,6 +571,19 @@ void LogEvent::ToProto(ProtoOutputStream& protoOutput) const { writeFieldValueTreeToStream(mTagId, getValues(), &protoOutput); } +bool LogEvent::hasAttributionChain(std::pair* indexRange) const { + if (mAttributionChainStartIndex == -1 || mAttributionChainEndIndex == -1) { + return false; + } + + if (nullptr != indexRange) { + indexRange->first = mAttributionChainStartIndex; + indexRange->second = mAttributionChainEndIndex; + } + + return true; +} + void writeExperimentIdsToProto(const std::vector& experimentIds, std::vector* protoOut) { ProtoOutputStream proto; diff --git a/cmds/statsd/src/logd/LogEvent.h b/cmds/statsd/src/logd/LogEvent.h index dedcfaf6cd877..731b9661067a3 100644 --- a/cmds/statsd/src/logd/LogEvent.h +++ b/cmds/statsd/src/logd/LogEvent.h @@ -163,12 +163,10 @@ public: return mUidFieldIndex; } - // Returns the index of (the first) attribution chain within the atom - // definition. Note that the value is 1-indexed. If there is no attribution - // chain, returns -1. - inline int getAttributionChainIndex() { - return mAttributionChainIndex; - } + // Returns whether this LogEvent has an AttributionChain. + // If it does and indexRange is not a nullptr, populate indexRange with the start and end index + // of the AttributionChain within mValues. + bool hasAttributionChain(std::pair* indexRange = nullptr) const; // Returns the index of the exclusive state field within the FieldValues vector if // an exclusive state exists. If there is no exclusive state field, returns -1. @@ -324,7 +322,8 @@ private: // Annotations bool mTruncateTimestamp = false; int mUidFieldIndex = -1; - int mAttributionChainIndex = -1; + int mAttributionChainStartIndex = -1; + int mAttributionChainEndIndex = -1; int mExclusiveStateFieldIndex = -1; int mResetState = -1; }; diff --git a/cmds/statsd/tests/LogEvent_test.cpp b/cmds/statsd/tests/LogEvent_test.cpp index e52e2d024e945..00f336a4986d2 100644 --- a/cmds/statsd/tests/LogEvent_test.cpp +++ b/cmds/statsd/tests/LogEvent_test.cpp @@ -95,6 +95,7 @@ TEST(LogEventTest, TestPrimitiveParsing) { EXPECT_EQ(100, logEvent.GetTagId()); EXPECT_EQ(1000, logEvent.GetUid()); EXPECT_EQ(1001, logEvent.GetPid()); + EXPECT_FALSE(logEvent.hasAttributionChain()); const vector& values = logEvent.getValues(); EXPECT_EQ(4, values.size()); @@ -143,6 +144,7 @@ TEST(LogEventTest, TestStringAndByteArrayParsing) { EXPECT_EQ(100, logEvent.GetTagId()); EXPECT_EQ(1000, logEvent.GetUid()); EXPECT_EQ(1001, logEvent.GetPid()); + EXPECT_FALSE(logEvent.hasAttributionChain()); const vector& values = logEvent.getValues(); EXPECT_EQ(2, values.size()); @@ -179,6 +181,7 @@ TEST(LogEventTest, TestEmptyString) { EXPECT_EQ(100, logEvent.GetTagId()); EXPECT_EQ(1000, logEvent.GetUid()); EXPECT_EQ(1001, logEvent.GetPid()); + EXPECT_FALSE(logEvent.hasAttributionChain()); const vector& values = logEvent.getValues(); EXPECT_EQ(1, values.size()); @@ -248,6 +251,11 @@ TEST(LogEventTest, TestAttributionChain) { const vector& values = logEvent.getValues(); EXPECT_EQ(4, values.size()); // 2 per attribution node + std::pair attrIndexRange; + EXPECT_TRUE(logEvent.hasAttributionChain(&attrIndexRange)); + EXPECT_EQ(0, attrIndexRange.first); + EXPECT_EQ(3, attrIndexRange.second); + // Check first attribution node const FieldValue& uid1Item = values[0]; Field expectedField = getField(100, {1, 1, 1}, 2, {true, false, false});