commit 9bd65be7f2b39e34ff45b376abf71762e791fe66
author Li Zhanhui <lizhanhui@gmail.com> Sat Oct 02 09:41:09 2021 +0000
committer Li Zhanhui <lizhanhui@gmail.com> Sat Oct 02 09:41:09 2021 +0000
tree f4de2b30d1a094bfc39c557e24a81be43badbe08
parent 8eeb23255421380a100202a661d807a9ce075814

BugFix: fix DEBUG enum item and macro collision

src/main/cpp/tracing/exporters/OtlpExporter.cpp

diff --git a/src/main/cpp/tracing/exporters/OtlpExporter.cpp b/src/main/cpp/tracing/exporters/OtlpExporter.cpp
index 89c66a2..40f93d2 100644
--- a/src/main/cpp/tracing/exporters/OtlpExporter.cpp
+++ b/src/main/cpp/tracing/exporters/OtlpExporter.cpp
@@ -129,9 +129,9 @@
   }
 
   switch (exp->traceMode()) {
-    case TraceMode::OFF:
+    case TraceMode::Off:
       return;
-    case TraceMode::DEBUG: {
+    case TraceMode::Develop: {
       {
         for (const auto& span : spans) {
           SPDLOG_INFO("{} --> {}: {}", absl::FormatTime(span.start_time()), absl::FormatTime(span.end_time()),
@@ -158,7 +158,7 @@
       }
       return;
     }
-    case TraceMode::GRPC:
+    case TraceMode::Grpc:
       break;
   }
 

src/main/cpp/tracing/exporters/include/OtlpExporter.h

diff --git a/src/main/cpp/tracing/exporters/include/OtlpExporter.h b/src/main/cpp/tracing/exporters/include/OtlpExporter.h
index dc80c00..6a39f96 100644
--- a/src/main/cpp/tracing/exporters/include/OtlpExporter.h
+++ b/src/main/cpp/tracing/exporters/include/OtlpExporter.h
@@ -26,9 +26,9 @@
 
 enum class TraceMode : std::uint8_t
 {
-  OFF = 0,
-  DEBUG = 1,
-  GRPC = 2
+  Off = 0,
+  Develop = 1,
+  Grpc = 2
 };
 
 class Samplers {
@@ -79,7 +79,7 @@
   std::vector<std::string> hosts_;
   absl::Mutex hosts_mtx_;
 
-  TraceMode mode_{TraceMode::OFF};
+  TraceMode mode_{TraceMode::Off};
 };
 
 class ExportClient {

src/test/cpp/ut/tracing/exporters/OtlpExportersTest.cpp

diff --git a/src/test/cpp/ut/tracing/exporters/OtlpExportersTest.cpp b/src/test/cpp/ut/tracing/exporters/OtlpExportersTest.cpp
index add9524..7cc649d 100644
--- a/src/test/cpp/ut/tracing/exporters/OtlpExportersTest.cpp
+++ b/src/test/cpp/ut/tracing/exporters/OtlpExportersTest.cpp
@@ -27,7 +27,7 @@
 
 TEST_F(OtlpExporterTest, testExport) {
   auto exporter = std::make_shared<OtlpExporter>(client_manager_, &client_config_);
-  exporter->traceMode(TraceMode::DEBUG);
+  exporter->traceMode(TraceMode::Develop);
   exporter->start();
 
   auto& sampler = Samplers::always();