-
Notifications
You must be signed in to change notification settings - Fork 174
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix missing instrumentation of the
Statement::execute() method of D…
…octrine DBAL (#548) Co-authored-by: Alessandro Lai <[email protected]>
- Loading branch information
Showing
13 changed files
with
672 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Sentry\SentryBundle\Tracing\Doctrine\DBAL; | ||
|
|
||
| use Doctrine\DBAL\Driver\Statement; | ||
| use Sentry\State\HubInterface; | ||
| use Sentry\Tracing\Span; | ||
| use Sentry\Tracing\SpanContext; | ||
|
|
||
| abstract class AbstractTracingStatement | ||
| { | ||
| /** | ||
| * @internal | ||
| */ | ||
| public const SPAN_OP_STMT_EXECUTE = 'sql.stmt.execute'; | ||
|
|
||
| /** | ||
| * @var HubInterface The current hub | ||
| */ | ||
| protected $hub; | ||
|
|
||
| /** | ||
| * @var Statement The decorated statement | ||
| */ | ||
| protected $decoratedStatement; | ||
|
|
||
| /** | ||
| * @var string The SQL query executed by the decorated statement | ||
| */ | ||
| protected $sqlQuery; | ||
|
|
||
| /** | ||
| * @var array<string, string> The span tags | ||
| */ | ||
| protected $spanTags; | ||
|
|
||
| /** | ||
| * Constructor. | ||
| * | ||
| * @param HubInterface $hub The current hub | ||
| * @param Statement $decoratedStatement The decorated statement | ||
| * @param string $sqlQuery The SQL query executed by the decorated statement | ||
| * @param array<string, string> $spanTags The span tags | ||
| */ | ||
| public function __construct(HubInterface $hub, Statement $decoratedStatement, string $sqlQuery, array $spanTags) | ||
| { | ||
| $this->hub = $hub; | ||
| $this->decoratedStatement = $decoratedStatement; | ||
| $this->sqlQuery = $sqlQuery; | ||
| $this->spanTags = $spanTags; | ||
| } | ||
|
|
||
| /** | ||
| * Calls the given callback by passing to it the specified arguments and | ||
| * wrapping its execution into a child {@see Span} of the current one. | ||
| * | ||
| * @param callable $callback The function to call | ||
| * @param mixed ...$args The arguments to pass to the callback | ||
| * | ||
| * @phpstan-template T | ||
| * | ||
| * @phpstan-param callable(mixed...): T $callback | ||
| * | ||
| * @phpstan-return T | ||
| */ | ||
| protected function traceFunction(SpanContext $spanContext, callable $callback, ...$args) | ||
| { | ||
| $span = $this->hub->getSpan(); | ||
|
|
||
| if (null !== $span) { | ||
| $span = $span->startChild($spanContext); | ||
| } | ||
|
|
||
| try { | ||
| return $callback(...$args); | ||
| } finally { | ||
| if (null !== $span) { | ||
| $span->finish(); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.