Merge remote-tracking branch 'upstream/main' into spi/laravel

ChrisLightfootWild · ChrisLightfootWild · commit 9788fdd77f2a · 2024-06-30T19:44:08.000+01:00
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ all-checks: style validate phan psalm phpstan test ## All checks + tests
 all: update all-checks ## Everything
 all-lowest: update-lowest all-checks ## Everything, with lowest supported versions
 build: ## Build image
-	$(DOCKER_COMPOSE) build --build-arg PHP_VERSION php
+	$(DOCKER_COMPOSE) build --build-arg PHP_VERSION=${PHP_VERSION} php
 install: ## Install dependencies
 	$(DC_RUN_PHP) env XDEBUG_MODE=off composer install
 update: ## Update dependencies
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -5,6 +5,7 @@ USER root
 
 RUN install-php-extensions \
         opentelemetry \
-        mongodb
+        mongodb \
+        amqp
 
 USER php
diff --git a/examples/instrumentation/Wordpress/composer.json b/examples/instrumentation/Wordpress/composer.json
@@ -4,9 +4,9 @@
     "type": "project",
     "minimum-stability": "beta",
     "require": {
-        "open-telemetry/opentelemetry-auto-wordpress": "^0.0.5",
-        "open-telemetry/sdk": "^1.0@beta",
-        "open-telemetry/exporter-otlp": "^1.0@beta",
+        "open-telemetry/opentelemetry-auto-wordpress": "^0.0.15",
+        "open-telemetry/sdk": "^1.0",
+        "open-telemetry/exporter-otlp": "^1.0",
         "php-http/guzzle7-adapter": "^1.0"
     },
     "config": {
diff --git a/src/Instrumentation/CakePHP/composer.json b/src/Instrumentation/CakePHP/composer.json
@@ -13,7 +13,7 @@
     "ext-opentelemetry": "*",
     "cakephp/cakephp": "^4 || ^5",
     "open-telemetry/api": "^1.0",
-    "open-telemetry/sem-conv": "^1.23"
+    "open-telemetry/sem-conv": "^1.24"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3",
diff --git a/src/Instrumentation/CakePHP/src/CakePHPInstrumentation.php b/src/Instrumentation/CakePHP/src/CakePHPInstrumentation.php
@@ -22,7 +22,11 @@ class CakePHPInstrumentation
 
     public static function register(): void
     {
-        $instrumentation = new CachedInstrumentation('io.opentelemetry.contrib.php.cakephp');
+        $instrumentation = new CachedInstrumentation(
+            'io.opentelemetry.contrib.php.cakephp',
+            null,
+            'https://opentelemetry.io/schemas/1.24.0'
+        );
 
         hook(
             Controller::class,
diff --git a/src/Instrumentation/CodeIgniter/composer.json b/src/Instrumentation/CodeIgniter/composer.json
@@ -13,7 +13,7 @@
       "ext-opentelemetry": "*",
       "codeigniter4/framework": "^4.3",
       "open-telemetry/api": "^1.0",
-      "open-telemetry/sem-conv": "^1.23"
+      "open-telemetry/sem-conv": "^1.24"
     },
     "require-dev": {
       "friendsofphp/php-cs-fixer": "^3.50",
diff --git a/src/Instrumentation/CodeIgniter/src/CodeIgniterInstrumentation.php b/src/Instrumentation/CodeIgniter/src/CodeIgniterInstrumentation.php
@@ -23,7 +23,11 @@ class CodeIgniterInstrumentation
 
     public static function register(): void
     {
-        $instrumentation = new CachedInstrumentation('io.opentelemetry.contrib.php.codeigniter');
+        $instrumentation = new CachedInstrumentation(
+            'io.opentelemetry.contrib.php.codeigniter',
+            null,
+            'https://opentelemetry.io/schemas/1.24.0'
+        );
 
         // The method that creates request/response/controller objects is in the same class as the method
         // that handles them, and they are not passed as method parameters, but rather stored in private
diff --git a/src/Instrumentation/ExtAmqp/composer.json b/src/Instrumentation/ExtAmqp/composer.json
@@ -13,7 +13,7 @@
     "ext-amqp": "*",
     "ext-opentelemetry": "*",
     "open-telemetry/api": "^1",
-    "open-telemetry/sem-conv": "^1.23"
+    "open-telemetry/sem-conv": "^1.24"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3",
diff --git a/src/Instrumentation/ExtAmqp/src/ExtAmqpInstrumentation.php b/src/Instrumentation/ExtAmqp/src/ExtAmqpInstrumentation.php
@@ -27,7 +27,7 @@ public static function register(): void
         $instrumentation = new CachedInstrumentation(
             'io.opentelemetry.contrib.php.ext_amqp',
             InstalledVersions::getVersion('open-telemetry/opentelemetry-auto-ext-amqp'),
-            TraceAttributes::SCHEMA_URL,
+            'https://opentelemetry.io/schemas/1.24.0',
         );
 
         hook(
diff --git a/src/Instrumentation/Guzzle/composer.json b/src/Instrumentation/Guzzle/composer.json
@@ -12,7 +12,7 @@
     "php": "^8.0",
     "ext-opentelemetry": "*",
     "open-telemetry/api": "^1.0",
-    "open-telemetry/sem-conv": "^1.23",
+    "open-telemetry/sem-conv": "^1.24",
     "guzzlehttp/guzzle": "^7"
   },
   "require-dev": {
diff --git a/src/Instrumentation/Guzzle/src/GuzzleInstrumentation.php b/src/Instrumentation/Guzzle/src/GuzzleInstrumentation.php
@@ -28,7 +28,11 @@ class GuzzleInstrumentation
 
     public static function register(): void
     {
-        $instrumentation = new CachedInstrumentation('io.opentelemetry.contrib.php.guzzle', schemaUrl: TraceAttributes::SCHEMA_URL);
+        $instrumentation = new CachedInstrumentation(
+            'io.opentelemetry.contrib.php.guzzle',
+            null,
+            'https://opentelemetry.io/schemas/1.24.0'
+        );
 
         hook(
             ClientInterface::class,
diff --git a/src/Instrumentation/HttpAsyncClient/composer.json b/src/Instrumentation/HttpAsyncClient/composer.json
@@ -12,7 +12,7 @@
     "php": "^8.0",
     "ext-opentelemetry": "*",
     "open-telemetry/api": "^1.0",
-    "open-telemetry/sem-conv": "^1.23",
+    "open-telemetry/sem-conv": "^1.24",
     "php-http/httplug": "^2"
   },
   "autoload": {
diff --git a/src/Instrumentation/IO/composer.json b/src/Instrumentation/IO/composer.json
@@ -11,7 +11,7 @@
     "php": "^8.2",
     "ext-opentelemetry": "*",
     "open-telemetry/api": "^1.0",
-    "open-telemetry/sem-conv": "^1.23"
+    "open-telemetry/sem-conv": "^1.24"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3",
diff --git a/src/Instrumentation/IO/src/IOInstrumentation.php b/src/Instrumentation/IO/src/IOInstrumentation.php
@@ -19,7 +19,11 @@ class IOInstrumentation
 
     public static function register(): void
     {
-        $instrumentation = new CachedInstrumentation('io.opentelemetry.contrib.php.io');
+        $instrumentation = new CachedInstrumentation(
+            'io.opentelemetry.contrib.php.io',
+            null,
+            'https://opentelemetry.io/schemas/1.24.0'
+        );
 
         self::_hook($instrumentation, null, 'fopen', 'fopen');
         self::_hook($instrumentation, null, 'fwrite', 'fwrite');
diff --git a/src/Instrumentation/Laravel/src/LaravelInstrumentation.php b/src/Instrumentation/Laravel/src/LaravelInstrumentation.php
@@ -11,6 +11,7 @@
 use OpenTelemetry\API\Instrumentation\AutoInstrumentation\Instrumentation;
 use OpenTelemetry\API\Instrumentation\ConfigurationResolver;
 use OpenTelemetry\Contrib\Instrumentation\Laravel\Hooks\Hook;
+use OpenTelemetry\SemConv\Version;
 
 class LaravelInstrumentation implements Instrumentation
 {
@@ -24,9 +25,9 @@ public function register(HookManager $hookManager, ConfigurationRegistry $config
             return;
         }
 
-        $logger = $context->loggerProvider->getLogger(self::INSTRUMENTATION_NAME);
-        $meter = $context->meterProvider->getMeter(self::INSTRUMENTATION_NAME);
-        $tracer = $context->tracerProvider->getTracer(self::INSTRUMENTATION_NAME);
+        $logger = $context->loggerProvider->getLogger(self::INSTRUMENTATION_NAME, schemaUrl: Version::VERSION_1_25_0->url());
+        $meter = $context->meterProvider->getMeter(self::INSTRUMENTATION_NAME, schemaUrl: Version::VERSION_1_25_0->url());
+        $tracer = $context->tracerProvider->getTracer(self::INSTRUMENTATION_NAME, schemaUrl: Version::VERSION_1_25_0->url());
 
         foreach (ServiceLoader::load(Hook::class) as $hook) {
             /** @var Hook $hook */
diff --git a/src/Instrumentation/MongoDB/composer.json b/src/Instrumentation/MongoDB/composer.json
@@ -12,8 +12,8 @@
     "ext-mongodb": "*",
     "ext-json": "*",
     "mongodb/mongodb": "^1.15",
-    "open-telemetry/api": "^1.0.0beta12",
-    "open-telemetry/sem-conv": "^1.23"
+    "open-telemetry/api": "^1.0",
+    "open-telemetry/sem-conv": "^1.24"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3",
diff --git a/src/Instrumentation/MongoDB/src/MongoDBInstrumentation.php b/src/Instrumentation/MongoDB/src/MongoDBInstrumentation.php
@@ -16,7 +16,11 @@ final class MongoDBInstrumentation
      */
     public static function register(callable $commandSerializer = null): void
     {
-        $instrumentation = new CachedInstrumentation('io.opentelemetry.contrib.php.mongodb');
+        $instrumentation = new CachedInstrumentation(
+            'io.opentelemetry.contrib.php.mongodb',
+            null,
+            'https://opentelemetry.io/schemas/1.24.0'
+        );
         $commandSerializer ??= self::defaultCommandSerializer();
         /** @psalm-suppress UnusedFunctionCall */
         addSubscriber(new MongoDBInstrumentationSubscriber($instrumentation, $commandSerializer));
diff --git a/src/Instrumentation/OpenAIPHP/composer.json b/src/Instrumentation/OpenAIPHP/composer.json
@@ -13,7 +13,7 @@
     "ext-opentelemetry": "*",
     "openai-php/client": "*",
     "open-telemetry/api": "^1",
-    "open-telemetry/sem-conv": "^1.22"
+    "open-telemetry/sem-conv": "^1.24"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3",
diff --git a/src/Instrumentation/OpenAIPHP/src/OpenAIPHPInstrumentation.php b/src/Instrumentation/OpenAIPHP/src/OpenAIPHPInstrumentation.php
@@ -39,7 +39,7 @@ public static function register(): void
         $instrumentation = new CachedInstrumentation(
             'io.opentelemetry.contrib.php.openaiphp',
             InstalledVersions::getVersion('open-telemetry/opentelemetry-auto-openai-php'),
-            TraceAttributes::SCHEMA_URL,
+            'https://opentelemetry.io/schemas/1.24.0',
         );
 
         self::$totalTokensCounter = $instrumentation->meter()->createCounter(
diff --git a/src/Instrumentation/PDO/composer.json b/src/Instrumentation/PDO/composer.json
@@ -13,7 +13,7 @@
     "ext-pdo": "*",
     "ext-opentelemetry": "*",
     "open-telemetry/api": "^1.0",
-    "open-telemetry/sem-conv": "^1.23"
+    "open-telemetry/sem-conv": "^1.24"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3",
diff --git a/src/Instrumentation/PDO/src/PDOInstrumentation.php b/src/Instrumentation/PDO/src/PDOInstrumentation.php
@@ -22,7 +22,11 @@ class PDOInstrumentation
 
     public static function register(): void
     {
-        $instrumentation = new CachedInstrumentation('io.opentelemetry.contrib.php.pdo');
+        $instrumentation = new CachedInstrumentation(
+            'io.opentelemetry.contrib.php.pdo',
+            null,
+            'https://opentelemetry.io/schemas/1.24.0'
+        );
         $pdoTracker = new PDOTracker();
 
         hook(
diff --git a/src/Instrumentation/Psr14/composer.json b/src/Instrumentation/Psr14/composer.json
@@ -12,7 +12,7 @@
     "php": "^8.0",
     "ext-opentelemetry": "*",
     "open-telemetry/api": "^1.0",
-    "open-telemetry/sem-conv": "^1.23",
+    "open-telemetry/sem-conv": "^1.24",
     "psr/event-dispatcher": "^1",
     "composer-runtime-api": "^2.0"
   },
diff --git a/src/Instrumentation/Psr14/src/Psr14Instrumentation.php b/src/Instrumentation/Psr14/src/Psr14Instrumentation.php
@@ -27,6 +27,7 @@ public static function register(): void
         $instrumentation = new CachedInstrumentation(
             'io.opentelemetry.contrib.php.psr14',
             InstalledVersions::getVersion('open-telemetry/opentelemetry-auto-psr14'),
+            'https://opentelemetry.io/schemas/1.24.0'
         );
 
         /**
diff --git a/src/Instrumentation/Psr15/composer.json b/src/Instrumentation/Psr15/composer.json
@@ -12,7 +12,7 @@
     "php": "^8.0",
     "ext-opentelemetry": "*",
     "open-telemetry/api": "^1.0",
-    "open-telemetry/sem-conv": "^1.23",
+    "open-telemetry/sem-conv": "^1.24",
     "psr/http-server-middleware": "^1"
   },
   "autoload": {
diff --git a/src/Instrumentation/Psr16/composer.json b/src/Instrumentation/Psr16/composer.json
@@ -12,7 +12,7 @@
     "php": "^8.0",
     "ext-opentelemetry": "*",
     "open-telemetry/api": "^1.0",
-    "open-telemetry/sem-conv": "^1.23",
+    "open-telemetry/sem-conv": "^1.24",
     "psr/simple-cache": "^1 || ^2 || ^3",
     "composer-runtime-api": "^2.0"
   },
diff --git a/src/Instrumentation/Psr16/src/Psr16Instrumentation.php b/src/Instrumentation/Psr16/src/Psr16Instrumentation.php
@@ -28,7 +28,7 @@ public static function register(): void
         $instrumentation = new CachedInstrumentation(
             'io.opentelemetry.contrib.php.psr16',
             InstalledVersions::getVersion('open-telemetry/opentelemetry-auto-psr16'),
-            'https://opentelemetry.io/schemas/1.25.0',
+            'https://opentelemetry.io/schemas/1.24.0',
         );
 
         $pre = static function (CacheInterface $cacheItem, array $params, string $class, string $function, ?string $filename, ?int $lineno) use ($instrumentation) {
diff --git a/src/Instrumentation/Psr18/composer.json b/src/Instrumentation/Psr18/composer.json
@@ -12,7 +12,7 @@
     "php": "^8.0",
     "ext-opentelemetry": "*",
     "open-telemetry/api": "^1.0",
-    "open-telemetry/sem-conv": "^1.23",
+    "open-telemetry/sem-conv": "^1.24",
     "psr/http-client": "^1"
   },
   "autoload": {
diff --git a/src/Instrumentation/Psr3/composer.json b/src/Instrumentation/Psr3/composer.json
@@ -18,8 +18,8 @@
   "require": {
     "php": "^8.0",
     "ext-opentelemetry": "*",
-    "open-telemetry/api": ">=1.0.0RC2",
-    "open-telemetry/sem-conv": "^1.23",
+    "open-telemetry/api": "^1.0",
+    "open-telemetry/sem-conv": "^1.24",
     "psr/log": "^1 || ^2 || ^3"
   },
   "autoload": {
diff --git a/src/Instrumentation/Psr3/src/Psr3Instrumentation.php b/src/Instrumentation/Psr3/src/Psr3Instrumentation.php
@@ -60,7 +60,11 @@ public static function register(): void
                     break;
                 case self::MODE_EXPORT:
                     static $instrumentation;
-                    $instrumentation ??= new CachedInstrumentation('psr3');
+                    $instrumentation ??= new CachedInstrumentation(
+                        'io.opentelemetry.contrib.php.psr3',
+                        null,
+                        'https://opentelemetry.io/schemas/1.24.0'
+                    );
                     if ($function === 'log') {
                         $level = $params[0];
                         $body = $params[1] ?? '';
diff --git a/src/Instrumentation/Psr3/tests/phpt/export_apix.phpt b/src/Instrumentation/Psr3/tests/phpt/export_apix.phpt
@@ -38,11 +38,11 @@ $span->end();
     },
     "scopes": [
         {
-            "name": "psr3",
+            "name": "io.opentelemetry.contrib.php.psr3",
             "version": null,
             "attributes": [],
             "dropped_attributes_count": 0,
-            "schema_url": null,
+            "schema_url": "https:\/\/opentelemetry.io\/schemas\/1.24.0",
             "logs": [
                 {
                     "timestamp": null,
diff --git a/src/Instrumentation/Psr3/tests/phpt/export_cake.phpt b/src/Instrumentation/Psr3/tests/phpt/export_cake.phpt
@@ -41,11 +41,11 @@ $span->end();
     },
     "scopes": [
         {
-            "name": "psr3",
+            "name": "io.opentelemetry.contrib.php.psr3",
             "version": null,
             "attributes": [],
             "dropped_attributes_count": 0,
-            "schema_url": null,
+            "schema_url": "https:\/\/opentelemetry.io\/schemas\/1.24.0",
             "logs": [
                 {
                     "timestamp": null,
diff --git a/src/Instrumentation/Psr3/tests/phpt/export_monolog.phpt b/src/Instrumentation/Psr3/tests/phpt/export_monolog.phpt
@@ -35,11 +35,11 @@ $span->end();
     },
     "scopes": [
         {
-            "name": "psr3",
+            "name": "io.opentelemetry.contrib.php.psr3",
             "version": null,
             "attributes": [],
             "dropped_attributes_count": 0,
-            "schema_url": null,
+            "schema_url": "https:\/\/opentelemetry.io\/schemas\/1.24.0",
             "logs": [
                 {
                     "timestamp": null,
diff --git a/src/Instrumentation/Psr3/tests/phpt/export_multi.phpt b/src/Instrumentation/Psr3/tests/phpt/export_multi.phpt
@@ -52,11 +52,11 @@ category: '%s'
     },
     "scopes": [
         {
-            "name": "psr3",
+            "name": "io.opentelemetry.contrib.php.psr3",
             "version": null,
             "attributes": [],
             "dropped_attributes_count": 0,
-            "schema_url": null,
+            "schema_url": "https:\/\/opentelemetry.io\/schemas\/1.24.0",
             "logs": [
                 {
                     "timestamp": null,
diff --git a/src/Instrumentation/Psr3/tests/phpt/export_symfony.phpt b/src/Instrumentation/Psr3/tests/phpt/export_symfony.phpt
@@ -37,11 +37,11 @@ $span->end();
     },
     "scopes": [
         {
-            "name": "psr3",
+            "name": "io.opentelemetry.contrib.php.psr3",
             "version": null,
             "attributes": [],
             "dropped_attributes_count": 0,
-            "schema_url": null,
+            "schema_url": "https:\/\/opentelemetry.io\/schemas\/1.24.0",
             "logs": [
                 {
                     "timestamp": null,
diff --git a/src/Instrumentation/Psr3/tests/phpt/export_yii.phpt b/src/Instrumentation/Psr3/tests/phpt/export_yii.phpt
@@ -58,11 +58,11 @@ category: '%s'
     },
     "scopes": [
         {
-            "name": "psr3",
+            "name": "io.opentelemetry.contrib.php.psr3",
             "version": null,
             "attributes": [],
             "dropped_attributes_count": 0,
-            "schema_url": null,
+            "schema_url": "https:\/\/opentelemetry.io\/schemas\/1.24.0",
             "logs": [
                 {
                     "timestamp": null,
diff --git a/src/Instrumentation/Psr6/composer.json b/src/Instrumentation/Psr6/composer.json
diff --git a/src/Instrumentation/Psr6/src/Psr6Instrumentation.php b/src/Instrumentation/Psr6/src/Psr6Instrumentation.php
diff --git a/src/Instrumentation/Slim/composer.json b/src/Instrumentation/Slim/composer.json
diff --git a/src/Instrumentation/Slim/src/SlimInstrumentation.php b/src/Instrumentation/Slim/src/SlimInstrumentation.php
diff --git a/src/Instrumentation/Slim/tests/Integration/SlimInstrumentationTest.php b/src/Instrumentation/Slim/tests/Integration/SlimInstrumentationTest.php
diff --git a/src/Instrumentation/Symfony/composer.json b/src/Instrumentation/Symfony/composer.json
diff --git a/src/Instrumentation/Symfony/src/HttpClientInstrumentation.php b/src/Instrumentation/Symfony/src/HttpClientInstrumentation.php
diff --git a/src/Instrumentation/Wordpress/composer.json b/src/Instrumentation/Wordpress/composer.json
diff --git a/src/Instrumentation/Wordpress/src/WordpressInstrumentation.php b/src/Instrumentation/Wordpress/src/WordpressInstrumentation.php
diff --git a/src/Instrumentation/Yii/composer.json b/src/Instrumentation/Yii/composer.json
diff --git a/src/Instrumentation/Yii/src/YiiInstrumentation.php b/src/Instrumentation/Yii/src/YiiInstrumentation.php
