Skip to content

Commit 6b2a1af

Browse files
intuibaseintuibase
committed
Fixed style
1 parent 4baa15e commit 6b2a1af

File tree

5 files changed

+41
-31
lines changed

5 files changed

+41
-31
lines changed

‎src/Instrumentation/Curl/src/CurlHandleMetadata.php‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace OpenTelemetry\Contrib\Instrumentation\Curl;
66

7-
use OpenTelemetry\SemConv\TraceAttributes;
87
use CurlHandle;
8+
use OpenTelemetry\SemConv\TraceAttributes;
99

1010
class CurlHandleMetadata
1111
{
@@ -43,7 +43,8 @@ public function setAttribute(string $key, mixed $value)
4343

4444
public function setHeaderToPropagate(string $key, $value): CurlHandleMetadata
4545
{
46-
$this->headersToPropagate[] = $key . ": " . $value;
46+
$this->headersToPropagate[] = $key . ': ' . $value;
47+
4748
return $this;
4849
}
4950

@@ -54,6 +55,7 @@ public function getRequestHeadersToSend(): ?array
5455
}
5556
$headers = array_merge($this->headersToPropagate, $this->headers);
5657
$this->headersToPropagate = [];
58+
5759
return $headers;
5860
}
5961

@@ -69,8 +71,8 @@ public function getResponseHeaderCaptureFunction()
6971

7072
$header = trim($headerLine, "\n\r");
7173
if (strlen($header) > 0) {
72-
if (strpos($header, ": ") !== false) {
73-
list($key, $value) = explode(": ", $header, 2);
74+
if (strpos($header, ': ') !== false) {
75+
list($key, $value) = explode(': ', $header, 2);
7476
$this->responseHeaders[strtolower($key)] = $value;
7577
}
7678
}
@@ -90,36 +92,45 @@ public function updateFromCurlOption(int $option, mixed $value)
9092
switch ($option) {
9193
case CURLOPT_CUSTOMREQUEST:
9294
$this->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, $value);
95+
9396
break;
9497
case CURLOPT_HTTPGET:
9598
// Based on https://github.com/curl/curl/blob/curl-7_73_0/lib/setopt.c#L841
9699
$this->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, 'GET');
100+
97101
break;
98102
case CURLOPT_POST:
99103
$this->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, ($value == 1 ? 'POST' : 'GET'));
104+
100105
break;
101106
case CURLOPT_POSTFIELDS:
102107
// Based on https://github.com/curl/curl/blob/curl-7_73_0/lib/setopt.c#L269
103108
$this->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, 'POST');
109+
104110
break;
105111
case CURLOPT_PUT:
106112
$this->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, ($value == 1 ? 'PUT' : 'GET'));
113+
107114
break;
108115
case CURLOPT_NOBODY:
109116
// Based on https://github.com/curl/curl/blob/curl-7_73_0/lib/setopt.c#L269
110117
$this->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, ($value == 1 ? 'HEAD' : 'GET'));
118+
111119
break;
112120
case CURLOPT_URL:
113121
// $this->setAttribute(TraceAttributes::URL_FULL, self::redactUrlString($value));
114122
break;
115123
case CURLOPT_USERAGENT:
116124
$this->setAttribute(TraceAttributes::USER_AGENT_ORIGINAL, $value);
125+
117126
break;
118127
case CURLOPT_HTTPHEADER:
119128
$this->headers = $value;
129+
120130
break;
121131
case CURLOPT_HEADERFUNCTION:
122132
$this->originalHeaderFunction = $value;
133+
// no break
123134
case CURLOPT_VERBOSE:
124135
$this->verboseEnabled = false;
125136
}

‎src/Instrumentation/Curl/src/CurlInstrumentation.php‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@
1212
use OpenTelemetry\API\Trace\SpanInterface;
1313
use OpenTelemetry\API\Trace\SpanKind;
1414
use OpenTelemetry\API\Trace\StatusCode;
15-
use OpenTelemetry\SDK\Common\Configuration\Configuration;
1615
use OpenTelemetry\Context\Context;
1716
use function OpenTelemetry\Instrumentation\hook;
17+
use OpenTelemetry\SDK\Common\Configuration\Configuration;
1818
use OpenTelemetry\SemConv\TraceAttributes;
19-
use Phan\Daemon\Transport\CapturerResponder;
2019
use WeakMap;
2120
use WeakReference;
2221

23-
2422
class CurlInstrumentation
2523
{
2624
public const NAME = 'curl';
@@ -167,9 +165,9 @@ public static function register(): void
167165
if (self::isRequestHeadersCapturingEnabled()) {
168166
if (!$curlHandleToAttributes[$params[0]]->isVerboseEnabled()) { // we let go of captuing request headers because CURLINFO_HEADER_OUT is disabling CURLOPT_VERBOSE
169167
curl_setopt($params[0], CURLINFO_HEADER_OUT, true);
170-
} else {
171-
//TODO log?
172168
}
169+
//TODO log?
170+
173171
}
174172
$curlSetOptInstrumentationSuppressed = false;
175173

@@ -297,9 +295,9 @@ public static function register(): void
297295
if (self::isRequestHeadersCapturingEnabled()) {
298296
if (!$curlHandleToAttributes[$cHandle]->isVerboseEnabled()) { // we let go of captuing request headers because CURLINFO_HEADER_OUT is disabling CURLOPT_VERBOSE
299297
curl_setopt($cHandle, CURLINFO_HEADER_OUT, true);
300-
} else {
301-
//TODO log?
302298
}
299+
//TODO log?
300+
303301
}
304302
$curlSetOptInstrumentationSuppressed = false;
305303

@@ -403,13 +401,16 @@ private static function transformHeaderStringToArray(string $header): array
403401
$headersResult = [];
404402
foreach ($lines as $line) {
405403
$line = trim($line, "\r");
406-
if (empty($line)) continue;
404+
if (empty($line)) {
405+
continue;
406+
}
407407

408-
if (strpos($line, ": ") !== false) {
409-
list($key, $value) = explode(": ", $line, 2);
408+
if (strpos($line, ': ') !== false) {
409+
list($key, $value) = explode(': ', $line, 2);
410410
$headersResult[strtolower($key)] = $value;
411411
}
412412
}
413+
413414
return $headersResult;
414415
}
415416

@@ -455,6 +456,7 @@ private static function isRequestHeadersCapturingEnabled(): bool
455456
if (class_exists('OpenTelemetry\SDK\Common\Configuration\Configuration') && count(Configuration::getList('OTEL_PHP_INSTRUMENTATION_HTTP_REQUEST_HEADERS', [])) > 0) {
456457
return true;
457458
}
459+
458460
return get_cfg_var('otel.instrumentation.http.request_headers') !== false;
459461
}
460462

‎src/Instrumentation/Curl/src/HeadersPropagator.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
use function assert;
88
use OpenTelemetry\Context\Propagation\PropagationSetterInterface;
9-
use CurlHandle;
109

1110
/**
1211
* @internal

‎src/Instrumentation/Curl/tests/Integration/CurlInstrumentationTest.php‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace OpenTelemetry\Tests\Instrumentation\Curl\Integration;
66

77
use ArrayObject;
8-
use LanguageServerProtocol\PublishDiagnosticsClientCapabilities;
98
use OpenTelemetry\API\Instrumentation\Configurator;
109
use OpenTelemetry\Context\ScopeInterface;
1110
use OpenTelemetry\SDK\Trace\ImmutableSpan;
@@ -132,8 +131,8 @@ public function test_curl_exec_calls_user_defined_headerfunc(): void
132131
{
133132
// test if response header capturing is not breaking user header func invocation
134133

135-
putenv("OTEL_PHP_INSTRUMENTATION_HTTP_RESPONSE_HEADERS=server");
136-
putenv("OTEL_PHP_INSTRUMENTATION_HTTP_REQUEST_HEADERS=host");
134+
putenv('OTEL_PHP_INSTRUMENTATION_HTTP_RESPONSE_HEADERS=server');
135+
putenv('OTEL_PHP_INSTRUMENTATION_HTTP_REQUEST_HEADERS=host');
137136

138137
$ch = curl_init('http://example.com/');
139138
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
@@ -163,8 +162,8 @@ public function test_curl_exec_calls_user_defined_headerfunc(): void
163162

164163
public function test_curl_exec_headers_captuing(): void
165164
{
166-
putenv("OTEL_PHP_INSTRUMENTATION_HTTP_RESPONSE_HEADERS=content-type");
167-
putenv("OTEL_PHP_INSTRUMENTATION_HTTP_REQUEST_HEADERS=host");
165+
putenv('OTEL_PHP_INSTRUMENTATION_HTTP_RESPONSE_HEADERS=content-type');
166+
putenv('OTEL_PHP_INSTRUMENTATION_HTTP_REQUEST_HEADERS=host');
168167

169168
$ch = curl_init('http://example.com/');
170169
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
@@ -176,13 +175,13 @@ public function test_curl_exec_headers_captuing(): void
176175
$this->assertSame('GET', $span->getName());
177176
$this->assertEquals(200, $span->getAttributes()->get(TraceAttributes::HTTP_RESPONSE_STATUS_CODE));
178177
$this->assertEqualsIgnoringCase('http', $span->getAttributes()->get(TraceAttributes::URL_SCHEME));
179-
$this->assertStringContainsStringIgnoringCase("text/html", $span->getAttributes()->get('http.response.header.content-type'));
180-
$this->assertEquals("example.com", $span->getAttributes()->get('http.request.header.host'));
178+
$this->assertStringContainsStringIgnoringCase('text/html', $span->getAttributes()->get('http.response.header.content-type'));
179+
$this->assertEquals('example.com', $span->getAttributes()->get('http.request.header.host'));
181180
}
182181

183182
public function test_curl_exec_sets_traceparent(): void
184183
{
185-
putenv("OTEL_PHP_INSTRUMENTATION_HTTP_REQUEST_HEADERS=traceparent");
184+
putenv('OTEL_PHP_INSTRUMENTATION_HTTP_REQUEST_HEADERS=traceparent');
186185

187186
$ch = curl_init('http://example.com/');
188187
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

‎src/Instrumentation/Curl/tests/Integration/CurlMultiInstrumentationTest.php‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,13 @@ public function test_curl_multi_remove_handle()
124124

125125
public function test_curl_multi_exec_calls_user_defined_headerfunc(): void
126126
{
127-
putenv("OTEL_PHP_INSTRUMENTATION_HTTP_RESPONSE_HEADERS=content-type");
128-
putenv("OTEL_PHP_INSTRUMENTATION_HTTP_REQUEST_HEADERS=host");
127+
putenv('OTEL_PHP_INSTRUMENTATION_HTTP_RESPONSE_HEADERS=content-type');
128+
putenv('OTEL_PHP_INSTRUMENTATION_HTTP_REQUEST_HEADERS=host');
129129

130130
$mh = curl_multi_init();
131131
$ch1 = curl_init('http://example.com/');
132132
curl_setopt($ch1, CURLOPT_RETURNTRANSFER, 1);
133133

134-
135134
$func = function (\CurlHandle $ch, string $headerLine) {
136135
return strlen($headerLine);
137136
};
@@ -175,8 +174,8 @@ public function test_curl_multi_exec_calls_user_defined_headerfunc(): void
175174

176175
public function test_curl_multi_exec_headers_captuing(): void
177176
{
178-
putenv("OTEL_PHP_INSTRUMENTATION_HTTP_RESPONSE_HEADERS=content-type");
179-
putenv("OTEL_PHP_INSTRUMENTATION_HTTP_REQUEST_HEADERS=host");
177+
putenv('OTEL_PHP_INSTRUMENTATION_HTTP_RESPONSE_HEADERS=content-type');
178+
putenv('OTEL_PHP_INSTRUMENTATION_HTTP_REQUEST_HEADERS=host');
180179

181180
$mh = curl_multi_init();
182181
$ch1 = curl_init('http://example.com/');
@@ -206,14 +205,14 @@ public function test_curl_multi_exec_headers_captuing(): void
206205
$this->assertEquals(200, $span->getAttributes()->get(TraceAttributes::HTTP_RESPONSE_STATUS_CODE));
207206
$this->assertEqualsIgnoringCase('http', $span->getAttributes()->get(TraceAttributes::URL_SCHEME));
208207
$this->assertEquals(80, $span->getAttributes()->get(TraceAttributes::SERVER_PORT));
209-
$this->assertStringContainsStringIgnoringCase("text/html", $span->getAttributes()->get('http.response.header.content-type'));
210-
$this->assertEquals("example.com", $span->getAttributes()->get('http.request.header.host'));
208+
$this->assertStringContainsStringIgnoringCase('text/html', $span->getAttributes()->get('http.response.header.content-type'));
209+
$this->assertEquals('example.com', $span->getAttributes()->get('http.request.header.host'));
211210
}
212211
}
213212

214213
public function test_curl_multi_exec_sets_traceparent(): void
215214
{
216-
putenv("OTEL_PHP_INSTRUMENTATION_HTTP_REQUEST_HEADERS=traceparent");
215+
putenv('OTEL_PHP_INSTRUMENTATION_HTTP_REQUEST_HEADERS=traceparent');
217216

218217
$mh = curl_multi_init();
219218
$ch1 = curl_init('http://example.com/');

0 commit comments

Comments
 (0)