Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9440e096 authored by Howard Ro's avatar Howard Ro
Browse files

Fix incorrect field ID for is_active in stats_log 

field number 13 in stats_log.proto conflicts with a copy in google3/

Bug: 121035918
Test: stats_test
Change-Id: Iadc3a5c227bb361553ba2bee2534cc767d34d7a3
parent b4ee870e

cmds/statsd/src/metrics/CountMetricProducer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ const int FIELD_ID_TIME_BASE = 9; 
const int FIELD_ID_BUCKET_SIZE = 10;

const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11;

const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12;

const int FIELD_ID_IS_ACTIVE = 13;

const int FIELD_ID_IS_ACTIVE = 14;



// for CountMetricDataWrapper

const int FIELD_ID_DATA = 1;

cmds/statsd/src/metrics/DurationMetricProducer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ const int FIELD_ID_TIME_BASE = 9; 
const int FIELD_ID_BUCKET_SIZE = 10;

const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11;

const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12;

const int FIELD_ID_IS_ACTIVE = 13;

const int FIELD_ID_IS_ACTIVE = 14;

// for DurationMetricDataWrapper

const int FIELD_ID_DATA = 1;

// for DurationMetricData

cmds/statsd/src/metrics/EventMetricProducer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ namespace statsd { 
// for StatsLogReport

const int FIELD_ID_ID = 1;

const int FIELD_ID_EVENT_METRICS = 4;

const int FIELD_ID_IS_ACTIVE = 13;

const int FIELD_ID_IS_ACTIVE = 14;

// for EventMetricDataWrapper

const int FIELD_ID_DATA = 1;

// for EventMetricData

cmds/statsd/src/metrics/GaugeMetricProducer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ const int FIELD_ID_TIME_BASE = 9; 
const int FIELD_ID_BUCKET_SIZE = 10;

const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11;

const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12;

const int FIELD_ID_IS_ACTIVE = 13;

const int FIELD_ID_IS_ACTIVE = 14;

// for GaugeMetricDataWrapper

const int FIELD_ID_DATA = 1;

const int FIELD_ID_SKIPPED = 2;

cmds/statsd/src/metrics/ValueMetricProducer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ const int FIELD_ID_TIME_BASE = 9; 
const int FIELD_ID_BUCKET_SIZE = 10;

const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11;

const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12;

const int FIELD_ID_IS_ACTIVE = 13;

const int FIELD_ID_IS_ACTIVE = 14;

// for ValueMetricDataWrapper

const int FIELD_ID_DATA = 1;

const int FIELD_ID_SKIPPED = 2;