fix: send satic labels as series labels, not dynamic labels (#43)

Author: korniltsev

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

@@ -398,11 +398,11 @@ bool CorProfilerCallback::InitializeServices()
         _pConfiguration->PyroscopeBasicAuthUser(),
         _pConfiguration->PyroscopeBasicAuthPassword(),
         _pConfiguration->PyroscopeTenantID(),
-        PyroscopePprofSink::ParseHeadersJSON(std::move(_pConfiguration->PyroscopeHttpHeaders())));
+        PyroscopePprofSink::ParseHeadersJSON(std::move(_pConfiguration->PyroscopeHttpHeaders())),
+        _pConfiguration->GetUserTags());
     _pExporter = std::make_unique<PprofExporter>(_pApplicationStore,
                                                  _pyroscopePprofSink,
-                                                 sampleTypeDefinitions,
-                                                 _pConfiguration->GetUserTags());
+                                                 sampleTypeDefinitions);
 
     _pSamplesCollector = RegisterService<SamplesCollector>(
         _pConfiguration.get(),

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

@@ -5,9 +5,8 @@
 #include "PprofBuilder.h"
 #include "Log.h"
 
-PprofBuilder::PprofBuilder(std::vector<SampleValueType>& sampleTypeDefinitions,
-                           std::vector<std::pair<std::string, std::string>>& staticTags) :
-    _sampleTypeDefinitions(sampleTypeDefinitions), _staticTags(staticTags)
+PprofBuilder::PprofBuilder(std::vector<SampleValueType>& sampleTypeDefinitions) :
+    _sampleTypeDefinitions(sampleTypeDefinitions)
 {
     Reset();
 }
@@ -38,12 +37,6 @@ void PprofBuilder::AddSample(const Sample& sample)
             pLabel->set_str(AddString(*label.second.Get()));
         }
     }
-    for (const auto& tag : _staticTags)
-    {
-        auto* pLabel = pSample->add_label();
-        pLabel->set_key(AddString(tag.first));
-        pLabel->set_str(AddString(tag.second));
-    }
     _samplesCount++;
 }
 

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

@@ -16,8 +16,7 @@ class PprofBuilder
 {
 
 public:
-    PprofBuilder(std::vector<SampleValueType>& sampleTypeDefinitions,
-                 std::vector<std::pair<std::string, std::string>>& staticTags);
+    PprofBuilder(std::vector<SampleValueType>& sampleTypeDefinitions);
 
     void AddSample(const Sample& sample);
     int SamplesCount();
@@ -35,5 +34,4 @@ class PprofBuilder
     std::map<std::pair<int64_t, int64_t>, int64_t> _locations;
     std::vector<SampleValueType>& _sampleTypeDefinitions;
 
-    std::vector<std::pair<std::string, std::string>> _staticTags;
 };

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

@@ -8,12 +8,11 @@
 
 PprofExporter::PprofExporter(IApplicationStore* applicationStore,
                              std::shared_ptr<PProfExportSink> sink,
-                             std::vector<SampleValueType> sampleTypeDefinitions,
-                             const std::vector<std::pair<std::string, std::string>>& staticTags) :
+                             std::vector<SampleValueType> sampleTypeDefinitions
+                             ) :
     _applicationStore(applicationStore),
     _sink(std::move(sink)),
-    _sampleTypeDefinitions(sampleTypeDefinitions),
-    _staticTags(staticTags)
+    _sampleTypeDefinitions(sampleTypeDefinitions)
 {
     signal(SIGPIPE, SIG_IGN);
 }
@@ -60,7 +59,7 @@ PprofBuilder& PprofExporter::GetPprofBuilder(std::string_view runtimeId)
     {
         return *it->second;
     }
-    auto instance = std::make_unique<PprofBuilder>(_sampleTypeDefinitions, _staticTags);
+    auto instance = std::make_unique<PprofBuilder>(_sampleTypeDefinitions);
     auto res = _perAppBuilder.emplace(runtimeId, std::move(instance));
     return *res.first->second;
 }

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

@@ -36,8 +36,7 @@ class PprofExporter : public IExporter
 public:
     PprofExporter(IApplicationStore* _applicationStore,
                   std::shared_ptr<PProfExportSink> sin,
-                  std::vector<SampleValueType> sampleTypeDefinitions,
-                  const std::vector<std::pair<std::string, std::string>>& staticTags
+                  std::vector<SampleValueType> sampleTypeDefinitions
     );
     void Add(std::shared_ptr<Sample> const& sample) override;
     void SetEndpoint(const std::string& runtimeId, uint64_t traceId, const std::string& endpoint) override;
@@ -51,6 +50,4 @@ class PprofExporter : public IExporter
     std::vector<SampleValueType> _sampleTypeDefinitions;
     std::unordered_map<std::string_view, std::unique_ptr<PprofBuilder>> _perAppBuilder;
     std::mutex _perAppBuilderLock;
-    std::vector<std::pair<std::string, std::string>> _staticTags;
-
 };

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

@@ -15,8 +15,10 @@ PyroscopePprofSink::PyroscopePprofSink(
     std::string basicAuthUser,
     std::string basicAuthPassword,
     std::string tenantID,
-    std::map<std::string, std::string> extraHeaders) :
+    std::map<std::string, std::string> extraHeaders,
+    const std::vector<std::pair<std::string, std::string>>& staticTags) :
     _appName(appName),
+    _appNameWithLabels(AppNameWithLabels(appName, staticTags)),
     _url(server),
     _authToken(authToken),
     _basicAuthUser(basicAuthUser),
@@ -144,7 +146,7 @@ void PyroscopePprofSink::upload(Pprof pprof, ProfileTime& startTime, ProfileTime
 
     std::string path = Url()
                            .path(_url.path() + "/ingest")
-                           .add_query("name", _appName)
+                           .add_query("name", _appNameWithLabels)
                            .add_query("from", std::to_string(startTime.time_since_epoch().count()))
                            .add_query("until", std::to_string(endTime.time_since_epoch().count()))
                            .add_query("spyName", "dotnetspy")
@@ -218,6 +220,24 @@ std::string PyroscopePprofSink::SchemeHostPort(Url& url)
     return res;
 }
 
+std::string PyroscopePprofSink::AppNameWithLabels(const std::string& appName, const std::vector<std::pair<std::string, std::string>>& staticTags)
+{
+    std::stringstream app_name_builder;
+    app_name_builder << appName << "{";
+    int i = 0;
+    for (const auto& item : staticTags)
+    {
+        if (i != 0)
+        {
+            app_name_builder << ",";
+        }
+        app_name_builder << item.first << "=" << item.second;
+        i++;
+    }
+    app_name_builder << "}";
+    return app_name_builder.str();
+}
+
 std::map<std::string, std::string> PyroscopePprofSink::ParseHeadersJSON(std::string headers)
 {
     std::map<std::string, std::string> result;

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

@@ -21,7 +21,8 @@ class PyroscopePprofSink : public PProfExportSink
                        std::string tenantID,
                        std::string basicAuthUser,
                        std::string basicAuthPassword,
-                       std::map<std::string, std::string> extraHeaders);
+                       std::map<std::string, std::string> extraHeaders,
+                       const std::vector<std::pair<std::string, std::string>>& staticTags);
     ~PyroscopePprofSink() override;
     void Export(Pprof pprof, ProfileTime& startTime, ProfileTime& endTime) override;
     void SetAuthToken(std::string authToken);
@@ -30,6 +31,7 @@ class PyroscopePprofSink : public PProfExportSink
 
 private:
     static std::string SchemeHostPort(Url& url);
+    static std::string AppNameWithLabels(const std::string& appName, const std::vector<std::pair<std::string, std::string>>& staticTags);
 
     struct PyroscopeRequest
     {
@@ -43,6 +45,7 @@ class PyroscopePprofSink : public PProfExportSink
     httplib::Headers getHeaders();
 
     std::string _appName;
+    std::string _appNameWithLabels;
     Url _url;
     httplib::Client _client;
     std::atomic<bool> _running;