rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-11-02 12:06:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

build(deps): bump opentelemetry crates to 0.27 (#6774)

Browse Source
This commit is contained in:
Sanchith Hegde
2024-12-10 16:35:34 +05:30
committed by GitHub
parent a52828296a
commit 47a3d2b2ab
86 changed files with 739 additions and 1086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
crates/router/src/core/webhooks/incoming.rs
View File

@ -14,7 +14,7 @@ use hyperswitch_domain_models::{
};
use hyperswitch_interfaces::webhooks::{IncomingWebhookFlowError, IncomingWebhookRequestDetails};
use masking::{ExposeInterface, PeekInterface};
use router_env::{instrument, metrics::add_attributes, tracing, tracing_actix_web::RequestId};
use router_env::{instrument, tracing, tracing_actix_web::RequestId};
use super::{types, utils, MERCHANT_ID};
use crate::{
@ -134,12 +134,8 @@ async fn incoming_webhooks_core<W: types::OutgoingWebhookType>(
let key_manager_state = &(&state).into();
metrics::WEBHOOK_INCOMING_COUNT.add(
&metrics::CONTEXT,
1,
&[metrics::KeyValue::new(
MERCHANT_ID,
merchant_account.get_id().get_string_repr().to_owned(),
)],
router_env::metric_attributes!((MERCHANT_ID, merchant_account.get_id().clone())),
);
let mut request_details = IncomingWebhookRequestDetails {
method: req.method().clone(),
@ -200,12 +196,11 @@ async fn incoming_webhooks_core<W: types::OutgoingWebhookType>(
);
metrics::WEBHOOK_EVENT_TYPE_IDENTIFICATION_FAILURE_COUNT.add(
&metrics::CONTEXT,
1,
&[
metrics::KeyValue::new(MERCHANT_ID, merchant_account.get_id().clone()),
metrics::KeyValue::new("connector", connector_name.to_string()),
],
router_env::metric_attributes!(
(MERCHANT_ID, merchant_account.get_id().clone()),
("connector", connector_name)
),
);
let response = connector
@ -328,12 +323,8 @@ async fn incoming_webhooks_core<W: types::OutgoingWebhookType>(
if source_verified {
metrics::WEBHOOK_SOURCE_VERIFIED_COUNT.add(
&metrics::CONTEXT,
1,
&[metrics::KeyValue::new(
MERCHANT_ID,
merchant_account.get_id().clone(),
)],
router_env::metric_attributes!((MERCHANT_ID, merchant_account.get_id().clone())),
);
} else if connector.is_webhook_source_verification_mandatory() {
// if webhook consumption is mandatory for connector, fail webhook
@ -498,12 +489,8 @@ async fn incoming_webhooks_core<W: types::OutgoingWebhookType>(
}
} else {
metrics::WEBHOOK_INCOMING_FILTERED_COUNT.add(
&metrics::CONTEXT,
1,
&[metrics::KeyValue::new(
MERCHANT_ID,
merchant_account.get_id().get_string_repr().to_owned(),
)],
router_env::metric_attributes!((MERCHANT_ID, merchant_account.get_id().clone())),
);
WebhookResponseTracker::NoEffect
};
@ -661,9 +648,11 @@ async fn payments_incoming_webhook_flow(
.unwrap_or(true) =>
{
metrics::WEBHOOK_PAYMENT_NOT_FOUND.add(
&metrics::CONTEXT,
1,
&add_attributes([("merchant_id", merchant_account.get_id().clone())]),
router_env::metric_attributes!((
"merchant_id",
merchant_account.get_id().clone()
)),
);
return Ok(WebhookResponseTracker::NoEffect);
}
@ -722,7 +711,7 @@ async fn payouts_incoming_webhook_flow(
event_type: webhooks::IncomingWebhookEvent,
source_verified: bool,
) -> CustomResult<WebhookResponseTracker, errors::ApiErrorResponse> {
metrics::INCOMING_PAYOUT_WEBHOOK_METRIC.add(&metrics::CONTEXT, 1, &[]);
metrics::INCOMING_PAYOUT_WEBHOOK_METRIC.add(1, &[]);
if source_verified {
let db = &*state.store;
//find payout_attempt by object_reference_id
@ -838,7 +827,7 @@ async fn payouts_incoming_webhook_flow(
status: updated_payout_attempt.status,
})
} else {
metrics::INCOMING_PAYOUT_WEBHOOK_SIGNATURE_FAILURE_METRIC.add(&metrics::CONTEXT, 1, &[]);
metrics::INCOMING_PAYOUT_WEBHOOK_SIGNATURE_FAILURE_METRIC.add(1, &[]);
Err(report!(
errors::ApiErrorResponse::WebhookAuthenticationFailed
))
@ -998,7 +987,7 @@ async fn get_or_update_dispute_object(
let db = &*state.store;
match option_dispute {
None => {
metrics::INCOMING_DISPUTE_WEBHOOK_NEW_RECORD_METRIC.add(&metrics::CONTEXT, 1, &[]);
metrics::INCOMING_DISPUTE_WEBHOOK_NEW_RECORD_METRIC.add(1, &[]);
let dispute_id = generate_id(consts::ID_LENGTH, "dp");
let new_dispute = diesel_models::dispute::DisputeNew {
dispute_id,
@ -1034,7 +1023,7 @@ async fn get_or_update_dispute_object(
}
Some(dispute) => {
logger::info!("Dispute Already exists, Updating the dispute details");
metrics::INCOMING_DISPUTE_WEBHOOK_UPDATE_RECORD_METRIC.add(&metrics::CONTEXT, 1, &[]);
metrics::INCOMING_DISPUTE_WEBHOOK_UPDATE_RECORD_METRIC.add(1, &[]);
let dispute_status = diesel_models::enums::DisputeStatus::foreign_try_from(event_type)
.change_context(errors::ApiErrorResponse::WebhookProcessingFailure)
.attach_printable("event type to dispute state conversion failure")?;
@ -1449,7 +1438,7 @@ async fn disputes_incoming_webhook_flow(
request_details: &IncomingWebhookRequestDetails<'_>,
event_type: webhooks::IncomingWebhookEvent,
) -> CustomResult<WebhookResponseTracker, errors::ApiErrorResponse> {
metrics::INCOMING_DISPUTE_WEBHOOK_METRIC.add(&metrics::CONTEXT, 1, &[]);
metrics::INCOMING_DISPUTE_WEBHOOK_METRIC.add(1, &[]);
if source_verified {
let db = &*state.store;
let dispute_details = connector.get_dispute_details(request_details).switch()?;
@ -1495,14 +1484,14 @@ async fn disputes_incoming_webhook_flow(
Some(dispute_object.created_at),
))
.await?;
metrics::INCOMING_DISPUTE_WEBHOOK_MERCHANT_NOTIFIED_METRIC.add(&metrics::CONTEXT, 1, &[]);
metrics::INCOMING_DISPUTE_WEBHOOK_MERCHANT_NOTIFIED_METRIC.add(1, &[]);
Ok(WebhookResponseTracker::Dispute {
dispute_id: dispute_object.dispute_id,
payment_id: dispute_object.payment_id,
status: dispute_object.dispute_status,
})
} else {
metrics::INCOMING_DISPUTE_WEBHOOK_SIGNATURE_FAILURE_METRIC.add(&metrics::CONTEXT, 1, &[]);
metrics::INCOMING_DISPUTE_WEBHOOK_SIGNATURE_FAILURE_METRIC.add(1, &[]);
Err(report!(
errors::ApiErrorResponse::WebhookAuthenticationFailed
))