update instrumentations to semconv 1.32 (#369)

SemConv 1.32 deprecates a couple of attributes which we use extensively:
- code.function.name is now an FQN (including class name)
- code.namespace is deprecated (included in code.function.name)
- code.linenumber is deprecated and replaced with code.line.number

Updated all packages to conform, updated min semconv to 1.32, and made
a couple of minor changes"

Author: brettmc

composer.json

@@ -12,7 +12,7 @@
     "php": "^8.1",
     "ext-opentelemetry": "*",
     "open-telemetry/api": "^1.0",
-    "open-telemetry/sem-conv": "^1.30",
+    "open-telemetry/sem-conv": "^1.32",
     "symfony/http-kernel": "*",
     "symfony/http-client-contracts": "*"
   },

src/HttpClientInstrumentation.php

@@ -13,6 +13,7 @@
 use OpenTelemetry\Context\Propagation\ArrayAccessGetterSetter;
 use function OpenTelemetry\Instrumentation\hook;
 use OpenTelemetry\SemConv\TraceAttributes;
+use OpenTelemetry\SemConv\Version;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
@@ -41,7 +42,7 @@ public static function register(): void
         $instrumentation = new CachedInstrumentation(
             'io.opentelemetry.contrib.php.symfony_http',
             null,
-            'https://opentelemetry.io/schemas/1.30.0',
+            Version::VERSION_1_32_0->url(),
         );
 
         /** @psalm-suppress UnusedFunctionCall */
@@ -64,9 +65,8 @@ public static function register(): void
                     ->setAttribute(TraceAttributes::PEER_SERVICE, parse_url((string) $params[1])['host'] ?? null)
                     ->setAttribute(TraceAttributes::URL_FULL, (string) $params[1])
                     ->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, $params[0])
-                    ->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
-                    ->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
-                    ->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
+                    ->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
+                    ->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
                     ->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno);
 
                 $propagator = Globals::propagator();

src/MessengerInstrumentation.php

@@ -11,6 +11,7 @@
 use OpenTelemetry\Context\Context;
 use function OpenTelemetry\Instrumentation\hook;
 use OpenTelemetry\SemConv\TraceAttributes;
+use OpenTelemetry\SemConv\Version;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Transport\Sender\SenderInterface;
@@ -38,7 +39,7 @@ public static function register(): void
         $instrumentation = new CachedInstrumentation(
             'io.opentelemetry.contrib.php.symfony_messenger',
             null,
-            'https://opentelemetry.io/schemas/1.30.0',
+            Version::VERSION_1_32_0->url(),
         );
 
         /**
@@ -66,9 +67,8 @@ public static function register(): void
                     ->tracer()
                     ->spanBuilder(\sprintf('DISPATCH %s', $messageClass))
                     ->setSpanKind(SpanKind::KIND_PRODUCER)
-                    ->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
-                    ->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
-                    ->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
+                    ->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
+                    ->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
                     ->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno)
 
                     ->setAttribute(self::ATTRIBUTE_MESSENGER_BUS, $class)
@@ -133,9 +133,8 @@ public static function register(): void
                     ->tracer()
                     ->spanBuilder(\sprintf('SEND %s', $messageClass))
                     ->setSpanKind(SpanKind::KIND_PRODUCER)
-                    ->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
-                    ->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
-                    ->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
+                    ->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
+                    ->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
                     ->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno)
 
                     ->setAttribute(self::ATTRIBUTE_MESSENGER_TRANSPORT, $class)

src/SymfonyInstrumentation.php

@@ -13,6 +13,7 @@
 use OpenTelemetry\Context\Context;
 use function OpenTelemetry\Instrumentation\hook;
 use OpenTelemetry\SemConv\TraceAttributes;
+use OpenTelemetry\SemConv\Version;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernel;
@@ -28,7 +29,7 @@ public static function register(): void
         $instrumentation = new CachedInstrumentation(
             'io.opentelemetry.contrib.php.symfony',
             null,
-            'https://opentelemetry.io/schemas/1.30.0',
+            Version::VERSION_1_32_0->url(),
         );
 
         /** @psalm-suppress UnusedFunctionCall */
@@ -54,9 +55,8 @@ public static function register(): void
                     ->tracer()
                     ->spanBuilder($name)
                     ->setSpanKind(($type === HttpKernelInterface::SUB_REQUEST) ? SpanKind::KIND_INTERNAL : SpanKind::KIND_SERVER)
-                    ->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
-                    ->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
-                    ->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
+                    ->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
+                    ->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
                     ->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno);
 
                 $parent = Context::getCurrent();