From d676cb32e143521224218feedf609b19fcafb8fe Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Tue, 2 Mar 2021 10:35:37 -0800
Subject: [PATCH] Separate tracers that will run in simulation from those that
 won't

---
 fdbserver/fdbserver.actor.cpp | 2 +-
 flow/Tracing.actor.cpp        | 2 +-
 flow/Tracing.h                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fdbserver/fdbserver.actor.cpp b/fdbserver/fdbserver.actor.cpp
index 6f74f9e562..162ac18835 100644
--- a/fdbserver/fdbserver.actor.cpp
+++ b/fdbserver/fdbserver.actor.cpp
@@ -1647,7 +1647,7 @@ int main(int argc, char* argv[]) {
 			//startOldSimulator();
 			startNewSimulator();
 			openTraceFile(NetworkAddress(), opts.rollsize, opts.maxLogsSize, opts.logFolder, "trace", opts.logGroup);
-			openTracer(TracerType(deterministicRandom()->randomInt(static_cast<int>(TracerType::DISABLED), static_cast<int>(TracerType::END))));
+			openTracer(TracerType(deterministicRandom()->randomInt(static_cast<int>(TracerType::DISABLED), static_cast<int>(TracerType::SIM_END))));
 		} else {
 			g_network = newNet2(opts.tlsConfig, opts.useThreadPool, true);
 			g_network->addStopCallback( Net2FileSystem::stop );
diff --git a/flow/Tracing.actor.cpp b/flow/Tracing.actor.cpp
index beb8bf6fd7..0a49a7de66 100644
--- a/flow/Tracing.actor.cpp
+++ b/flow/Tracing.actor.cpp
@@ -365,7 +365,7 @@ void openTracer(TracerType type) {
 		g_tracer = new FastUDPTracer{};
 #endif
 		break;
-	case TracerType::END:
+	case TracerType::SIM_END:
 		ASSERT(false);
 		break;
 	}
diff --git a/flow/Tracing.h b/flow/Tracing.h
index e14ce0e3cf..6dcdbfe7cf 100644
--- a/flow/Tracing.h
+++ b/flow/Tracing.h
@@ -98,7 +98,7 @@ struct Span {
 enum class TracerType {
 	DISABLED = 0,
 	NETWORK_LOSSY = 1,
-	END = 2,  // Any tracers that come after END will not be tested in simulation
+	SIM_END = 2,  // Any tracers that come after SIM_END will not be tested in simulation
 	LOG_FILE = 3
 };