Skip to content

Commit 7aacbbd

Browse files
Update TraceAttributes to semconv to 1.22.0 (#204)
* Replace HTTP_FLAVOR with NETWORK_PROTOCOL_VERSION * Set SemConv version * Update deprecated attributes * Update NETWORK_PEER_ADDRESS
1 parent ef2d4cd commit 7aacbbd

3 files changed

Lines changed: 16 additions & 16 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"php": "^8.0",
1313
"ext-opentelemetry": "*",
1414
"open-telemetry/api": "^1.0.0beta10",
15-
"open-telemetry/sem-conv": "^1",
15+
"open-telemetry/sem-conv": "^1.22",
1616
"psr/http-client": "^1"
1717
},
1818
"autoload": {

src/Psr18Instrumentation.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ public static function register(): void
4949
->spanBuilder(sprintf('HTTP %s', $request->getMethod()))
5050
->setParent($parentContext)
5151
->setSpanKind(SpanKind::KIND_CLIENT)
52-
->setAttribute(TraceAttributes::HTTP_URL, (string) $request->getUri())
53-
->setAttribute(TraceAttributes::HTTP_METHOD, $request->getMethod())
54-
->setAttribute(TraceAttributes::HTTP_FLAVOR, $request->getProtocolVersion())
52+
->setAttribute(TraceAttributes::URL_FULL, (string) $request->getUri())
53+
->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, $request->getMethod())
54+
->setAttribute(TraceAttributes::NETWORK_PROTOCOL_VERSION, $request->getProtocolVersion())
5555
->setAttribute(TraceAttributes::HTTP_USER_AGENT, $request->getHeaderLine('User-Agent'))
56-
->setAttribute(TraceAttributes::HTTP_REQUEST_CONTENT_LENGTH, $request->getHeaderLine('Content-Length'))
57-
->setAttribute(TraceAttributes::NET_PEER_NAME, $request->getUri()->getHost())
58-
->setAttribute(TraceAttributes::NET_PEER_PORT, $request->getUri()->getPort())
56+
->setAttribute(TraceAttributes::HTTP_REQUEST_BODY_SIZE, $request->getHeaderLine('Content-Length'))
57+
->setAttribute(TraceAttributes::SERVER_ADDRESS, $request->getUri()->getHost())
58+
->setAttribute(TraceAttributes::SERVER_PORT, $request->getUri()->getPort())
5959
->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
6060
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
6161
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
@@ -95,9 +95,9 @@ public static function register(): void
9595
$span = Span::fromContext($scope->context());
9696

9797
if ($response) {
98-
$span->setAttribute(TraceAttributes::HTTP_STATUS_CODE, $response->getStatusCode());
99-
$span->setAttribute(TraceAttributes::HTTP_FLAVOR, $response->getProtocolVersion());
100-
$span->setAttribute(TraceAttributes::HTTP_RESPONSE_CONTENT_LENGTH, $response->getHeaderLine('Content-Length'));
98+
$span->setAttribute(TraceAttributes::HTTP_RESPONSE_STATUS_CODE, $response->getStatusCode());
99+
$span->setAttribute(TraceAttributes::NETWORK_PROTOCOL_VERSION, $response->getProtocolVersion());
100+
$span->setAttribute(TraceAttributes::HTTP_RESPONSE_BODY_SIZE, $response->getHeaderLine('Content-Length'));
101101

102102
foreach ((array) (get_cfg_var('otel.instrumentation.http.response_headers') ?: []) as $header) {
103103
if ($response->hasHeader($header)) {

tests/Integration/Psr18InstrumentationTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ public function test_send_request(string $method, string $uri, int $statusCode):
8080
$span = $this->storage[0];
8181

8282
$this->assertStringContainsString($method, $span->getName());
83-
$this->assertTrue($span->getAttributes()->has(TraceAttributes::HTTP_URL));
84-
$this->assertSame($uri, $span->getAttributes()->get(TraceAttributes::HTTP_URL));
85-
$this->assertTrue($span->getAttributes()->has(TraceAttributes::HTTP_METHOD));
86-
$this->assertSame($method, $span->getAttributes()->get(TraceAttributes::HTTP_METHOD));
87-
$this->assertTrue($span->getAttributes()->has(TraceAttributes::HTTP_STATUS_CODE));
88-
$this->assertSame($statusCode, $span->getAttributes()->get(TraceAttributes::HTTP_STATUS_CODE));
83+
$this->assertTrue($span->getAttributes()->has(TraceAttributes::URL_FULL));
84+
$this->assertSame($uri, $span->getAttributes()->get(TraceAttributes::URL_FULL));
85+
$this->assertTrue($span->getAttributes()->has(TraceAttributes::HTTP_REQUEST_METHOD));
86+
$this->assertSame($method, $span->getAttributes()->get(TraceAttributes::HTTP_REQUEST_METHOD));
87+
$this->assertTrue($span->getAttributes()->has(TraceAttributes::HTTP_RESPONSE_STATUS_CODE));
88+
$this->assertSame($statusCode, $span->getAttributes()->get(TraceAttributes::HTTP_RESPONSE_STATUS_CODE));
8989
}
9090

9191
public function requestProvider(): array

0 commit comments

Comments
 (0)