-
Notifications
You must be signed in to change notification settings - Fork 117
Curl auto instrumentation distributed tracing headers propagation, request and response headers capturing (#1420) #314
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.
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
bobstrecansky
merged 5 commits into
open-telemetry:main
from
intuibase:curl_headers_propagation
Nov 6, 2024
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
382525e
Curl auto instrumentation distributed tracing headers propagation, re…
intuibase f9d9d7e
Apply suggestions from code review
intuibase caf990c
Fixes after code review
intuibase be05c52
Update src/Instrumentation/Curl/tests/Integration/CurlInstrumentation…
intuibase 884a13f
Update src/Instrumentation/Curl/tests/Integration/CurlMultiInstrument…
intuibase File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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,139 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace OpenTelemetry\Contrib\Instrumentation\Curl; | ||
|
|
||
| use CurlHandle; | ||
| use OpenTelemetry\SemConv\TraceAttributes; | ||
|
|
||
| class CurlHandleMetadata | ||
| { | ||
| private array $attributes = []; | ||
|
|
||
| private array $headers = []; | ||
|
|
||
| private array $headersToPropagate = []; | ||
|
|
||
| private mixed $originalHeaderFunction = null; | ||
| private array $responseHeaders = []; | ||
|
|
||
| private bool $verboseEnabled = false; | ||
|
|
||
| public function __construct() | ||
| { | ||
| $this->attributes = [TraceAttributes::HTTP_REQUEST_METHOD => 'GET']; | ||
| $this->headers = []; | ||
| $headersToPropagate = []; | ||
| } | ||
|
|
||
| public function isVerboseEnabled(): bool | ||
| { | ||
| return $this->verboseEnabled; | ||
| } | ||
| public function getAttributes(): array | ||
intuibase marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| { | ||
| return $this->attributes; | ||
| } | ||
|
|
||
| public function setAttribute(string $key, mixed $value) | ||
| { | ||
| $this->attributes[$key] = $value; | ||
| } | ||
|
|
||
| public function setHeaderToPropagate(string $key, $value): CurlHandleMetadata | ||
| { | ||
| $this->headersToPropagate[] = $key . ': ' . $value; | ||
|
|
||
| return $this; | ||
| } | ||
|
|
||
| public function getRequestHeadersToSend(): ?array | ||
| { | ||
| if (count($this->headersToPropagate) == 0) { | ||
| return null; | ||
| } | ||
| $headers = array_merge($this->headersToPropagate, $this->headers); | ||
| $this->headersToPropagate = []; | ||
|
|
||
| return $headers; | ||
| } | ||
|
|
||
| public function getCapturedResponseHeaders(): array | ||
| { | ||
| return $this->responseHeaders; | ||
| } | ||
|
|
||
| public function getResponseHeaderCaptureFunction() | ||
| { | ||
| $this->responseHeaders = []; | ||
| $func = function (CurlHandle $handle, string $headerLine): int { | ||
|
|
||
| $header = trim($headerLine, "\n\r"); | ||
| if (strlen($header) > 0) { | ||
intuibase marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (strpos($header, ': ') !== false) { | ||
| /** @psalm-suppress PossiblyUndefinedArrayOffset */ | ||
| list($key, $value) = explode(': ', $header, 2); | ||
intuibase marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| $this->responseHeaders[strtolower($key)] = $value; | ||
| } | ||
| } | ||
|
|
||
| if ($this->originalHeaderFunction) { | ||
| return call_user_func($this->originalHeaderFunction, $handle, $headerLine); | ||
| } | ||
|
|
||
| return strlen($headerLine); | ||
| }; | ||
|
|
||
| return \Closure::bind($func, $this, self::class); | ||
| } | ||
|
|
||
| public function updateFromCurlOption(int $option, mixed $value) | ||
| { | ||
| switch ($option) { | ||
| case CURLOPT_CUSTOMREQUEST: | ||
| $this->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, $value); | ||
|
|
||
| break; | ||
| case CURLOPT_HTTPGET: | ||
| // Based on https://github.com/curl/curl/blob/curl-7_73_0/lib/setopt.c#L841 | ||
| $this->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, 'GET'); | ||
|
|
||
| break; | ||
| case CURLOPT_POST: | ||
| $this->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, ($value == 1 ? 'POST' : 'GET')); | ||
|
|
||
| break; | ||
| case CURLOPT_POSTFIELDS: | ||
| // Based on https://github.com/curl/curl/blob/curl-7_73_0/lib/setopt.c#L269 | ||
| $this->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, 'POST'); | ||
|
|
||
| break; | ||
| case CURLOPT_PUT: | ||
| $this->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, ($value == 1 ? 'PUT' : 'GET')); | ||
|
|
||
| break; | ||
| case CURLOPT_NOBODY: | ||
| // Based on https://github.com/curl/curl/blob/curl-7_73_0/lib/setopt.c#L269 | ||
| $this->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, ($value == 1 ? 'HEAD' : 'GET')); | ||
|
|
||
| break; | ||
| case CURLOPT_URL: | ||
| // $this->setAttribute(TraceAttributes::URL_FULL, self::redactUrlString($value)); | ||
intuibase marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| break; | ||
| case CURLOPT_USERAGENT: | ||
| $this->setAttribute(TraceAttributes::USER_AGENT_ORIGINAL, $value); | ||
|
|
||
| break; | ||
| case CURLOPT_HTTPHEADER: | ||
| $this->headers = $value; | ||
|
|
||
| break; | ||
| case CURLOPT_HEADERFUNCTION: | ||
| $this->originalHeaderFunction = $value; | ||
| // no break | ||
| case CURLOPT_VERBOSE: | ||
| $this->verboseEnabled = false; | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.