Skip to content

Try add a trace from Web Fastly request API request so can add to log… #3385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 21, 2025
Merged

Try add a trace from Web Fastly request API request so can add to log… #3385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app.psgi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ builder {
$env->{REMOTE_ADDR}, $env->{REQUEST_URI}, time, $$, rand, ) );
$env->{'MetaCPAN::Web.request_id'} = $request_id;

# Capture X-Trace-ID, set by Fastly, to pass to API backend
$env->{'MetaCPAN::Web.x_trace_id'} = $env->{HTTP_X_TRACE_ID};

my $mdc = Log::Log4perl::MDC->get_context;
%$mdc = (
request_id => $request_id,
Expand Down
11 changes: 10 additions & 1 deletion lib/MetaCPAN/Web/Model/API.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ has log => ( is => 'ro' );
has debug => ( is => 'ro' );
has request_uri => ( is => 'ro' );
has request_id => ( is => 'ro' );
has x_trace_id => ( is => 'ro' );

sub COMPONENT {
my ( $class, $app, $args ) = @_;
Expand All @@ -77,7 +78,10 @@ sub ACCEPT_CONTEXT {
request_url => $r->uri,
(
$r->env
? ( request_id => $r->env->{'MetaCPAN::Web.request_id'}, )
? (
request_id => $r->env->{'MetaCPAN::Web.request_id'},
x_trace_id => $r->env->{'MetaCPAN::Web.x_trace_id'},
)
: ()
),
);
Expand All @@ -102,6 +106,8 @@ sub request {

my $current_url = $self->request_uri;
my $request_id = $self->request_id;
my $x_trace_id = $self->x_trace_id || 'No-Trace-ID-to-MC';

if ( $method =~ /^(GET|DELETE)$/ || $search ) {
for my $param ( keys %{ $params || {} } ) {
$url->query_param( $param => $params->{$param} );
Expand All @@ -124,6 +130,9 @@ sub request {
),
( $current_url ? ( 'Referer' => $current_url->as_string ) : () ),
( $request_id ? ( 'X-MetaCPAN-Request-ID' => $request_id ) : () ),

# Comes from the UUID fastly sets
( $x_trace_id ? ( 'X-Trace-ID' => $x_trace_id ) : () ),
'Accept' => 'application/json, */*',
);

Expand Down
Loading