Do not #define DEBUG in statsd code.
DEBUG is defined in android-base/logging.h, and any transitive usage
of that introduces a conflict in statsd.
The change was generated with sed being called on all files.
Bug: 211747008
Test: presubmit
Change-Id: I89c480dbd4fa2755abc27748f9e38e382f8b836a
diff --git a/statsd/src/FieldValue.cpp b/statsd/src/FieldValue.cpp
index e78edf0..9e4e450 100644
--- a/statsd/src/FieldValue.cpp
+++ b/statsd/src/FieldValue.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false
+#define STATSD_DEBUG false
#include "Log.h"
#include "FieldValue.h"
#include "HashableDimensionKey.h"
diff --git a/statsd/src/HashableDimensionKey.cpp b/statsd/src/HashableDimensionKey.cpp
index bceaf9d..c1b250a 100644
--- a/statsd/src/HashableDimensionKey.cpp
+++ b/statsd/src/HashableDimensionKey.cpp
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "HashableDimensionKey.h"
diff --git a/statsd/src/Log.h b/statsd/src/Log.h
index 87f4cba..c00dc07 100644
--- a/statsd/src/Log.h
+++ b/statsd/src/Log.h
@@ -28,6 +28,6 @@
// Use the local value to turn on/off debug logs instead of using log.tag. properties.
// The advantage is that in production compiler can remove the logging code if the local
-// DEBUG/VERBOSE is false.
+// STATSD_DEBUG/VERBOSE is false.
#define VLOG(...) \
- if (DEBUG) ALOGD(__VA_ARGS__);
+ if (STATSD_DEBUG) ALOGD(__VA_ARGS__);
diff --git a/statsd/src/StatsLogProcessor.cpp b/statsd/src/StatsLogProcessor.cpp
index d5ee388..10d2112 100644
--- a/statsd/src/StatsLogProcessor.cpp
+++ b/statsd/src/StatsLogProcessor.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "StatsLogProcessor.h"
diff --git a/statsd/src/StatsService.cpp b/statsd/src/StatsService.cpp
index 4770a53..0037057 100644
--- a/statsd/src/StatsService.cpp
+++ b/statsd/src/StatsService.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "StatsService.h"
diff --git a/statsd/src/anomaly/AlarmMonitor.cpp b/statsd/src/anomaly/AlarmMonitor.cpp
index b632d04..4822b54 100644
--- a/statsd/src/anomaly/AlarmMonitor.cpp
+++ b/statsd/src/anomaly/AlarmMonitor.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false
+#define STATSD_DEBUG false
#include "Log.h"
#include "anomaly/AlarmMonitor.h"
diff --git a/statsd/src/anomaly/AlarmTracker.cpp b/statsd/src/anomaly/AlarmTracker.cpp
index 6d9beb8..e8c70fa 100644
--- a/statsd/src/anomaly/AlarmTracker.cpp
+++ b/statsd/src/anomaly/AlarmTracker.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "anomaly/AlarmTracker.h"
diff --git a/statsd/src/anomaly/AnomalyTracker.cpp b/statsd/src/anomaly/AnomalyTracker.cpp
index 6aa410b..68dc0aa 100644
--- a/statsd/src/anomaly/AnomalyTracker.cpp
+++ b/statsd/src/anomaly/AnomalyTracker.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "AnomalyTracker.h"
diff --git a/statsd/src/anomaly/DurationAnomalyTracker.cpp b/statsd/src/anomaly/DurationAnomalyTracker.cpp
index 2b56810..66c71ad 100644
--- a/statsd/src/anomaly/DurationAnomalyTracker.cpp
+++ b/statsd/src/anomaly/DurationAnomalyTracker.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "DurationAnomalyTracker.h"
diff --git a/statsd/src/anomaly/subscriber_util.cpp b/statsd/src/anomaly/subscriber_util.cpp
index 5a4a41d..34f3320 100644
--- a/statsd/src/anomaly/subscriber_util.cpp
+++ b/statsd/src/anomaly/subscriber_util.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "external/Perfetto.h"
diff --git a/statsd/src/condition/CombinationConditionTracker.cpp b/statsd/src/condition/CombinationConditionTracker.cpp
index 4574b2e..7a97ab3 100644
--- a/statsd/src/condition/CombinationConditionTracker.cpp
+++ b/statsd/src/condition/CombinationConditionTracker.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "CombinationConditionTracker.h"
diff --git a/statsd/src/condition/SimpleConditionTracker.cpp b/statsd/src/condition/SimpleConditionTracker.cpp
index 1398c3e..66ce961 100644
--- a/statsd/src/condition/SimpleConditionTracker.cpp
+++ b/statsd/src/condition/SimpleConditionTracker.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "SimpleConditionTracker.h"
@@ -249,7 +249,7 @@
}
// dump all dimensions for debugging
- if (DEBUG) {
+ if (STATSD_DEBUG) {
dumpState();
}
diff --git a/statsd/src/config/ConfigManager.cpp b/statsd/src/config/ConfigManager.cpp
index d839e02..1a76cb8 100644
--- a/statsd/src/config/ConfigManager.cpp
+++ b/statsd/src/config/ConfigManager.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "config/ConfigManager.h"
diff --git a/statsd/src/external/Perfetto.cpp b/statsd/src/external/Perfetto.cpp
index b9ccfd2..86c8d7a 100644
--- a/statsd/src/external/Perfetto.cpp
+++ b/statsd/src/external/Perfetto.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "config/ConfigKey.h"
#include "Log.h"
diff --git a/statsd/src/external/StatsCallbackPuller.cpp b/statsd/src/external/StatsCallbackPuller.cpp
index 4986471..7d5d04b 100644
--- a/statsd/src/external/StatsCallbackPuller.cpp
+++ b/statsd/src/external/StatsCallbackPuller.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "StatsCallbackPuller.h"
diff --git a/statsd/src/external/StatsPuller.cpp b/statsd/src/external/StatsPuller.cpp
index b8e4abc..395e660 100644
--- a/statsd/src/external/StatsPuller.cpp
+++ b/statsd/src/external/StatsPuller.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "StatsPuller.h"
diff --git a/statsd/src/external/StatsPullerManager.cpp b/statsd/src/external/StatsPullerManager.cpp
index c8c09b4..90e1cd0 100644
--- a/statsd/src/external/StatsPullerManager.cpp
+++ b/statsd/src/external/StatsPullerManager.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false
+#define STATSD_DEBUG false
#include "Log.h"
#include "StatsPullerManager.h"
diff --git a/statsd/src/external/TrainInfoPuller.cpp b/statsd/src/external/TrainInfoPuller.cpp
index 9273788..f2a55d9 100644
--- a/statsd/src/external/TrainInfoPuller.cpp
+++ b/statsd/src/external/TrainInfoPuller.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "external/StatsPuller.h"
diff --git a/statsd/src/external/puller_util.cpp b/statsd/src/external/puller_util.cpp
index 3076ce3..dc7cdce 100644
--- a/statsd/src/external/puller_util.cpp
+++ b/statsd/src/external/puller_util.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "puller_util.h"
diff --git a/statsd/src/guardrail/StatsdStats.cpp b/statsd/src/guardrail/StatsdStats.cpp
index 000ac81..0e66019 100644
--- a/statsd/src/guardrail/StatsdStats.cpp
+++ b/statsd/src/guardrail/StatsdStats.cpp
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "StatsdStats.h"
diff --git a/statsd/src/logd/LogEvent.cpp b/statsd/src/logd/LogEvent.cpp
index c4f15ad..e89d067 100644
--- a/statsd/src/logd/LogEvent.cpp
+++ b/statsd/src/logd/LogEvent.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "logd/LogEvent.h"
#include <android-base/stringprintf.h>
diff --git a/statsd/src/logd/LogEventQueue.cpp b/statsd/src/logd/LogEventQueue.cpp
index 146464b..96b7f01 100644
--- a/statsd/src/logd/LogEventQueue.cpp
+++ b/statsd/src/logd/LogEventQueue.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "LogEventQueue.h"
diff --git a/statsd/src/main.cpp b/statsd/src/main.cpp
index df723c6..01e1e92 100644
--- a/statsd/src/main.cpp
+++ b/statsd/src/main.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "StatsService.h"
diff --git a/statsd/src/matchers/SimpleAtomMatchingTracker.cpp b/statsd/src/matchers/SimpleAtomMatchingTracker.cpp
index 423da5b..76bd476 100644
--- a/statsd/src/matchers/SimpleAtomMatchingTracker.cpp
+++ b/statsd/src/matchers/SimpleAtomMatchingTracker.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "SimpleAtomMatchingTracker.h"
diff --git a/statsd/src/matchers/matcher_util.cpp b/statsd/src/matchers/matcher_util.cpp
index 4ea117f..68c1159 100644
--- a/statsd/src/matchers/matcher_util.cpp
+++ b/statsd/src/matchers/matcher_util.cpp
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "src/statsd_config.pb.h"
diff --git a/statsd/src/metrics/CountMetricProducer.cpp b/statsd/src/metrics/CountMetricProducer.cpp
index 5896754..434bba7 100644
--- a/statsd/src/metrics/CountMetricProducer.cpp
+++ b/statsd/src/metrics/CountMetricProducer.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "CountMetricProducer.h"
diff --git a/statsd/src/metrics/DurationMetricProducer.cpp b/statsd/src/metrics/DurationMetricProducer.cpp
index 569618c..add5fa4 100644
--- a/statsd/src/metrics/DurationMetricProducer.cpp
+++ b/statsd/src/metrics/DurationMetricProducer.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false
+#define STATSD_DEBUG false
#include "Log.h"
diff --git a/statsd/src/metrics/EventMetricProducer.cpp b/statsd/src/metrics/EventMetricProducer.cpp
index 31ad229..502ea8a 100644
--- a/statsd/src/metrics/EventMetricProducer.cpp
+++ b/statsd/src/metrics/EventMetricProducer.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "EventMetricProducer.h"
diff --git a/statsd/src/metrics/GaugeMetricProducer.cpp b/statsd/src/metrics/GaugeMetricProducer.cpp
index da54a9e..b4fbe17 100644
--- a/statsd/src/metrics/GaugeMetricProducer.cpp
+++ b/statsd/src/metrics/GaugeMetricProducer.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "GaugeMetricProducer.h"
diff --git a/statsd/src/metrics/KllMetricProducer.cpp b/statsd/src/metrics/KllMetricProducer.cpp
index 8897c51..5fe08fc 100644
--- a/statsd/src/metrics/KllMetricProducer.cpp
+++ b/statsd/src/metrics/KllMetricProducer.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "KllMetricProducer.h"
diff --git a/statsd/src/metrics/MetricProducer.cpp b/statsd/src/metrics/MetricProducer.cpp
index 6c7b8d5..9a00c87 100644
--- a/statsd/src/metrics/MetricProducer.cpp
+++ b/statsd/src/metrics/MetricProducer.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "MetricProducer.h"
diff --git a/statsd/src/metrics/MetricsManager.cpp b/statsd/src/metrics/MetricsManager.cpp
index 53eab96..7c8d9b7 100644
--- a/statsd/src/metrics/MetricsManager.cpp
+++ b/statsd/src/metrics/MetricsManager.cpp
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "MetricsManager.h"
@@ -281,7 +281,7 @@
auto uids = mUidMap->getAppUid(pkg);
mAllowedLogSources.insert(uids.begin(), uids.end());
}
- if (DEBUG) {
+ if (STATSD_DEBUG) {
for (const auto& uid : mAllowedLogSources) {
VLOG("Allowed uid %d", uid);
}
diff --git a/statsd/src/metrics/NumericValueMetricProducer.cpp b/statsd/src/metrics/NumericValueMetricProducer.cpp
index 2660c0c..fd2e207 100644
--- a/statsd/src/metrics/NumericValueMetricProducer.cpp
+++ b/statsd/src/metrics/NumericValueMetricProducer.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "NumericValueMetricProducer.h"
diff --git a/statsd/src/metrics/ValueMetricProducer.cpp b/statsd/src/metrics/ValueMetricProducer.cpp
index ba2e88e..530de93 100644
--- a/statsd/src/metrics/ValueMetricProducer.cpp
+++ b/statsd/src/metrics/ValueMetricProducer.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "ValueMetricProducer.h"
diff --git a/statsd/src/metrics/duration_helper/MaxDurationTracker.cpp b/statsd/src/metrics/duration_helper/MaxDurationTracker.cpp
index 0ee5e46..0e93c28 100644
--- a/statsd/src/metrics/duration_helper/MaxDurationTracker.cpp
+++ b/statsd/src/metrics/duration_helper/MaxDurationTracker.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false
+#define STATSD_DEBUG false
#include "Log.h"
#include "MaxDurationTracker.h"
diff --git a/statsd/src/metrics/duration_helper/OringDurationTracker.cpp b/statsd/src/metrics/duration_helper/OringDurationTracker.cpp
index b67e25c..b9dafda 100644
--- a/statsd/src/metrics/duration_helper/OringDurationTracker.cpp
+++ b/statsd/src/metrics/duration_helper/OringDurationTracker.cpp
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#define DEBUG false
+#define STATSD_DEBUG false
#include "Log.h"
#include "OringDurationTracker.h"
#include "guardrail/StatsdStats.h"
diff --git a/statsd/src/metrics/parsing_utils/config_update_utils.cpp b/statsd/src/metrics/parsing_utils/config_update_utils.cpp
index 9fd30b6..f136124 100644
--- a/statsd/src/metrics/parsing_utils/config_update_utils.cpp
+++ b/statsd/src/metrics/parsing_utils/config_update_utils.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "config_update_utils.h"
diff --git a/statsd/src/metrics/parsing_utils/metrics_manager_util.cpp b/statsd/src/metrics/parsing_utils/metrics_manager_util.cpp
index efb456d..cde8101 100644
--- a/statsd/src/metrics/parsing_utils/metrics_manager_util.cpp
+++ b/statsd/src/metrics/parsing_utils/metrics_manager_util.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "metrics_manager_util.h"
diff --git a/statsd/src/packages/UidMap.cpp b/statsd/src/packages/UidMap.cpp
index 121c7a0..69584b5 100644
--- a/statsd/src/packages/UidMap.cpp
+++ b/statsd/src/packages/UidMap.cpp
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "hash.h"
diff --git a/statsd/src/shell/ShellSubscriber.cpp b/statsd/src/shell/ShellSubscriber.cpp
index 9d8f0c2..35e64e4 100644
--- a/statsd/src/shell/ShellSubscriber.cpp
+++ b/statsd/src/shell/ShellSubscriber.cpp
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "ShellSubscriber.h"
diff --git a/statsd/src/socket/StatsSocketListener.cpp b/statsd/src/socket/StatsSocketListener.cpp
index b877cc9..7b46573 100755
--- a/statsd/src/socket/StatsSocketListener.cpp
+++ b/statsd/src/socket/StatsSocketListener.cpp
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include <ctype.h>
diff --git a/statsd/src/state/StateManager.cpp b/statsd/src/state/StateManager.cpp
index 367f3d8..c488d04 100644
--- a/statsd/src/state/StateManager.cpp
+++ b/statsd/src/state/StateManager.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "StateManager.h"
diff --git a/statsd/src/state/StateTracker.cpp b/statsd/src/state/StateTracker.cpp
index 6072694..719ff3f 100644
--- a/statsd/src/state/StateTracker.cpp
+++ b/statsd/src/state/StateTracker.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG true // STOPSHIP if true
+#define STATSD_DEBUG true // STOPSHIP if true
#include "Log.h"
#include "stats_util.h"
diff --git a/statsd/src/statscompanion_util.cpp b/statsd/src/statscompanion_util.cpp
index ce07ec0..75de24f 100644
--- a/statsd/src/statscompanion_util.cpp
+++ b/statsd/src/statscompanion_util.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "statscompanion_util.h"
diff --git a/statsd/src/storage/StorageManager.cpp b/statsd/src/storage/StorageManager.cpp
index 782b020..b3e8d8a 100644
--- a/statsd/src/storage/StorageManager.cpp
+++ b/statsd/src/storage/StorageManager.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "android-base/stringprintf.h"
diff --git a/statsd/src/subscriber/IncidentdReporter.cpp b/statsd/src/subscriber/IncidentdReporter.cpp
index 1d77513..09ef325 100644
--- a/statsd/src/subscriber/IncidentdReporter.cpp
+++ b/statsd/src/subscriber/IncidentdReporter.cpp
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#define DEBUG false
+#define STATSD_DEBUG false
#include "Log.h"
#include "FieldValue.h"
diff --git a/statsd/src/subscriber/SubscriberReporter.cpp b/statsd/src/subscriber/SubscriberReporter.cpp
index c6bdc3f..2fb5c76 100644
--- a/statsd/src/subscriber/SubscriberReporter.cpp
+++ b/statsd/src/subscriber/SubscriberReporter.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "Log.h"
#include "SubscriberReporter.h"
diff --git a/statsd/src/utils/MultiConditionTrigger.cpp b/statsd/src/utils/MultiConditionTrigger.cpp
index 43a6933..5ef50ee 100644
--- a/statsd/src/utils/MultiConditionTrigger.cpp
+++ b/statsd/src/utils/MultiConditionTrigger.cpp
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#define DEBUG false // STOPSHIP if true
+#define STATSD_DEBUG false // STOPSHIP if true
#include "MultiConditionTrigger.h"
