Skip to content
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

Jump to bottom

Bump dependency on OpenTelemetry to 0.019 #1

Merged
merged 3 commits into from
Dec 3, 2023
Merged

Bump dependency on OpenTelemetry to 0.019 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a854764
Bump dependency on OpenTelemetry to 0.019
jjatria Dec 3, 2023
e04fd32
Temporarily work around Test2 object check issue on 5.32
jjatria Dec 3, 2023
d846630
Mark span as error if not success response
jjatria Dec 3, 2023
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
7 changes: 6 additions & 1 deletion META.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"requires" : {
"Feature::Compat::Try" : "0",
"Mojolicious" : "0",
"OpenTelemetry" : "0.010",
"OpenTelemetry" : "0.019",
"Syntax::Keyword::Dynamically" : "0",
"perl" : "5.013010"
}
Expand Down Expand Up @@ -72,6 +72,11 @@
"resources" : {
"bugtracker" : {
"web" : "https://gitlab.com/jjatria/mojolicious-plugin-opentelemetry/issues"
},
"repository" : {
"type" : "git",
"url" : "git://github.com/jjatria/mojolicious-plugin-opentelemetry.git",
"web" : "https://github.com/jjatria/mojolicious-plugin-opentelemetry"
}
},
"version" : "0.001",
Expand Down
2 changes: 1 addition & 1 deletion cpanfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
requires 'Feature::Compat::Try';
requires 'Mojolicious';
requires 'OpenTelemetry', '0.010';
requires 'OpenTelemetry', '0.019';
requires 'Syntax::Keyword::Dynamically';

on test => sub {
Expand Down
9 changes: 5 additions & 4 deletions lib/Mojolicious/Plugin/OpenTelemetry.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,12 @@ sub register ( $, $app, $config, @ ) {
: Mojo::Promise->resolve(1);

$promise->then( sub {
my $code = $tx->res->code;
my $error = $code >= 400 && $code < 600;

$span
->set_status( SPAN_STATUS_OK )
->set_attribute(
'http.response.status_code' => $tx->res->code,
)
->set_status( $error ? SPAN_STATUS_ERROR : SPAN_STATUS_OK )
->set_attribute( 'http.response.status_code' => $code )
->end;
})->wait;

Expand Down
28 changes: 16 additions & 12 deletions t/basic.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,10 @@ subtest 'Static URL' => sub {
},
kind => SPAN_KIND_SERVER,
name => 'GET /static/url',
parent => object {
prop isa => 'OpenTelemetry::Context';
},
parent => D, # FIXME: cannot use an object check on 5.32?
# parent => object {
# prop isa => 'OpenTelemetry::Context';
# },
};

span_calls [
Expand Down Expand Up @@ -123,9 +124,10 @@ subtest 'Async' => sub {
},
kind => SPAN_KIND_SERVER,
name => 'GET /async',
parent => object {
prop isa => 'OpenTelemetry::Context';
},
parent => D, # FIXME: cannot use an object check on 5.32?
# parent => object {
# prop isa => 'OpenTelemetry::Context';
# },
};

span_calls [
Expand Down Expand Up @@ -155,9 +157,10 @@ subtest 'With placeholder' => sub {
},
kind => SPAN_KIND_SERVER,
name => 'GET /url/with/:placeholder',
parent => object {
prop isa => 'OpenTelemetry::Context';
},
parent => D, # FIXME: cannot use an object check on 5.32?
# parent => object {
# prop isa => 'OpenTelemetry::Context';
# },
};

span_calls [
Expand Down Expand Up @@ -186,9 +189,10 @@ subtest Error => sub {
},
kind => SPAN_KIND_SERVER,
name => 'GET /error',
parent => object {
prop isa => 'OpenTelemetry::Context';
},
parent => D, # FIXME: cannot use an object check on 5.32?
# parent => object {
# prop isa => 'OpenTelemetry::Context';
# },
};

span_calls [
Expand Down
Loading