From bfc4a6e038822e4c736df216c09845f47b195014 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 16 Dec 2016 13:59:04 -0800
Subject: [PATCH] Fix stat tracker missing in agents

---
 assignment-client/src/AssignmentClient.cpp | 2 ++
 domain-server/src/DomainServer.cpp         | 2 ++
 interface/src/Application.cpp              | 6 ------
 libraries/shared/src/Profile.cpp           | 4 ----
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp
index 56416809d1..fe565b62f4 100644
--- a/assignment-client/src/AssignmentClient.cpp
+++ b/assignment-client/src/AssignmentClient.cpp
@@ -38,6 +38,7 @@
 #include "AssignmentClientLogging.h"
 #include "avatars/ScriptableAvatar.h"
 #include <Trace.h>
+#include <StatTracker.h>
 
 const QString ASSIGNMENT_CLIENT_TARGET_NAME = "assignment-client";
 const long long ASSIGNMENT_REQUEST_INTERVAL_MSECS = 1 * 1000;
@@ -50,6 +51,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
     LogUtils::init();
 
     DependencyManager::set<tracing::Tracer>();
+    DependencyManager::set<StatTracker>();
     DependencyManager::set<AccountManager>();
 
     auto scriptableAvatar = DependencyManager::set<ScriptableAvatar>();
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index e531812077..3dd75a19b2 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -44,6 +44,7 @@
 #include "DomainServerNodeData.h"
 #include "NodeConnectionData.h"
 #include <Trace.h>
+#include <StatTracker.h>
 
 int const DomainServer::EXIT_CODE_REBOOT = 234923;
 
@@ -75,6 +76,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     parseCommandLine();
 
     DependencyManager::set<tracing::Tracer>();
+    DependencyManager::set<StatTracker>();
 
     LogUtils::init();
     Setting::init();
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index ffb8b8e8d5..72aa569097 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3313,7 +3313,6 @@ bool Application::shouldPaint(float nsecsElapsed) {
 }
 
 void Application::idle(float nsecsElapsed) {
-    PROFILE_RANGE(interfaceapp, __FUNCTION__);
     PerformanceTimer perfTimer("idle");
 
     // Update the deadlock watchdog
@@ -4682,11 +4681,6 @@ QRect Application::getDesirableApplicationGeometry() const {
 //                 or the "myCamera".
 //
 void Application::loadViewFrustum(Camera& camera, ViewFrustum& viewFrustum) {
-<<<<<<< HEAD
-    PROFILE_RANGE(interfaceapp, __FUNCTION__);
-    PerformanceTimer perfTimer("loadViewFrustum");
-=======
->>>>>>> tracing polish
     // We will use these below, from either the camera or head vectors calculated above
     viewFrustum.setProjection(camera.getProjection());
 
diff --git a/libraries/shared/src/Profile.cpp b/libraries/shared/src/Profile.cpp
index 007063f241..4c5882348e 100644
--- a/libraries/shared/src/Profile.cpp
+++ b/libraries/shared/src/Profile.cpp
@@ -20,10 +20,6 @@ Q_LOGGING_CATEGORY(trace_simulation, "trace.simulation")
 Q_LOGGING_CATEGORY(trace_simulation_animation, "trace.simulation.animation")
 Q_LOGGING_CATEGORY(trace_simulation_physics, "trace.simulation.physics")
 
-void foo() {
-    randFloat();
-}
-
 #if defined(NSIGHT_FOUND)
 #include "nvToolsExt.h"
 #define NSIGHT_TRACING