feat(push): allow any url prefix for push gateway

Fix: #718
jupp0r · Nov 3, 2024 · 5d2c502 · 5d2c502
1 parent 6492e82
commit 5d2c502
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/push/include/prometheus/gateway.h b/push/include/prometheus/gateway.h
@@ -34,6 +34,10 @@ class PROMETHEUS_CPP_PUSH_EXPORT Gateway {
           std::function<void(CURL*)> presetupCurl, const std::string& jobname,
           const Labels& labels = {});
 
+  Gateway(const std::string& url,
+          std::function<void(CURL*)> presetupCurl, const std::string& jobname,
+          const Labels& labels = {});
+
   Gateway(const Gateway&) = delete;
   Gateway(Gateway&&) = delete;
   Gateway& operator=(const Gateway&) = delete;

diff --git a/push/src/gateway.cc b/push/src/gateway.cc
@@ -42,6 +42,12 @@ class SetupAdapter {
   std::string auth_;
   std::chrono::seconds timeout_;
 };
+
+std::string concatenate(const std::string& host, const std::string& port) {
+  std::stringstream ss;
+  ss << host << ":" << port;
+  return ss.str();
+}
 }  // namespace
 
 Gateway::Gateway(const std::string& host, const std::string& port,
@@ -52,12 +58,21 @@ Gateway::Gateway(const std::string& host, const std::string& port,
               labels) {}
 
 Gateway::Gateway(const std::string& host, const std::string& port,
+                 std::function<void(CURL*)> presetupCurl,
+                 const std::string& jobname, const Labels& labels)
+    : Gateway(concatenate(host, port), presetupCurl, jobname, labels) {}
+
+Gateway::Gateway(const std::string& url,
                  std::function<void(CURL*)> presetupCurl,
                  const std::string& jobname, const Labels& labels) {
   curlWrapper_ = detail::make_unique<detail::CurlWrapper>(presetupCurl);
 
   std::stringstream jobUriStream;
-  jobUriStream << host << ':' << port << "/metrics";
+  jobUriStream << url;
+  if (!url.empty() && url.back() != '/') {
+    jobUriStream << "/";
+  }
+  jobUriStream << "metrics";
   detail::encodeLabel(jobUriStream, {"job", jobname});
   jobUri_ = jobUriStream.str();