Fix merge issues

flow/Tracing.actor.cpp

@@ -422,6 +422,9 @@ void openTracer(TracerType type) {
 	case TracerType::NETWORK_LOSSY:
 		g_tracer = new FastUDPTracer{};
 		break;
+	case TracerType::END:
+		ASSERT(false);
+		break;
 	}
 }
 

flow/Tracing.cpp

@@ -1,93 +0,0 @@
-/*
- * Tracing.cpp
- *
- * This source file is part of the FoundationDB open source project
- *
- * Copyright 2013-2020 Apple Inc. and the FoundationDB project authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "flow/Tracing.h"
-
-namespace {
-
-struct NoopTracer : ITracer {
-	TracerType type() const { return TracerType::DISABLED; }
-	void trace(Span const& span) override {}
-};
-
-struct LogfileTracer : ITracer {
-	TracerType type() const { return TracerType::LOG_FILE; }
-	void trace(Span const& span) override {
-		if (g_network->isSimulated()) {
-			return;
-		}
-		TraceEvent te(SevInfo, "TracingSpan", span.context);
-		te.detail("Location", span.location.name)
-			.detail("Begin", format("%.6f", span.begin))
-			.detail("End", format("%.6f", span.end));
-		if (span.parents.size() == 1) {
-			te.detail("Parent", *span.parents.begin());
-		} else {
-			for (auto parent : span.parents) {
-				TraceEvent(SevInfo, "TracingSpanAddParent", span.context).detail("AddParent", parent);
-			}
-		}
-	}
-};
-
-ITracer* g_tracer = new NoopTracer();
-
-} // namespace
-
-void openTracer(TracerType type) {
-	if (g_tracer->type() == type) {
-		return;
-	}
-	delete g_tracer;
-	switch (type) {
-	case TracerType::DISABLED:
-		g_tracer = new NoopTracer{};
-		break;
-	case TracerType::LOG_FILE:
-		g_tracer = new LogfileTracer{};
-		break;
-	case TracerType::END:
-		ASSERT(false);
-		break;
-	}
-}
-
-ITracer::~ITracer() {}
-
-Span& Span::operator=(Span&& o) {
-	if (begin > 0.0) {
-		end = g_network->now();
-		g_tracer->trace(*this);
-	}
-	arena = std::move(o.arena);
-	context = o.context;
-	begin = o.begin;
-	end = o.end;
-	location = o.location;
-	parents = std::move(o.parents);
-	return *this;
-}
-
-Span::~Span() {
-	if (begin > 0.0) {
-		end = g_network->now();
-		g_tracer->trace(*this);
-	}
-}