only reason

PBH-BTN · Jan 26, 2025 · 57ffad0 · 57ffad0
1 parent 8f33a50
commit 57ffad0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/biz/handler/announce.go b/biz/handler/announce.go
@@ -2,7 +2,6 @@ package handler
 
 import (
 	"context"
-	"encoding/hex"
 	"errors"
 	"math/rand"
 
@@ -13,7 +12,6 @@ import (
 	"github.com/PBH-BTN/trunker/service/metrics"
 	"github.com/PBH-BTN/trunker/utils"
 	"github.com/PBH-BTN/trunker/utils/bencode"
-	"github.com/PBH-BTN/trunker/utils/conv"
 	"github.com/PBH-BTN/trunker/utils/http"
 	"github.com/cloudwego/hertz/pkg/app"
 	hertz "github.com/cloudwego/hertz/pkg/common/utils"
@@ -98,17 +96,13 @@ func validAnnounceReq(req *model.AnnounceRequest) bool {
 	}
 	if len(req.InfoHash) != 20 || len(req.PeerID) != 20 {
 		metrics.EmitCounter(metrics.CounterInvalidRequest, 1, map[string]string{
-			metrics.LabelReason:   "info hash or peer id length error",
-			metrics.LabelPeerId:   req.PeerID,
-			metrics.LabelInfoHash: hex.EncodeToString(conv.UnsafeStringToBytes(req.InfoHash)),
+			metrics.LabelReason: "info hash or peer id length error",
 		})
 		return false
 	}
 	if req.Port >= 0 && req.Port < 65535 {
 		metrics.EmitCounter(metrics.CounterInvalidRequest, 1, map[string]string{
-			metrics.LabelReason:   "invalid port",
-			metrics.LabelPeerId:   req.PeerID,
-			metrics.LabelInfoHash: hex.EncodeToString(conv.UnsafeStringToBytes(req.InfoHash)),
+			metrics.LabelReason: "invalid port",
 		})
 		return false
 	}

diff --git a/service/metrics/counter.go b/service/metrics/counter.go
@@ -29,9 +29,7 @@ func histogramObserve(histogramVec *prometheus.HistogramVec, value time.Duration
 }
 
 const (
-	LabelPeerId   = "peerId"
-	LabelInfoHash = "infoHash"
-	LabelReason   = "reason"
+	LabelReason = "reason"
 )
 
 func registerCounter(registry *prometheus.Registry) map[counterMetrics]*prometheus.CounterVec {
@@ -41,7 +39,7 @@ func registerCounter(registry *prometheus.Registry) map[counterMetrics]*promethe
 		prometheus.NewCounterVec(prometheus.CounterOpts{
 			Name: counterPrefix + string(CounterInvalidRequest),
 			Help: "Total invalid announce counter",
-		}, []string{LabelPeerId, LabelInfoHash, LabelReason})
+		}, []string{LabelReason})
 
 	for _, h := range m {
 		registry.MustRegister(h)