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

Author: julianocosta89

composer.json

@@ -13,7 +13,7 @@
     "ext-opentelemetry": "*",
     "laravel/framework": ">=6.0",
     "open-telemetry/api": "^1.0.0beta10",
-    "open-telemetry/sem-conv": "^1"
+    "open-telemetry/sem-conv": "^1.22"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3",

src/HttpInstrumentation.php

@@ -40,16 +40,16 @@ public static function register(CachedInstrumentation $instrumentation): void
                     $parent = Globals::propagator()->extract($request, HeadersPropagator::instance());
                     $span = $builder
                         ->setParent($parent)
-                        ->setAttribute(TraceAttributes::HTTP_URL, $request->fullUrl())
-                        ->setAttribute(TraceAttributes::HTTP_METHOD, $request->method())
-                        ->setAttribute(TraceAttributes::HTTP_REQUEST_CONTENT_LENGTH, $request->header('Content-Length'))
-                        ->setAttribute(TraceAttributes::HTTP_SCHEME, $request->getScheme())
-                        ->setAttribute(TraceAttributes::HTTP_FLAVOR, $request->getProtocolVersion())
-                        ->setAttribute(TraceAttributes::HTTP_CLIENT_IP, $request->ip())
-                        ->setAttribute(TraceAttributes::HTTP_TARGET, self::httpTarget($request))
-                        ->setAttribute(TraceAttributes::NET_HOST_NAME, self::httpHostName($request))
-                        ->setAttribute(TraceAttributes::NET_HOST_PORT, $request->getPort())
-                        ->setAttribute(TraceAttributes::NET_PEER_PORT, $request->server('REMOTE_PORT'))
+                        ->setAttribute(TraceAttributes::URL_FULL, $request->fullUrl())
+                        ->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, $request->method())
+                        ->setAttribute(TraceAttributes::HTTP_REQUEST_BODY_SIZE, $request->header('Content-Length'))
+                        ->setAttribute(TraceAttributes::URL_SCHEME, $request->getScheme())
+                        ->setAttribute(TraceAttributes::NETWORK_PROTOCOL_VERSION, $request->getProtocolVersion())
+                        ->setAttribute(TraceAttributes::NETWORK_PEER_ADDRESS, $request->ip())
+                        ->setAttribute(TraceAttributes::URL_PATH, self::httpTarget($request))
+                        ->setAttribute(TraceAttributes::SERVER_ADDRESS, self::httpHostName($request))
+                        ->setAttribute(TraceAttributes::SERVER_PORT, $request->getPort())
+                        ->setAttribute(TraceAttributes::CLIENT_PORT, $request->server('REMOTE_PORT'))
                         ->setAttribute(TraceAttributes::USER_AGENT_ORIGINAL, $request->userAgent())
                         ->startSpan();
                     $request->attributes->set(SpanInterface::class, $span);
@@ -75,9 +75,9 @@ public static function register(CachedInstrumentation $instrumentation): void
                     if ($response->getStatusCode() >= 400) {
                         $span->setStatus(StatusCode::STATUS_ERROR);
                     }
-                    $span->setAttribute(TraceAttributes::HTTP_STATUS_CODE, $response->getStatusCode());
-                    $span->setAttribute(TraceAttributes::HTTP_FLAVOR, $response->getProtocolVersion());
-                    $span->setAttribute(TraceAttributes::HTTP_RESPONSE_CONTENT_LENGTH, $response->headers->get('Content-Length'));
+                    $span->setAttribute(TraceAttributes::HTTP_RESPONSE_STATUS_CODE, $response->getStatusCode());
+                    $span->setAttribute(TraceAttributes::NETWORK_PROTOCOL_VERSION, $response->getProtocolVersion());
+                    $span->setAttribute(TraceAttributes::HTTP_RESPONSE_BODY_SIZE, $response->headers->get('Content-Length'));
                 }
 
                 $span->end();

src/Watchers/ClientRequestWatcher.php

@@ -47,13 +47,13 @@ public function recordRequest(RequestSending $request): void
         $span = $this->instrumentation->tracer()->spanBuilder('HTTP ' . $request->request->method())
             ->setSpanKind(SpanKind::KIND_CLIENT)
             ->setAttributes([
-                TraceAttributes::HTTP_METHOD => $request->request->method(),
-                TraceAttributes::HTTP_URL => $processedUrl,
-                TraceAttributes::HTTP_TARGET => $parsedUrl['path'] ?? '',
+                TraceAttributes::HTTP_REQUEST_METHOD => $request->request->method(),
+                TraceAttributes::URL_FULL => $processedUrl,
+                TraceAttributes::URL_PATH => $parsedUrl['path'] ?? '',
                 TraceAttributes::HTTP_HOST => $parsedUrl['host'] ?? '',
-                TraceAttributes::HTTP_SCHEME => $parsedUrl['scheme'] ?? '',
-                TraceAttributes::NET_PEER_NAME => $parsedUrl['host'] ?? '',
-                TraceAttributes::NET_PEER_PORT => $parsedUrl['port'] ?? '',
+                TraceAttributes::URL_SCHEME => $parsedUrl['scheme'] ?? '',
+                TraceAttributes::SERVER_ADDRESS => $parsedUrl['host'] ?? '',
+                TraceAttributes::SERVER_PORT => $parsedUrl['port'] ?? '',
             ])
             ->startSpan();
         $this->spans[$this->createRequestComparisonHash($request->request)] = $span;
@@ -84,8 +84,8 @@ public function recordResponse(ResponseReceived $request): void
         }
 
         $span->setAttributes([
-            TraceAttributes::HTTP_STATUS_CODE => $request->response->status(),
-            TraceAttributes::HTTP_RESPONSE_CONTENT_LENGTH => $request->response->header('Content-Length'),
+            TraceAttributes::HTTP_RESPONSE_STATUS_CODE => $request->response->status(),
+            TraceAttributes::HTTP_RESPONSE_BODY_SIZE => $request->response->header('Content-Length'),
         ]);
 
         $this->maybeRecordError($span, $request->response);

tests/Integration/LaravelInstrumentationTest.php

@@ -82,7 +82,7 @@ public function test_cache_log_db(): void
         $this->assertCount(2, $this->storage);
         $span = $this->storage->offsetGet(1);
         $this->assertSame('HTTP GET', $span->getName());
-        $this->assertSame('http://localhost/hello', $span->getAttributes()->get(TraceAttributes::HTTP_URL));
+        $this->assertSame('http://localhost/hello', $span->getAttributes()->get(TraceAttributes::URL_FULL));
         $this->assertCount(5, $span->getEvents());
         $this->assertSame('cache set', $span->getEvents()[0]->getName());
         $this->assertSame('Log info', $span->getEvents()[1]->getName());