feat: add lc_target_hash

alibaba · Jan 14, 2025 · 7eea950 · 7eea950
1 parent dbdc8c6
commit 7eea950
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/core/plugin/processor/inner/ProcessorPromRelabelMetricNative.cpp b/core/plugin/processor/inner/ProcessorPromRelabelMetricNative.cpp
@@ -16,8 +16,7 @@
 #include "plugin/processor/inner/ProcessorPromRelabelMetricNative.h"
 
 #include <cstddef>
-
-#include "json/json.h"
+#include <json/json.h>
 
 #include "common/Flags.h"
 #include "common/StringTools.h"
@@ -186,18 +185,26 @@ void ProcessorPromRelabelMetricNative::UpdateAutoMetrics(const PipelineEventGrou
 
 void ProcessorPromRelabelMetricNative::AddAutoMetrics(PipelineEventGroup& eGroup,
                                                       const prom::AutoMetric& autoMetric) const {
-    auto targetTags = eGroup.GetTags();
     if (!eGroup.HasMetadata(EventGroupMetaKey::PROMETHEUS_SCRAPE_TIMESTAMP_MILLISEC)) {
         LOG_ERROR(sLogger, ("scrape_timestamp_milliseconds is not set", ""));
         return;
     }
+    auto targetTags = eGroup.GetTags();
+    auto toDelete = GetToDeleteTargetLabels(targetTags);
+    for (const auto& item : toDelete) {
+        targetTags.erase(item);
+    }
+    if (!eGroup.HasMetadata(EventGroupMetaKey::PROMETHEUS_STREAM_ID)) {
+        LOG_ERROR(sLogger, ("prometheus stream id", ""));
+        return;
+    }
+    targetTags[prometheus::LC_TARGET_HASH] = eGroup.GetMetadata(EventGroupMetaKey::PROMETHEUS_STREAM_ID);
 
     StringView scrapeTimestampMilliSecStr = eGroup.GetMetadata(EventGroupMetaKey::PROMETHEUS_SCRAPE_TIMESTAMP_MILLISEC);
     auto timestampMilliSec = StringTo<uint64_t>(scrapeTimestampMilliSecStr.to_string());
     auto timestamp = timestampMilliSec / 1000;
     auto nanoSec = timestampMilliSec % 1000 * 1000000;
 
-
     AddMetric(
         eGroup, prometheus::SCRAPE_DURATION_SECONDS, autoMetric.mScrapeDurationSeconds, timestamp, nanoSec, targetTags);
 

diff --git a/core/prometheus/Constants.h b/core/prometheus/Constants.h
@@ -13,6 +13,7 @@ const uint64_t RefeshIntervalSeconds = 5;
 const char* const META = "__meta_";
 const char* const UNDEFINED = "undefined";
 const std::string PROMETHEUS = "prometheus";
+const char* const LC_TARGET_HASH = "lc_target_hash";
 
 // relabel config
 const char* const SOURCE_LABELS = "source_labels";

diff --git a/core/prometheus/component/StreamScraper.cpp b/core/prometheus/component/StreamScraper.cpp
@@ -102,7 +102,7 @@ void StreamScraper::PushEventGroup(PipelineEventGroup&& eGroup) const {
 void StreamScraper::SendMetrics() {
     mEventGroup.SetMetadata(EventGroupMetaKey::PROMETHEUS_SCRAPE_TIMESTAMP_MILLISEC,
                             ToString(mScrapeTimestampMilliSec));
-    mEventGroup.SetMetadata(EventGroupMetaKey::PROMETHEUS_STREAM_ID, GetId() + ToString(mScrapeTimestampMilliSec));
+    mEventGroup.SetMetadata(EventGroupMetaKey::PROMETHEUS_STREAM_ID, GetId());
 
     SetTargetLabels(mEventGroup);
     PushEventGroup(std::move(mEventGroup));
@@ -127,7 +127,7 @@ void StreamScraper::SetAutoMetricMeta(double scrapeDurationSeconds, bool upState
     mEventGroup.SetMetadata(EventGroupMetaKey::PROMETHEUS_SCRAPE_DURATION, ToString(scrapeDurationSeconds));
     mEventGroup.SetMetadata(EventGroupMetaKey::PROMETHEUS_SCRAPE_RESPONSE_SIZE, ToString(mRawSize));
     mEventGroup.SetMetadata(EventGroupMetaKey::PROMETHEUS_UP_STATE, ToString(upState));
-    mEventGroup.SetMetadata(EventGroupMetaKey::PROMETHEUS_STREAM_ID, GetId() + ToString(mScrapeTimestampMilliSec));
+    mEventGroup.SetMetadata(EventGroupMetaKey::PROMETHEUS_STREAM_ID, GetId());
     mEventGroup.SetMetadata(EventGroupMetaKey::PROMETHEUS_STREAM_TOTAL, ToString(mStreamIndex));
 }
 std::string StreamScraper::GetId() {

diff --git a/core/prometheus/schedulers/ScrapeScheduler.cpp b/core/prometheus/schedulers/ScrapeScheduler.cpp
@@ -101,10 +101,6 @@ string ScrapeScheduler::GetId() const {
     return mTargetInfo.mHash;
 }
 
-string ScrapeScheduler::GetHashForOperator() const {
-    return mTargetInfo.mHashForOperator;
-}
-
 void ScrapeScheduler::SetComponent(shared_ptr<Timer> timer, EventPool* eventPool) {
     mTimer = std::move(timer);
     mEventPool = eventPool;

diff --git a/core/prometheus/schedulers/ScrapeScheduler.h b/core/prometheus/schedulers/ScrapeScheduler.h
@@ -36,7 +36,6 @@ struct PromTargetInfo {
     Labels mLabels;
     std::string mInstance;
     std::string mHash;
-    std::string mHashForOperator;
     uint64_t mRebalanceMs = 0;
 };
 
@@ -55,7 +54,6 @@ class ScrapeScheduler : public BaseScheduler {
     void OnMetricResult(HttpResponse&, uint64_t timestampMilliSec);
 
     std::string GetId() const;
-    std::string GetHashForOperator() const;
 
     void SetComponent(std::shared_ptr<Timer> timer, EventPool* eventPool);
     uint64_t GetLastScrapeSize() const { return mScrapeResponseSizeBytes; }

diff --git a/core/prometheus/schedulers/TargetSubscriberScheduler.cpp b/core/prometheus/schedulers/TargetSubscriberScheduler.cpp
@@ -190,7 +190,6 @@ bool TargetSubscriberScheduler::ParseScrapeSchedulerGroup(const std::string& con
         rawHashStream << std::setw(16) << std::setfill('0') << std::hex << labels.Hash();
         string rawAddress = labels.Get(prometheus::ADDRESS_LABEL_NAME);
         targetInfo.mHash = mScrapeConfigPtr->mJobName + rawAddress + rawHashStream.str();
-        targetInfo.mHashForOperator = targetInfo.mHash;
         targetInfo.mInstance = targets[0];
 
         labels.Set(prometheus::JOB, mJobName);
@@ -208,7 +207,7 @@ bool TargetSubscriberScheduler::ParseScrapeSchedulerGroup(const std::string& con
         targetInfo.mLabels = labels;
 
         if (element.isMember(prometheus::TARGET_HASH) && element[prometheus::TARGET_HASH].isString()) {
-            targetInfo.mHashForOperator = element[prometheus::TARGET_HASH].asString();
+            targetInfo.mHash = element[prometheus::TARGET_HASH].asString();
         }
 
         if (element.isMember(prometheus::REBALANCE_MS) && element[prometheus::REBALANCE_MS].isUInt64()) {
@@ -363,7 +362,7 @@ string TargetSubscriberScheduler::TargetsInfoToString() const {
         ReadLock lock(mRWLock);
         for (const auto& [k, v] : mScrapeSchedulerMap) {
             Json::Value targetInfo;
-            targetInfo[prometheus::HASH] = v->GetHashForOperator();
+            targetInfo[prometheus::HASH] = v->GetId();
             targetInfo[prometheus::SIZE] = v->GetLastScrapeSize();
             if (needToUpdate) {
                 mDelaySeconds += v->mExecDelayCount;