Skip to content

Commit f0bf723

Browse files
authored
Fix double incrementing te_request_count metric (#486)
1 parent c0b7080 commit f0bf723

File tree

2 files changed

+15
-28
lines changed

2 files changed

+15
-28
lines changed

router/src/grpc/server.rs

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -598,8 +598,7 @@ impl grpc::embed_server::Embed for TextEmbeddingsService {
598598
&self,
599599
request: Request<EmbedRequest>,
600600
) -> Result<Response<EmbedResponse>, Status> {
601-
let counter = metrics::counter!("te_request_count", "method" => "single");
602-
counter.increment(1);
601+
metrics::counter!("te_request_count", "method" => "single").increment(1);
603602

604603
let permit = self
605604
.infer
@@ -610,8 +609,7 @@ impl grpc::embed_server::Embed for TextEmbeddingsService {
610609
let (response, metadata) = self.embed_pooled_inner(request, permit).await?;
611610
let headers = HeaderMap::from(metadata);
612611

613-
let counter = metrics::counter!("te_request_count", "method" => "single");
614-
counter.increment(1);
612+
metrics::counter!("te_request_success", "method" => "single").increment(1);
615613

616614
Ok(Response::from_parts(
617615
MetadataMap::from_headers(headers),
@@ -728,8 +726,7 @@ impl grpc::predict_server::Predict for TextEmbeddingsService {
728726
&self,
729727
request: Request<PredictRequest>,
730728
) -> Result<Response<PredictResponse>, Status> {
731-
let counter = metrics::counter!("te_request_count", "method" => "single");
732-
counter.increment(1);
729+
metrics::counter!("te_request_count", "method" => "single").increment(1);
733730

734731
let permit = self
735732
.infer
@@ -749,8 +746,7 @@ impl grpc::predict_server::Predict for TextEmbeddingsService {
749746
.await?;
750747
let headers = HeaderMap::from(metadata);
751748

752-
let counter = metrics::counter!("te_request_count", "method" => "single");
753-
counter.increment(1);
749+
metrics::counter!("te_request_success", "method" => "single").increment(1);
754750

755751
Ok(Response::from_parts(
756752
MetadataMap::from_headers(headers),
@@ -763,8 +759,8 @@ impl grpc::predict_server::Predict for TextEmbeddingsService {
763759
&self,
764760
request: Request<PredictPairRequest>,
765761
) -> Result<Response<PredictResponse>, Status> {
766-
let counter = metrics::counter!("te_request_count", "method" => "single");
767-
counter.increment(1);
762+
metrics::counter!("te_request_count", "method" => "single").increment(1);
763+
768764
let request = request.into_inner();
769765

770766
let mut inputs = request.inputs;
@@ -800,8 +796,7 @@ impl grpc::predict_server::Predict for TextEmbeddingsService {
800796
.await?;
801797
let headers = HeaderMap::from(metadata);
802798

803-
let counter = metrics::counter!("te_request_count", "method" => "single");
804-
counter.increment(1);
799+
metrics::counter!("te_request_success", "method" => "single").increment(1);
805800

806801
Ok(Response::from_parts(
807802
MetadataMap::from_headers(headers),

router/src/http/server.rs

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,7 @@ async fn embed(
581581

582582
let (response, metadata) = match req.inputs {
583583
Input::Single(input) => {
584-
let counter = metrics::counter!("te_request_count", "method" => "single");
585-
counter.increment(1);
584+
metrics::counter!("te_request_count", "method" => "single").increment(1);
586585

587586
let compute_chars = input.count_chars();
588587

@@ -599,8 +598,7 @@ async fn embed(
599598
.await
600599
.map_err(ErrorResponse::from)?;
601600

602-
let counter = metrics::counter!("te_request_count", "method" => "single");
603-
counter.increment(1);
601+
metrics::counter!("te_request_success", "method" => "single").increment(1);
604602

605603
(
606604
EmbedResponse(vec![response.results]),
@@ -761,8 +759,7 @@ async fn embed_sparse(
761759

762760
let (response, metadata) = match req.inputs {
763761
Input::Single(input) => {
764-
let counter = metrics::counter!("te_request_count", "method" => "single");
765-
counter.increment(1);
762+
metrics::counter!("te_request_count", "method" => "single").increment(1);
766763

767764
let compute_chars = input.count_chars();
768765

@@ -778,8 +775,7 @@ async fn embed_sparse(
778775
.await
779776
.map_err(ErrorResponse::from)?;
780777

781-
let counter = metrics::counter!("te_request_count", "method" => "single");
782-
counter.increment(1);
778+
metrics::counter!("te_request_success", "method" => "single").increment(1);
783779

784780
(
785781
EmbedSparseResponse(vec![sparsify(response.results)]),
@@ -932,8 +928,7 @@ async fn embed_all(
932928

933929
let (response, metadata) = match req.inputs {
934930
Input::Single(input) => {
935-
let counter = metrics::counter!("te_request_count", "method" => "single");
936-
counter.increment(1);
931+
metrics::counter!("te_request_count", "method" => "single").increment(1);
937932

938933
let compute_chars = input.count_chars();
939934

@@ -949,8 +944,7 @@ async fn embed_all(
949944
.await
950945
.map_err(ErrorResponse::from)?;
951946

952-
let counter = metrics::counter!("te_request_count", "method" => "single");
953-
counter.increment(1);
947+
metrics::counter!("te_request_success", "method" => "single").increment(1);
954948

955949
(
956950
EmbedAllResponse(vec![response.results]),
@@ -1117,8 +1111,7 @@ async fn openai_embed(
11171111

11181112
let (embeddings, metadata) = match req.input {
11191113
Input::Single(input) => {
1120-
let counter = metrics::counter!("te_request_count", "method" => "single");
1121-
counter.increment(1);
1114+
metrics::counter!("te_request_count", "method" => "single").increment(1);
11221115

11231116
let compute_chars = input.count_chars();
11241117

@@ -1135,8 +1128,7 @@ async fn openai_embed(
11351128
.await
11361129
.map_err(ErrorResponse::from)?;
11371130

1138-
let counter = metrics::counter!("te_request_count", "method" => "single");
1139-
counter.increment(1);
1131+
metrics::counter!("te_request_success", "method" => "single").increment(1);
11401132

11411133
let embedding = encode_embedding(response.results);
11421134
(

0 commit comments

Comments
 (0)