diff --git a/composer.json b/composer.json index 6f271ae..019b1c0 100644 --- a/composer.json +++ b/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/Psr3Instrumentation.php b/src/Psr3Instrumentation.php index 8c46864..952052f 100644 --- a/src/Psr3Instrumentation.php +++ b/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/tests/phpt/export_apix.phpt b/tests/phpt/export_apix.phpt index 3561201..67b2489 100644 --- a/tests/phpt/export_apix.phpt +++ b/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/tests/phpt/export_cake.phpt b/tests/phpt/export_cake.phpt index 729256b..1c190b1 100644 --- a/tests/phpt/export_cake.phpt +++ b/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/tests/phpt/export_monolog.phpt b/tests/phpt/export_monolog.phpt index 283e768..919579a 100644 --- a/tests/phpt/export_monolog.phpt +++ b/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/tests/phpt/export_multi.phpt b/tests/phpt/export_multi.phpt index f82cb9f..363bd9d 100644 --- a/tests/phpt/export_multi.phpt +++ b/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/tests/phpt/export_symfony.phpt b/tests/phpt/export_symfony.phpt index 83486dd..b7a07fa 100644 --- a/tests/phpt/export_symfony.phpt +++ b/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/tests/phpt/export_yii.phpt b/tests/phpt/export_yii.phpt index 35dd6be..af2b061 100644 --- a/tests/phpt/export_yii.phpt +++ b/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,