From c289b0976b4cc902538c4a02c9dbdd91e19726a1 Mon Sep 17 00:00:00 2001
From: Bertrand Mermet <bertrand.mermet@datadoghq.com>
Date: Fri, 10 Nov 2017 14:39:56 +0100
Subject: [PATCH] Change default log path on Windows

---
 agent/log.go            | 11 +++++------
 config/agent.go         |  2 +-
 config/agent_nix.go     |  6 ++++++
 config/agent_windows.go |  4 ++++
 4 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 config/agent_nix.go
 create mode 100644 config/agent_windows.go

diff --git a/agent/log.go b/agent/log.go
index ec4e84915..e1db5b162 100644
--- a/agent/log.go
+++ b/agent/log.go
@@ -7,11 +7,10 @@ import (
 
 	log "github.com/cihub/seelog"
 
+	"github.com/DataDog/datadog-trace-agent/config"
 	"github.com/DataDog/datadog-trace-agent/watchdog"
 )
 
-const defaultLogFilePath = "/var/log/datadog/trace-agent.log"
-
 const agentLoggerConfigFmt = `
 <seelog minlevel="%[1]s">
   <outputs formatid="agent">
@@ -198,7 +197,7 @@ func SetupLogger(minLogLvl log.LogLevel, logFilePath string, logsDropInterval ti
 	log.RegisterReceiver("throttled", &ThrottledReceiver{})
 
 	// Build our config string
-	config := fmt.Sprintf(
+	logConfig := fmt.Sprintf(
 		agentLoggerConfigFmt,
 		minLogLvl,
 		logsDropInterval,
@@ -206,7 +205,7 @@ func SetupLogger(minLogLvl log.LogLevel, logFilePath string, logsDropInterval ti
 		logFilePath,
 	)
 
-	logger, err := log.LoggerFromConfigAsString(config)
+	logger, err := log.LoggerFromConfigAsString(logConfig)
 	if err != nil {
 		return err
 	}
@@ -216,9 +215,9 @@ func SetupLogger(minLogLvl log.LogLevel, logFilePath string, logsDropInterval ti
 // SetupDefaultLogger sets up a default logger for the agent, showing
 // all log messages and with no throttling.
 func SetupDefaultLogger() error {
-	config := fmt.Sprintf(rawLoggerConfigFmt, defaultLogFilePath)
+	logConfig := fmt.Sprintf(rawLoggerConfigFmt, config.DefaultLogFilePath)
 
-	logger, err := log.LoggerFromConfigAsString(config)
+	logger, err := log.LoggerFromConfigAsString(logConfig)
 	if err != nil {
 		return err
 	}
diff --git a/config/agent.go b/config/agent.go
index 43f8de3fe..3797e0708 100644
--- a/config/agent.go
+++ b/config/agent.go
@@ -184,7 +184,7 @@ func NewDefaultAgentConfig() *AgentConfig {
 		StatsdPort: 8125,
 
 		LogLevel:             "INFO",
-		LogFilePath:          "/var/log/datadog/trace-agent.log",
+		LogFilePath:          DefaultLogFilePath,
 		LogThrottlingEnabled: true,
 
 		MaxMemory:        5e8, // 500 Mb, should rarely go above 50 Mb
diff --git a/config/agent_nix.go b/config/agent_nix.go
new file mode 100644
index 000000000..79d675794
--- /dev/null
+++ b/config/agent_nix.go
@@ -0,0 +1,6 @@
+// +build !windows
+
+package config
+
+// DefaultLogFilePath is where the agent will write logs if not overriden in the conf
+const DefaultLogFilePath = "/var/log/datadog/trace-agent.log"
diff --git a/config/agent_windows.go b/config/agent_windows.go
new file mode 100644
index 000000000..90e176c7a
--- /dev/null
+++ b/config/agent_windows.go
@@ -0,0 +1,4 @@
+package config
+
+// DefaultLogFilePath is where the agent will write logs if not overriden in the conf
+const DefaultLogFilePath = "c:\\programdata\\datadog\\logs\\trace-agent.log"