chore: improve logging (#17)

Author: korniltsev

profiler/src/ProfilerEngine/Datadog.Profiler.Native/Log.h

@@ -18,7 +18,7 @@ class Log final
 private:
     struct ProfilerLoggerPolicy
     {
-        inline static const std::string file_name = "DD-DotNet-Profiler-Native";
+        inline static const std::string file_name = "Pyroscope-DotNet-Profiler-Native";
 #ifdef _WIN32
         inline static const shared::WSTRING folder_path = WStr(R"(Datadog-APM\logs\DotNet)");
 #endif

profiler/src/ProfilerEngine/Datadog.Profiler.Native/OpSysTools.cpp

@@ -345,6 +345,10 @@ bool OpSysTools::IsSafeToStartProfiler(double coresThreshold)
     // We assume that the profiler library is in the same folder as the wrapper library
     auto currentModulePath = fs::path(shared::GetCurrentModuleFileName());
     auto wrapperLibrary = currentModulePath.parent_path() / "Pyroscope.Linux.ApiWrapper.x64.so";
+    if (!fs::exists(wrapperLibrary))
+    {
+        wrapperLibrary = currentModulePath.parent_path() / "Datadog.Linux.ApiWrapper.x64.so";
+    }
     auto wrapperLibraryPath = wrapperLibrary.string();
 
     auto* instance = dlopen(wrapperLibraryPath.c_str(), RTLD_LAZY | RTLD_LOCAL);

profiler/src/ProfilerEngine/Datadog.Profiler.Native/PprofBuilder.cpp

@@ -51,7 +51,7 @@ std::string PprofBuilder::Build()
 {
     std::lock_guard<std::mutex> lock(this->_lock);
     auto res = _profile.SerializeAsString();
-    Log::Info("PprofBuilder samples: ", _samplesCount, ", serialized bytes: ", res.size());
+    Log::Debug("PprofBuilder samples: ", _samplesCount, ", serialized bytes: ", res.size());
     Reset();
     return std::move(res);
 }

profiler/src/ProfilerEngine/Datadog.Profiler.Native/PyroscopePprofSink.cpp

@@ -7,7 +7,7 @@
 #include "OpSysTools.h"
 
 PyroscopePprofSink::PyroscopePprofSink(std::string server, std::string appName, std::string authToken) :
-    _appName(appName), _client(server)
+    _appName(appName), _server(server), _client(server)
 {
     if (!authToken.empty())
     {
@@ -79,6 +79,6 @@ void PyroscopePprofSink::upload(Pprof pprof, ProfileTime& startTime, ProfileTime
     else
     {
         auto err = res.error();
-        Log::Info("PyroscopePprofSink err ", to_string(err));
+        Log::Info("PyroscopePprofSink err ", to_string(err), " ", _server);
     }
 }

profiler/src/ProfilerEngine/Datadog.Profiler.Native/PyroscopePprofSink.h

@@ -27,6 +27,7 @@ class PyroscopePprofSink: public PProfExportSink
     void upload(Pprof pprof, ProfileTime &startTime, ProfileTime &endTime);
 
     std::string _appName;
+    std::string _server;
     httplib::Client _client;
     LockingQueue<PyroscopeRequest> _queue;
     std::thread _workerThread;

shared/src/native-src/logger.h

@@ -115,16 +115,13 @@ std::shared_ptr<spdlog::logger> Logger::CreateInternalLogger()
 
     try
     {
-
-        // todo
-//#if defined(PROFILER_LOG_TO_STDOUT)
         std::vector<spdlog::sink_ptr> sinks;
-        sinks.push_back(std::make_shared<spdlog::sinks::stdout_color_sink_mt>());
+        if (::shared::StderrLogEnabled())
+        {
+            sinks.push_back(std::make_shared<spdlog::sinks::ansicolor_stderr_sink_mt>());
+        }
+        sinks.push_back(std::make_shared<spdlog::sinks::rotating_file_sink_mt>(Logger::GetLogPath<LoggerPolicy>(file_name_suffix), 1048576 * 5, 10));
         logger = std::make_shared<spdlog::logger>(LoggerPolicy::file_name, begin(sinks), end(sinks));
-//#else
-        logger =
-            spdlog::rotating_logger_mt(LoggerPolicy::file_name, Logger::GetLogPath<LoggerPolicy>(file_name_suffix), 1048576 * 5, 10);
-//#endif
     }
     catch (...)
     {
@@ -157,7 +154,12 @@ std::string Logger::GetLogPath(const std::string& file_name_suffix)
 
         if (!fs::exists(parent_path))
         {
-            fs::create_directories(parent_path);
+            try {
+
+                fs::create_directories(parent_path);
+            } catch (std::exception &e) {
+                std::cerr << "Logger::GetLogPath failed to create a parent directory: " << parent_path <<  std::endl;
+            }
         }
     }
 

shared/src/native-src/pal.h

@@ -25,6 +25,15 @@
 
 namespace shared
 {
+inline bool StderrLogEnabled() {
+    auto log_to_stderr = GetEnvironmentValue(WStr("PYROSCOPE_LOG_STDERR"));
+    bool enabled = false;
+    bool parsed = TryParseBooleanEnvironmentValue(log_to_stderr, enabled);
+    if (parsed) {
+        return enabled;
+    }
+    return true;
+}
 
 template <class TLoggerPolicy>
 inline shared::WSTRING GetDatadogLogFilePath(const std::string& file_name_suffix)
@@ -63,7 +72,7 @@ inline shared::WSTRING GetDatadogLogFilePath(const std::string& file_name_suffix
     // on Windows WSTRING == wstring
     return (program_data_path / TLoggerPolicy::folder_path / file_name).wstring();
 #else
-    return ToWSTRING("/var/log/datadog/dotnet/" + file_name);
+    return ToWSTRING("/var/log/pyroscope/dotnet/" + file_name);
 #endif
 }