From 134c97a24a9e762ac1a6d73567beb6f46eb8dd84 Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Wed, 9 Feb 2022 12:45:25 +0000
Subject: 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
---
 statsd/src/FieldValue.cpp                                   | 2 +-
 statsd/src/HashableDimensionKey.cpp                         | 2 +-
 statsd/src/Log.h                                            | 4 ++--
 statsd/src/StatsLogProcessor.cpp                            | 2 +-
 statsd/src/StatsService.cpp                                 | 2 +-
 statsd/src/anomaly/AlarmMonitor.cpp                         | 2 +-
 statsd/src/anomaly/AlarmTracker.cpp                         | 2 +-
 statsd/src/anomaly/AnomalyTracker.cpp                       | 2 +-
 statsd/src/anomaly/DurationAnomalyTracker.cpp               | 2 +-
 statsd/src/anomaly/subscriber_util.cpp                      | 2 +-
 statsd/src/condition/CombinationConditionTracker.cpp        | 2 +-
 statsd/src/condition/SimpleConditionTracker.cpp             | 4 ++--
 statsd/src/config/ConfigManager.cpp                         | 2 +-
 statsd/src/external/Perfetto.cpp                            | 2 +-
 statsd/src/external/StatsCallbackPuller.cpp                 | 2 +-
 statsd/src/external/StatsPuller.cpp                         | 2 +-
 statsd/src/external/StatsPullerManager.cpp                  | 2 +-
 statsd/src/external/TrainInfoPuller.cpp                     | 2 +-
 statsd/src/external/puller_util.cpp                         | 2 +-
 statsd/src/guardrail/StatsdStats.cpp                        | 2 +-
 statsd/src/logd/LogEvent.cpp                                | 2 +-
 statsd/src/logd/LogEventQueue.cpp                           | 2 +-
 statsd/src/main.cpp                                         | 2 +-
 statsd/src/matchers/SimpleAtomMatchingTracker.cpp           | 2 +-
 statsd/src/matchers/matcher_util.cpp                        | 2 +-
 statsd/src/metrics/CountMetricProducer.cpp                  | 2 +-
 statsd/src/metrics/DurationMetricProducer.cpp               | 2 +-
 statsd/src/metrics/EventMetricProducer.cpp                  | 2 +-
 statsd/src/metrics/GaugeMetricProducer.cpp                  | 2 +-
 statsd/src/metrics/KllMetricProducer.cpp                    | 2 +-
 statsd/src/metrics/MetricProducer.cpp                       | 2 +-
 statsd/src/metrics/MetricsManager.cpp                       | 4 ++--
 statsd/src/metrics/NumericValueMetricProducer.cpp           | 2 +-
 statsd/src/metrics/ValueMetricProducer.cpp                  | 2 +-
 statsd/src/metrics/duration_helper/MaxDurationTracker.cpp   | 2 +-
 statsd/src/metrics/duration_helper/OringDurationTracker.cpp | 2 +-
 statsd/src/metrics/parsing_utils/config_update_utils.cpp    | 2 +-
 statsd/src/metrics/parsing_utils/metrics_manager_util.cpp   | 2 +-
 statsd/src/packages/UidMap.cpp                              | 2 +-
 statsd/src/shell/ShellSubscriber.cpp                        | 2 +-
 statsd/src/socket/StatsSocketListener.cpp                   | 2 +-
 statsd/src/state/StateManager.cpp                           | 2 +-
 statsd/src/state/StateTracker.cpp                           | 2 +-
 statsd/src/statscompanion_util.cpp                          | 2 +-
 statsd/src/storage/StorageManager.cpp                       | 2 +-
 statsd/src/subscriber/IncidentdReporter.cpp                 | 2 +-
 statsd/src/subscriber/SubscriberReporter.cpp                | 2 +-
 statsd/src/utils/MultiConditionTrigger.cpp                  | 2 +-
 48 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/statsd/src/FieldValue.cpp b/statsd/src/FieldValue.cpp
index e78edf05..9e4e4504 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 bceaf9d2..c1b250a1 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 87f4cbaf..c00dc07f 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 d5ee388a..10d21121 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 4770a539..00370577 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 b632d040..4822b541 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 6d9beb8f..e8c70fa5 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 6aa410b1..68dc0aa0 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 2b568101..66c71ad5 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 5a4a41d0..34f33205 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 4574b2e3..7a97ab39 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 1398c3eb..66ce961f 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 @@ void SimpleConditionTracker::handleConditionEvent(const HashableDimensionKey& ou
     }
 
     // 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 d839e024..1a76cb88 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 b9ccfd2b..86c8d7a8 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 49864710..7d5d04b1 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 b8e4abc7..395e660e 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 c8c09b42..90e1cd0e 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 9273788d..f2a55d9b 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 3076ce36..dc7cdce9 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 000ac81d..0e660190 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 c4f15ad6..e89d067b 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 146464bb..96b7f015 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 df723c64..01e1e924 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 423da5bd..76bd4761 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 4ea117fa..68c11592 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 5896754f..434bba70 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 569618cd..add5fa43 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 31ad2292..502ea8ad 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 da54a9e6..b4fbe172 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 8897c51b..5fe08fc7 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 6c7b8d5c..9a00c87f 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 53eab968..7c8d9b79 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 @@ void MetricsManager::initAllowedLogSources() {
         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 2660c0c0..fd2e207a 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 ba2e88e2..530de931 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 0ee5e46d..0e93c283 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 b67e25c4..b9dafda3 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 9fd30b62..f1361244 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 efb456df..cde81015 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 121c7a0f..69584b58 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 9d8f0c24..35e64e47 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 b877cc9c..7b465735 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 367f3d86..c488d044 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 60726947..719ff3f2 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 ce07ec0e..75de24f5 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 782b020b..b3e8d8a1 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 1d77513d..09ef325f 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 c6bdc3fe..2fb5c761 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 43a69337..5ef50ee0 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"
 
-- 
cgit v1.2.3