http server semconv 1.23 updates (#208)

* update http server span names to match spec ("GET" or "GET <route>"), per https://github.com/open-telemetry/semantic-conventions/blob/v1.23.0/docs/http/http-spans.md#name
* adding http client/server span attributes
* do not normalize hyphen to underscore for http request/response header key, per https://opentelemetry.io/blog/2023/http-conventions-declared-stable/#common-attributes-across-http-client-and-server-spans

Author: brettmc

src/HttpInstrumentation.php

@@ -29,7 +29,7 @@ public static function register(CachedInstrumentation $instrumentation): void
                 $request = ($params[0] instanceof Request) ? $params[0] : null;
                 /** @psalm-suppress ArgumentTypeCoercion */
                 $builder = $instrumentation->tracer()
-                    ->spanBuilder(sprintf('HTTP %s', $request?->method() ?? 'unknown'))
+                    ->spanBuilder(sprintf('%s', $request?->method() ?? 'unknown'))
                     ->setSpanKind(SpanKind::KIND_SERVER)
                     ->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
                     ->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)

src/Watchers/ClientRequestWatcher.php

@@ -36,6 +36,9 @@ public function register(Application $app): void
         $app['events']->listen(ResponseReceived::class, [$this, 'recordResponse']);
     }
 
+    /**
+     * @psalm-suppress ArgumentTypeCoercion
+     */
     public function recordRequest(RequestSending $request): void
     {
         $parsedUrl = collect(parse_url($request->request->url()));
@@ -44,7 +47,7 @@ public function recordRequest(RequestSending $request): void
         if ($parsedUrl->has('query')) {
             $processedUrl .= '?' . $parsedUrl->get('query');
         }
-        $span = $this->instrumentation->tracer()->spanBuilder('HTTP ' . $request->request->method())
+        $span = $this->instrumentation->tracer()->spanBuilder($request->request->method())
             ->setSpanKind(SpanKind::KIND_CLIENT)
             ->setAttributes([
                 TraceAttributes::HTTP_REQUEST_METHOD => $request->request->method(),

tests/Integration/LaravelInstrumentationTest.php

@@ -55,12 +55,12 @@ public function test_request_response(): void
         $this->assertEquals(200, $response->status());
         $this->assertCount(1, $this->storage);
         $span = $this->storage->offsetGet(0);
-        $this->assertSame('HTTP GET', $span->getName());
+        $this->assertSame('GET', $span->getName());
 
         $response = Http::get('opentelemetry.io');
         $this->assertEquals(200, $response->status());
         $span = $this->storage->offsetGet(1);
-        $this->assertSame('HTTP GET', $span->getName());
+        $this->assertSame('GET', $span->getName());
     }
     public function test_cache_log_db(): void
     {
@@ -81,7 +81,7 @@ public function test_cache_log_db(): void
         $this->assertEquals(200, $response->status());
         $this->assertCount(2, $this->storage);
         $span = $this->storage->offsetGet(1);
-        $this->assertSame('HTTP GET', $span->getName());
+        $this->assertSame('GET', $span->getName());
         $this->assertSame('http://localhost/hello', $span->getAttributes()->get(TraceAttributes::URL_FULL));
         $this->assertCount(5, $span->getEvents());
         $this->assertSame('cache set', $span->getEvents()[0]->getName());