diff --git a/composer.json b/composer.json
index c763827..aa7b427 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
"open-telemetry/opentelemetry-propagation-server-timing": "^0.0.1",
"open-telemetry/opentelemetry-propagation-traceresponse": "^0.0.2",
"open-telemetry/sdk": "^1.0",
- "open-telemetry/sem-conv": "^1.23",
+ "open-telemetry/sem-conv": "^1.24",
"open-telemetry/symfony-sdk-bundle": "^0.0.24",
"php-http/discovery": "^1.19",
"psr/http-factory": "^1.0",
@@ -47,15 +47,15 @@
"ext-mbstring": "*",
"ext-opentelemetry": "*",
"ext-xdebug": "*",
- "doctrine/dbal": "^3.7",
+ "doctrine/dbal": "^3.8",
"doctrine/doctrine-bundle": "^2.11",
"doctrine/orm": "^2.17",
- "ergebnis/composer-normalize": "^2.41",
- "friendsofphp/php-cs-fixer": "^3.41",
+ "ergebnis/composer-normalize": "^2.42",
+ "friendsofphp/php-cs-fixer": "^3.49",
"guzzlehttp/promises": "^2.0",
"maglnet/composer-require-checker": "^4.8",
"matthiasnoback/symfony-config-test": "^5.1",
- "matthiasnoback/symfony-dependency-injection-test": "^5.0",
+ "matthiasnoback/symfony-dependency-injection-test": "^5.1",
"nyholm/symfony-bundle-test": "^3.0",
"open-telemetry/exporter-otlp": "^1.0",
"open-telemetry/exporter-zipkin": "^1.0",
@@ -67,7 +67,7 @@
"phpstan/phpstan-phpunit": "^1.3",
"phpstan/phpstan-strict-rules": "^1.5",
"phpstan/phpstan-symfony": "^1.3",
- "phpunit/phpunit": "^9.6",
+ "phpunit/phpunit": "^10.5",
"pyrech/composer-changelogs": "^2.1",
"roave/security-advisories": "dev-master",
"symfony/cache": "^6.4 || ^7.0",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0258944..a7f3485 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,15 +1,13 @@
+ xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+ bootstrap="vendor/autoload.php"
+ executionOrder="depends,defects"
+ beStrictAboutOutputDuringTests="true"
+ failOnRisky="true"
+ failOnWarning="false"
+ cacheDirectory=".phpunit.cache"
+>
@@ -24,14 +22,9 @@
-
+
src
-
-
-
-
-
+
diff --git a/src/Instrumentation/Symfony/Cache/TagAwareTraceableCacheAdapter.php b/src/Instrumentation/Symfony/Cache/TagAwareTraceableCacheAdapter.php
index 275725b..d21cf8a 100644
--- a/src/Instrumentation/Symfony/Cache/TagAwareTraceableCacheAdapter.php
+++ b/src/Instrumentation/Symfony/Cache/TagAwareTraceableCacheAdapter.php
@@ -22,7 +22,7 @@ public function __construct(
$this->adapter = $adapter;
}
- public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+ public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed
{
return $this->tracer->traceFunction(
'cache.get',
diff --git a/src/Instrumentation/Symfony/Cache/TraceableCacheAdapter.php b/src/Instrumentation/Symfony/Cache/TraceableCacheAdapter.php
index 87d3dbc..2529d44 100644
--- a/src/Instrumentation/Symfony/Cache/TraceableCacheAdapter.php
+++ b/src/Instrumentation/Symfony/Cache/TraceableCacheAdapter.php
@@ -21,7 +21,7 @@ public function __construct(
$this->adapter = $adapter;
}
- public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+ public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed
{
return $this->tracer->traceFunction(
'cache.get',
diff --git a/src/Instrumentation/Symfony/HttpClient/TraceableHttpClient.php b/src/Instrumentation/Symfony/HttpClient/TraceableHttpClient.php
index eb9e1ee..060e148 100644
--- a/src/Instrumentation/Symfony/HttpClient/TraceableHttpClient.php
+++ b/src/Instrumentation/Symfony/HttpClient/TraceableHttpClient.php
@@ -61,7 +61,7 @@ public function request(string $method, string $url, array $options = []): Respo
}
}
- public function stream(iterable|ResponseInterface $responses, float $timeout = null): ResponseStreamInterface
+ public function stream(iterable|ResponseInterface $responses, ?float $timeout = null): ResponseStreamInterface
{
$scope = Context::storage()->scope();
if (null === $scope) {
diff --git a/src/Instrumentation/Symfony/HttpClient/TraceableResponse.php b/src/Instrumentation/Symfony/HttpClient/TraceableResponse.php
index 59bdea1..8052f9d 100644
--- a/src/Instrumentation/Symfony/HttpClient/TraceableResponse.php
+++ b/src/Instrumentation/Symfony/HttpClient/TraceableResponse.php
@@ -78,7 +78,7 @@ public function cancel(): void
$this->endSpan();
}
- public function getInfo(string $type = null): mixed
+ public function getInfo(?string $type = null): mixed
{
return $this->response->getInfo($type);
}
diff --git a/src/Instrumentation/Symfony/Mailer/TraceableMailer.php b/src/Instrumentation/Symfony/Mailer/TraceableMailer.php
index 79afb7a..8d9ce66 100644
--- a/src/Instrumentation/Symfony/Mailer/TraceableMailer.php
+++ b/src/Instrumentation/Symfony/Mailer/TraceableMailer.php
@@ -22,7 +22,7 @@ public function __construct(
) {
}
- public function send(RawMessage $message, Envelope $envelope = null): void
+ public function send(RawMessage $message, ?Envelope $envelope = null): void
{
$scope = Context::storage()->scope();
if (null === $scope) {
diff --git a/src/Instrumentation/Symfony/Mailer/TraceableMailerTransport.php b/src/Instrumentation/Symfony/Mailer/TraceableMailerTransport.php
index 2dbb4f9..a5db5c8 100644
--- a/src/Instrumentation/Symfony/Mailer/TraceableMailerTransport.php
+++ b/src/Instrumentation/Symfony/Mailer/TraceableMailerTransport.php
@@ -29,7 +29,7 @@ public function __toString()
return (string) $this->transport;
}
- public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage
+ public function send(RawMessage $message, ?Envelope $envelope = null): ?SentMessage
{
$scope = Context::storage()->scope();
if (null === $scope) {
diff --git a/src/OpenTelemetry/Exporter/ExporterDsn.php b/src/OpenTelemetry/Exporter/ExporterDsn.php
index 47c1b58..412c426 100644
--- a/src/OpenTelemetry/Exporter/ExporterDsn.php
+++ b/src/OpenTelemetry/Exporter/ExporterDsn.php
@@ -55,7 +55,7 @@ public function getPath(): ?string
return $this->uri->path()->isEmpty() ? null : $this->uri->path()->toString();
}
- public function getPort(int $default = null): ?int
+ public function getPort(?int $default = null): ?int
{
return $this->uri->port() ?? $default;
}
diff --git a/src/OpenTelemetry/Exporter/OtlpExporterEndpoint.php b/src/OpenTelemetry/Exporter/OtlpExporterEndpoint.php
index e8f1c4a..74e79d1 100644
--- a/src/OpenTelemetry/Exporter/OtlpExporterEndpoint.php
+++ b/src/OpenTelemetry/Exporter/OtlpExporterEndpoint.php
@@ -17,7 +17,7 @@ final class OtlpExporterEndpoint implements ExporterEndpointInterface
private function __construct(
private readonly ExporterDsn $dsn,
- UriFactoryInterface $uriFactory = null,
+ ?UriFactoryInterface $uriFactory = null,
) {
if ('otlp' !== $this->dsn->getExporter()) {
throw new \RuntimeException('Provided DSN exporter is not compatible with this endpoint.');
diff --git a/src/OpenTelemetry/Log/LogProcessor/LogProcessorFactoryInterface.php b/src/OpenTelemetry/Log/LogProcessor/LogProcessorFactoryInterface.php
index 3566257..7c7beb3 100644
--- a/src/OpenTelemetry/Log/LogProcessor/LogProcessorFactoryInterface.php
+++ b/src/OpenTelemetry/Log/LogProcessor/LogProcessorFactoryInterface.php
@@ -12,6 +12,6 @@ interface LogProcessorFactoryInterface
*/
public static function createProcessor(
array $processors = [],
- LogRecordExporterInterface $exporter = null,
+ ?LogRecordExporterInterface $exporter = null,
): LogRecordProcessorInterface;
}
diff --git a/src/OpenTelemetry/Log/LogProcessor/MultiLogProcessorFactory.php b/src/OpenTelemetry/Log/LogProcessor/MultiLogProcessorFactory.php
index ca418bd..7015526 100644
--- a/src/OpenTelemetry/Log/LogProcessor/MultiLogProcessorFactory.php
+++ b/src/OpenTelemetry/Log/LogProcessor/MultiLogProcessorFactory.php
@@ -10,7 +10,7 @@ final class MultiLogProcessorFactory extends AbstractLogProcessorFactory
{
public static function createProcessor(
array $processors = [],
- LogRecordExporterInterface $exporter = null,
+ ?LogRecordExporterInterface $exporter = null,
): LogRecordProcessorInterface {
if (0 >= count($processors)) {
throw new \InvalidArgumentException('Processors should not be empty');
diff --git a/src/OpenTelemetry/Log/LogProcessor/NoopLogProcessorFactory.php b/src/OpenTelemetry/Log/LogProcessor/NoopLogProcessorFactory.php
index 118c495..fa53466 100644
--- a/src/OpenTelemetry/Log/LogProcessor/NoopLogProcessorFactory.php
+++ b/src/OpenTelemetry/Log/LogProcessor/NoopLogProcessorFactory.php
@@ -10,7 +10,7 @@ final class NoopLogProcessorFactory extends AbstractLogProcessorFactory
{
public static function createProcessor(
array $processors = [],
- LogRecordExporterInterface $exporter = null,
+ ?LogRecordExporterInterface $exporter = null,
): LogRecordProcessorInterface {
return new NoopLogRecordProcessor();
}
diff --git a/src/OpenTelemetry/Log/LogProcessor/SimpleLogProcessorFactory.php b/src/OpenTelemetry/Log/LogProcessor/SimpleLogProcessorFactory.php
index 7de3e76..8070477 100644
--- a/src/OpenTelemetry/Log/LogProcessor/SimpleLogProcessorFactory.php
+++ b/src/OpenTelemetry/Log/LogProcessor/SimpleLogProcessorFactory.php
@@ -10,7 +10,7 @@ final class SimpleLogProcessorFactory extends AbstractLogProcessorFactory
{
public static function createProcessor(
array $processors = [],
- LogRecordExporterInterface $exporter = null,
+ ?LogRecordExporterInterface $exporter = null,
): LogRecordProcessorInterface {
if (null === $exporter) {
throw new \InvalidArgumentException('Exporter is null');
diff --git a/src/OpenTelemetry/Metric/MeterProvider/NoopMeterProviderFactory.php b/src/OpenTelemetry/Metric/MeterProvider/NoopMeterProviderFactory.php
index 825e8d3..c82e13c 100644
--- a/src/OpenTelemetry/Metric/MeterProvider/NoopMeterProviderFactory.php
+++ b/src/OpenTelemetry/Metric/MeterProvider/NoopMeterProviderFactory.php
@@ -9,7 +9,7 @@
final class NoopMeterProviderFactory extends AbstractMeterProviderFactory
{
- public static function createProvider(MetricExporterInterface $exporter = null, ExemplarFilterInterface $filter = null): MeterProviderInterface
+ public static function createProvider(?MetricExporterInterface $exporter = null, ?ExemplarFilterInterface $filter = null): MeterProviderInterface
{
return new NoopMeterProvider();
}
diff --git a/src/OpenTelemetry/Trace/SamplerFactory.php b/src/OpenTelemetry/Trace/SamplerFactory.php
index f8d6050..2200e11 100644
--- a/src/OpenTelemetry/Trace/SamplerFactory.php
+++ b/src/OpenTelemetry/Trace/SamplerFactory.php
@@ -10,7 +10,7 @@
final class SamplerFactory
{
- public static function create(string $name, float $probability = null): SamplerInterface
+ public static function create(string $name, ?float $probability = null): SamplerInterface
{
$sampler = TraceSamplerEnum::tryFrom($name);
diff --git a/src/OpenTelemetry/Trace/SpanProcessor/MultiSpanProcessorFactory.php b/src/OpenTelemetry/Trace/SpanProcessor/MultiSpanProcessorFactory.php
index 4e27eeb..39575a1 100644
--- a/src/OpenTelemetry/Trace/SpanProcessor/MultiSpanProcessorFactory.php
+++ b/src/OpenTelemetry/Trace/SpanProcessor/MultiSpanProcessorFactory.php
@@ -10,7 +10,7 @@ final class MultiSpanProcessorFactory extends AbstractSpanProcessorFactory
{
public static function createProcessor(
array $processors = [],
- SpanExporterInterface $exporter = null
+ ?SpanExporterInterface $exporter = null
): SpanProcessorInterface {
if (0 >= count($processors)) {
throw new \InvalidArgumentException('Processors should not be empty');
diff --git a/src/OpenTelemetry/Trace/SpanProcessor/NoopSpanProcessorFactory.php b/src/OpenTelemetry/Trace/SpanProcessor/NoopSpanProcessorFactory.php
index 1117d3c..9c216f1 100644
--- a/src/OpenTelemetry/Trace/SpanProcessor/NoopSpanProcessorFactory.php
+++ b/src/OpenTelemetry/Trace/SpanProcessor/NoopSpanProcessorFactory.php
@@ -10,7 +10,7 @@ final class NoopSpanProcessorFactory extends AbstractSpanProcessorFactory
{
public static function createProcessor(
array $processors = [],
- SpanExporterInterface $exporter = null
+ ?SpanExporterInterface $exporter = null
): SpanProcessorInterface {
return new NoopSpanProcessor();
}
diff --git a/src/OpenTelemetry/Trace/SpanProcessor/SimpleSpanProcessorFactory.php b/src/OpenTelemetry/Trace/SpanProcessor/SimpleSpanProcessorFactory.php
index fb9c83f..140a493 100644
--- a/src/OpenTelemetry/Trace/SpanProcessor/SimpleSpanProcessorFactory.php
+++ b/src/OpenTelemetry/Trace/SpanProcessor/SimpleSpanProcessorFactory.php
@@ -10,7 +10,7 @@ final class SimpleSpanProcessorFactory extends AbstractSpanProcessorFactory
{
public static function createProcessor(
array $processors = [],
- SpanExporterInterface $exporter = null
+ ?SpanExporterInterface $exporter = null
): SpanProcessorInterface {
if (null === $exporter) {
throw new \InvalidArgumentException('Exporter is null');
diff --git a/src/OpenTelemetry/Trace/SpanProcessor/SpanProcessorFactoryInterface.php b/src/OpenTelemetry/Trace/SpanProcessor/SpanProcessorFactoryInterface.php
index 4c14817..15e81c9 100644
--- a/src/OpenTelemetry/Trace/SpanProcessor/SpanProcessorFactoryInterface.php
+++ b/src/OpenTelemetry/Trace/SpanProcessor/SpanProcessorFactoryInterface.php
@@ -12,6 +12,6 @@ interface SpanProcessorFactoryInterface
*/
public static function createProcessor(
array $processors = [],
- SpanExporterInterface $exporter = null
+ ?SpanExporterInterface $exporter = null
): SpanProcessorInterface;
}
diff --git a/src/OpenTelemetry/Trace/TracerProvider/DefaultTracerProviderFactory.php b/src/OpenTelemetry/Trace/TracerProvider/DefaultTracerProviderFactory.php
index c35c594..19e7a4b 100644
--- a/src/OpenTelemetry/Trace/TracerProvider/DefaultTracerProviderFactory.php
+++ b/src/OpenTelemetry/Trace/TracerProvider/DefaultTracerProviderFactory.php
@@ -8,7 +8,7 @@
final readonly class DefaultTracerProviderFactory implements TracerProviderFactoryInterface
{
- public static function createProvider(SamplerInterface $sampler = null, array $processors = []): TracerProviderInterface
+ public static function createProvider(?SamplerInterface $sampler = null, array $processors = []): TracerProviderInterface
{
if (0 >= count($processors)) {
throw new \InvalidArgumentException('Processors should not be empty');
diff --git a/src/OpenTelemetry/Trace/TracerProvider/NoopTracerProviderFactory.php b/src/OpenTelemetry/Trace/TracerProvider/NoopTracerProviderFactory.php
index b041e78..153ca82 100644
--- a/src/OpenTelemetry/Trace/TracerProvider/NoopTracerProviderFactory.php
+++ b/src/OpenTelemetry/Trace/TracerProvider/NoopTracerProviderFactory.php
@@ -8,7 +8,7 @@
final class NoopTracerProviderFactory implements TracerProviderFactoryInterface
{
- public static function createProvider(SamplerInterface $sampler = null, array $processors = []): TracerProviderInterface
+ public static function createProvider(?SamplerInterface $sampler = null, array $processors = []): TracerProviderInterface
{
return new NoopTracerProvider();
}
diff --git a/src/OpenTelemetry/Trace/TracerProvider/TracerProviderFactoryInterface.php b/src/OpenTelemetry/Trace/TracerProvider/TracerProviderFactoryInterface.php
index a311f53..570b375 100644
--- a/src/OpenTelemetry/Trace/TracerProvider/TracerProviderFactoryInterface.php
+++ b/src/OpenTelemetry/Trace/TracerProvider/TracerProviderFactoryInterface.php
@@ -11,5 +11,5 @@ interface TracerProviderFactoryInterface
/**
* @param SpanProcessorInterface[] $processors
*/
- public static function createProvider(SamplerInterface $sampler = null, array $processors = []): TracerProviderInterface;
+ public static function createProvider(?SamplerInterface $sampler = null, array $processors = []): TracerProviderInterface;
}
diff --git a/src/OpenTelemetry/Trace/ZipkinExporterEndpoint.php b/src/OpenTelemetry/Trace/ZipkinExporterEndpoint.php
index f097425..d7fab97 100644
--- a/src/OpenTelemetry/Trace/ZipkinExporterEndpoint.php
+++ b/src/OpenTelemetry/Trace/ZipkinExporterEndpoint.php
@@ -16,7 +16,7 @@ final class ZipkinExporterEndpoint implements ExporterEndpointInterface
private function __construct(
private readonly ExporterDsn $dsn,
- UriFactoryInterface $uriFactory = null,
+ ?UriFactoryInterface $uriFactory = null,
) {
if (TraceExporterEnum::Zipkin !== TraceExporterEnum::fromDsn($this->dsn)) {
throw new \InvalidArgumentException('Unsupported DSN exporter for this endpoint.');
diff --git a/tests/Unit/Command/DummyCommandTest.php b/tests/Unit/Command/DummyCommandTest.php
index 8a53bfc..4482f1b 100644
--- a/tests/Unit/Command/DummyCommandTest.php
+++ b/tests/Unit/Command/DummyCommandTest.php
@@ -3,13 +3,13 @@
namespace FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Unit\Command;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Application\Command\DummyCommand;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Tester\CommandTester;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\Tests\Application\Command\DummyCommand
- */
+#[CoversClass(DummyCommand::class)]
final class DummyCommandTest extends TestCase
{
public function testSuccessful(): void
@@ -49,7 +49,7 @@ public function testThrow(): void
/**
* @return array}>
*/
- public function exitCodeProvider(): array
+ public static function exitCodeProvider(): array
{
return [
[42, ['--exit-code' => 42]],
@@ -58,10 +58,9 @@ public function exitCodeProvider(): array
}
/**
- * @dataProvider exitCodeProvider
- *
* @param array $args
*/
+ #[DataProvider('exitCodeProvider')]
public function testExitCode(int $exitCode, array $args): void
{
$commandTester = new CommandTester(new DummyCommand());
diff --git a/tests/Unit/EventSubscriber/ConsoleEventSubscriberTest.php b/tests/Unit/EventSubscriber/ConsoleEventSubscriberTest.php
index 66f5a44..5b063ec 100644
--- a/tests/Unit/EventSubscriber/ConsoleEventSubscriberTest.php
+++ b/tests/Unit/EventSubscriber/ConsoleEventSubscriberTest.php
@@ -10,15 +10,15 @@
use OpenTelemetry\Context\ContextStorageScopeInterface;
use OpenTelemetry\SDK\Trace\StatusData;
use OpenTelemetry\SDK\Trace\TracerProvider;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Event\ConsoleCommandEvent;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Output\NullOutput;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\Instrumentation\Symfony\Console\TraceableConsoleEventSubscriber
- */
+#[CoversClass(TraceableConsoleEventSubscriber::class)]
final class ConsoleEventSubscriberTest extends TestCase
{
private readonly TracerInterface $tracer;
@@ -43,16 +43,14 @@ protected function tearDown(): void
/**
* @return array
*/
- public function consoleCommandEventDataProvider(): array
+ public static function consoleCommandEventDataProvider(): array
{
return [
[new ConsoleCommandEvent(new DummyCommand(), new ArrayInput([]), new NullOutput())],
];
}
- /**
- * @dataProvider consoleCommandEventDataProvider
- */
+ #[DataProvider('consoleCommandEventDataProvider')]
public function testHandleCommandEvent(ConsoleCommandEvent $event): void
{
$subscriber = new TraceableConsoleEventSubscriber($this->tracer);
diff --git a/tests/Unit/OpenTelemetry/Exporter/ConsoleExporterEndpointTest.php b/tests/Unit/OpenTelemetry/Exporter/ConsoleExporterEndpointTest.php
index f604644..c81dba9 100644
--- a/tests/Unit/OpenTelemetry/Exporter/ConsoleExporterEndpointTest.php
+++ b/tests/Unit/OpenTelemetry/Exporter/ConsoleExporterEndpointTest.php
@@ -4,16 +4,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\ConsoleExporterEndpoint;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\ExporterDsn;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\ConsoleExporterEndpoint
- */
+#[CoversClass(ConsoleExporterEndpoint::class)]
class ConsoleExporterEndpointTest extends TestCase
{
- /**
- * @dataProvider dsnProvider
- */
+ #[DataProvider('dsnProvider')]
public function testFromDsn(string $dsn, string $endpoint): void
{
self::assertSame($endpoint, (string) ConsoleExporterEndpoint::fromDsn(ExporterDsn::fromString($dsn)));
@@ -22,7 +20,7 @@ public function testFromDsn(string $dsn, string $endpoint): void
/**
* @return \Generator
*/
- public function dsnProvider(): \Generator
+ public static function dsnProvider(): \Generator
{
yield [
'stream+console://default',
diff --git a/tests/Unit/OpenTelemetry/Exporter/OtlpExporterEndpointTest.php b/tests/Unit/OpenTelemetry/Exporter/OtlpExporterEndpointTest.php
index 0d4f608..d6a0e49 100644
--- a/tests/Unit/OpenTelemetry/Exporter/OtlpExporterEndpointTest.php
+++ b/tests/Unit/OpenTelemetry/Exporter/OtlpExporterEndpointTest.php
@@ -5,16 +5,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\ExporterDsn;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\OtlpExporterEndpoint;
use OpenTelemetry\API\Signals;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\OtlpExporterEndpoint
- */
+#[CoversClass(OtlpExporterEndpoint::class)]
class OtlpExporterEndpointTest extends TestCase
{
- /**
- * @dataProvider dsnProvider
- */
+ #[DataProvider('dsnProvider')]
public function testFromDsn(string $dsn, string $endpoint, string $signal): void
{
self::assertSame($endpoint, (string) OtlpExporterEndpoint::fromDsn(ExporterDsn::fromString($dsn))->withSignal($signal));
@@ -23,7 +21,7 @@ public function testFromDsn(string $dsn, string $endpoint, string $signal): void
/**
* @return \Generator
*/
- public function dsnProvider(): \Generator
+ public static function dsnProvider(): \Generator
{
yield [
'http+otlp://localhost',
diff --git a/tests/Unit/OpenTelemetry/Exporter/OtlpExporterOptionsTest.php b/tests/Unit/OpenTelemetry/Exporter/OtlpExporterOptionsTest.php
index 1b942b6..cd93d2c 100644
--- a/tests/Unit/OpenTelemetry/Exporter/OtlpExporterOptionsTest.php
+++ b/tests/Unit/OpenTelemetry/Exporter/OtlpExporterOptionsTest.php
@@ -6,6 +6,8 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\OtlpExporterCompressionEnum;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\OtlpExporterFormatEnum;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\OtlpExporterOptions;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
/**
@@ -13,6 +15,7 @@
*
* @phpstan-import-type ExporterOptions from ExporterOptionsInterface
*/
+#[CoversClass(OtlpExporterOptions::class)]
class OtlpExporterOptionsTest extends TestCase
{
public function testDefault(): void
@@ -33,11 +36,10 @@ public function testDefault(): void
}
/**
- * @dataProvider configurationProvider
- *
* @param array&ExporterOptions $configuration
* @param callable(OtlpExporterOptions): void $assertion
*/
+ #[DataProvider('configurationProvider')]
public function testFromConfiguration(array $configuration, callable $assertion): void
{
$options = OtlpExporterOptions::fromConfiguration($configuration);
@@ -51,7 +53,7 @@ public function testFromConfiguration(array $configuration, callable $assertion)
* 1: callable(OtlpExporterOptions): void
* }>
*/
- public function configurationProvider(): \Generator
+ public static function configurationProvider(): \Generator
{
yield [
['format' => 'ndjson'],
diff --git a/tests/Unit/OpenTelemetry/Log/LogExporter/ConsoleLogExporterFactoryTest.php b/tests/Unit/OpenTelemetry/Log/LogExporter/ConsoleLogExporterFactoryTest.php
index c95fcf2..506659a 100644
--- a/tests/Unit/OpenTelemetry/Log/LogExporter/ConsoleLogExporterFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Log/LogExporter/ConsoleLogExporterFactoryTest.php
@@ -9,16 +9,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\StreamTransportFactory;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\TransportFactory;
use OpenTelemetry\SDK\Common\Export\Stream\StreamTransport;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Log\LogExporter\ConsoleLogExporterFactory
- */
+#[CoversClass(ConsoleLogExporterFactory::class)]
class ConsoleLogExporterFactoryTest extends TestCase
{
- /**
- * @dataProvider exporterProvider
- */
+ #[DataProvider('exporterProvider')]
public function testCreateExporter(string $dsn, ExporterOptionsInterface $options, ?\Exception $exception): void
{
if (null !== $exception) {
@@ -38,7 +36,7 @@ public function testCreateExporter(string $dsn, ExporterOptionsInterface $option
/**
* @return \Generator
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
'stream+console://default',
diff --git a/tests/Unit/OpenTelemetry/Log/LogExporter/InMemoryLogExporterFactoryTest.php b/tests/Unit/OpenTelemetry/Log/LogExporter/InMemoryLogExporterFactoryTest.php
index cf98203..c2c28a2 100644
--- a/tests/Unit/OpenTelemetry/Log/LogExporter/InMemoryLogExporterFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Log/LogExporter/InMemoryLogExporterFactoryTest.php
@@ -7,16 +7,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\ExporterOptionsInterface;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Log\LogExporter\InMemoryLogExporterFactory;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\TransportFactory;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Log\LogExporter\InMemoryLogExporterFactory
- */
+#[CoversClass(InMemoryLogExporterFactory::class)]
class InMemoryLogExporterFactoryTest extends TestCase
{
- /**
- * @dataProvider exporterProvider
- */
+ #[DataProvider('exporterProvider')]
public function testCreateExporter(string $dsn, ExporterOptionsInterface $options, ?\Exception $exception): void
{
if (null !== $exception) {
@@ -31,7 +29,7 @@ public function testCreateExporter(string $dsn, ExporterOptionsInterface $option
/**
* @return \Generator
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
'in-memory://default',
diff --git a/tests/Unit/OpenTelemetry/Log/LogExporter/LogExporterFactoryTest.php b/tests/Unit/OpenTelemetry/Log/LogExporter/LogExporterFactoryTest.php
index 890134d..90baa03 100644
--- a/tests/Unit/OpenTelemetry/Log/LogExporter/LogExporterFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Log/LogExporter/LogExporterFactoryTest.php
@@ -25,11 +25,11 @@
use OpenTelemetry\SDK\Logs\Exporter\InMemoryExporter;
use OpenTelemetry\SDK\Logs\Exporter\NoopExporter;
use OpenTelemetry\SDK\Logs\LogRecordExporterInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Log\LogExporter\LogExporterFactory
- */
+#[CoversClass(LogExporterFactory::class)]
class LogExporterFactoryTest extends TestCase
{
private function getTransportFactory(): TransportFactory
@@ -42,9 +42,7 @@ private function getTransportFactory(): TransportFactory
]);
}
- /**
- * @dataProvider exporterProvider
- */
+ #[DataProvider('exporterProvider')]
public function testCreateExporter(
string $dsn,
ExporterOptionsInterface $options,
@@ -78,7 +76,7 @@ public function testCreateExporter(
* 3: ?class-string>,
* }>
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
'stream+console://default',
diff --git a/tests/Unit/OpenTelemetry/Log/LogExporter/NoopLogExporterFactoryTest.php b/tests/Unit/OpenTelemetry/Log/LogExporter/NoopLogExporterFactoryTest.php
index 85ea990..7ae92f0 100644
--- a/tests/Unit/OpenTelemetry/Log/LogExporter/NoopLogExporterFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Log/LogExporter/NoopLogExporterFactoryTest.php
@@ -7,16 +7,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\ExporterOptionsInterface;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Log\LogExporter\NoopLogExporterFactory;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\TransportFactory;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Log\LogExporter\NoopLogExporterFactory
- */
+#[CoversClass(NoopLogExporterFactory::class)]
class NoopLogExporterFactoryTest extends TestCase
{
- /**
- * @dataProvider exporterProvider
- */
+ #[DataProvider('exporterProvider')]
public function testCreateExporter(string $dsn, ExporterOptionsInterface $options, ?\Exception $exception): void
{
if (null !== $exception) {
@@ -31,7 +29,7 @@ public function testCreateExporter(string $dsn, ExporterOptionsInterface $option
/**
* @return \Generator
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
'noop://default',
diff --git a/tests/Unit/OpenTelemetry/Log/LogExporter/OtlpLogExporterFactoryTest.php b/tests/Unit/OpenTelemetry/Log/LogExporter/OtlpLogExporterFactoryTest.php
index 7f2c27b..c4bae1f 100644
--- a/tests/Unit/OpenTelemetry/Log/LogExporter/OtlpLogExporterFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Log/LogExporter/OtlpLogExporterFactoryTest.php
@@ -12,18 +12,17 @@
use OpenTelemetry\Contrib\Grpc\GrpcTransport;
use OpenTelemetry\SDK\Common\Export\Http\PsrTransport;
use OpenTelemetry\SDK\Common\Export\TransportInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Log\LogExporter\OtlpLogExporterFactory
- */
+#[CoversClass(OtlpLogExporterFactory::class)]
class OtlpLogExporterFactoryTest extends TestCase
{
/**
- * @dataProvider exporterProvider
- *
* @param ?class-string> $transportClass
*/
+ #[DataProvider('exporterProvider')]
public function testCreateExporter(
string $dsn,
ExporterOptionsInterface $options,
@@ -54,7 +53,7 @@ public function testCreateExporter(
* 3: ?\Exception,
* }>
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
'http+otlp://default',
diff --git a/tests/Unit/OpenTelemetry/Log/LogExporterEndpointTest.php b/tests/Unit/OpenTelemetry/Log/LogExporterEndpointTest.php
index d62b338..2496ceb 100644
--- a/tests/Unit/OpenTelemetry/Log/LogExporterEndpointTest.php
+++ b/tests/Unit/OpenTelemetry/Log/LogExporterEndpointTest.php
@@ -4,16 +4,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\ExporterDsn;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Log\LogExporterEndpoint;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Log\LogExporterEndpoint
- */
+#[CoversClass(LogExporterEndpoint::class)]
class LogExporterEndpointTest extends TestCase
{
- /**
- * @dataProvider dsnProvider
- */
+ #[DataProvider('dsnProvider')]
public function testFromDsn(string $dsn, ?string $endpoint, ?\Exception $exception): void
{
if (null !== $exception) {
@@ -30,7 +28,7 @@ public function testFromDsn(string $dsn, ?string $endpoint, ?\Exception $excepti
* 2: ?\Exception,
* }>
*/
- public function dsnProvider(): \Generator
+ public static function dsnProvider(): \Generator
{
yield [
'http+otlp://localhost',
diff --git a/tests/Unit/OpenTelemetry/Metric/MetricExporter/ConsoleMetricExporterFactoryTest.php b/tests/Unit/OpenTelemetry/Metric/MetricExporter/ConsoleMetricExporterFactoryTest.php
index 61f1ec9..ee077e6 100644
--- a/tests/Unit/OpenTelemetry/Metric/MetricExporter/ConsoleMetricExporterFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Metric/MetricExporter/ConsoleMetricExporterFactoryTest.php
@@ -9,16 +9,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MetricExporterOptions;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\TransportFactory;
use OpenTelemetry\SDK\Metrics\Data\Temporality;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MetricExporter\ConsoleMetricExporterFactory
- */
+#[CoversClass(ConsoleMetricExporterFactory::class)]
class ConsoleMetricExporterFactoryTest extends TestCase
{
- /**
- * @dataProvider exporterProvider
- */
+ #[DataProvider('exporterProvider')]
public function testCreateExporter(string $dsn, ExporterOptionsInterface $options, ?string $temporality, ?\Exception $exception): void
{
if (null !== $exception) {
@@ -41,7 +39,7 @@ public function testCreateExporter(string $dsn, ExporterOptionsInterface $option
* 3: ?\Exception,
* }>
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
'stream+console://default',
diff --git a/tests/Unit/OpenTelemetry/Metric/MetricExporter/InMemoryMetricExporterFactoryTest.php b/tests/Unit/OpenTelemetry/Metric/MetricExporter/InMemoryMetricExporterFactoryTest.php
index 45737f6..e47764a 100644
--- a/tests/Unit/OpenTelemetry/Metric/MetricExporter/InMemoryMetricExporterFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Metric/MetricExporter/InMemoryMetricExporterFactoryTest.php
@@ -9,16 +9,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MetricExporterOptions;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\TransportFactory;
use OpenTelemetry\SDK\Metrics\Data\Temporality;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MetricExporter\InMemoryMetricExporterFactory
- */
+#[CoversClass(InMemoryMetricExporterFactory::class)]
class InMemoryMetricExporterFactoryTest extends TestCase
{
- /**
- * @dataProvider exporterProvider
- */
+ #[DataProvider('exporterProvider')]
public function testCreateExporter(string $dsn, ExporterOptionsInterface $options, ?string $temporality, ?\Exception $exception): void
{
if (null !== $exception) {
@@ -41,7 +39,7 @@ public function testCreateExporter(string $dsn, ExporterOptionsInterface $option
* 3: ?\Exception,
* }>
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
'stream+console://default',
diff --git a/tests/Unit/OpenTelemetry/Metric/MetricExporter/MetricExporterFactoryTest.php b/tests/Unit/OpenTelemetry/Metric/MetricExporter/MetricExporterFactoryTest.php
index 30eca72..4442aa9 100644
--- a/tests/Unit/OpenTelemetry/Metric/MetricExporter/MetricExporterFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Metric/MetricExporter/MetricExporterFactoryTest.php
@@ -23,11 +23,11 @@
use OpenTelemetry\SDK\Metrics\MetricExporter\InMemoryExporter;
use OpenTelemetry\SDK\Metrics\MetricExporter\NoopMetricExporter;
use OpenTelemetry\SDK\Metrics\MetricExporterInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MetricExporter\MetricExporterFactory
- */
+#[CoversClass(MetricExporterFactory::class)]
class MetricExporterFactoryTest extends TestCase
{
private function getTransportFactory(): TransportFactory
@@ -40,9 +40,7 @@ private function getTransportFactory(): TransportFactory
]);
}
- /**
- * @dataProvider exporterProvider
- */
+ #[DataProvider('exporterProvider')]
public function testCreateExporter(
string $dsn,
ExporterOptionsInterface $options,
@@ -76,7 +74,7 @@ public function testCreateExporter(
* 3: ?class-string>,
* }>
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
'stream+console://default',
diff --git a/tests/Unit/OpenTelemetry/Metric/MetricExporter/NoopMetricExporterFactoryTest.php b/tests/Unit/OpenTelemetry/Metric/MetricExporter/NoopMetricExporterFactoryTest.php
index 84c109c..b8f7f68 100644
--- a/tests/Unit/OpenTelemetry/Metric/MetricExporter/NoopMetricExporterFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Metric/MetricExporter/NoopMetricExporterFactoryTest.php
@@ -7,16 +7,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MetricExporter\NoopMetricExporterFactory;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MetricExporterOptions;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\TransportFactory;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MetricExporter\NoopMetricExporterFactory
- */
+#[CoversClass(NoopMetricExporterFactory::class)]
class NoopMetricExporterFactoryTest extends TestCase
{
- /**
- * @dataProvider exporterProvider
- */
+ #[DataProvider('exporterProvider')]
public function testCreateExporter(string $dsn, ExporterOptionsInterface $options, ?\Exception $exception): void
{
if (null !== $exception) {
@@ -35,7 +33,7 @@ public function testCreateExporter(string $dsn, ExporterOptionsInterface $option
* 2: ?\Exception,
* }>
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
'stream+console://default',
diff --git a/tests/Unit/OpenTelemetry/Metric/MetricExporter/OtlpMetricExporterFactoryTest.php b/tests/Unit/OpenTelemetry/Metric/MetricExporter/OtlpMetricExporterFactoryTest.php
index 24b86f2..97536be 100644
--- a/tests/Unit/OpenTelemetry/Metric/MetricExporter/OtlpMetricExporterFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Metric/MetricExporter/OtlpMetricExporterFactoryTest.php
@@ -10,16 +10,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\OtlpHttpTransportFactory;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\TransportFactory;
use OpenTelemetry\SDK\Metrics\Data\Temporality;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MetricExporter\OtlpMetricExporterFactory
- */
+#[CoversClass(OtlpMetricExporterFactory::class)]
class OtlpMetricExporterFactoryTest extends TestCase
{
- /**
- * @dataProvider exporterProvider
- */
+ #[DataProvider('exporterProvider')]
public function testCreateExporter(string $dsn, ExporterOptionsInterface $options, ?string $temporality, ?\Exception $exception): void
{
if (null !== $exception) {
@@ -45,7 +43,7 @@ public function testCreateExporter(string $dsn, ExporterOptionsInterface $option
* 3: ?\Exception,
* }>
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
'http+otlp://default',
diff --git a/tests/Unit/OpenTelemetry/Metric/MetricExporterEndpointTest.php b/tests/Unit/OpenTelemetry/Metric/MetricExporterEndpointTest.php
index f17204d..aa2d111 100644
--- a/tests/Unit/OpenTelemetry/Metric/MetricExporterEndpointTest.php
+++ b/tests/Unit/OpenTelemetry/Metric/MetricExporterEndpointTest.php
@@ -4,16 +4,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\ExporterDsn;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MetricExporterEndpoint;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MetricExporterEndpoint
- */
+#[CoversClass(MetricExporterEndpoint::class)]
class MetricExporterEndpointTest extends TestCase
{
- /**
- * @dataProvider dsnProvider
- */
+ #[DataProvider('dsnProvider')]
public function testFromDsn(string $dsn, ?string $endpoint, ?\Exception $exception): void
{
if (null !== $exception) {
@@ -30,7 +28,7 @@ public function testFromDsn(string $dsn, ?string $endpoint, ?\Exception $excepti
* 2: ?\Exception,
* }>
*/
- public function dsnProvider(): \Generator
+ public static function dsnProvider(): \Generator
{
yield [
'http+otlp://localhost',
diff --git a/tests/Unit/OpenTelemetry/Metric/MetricExporterOptionsTest.php b/tests/Unit/OpenTelemetry/Metric/MetricExporterOptionsTest.php
index 135751d..3210673 100644
--- a/tests/Unit/OpenTelemetry/Metric/MetricExporterOptionsTest.php
+++ b/tests/Unit/OpenTelemetry/Metric/MetricExporterOptionsTest.php
@@ -7,13 +7,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\OtlpExporterFormatEnum;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MetricExporter\MetricTemporalityEnum;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MetricExporterOptions;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MetricExporterOptions
- *
* @phpstan-import-type ExporterOptions from ExporterOptionsInterface
*/
+#[CoversClass(MetricExporterOptions::class)]
class MetricExporterOptionsTest extends TestCase
{
public function testDefault(): void
@@ -37,11 +38,10 @@ public function testDefault(): void
}
/**
- * @dataProvider configurationProvider
- *
* @param array&ExporterOptions $configuration
* @param callable(MetricExporterOptions): void $assertion
*/
+ #[DataProvider('configurationProvider')]
public function testFromConfiguration(array $configuration, callable $assertion): void
{
$options = MetricExporterOptions::fromConfiguration($configuration);
@@ -55,7 +55,7 @@ public function testFromConfiguration(array $configuration, callable $assertion)
* 1: callable(MetricExporterOptions): void
* }>
*/
- public function configurationProvider(): \Generator
+ public static function configurationProvider(): \Generator
{
yield [
['temporality' => 'cumulative'],
diff --git a/tests/Unit/OpenTelemetry/Trace/SamplerFactoryTest.php b/tests/Unit/OpenTelemetry/Trace/SamplerFactoryTest.php
index ee7c82c..5671f66 100644
--- a/tests/Unit/OpenTelemetry/Trace/SamplerFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Trace/SamplerFactoryTest.php
@@ -8,16 +8,14 @@
use OpenTelemetry\SDK\Trace\Sampler\ParentBased;
use OpenTelemetry\SDK\Trace\Sampler\TraceIdRatioBasedSampler;
use OpenTelemetry\SDK\Trace\SamplerInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\SamplerFactory
- */
+#[CoversClass(SamplerFactory::class)]
class SamplerFactoryTest extends TestCase
{
- /**
- * @dataProvider samplerProvider
- */
+ #[DataProvider('samplerProvider')]
public function testCreateSampler(string $name, string $expectedClass, string $description, ?float $probability): void
{
$sampler = SamplerFactory::create($name, $probability);
@@ -34,7 +32,7 @@ public function testCreateSampler(string $name, string $expectedClass, string $d
* 3: float|null,
* }>
*/
- public function samplerProvider(): \Generator
+ public static function samplerProvider(): \Generator
{
yield [
'always_off',
diff --git a/tests/Unit/OpenTelemetry/Trace/SpanExporter/ConsoleSpanExporterFactoryTest.php b/tests/Unit/OpenTelemetry/Trace/SpanExporter/ConsoleSpanExporterFactoryTest.php
index 4f69d09..4345139 100644
--- a/tests/Unit/OpenTelemetry/Trace/SpanExporter/ConsoleSpanExporterFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Trace/SpanExporter/ConsoleSpanExporterFactoryTest.php
@@ -9,16 +9,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\StreamTransportFactory;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\TransportFactory;
use OpenTelemetry\SDK\Common\Export\Stream\StreamTransport;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\SpanExporter\ConsoleSpanExporterFactory
- */
+#[CoversClass(ConsoleSpanExporterFactory::class)]
class ConsoleSpanExporterFactoryTest extends TestCase
{
- /**
- * @dataProvider exporterProvider
- */
+ #[DataProvider('exporterProvider')]
public function testCreateExporter(string $dsn, ExporterOptionsInterface $options, ?\Exception $exception): void
{
if (null !== $exception) {
@@ -38,7 +36,7 @@ public function testCreateExporter(string $dsn, ExporterOptionsInterface $option
/**
* @return \Generator
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
'stream+console://default',
diff --git a/tests/Unit/OpenTelemetry/Trace/SpanExporter/InMemorySpanExporterFactoryTest.php b/tests/Unit/OpenTelemetry/Trace/SpanExporter/InMemorySpanExporterFactoryTest.php
index b3a2003..4aa37b7 100644
--- a/tests/Unit/OpenTelemetry/Trace/SpanExporter/InMemorySpanExporterFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Trace/SpanExporter/InMemorySpanExporterFactoryTest.php
@@ -7,16 +7,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\ExporterOptionsInterface;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\SpanExporter\InMemorySpanExporterFactory;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\TransportFactory;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\SpanExporter\InMemorySpanExporterFactory
- */
+#[CoversClass(InMemorySpanExporterFactory::class)]
class InMemorySpanExporterFactoryTest extends TestCase
{
- /**
- * @dataProvider exporterProvider
- */
+ #[DataProvider('exporterProvider')]
public function testCreateExporter(string $dsn, ExporterOptionsInterface $options, ?\Exception $exception): void
{
if (null !== $exception) {
@@ -31,7 +29,7 @@ public function testCreateExporter(string $dsn, ExporterOptionsInterface $option
/**
* @return \Generator
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
'in-memory://default',
diff --git a/tests/Unit/OpenTelemetry/Trace/SpanExporter/OtlpSpanExporterFactoryTest.php b/tests/Unit/OpenTelemetry/Trace/SpanExporter/OtlpSpanExporterFactoryTest.php
index 05ece65..ab888fe 100644
--- a/tests/Unit/OpenTelemetry/Trace/SpanExporter/OtlpSpanExporterFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Trace/SpanExporter/OtlpSpanExporterFactoryTest.php
@@ -12,18 +12,17 @@
use OpenTelemetry\Contrib\Grpc\GrpcTransport;
use OpenTelemetry\SDK\Common\Export\Http\PsrTransport;
use OpenTelemetry\SDK\Common\Export\TransportInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\SpanExporter\OtlpSpanExporterFactory
- */
+#[CoversClass(OtlpSpanExporterFactory::class)]
class OtlpSpanExporterFactoryTest extends TestCase
{
/**
- * @dataProvider exporterProvider
- *
* @param ?class-string> $transportClass
*/
+ #[DataProvider('exporterProvider')]
public function testCreateExporter(
string $dsn,
ExporterOptionsInterface $options,
@@ -53,7 +52,7 @@ public function testCreateExporter(
* 3: ?\Exception,
* }>
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
'http+otlp://default',
diff --git a/tests/Unit/OpenTelemetry/Trace/SpanExporter/SpanExporterFactoryTest.php b/tests/Unit/OpenTelemetry/Trace/SpanExporter/SpanExporterFactoryTest.php
index 5c24119..4bf23d2 100644
--- a/tests/Unit/OpenTelemetry/Trace/SpanExporter/SpanExporterFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Trace/SpanExporter/SpanExporterFactoryTest.php
@@ -24,11 +24,11 @@
use OpenTelemetry\SDK\Trace\SpanExporter\ConsoleSpanExporter;
use OpenTelemetry\SDK\Trace\SpanExporter\InMemoryExporter;
use OpenTelemetry\SDK\Trace\SpanExporterInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\SpanExporter\SpanExporterFactory
- */
+#[CoversClass(SpanExporterFactory::class)]
class SpanExporterFactoryTest extends TestCase
{
private function getTransportFactory(): TransportFactory
@@ -41,9 +41,7 @@ private function getTransportFactory(): TransportFactory
]);
}
- /**
- * @dataProvider exporterProvider
- */
+ #[DataProvider('exporterProvider')]
public function testCreateExporter(
string $dsn,
ExporterOptionsInterface $options,
@@ -77,7 +75,7 @@ public function testCreateExporter(
* 3: ?class-string>,
* }>
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
'stream+console://default',
diff --git a/tests/Unit/OpenTelemetry/Trace/SpanExporter/ZipkinSpanExporterFactoryTest.php b/tests/Unit/OpenTelemetry/Trace/SpanExporter/ZipkinSpanExporterFactoryTest.php
index 987b865..5185a24 100644
--- a/tests/Unit/OpenTelemetry/Trace/SpanExporter/ZipkinSpanExporterFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Trace/SpanExporter/ZipkinSpanExporterFactoryTest.php
@@ -10,18 +10,17 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\TransportFactory;
use OpenTelemetry\SDK\Common\Export\Http\PsrTransport;
use OpenTelemetry\SDK\Common\Export\TransportInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\SpanExporter\ZipkinSpanExporterFactory
- */
+#[CoversClass(ZipkinSpanExporterFactory::class)]
class ZipkinSpanExporterFactoryTest extends TestCase
{
/**
- * @dataProvider exporterProvider
- *
* @param ?class-string> $transportClass
*/
+ #[DataProvider('exporterProvider')]
public function testCreateExporter(
string $dsn,
ExporterOptionsInterface $options,
@@ -50,7 +49,7 @@ public function testCreateExporter(
* 3: ?\Exception,
* }>
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
'http+zipkin://default',
diff --git a/tests/Unit/OpenTelemetry/Trace/TraceExporterEndpointTest.php b/tests/Unit/OpenTelemetry/Trace/TraceExporterEndpointTest.php
index 3cc1195..b366c2f 100644
--- a/tests/Unit/OpenTelemetry/Trace/TraceExporterEndpointTest.php
+++ b/tests/Unit/OpenTelemetry/Trace/TraceExporterEndpointTest.php
@@ -4,16 +4,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\ExporterDsn;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\TraceExporterEndpoint;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\TraceExporterEndpoint
- */
+#[CoversClass(TraceExporterEndpoint::class)]
class TraceExporterEndpointTest extends TestCase
{
- /**
- * @dataProvider dsnProvider
- */
+ #[DataProvider('dsnProvider')]
public function testFromDsn(string $dsn, ?string $endpoint, ?\Exception $exception): void
{
if (null !== $exception) {
@@ -30,7 +28,7 @@ public function testFromDsn(string $dsn, ?string $endpoint, ?\Exception $excepti
* 2: ?\Exception
* }>
*/
- public function dsnProvider(): \Generator
+ public static function dsnProvider(): \Generator
{
yield [
'http+otlp://localhost',
diff --git a/tests/Unit/OpenTelemetry/Trace/ZipkinExporterEndpointTest.php b/tests/Unit/OpenTelemetry/Trace/ZipkinExporterEndpointTest.php
index c6372be..1858656 100644
--- a/tests/Unit/OpenTelemetry/Trace/ZipkinExporterEndpointTest.php
+++ b/tests/Unit/OpenTelemetry/Trace/ZipkinExporterEndpointTest.php
@@ -4,16 +4,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\ExporterDsn;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\ZipkinExporterEndpoint;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\TraceExporterEndpoint
- */
+#[CoversClass(ZipkinExporterEndpoint::class)]
class ZipkinExporterEndpointTest extends TestCase
{
- /**
- * @dataProvider dsnProvider
- */
+ #[DataProvider('dsnProvider')]
public function testFromDsn(string $dsn, ?string $endpoint, ?\Exception $exception): void
{
if (null !== $exception) {
@@ -30,7 +28,7 @@ public function testFromDsn(string $dsn, ?string $endpoint, ?\Exception $excepti
* 2: ?\Exception
* }>
*/
- public function dsnProvider(): \Generator
+ public static function dsnProvider(): \Generator
{
yield [
'http+zipkin://localhost',
diff --git a/tests/Unit/OpenTelemetry/Transport/GrpcTransportFactoryTest.php b/tests/Unit/OpenTelemetry/Transport/GrpcTransportFactoryTest.php
index b5e20ce..7f7f052 100644
--- a/tests/Unit/OpenTelemetry/Transport/GrpcTransportFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Transport/GrpcTransportFactoryTest.php
@@ -12,16 +12,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Metric\MetricExporterOptions;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\TraceExporterEndpoint;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\GrpcTransportFactory;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\GrpcTransportFactory
- */
+#[CoversClass(GrpcTransportFactory::class)]
class GrpcTransportFactoryTest extends TestCase
{
- /**
- * @dataProvider exporterProvider
- */
+ #[DataProvider('exporterProvider')]
public function testCreateTransportFromExporter(
ExporterEndpointInterface $endpoint,
ExporterOptionsInterface $options,
@@ -43,7 +41,7 @@ public function testCreateTransportFromExporter(
* 2: bool
* }>
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
TraceExporterEndpoint::fromDsn(ExporterDsn::fromString('grpc+otlp://localhost')),
diff --git a/tests/Unit/OpenTelemetry/Transport/OtlpHttpTransportFactoryTest.php b/tests/Unit/OpenTelemetry/Transport/OtlpHttpTransportFactoryTest.php
index 885ff0d..21e8829 100644
--- a/tests/Unit/OpenTelemetry/Transport/OtlpHttpTransportFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Transport/OtlpHttpTransportFactoryTest.php
@@ -13,16 +13,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\TraceExporterEndpoint;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\ZipkinExporterEndpoint;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\OtlpHttpTransportFactory;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\OtlpHttpTransportFactory
- */
+#[CoversClass(OtlpHttpTransportFactory::class)]
class OtlpHttpTransportFactoryTest extends TestCase
{
- /**
- * @dataProvider exporterProvider
- */
+ #[DataProvider('exporterProvider')]
public function testCreateTransportFromExporter(
ExporterEndpointInterface $endpoint,
ExporterOptionsInterface $options,
@@ -44,7 +42,7 @@ public function testCreateTransportFromExporter(
* 2: bool,
* }>
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
TraceExporterEndpoint::fromDsn(ExporterDsn::fromString('http+otlp://localhost')),
diff --git a/tests/Unit/OpenTelemetry/Transport/PsrHttpTransportFactoryTest.php b/tests/Unit/OpenTelemetry/Transport/PsrHttpTransportFactoryTest.php
index 4af63b3..b6c9b2a 100644
--- a/tests/Unit/OpenTelemetry/Transport/PsrHttpTransportFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Transport/PsrHttpTransportFactoryTest.php
@@ -13,16 +13,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\TraceExporterEndpoint;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\ZipkinExporterEndpoint;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\PsrHttpTransportFactory;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\PsrHttpTransportFactory
- */
+#[CoversClass(PsrHttpTransportFactory::class)]
class PsrHttpTransportFactoryTest extends TestCase
{
- /**
- * @dataProvider exporterProvider
- */
+ #[DataProvider('exporterProvider')]
public function testCreateTransportFromExporter(
ExporterEndpointInterface $endpoint,
ExporterOptionsInterface $options,
@@ -44,7 +42,7 @@ public function testCreateTransportFromExporter(
* 2: bool,
* }>
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
TraceExporterEndpoint::fromDsn(ExporterDsn::fromString('http+otlp://localhost')),
diff --git a/tests/Unit/OpenTelemetry/Transport/StreamTransportFactoryTest.php b/tests/Unit/OpenTelemetry/Transport/StreamTransportFactoryTest.php
index 203fb07..65b8762 100644
--- a/tests/Unit/OpenTelemetry/Transport/StreamTransportFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Transport/StreamTransportFactoryTest.php
@@ -13,16 +13,14 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\TraceExporterEndpoint;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Trace\ZipkinExporterEndpoint;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\StreamTransportFactory;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\StreamTransportFactory
- */
+#[CoversClass(StreamTransportFactory::class)]
class StreamTransportFactoryTest extends TestCase
{
- /**
- * @dataProvider exporterProvider
- */
+ #[DataProvider('exporterProvider')]
public function testCreateTransportFromExporter(
ExporterEndpointInterface $endpoint,
ExporterOptionsInterface $options,
@@ -44,7 +42,7 @@ public function testCreateTransportFromExporter(
* 2: bool,
* }>
*/
- public function exporterProvider(): \Generator
+ public static function exporterProvider(): \Generator
{
yield [
TraceExporterEndpoint::fromDsn(ExporterDsn::fromString('stream+console://default')),
diff --git a/tests/Unit/OpenTelemetry/Transport/TransportFactoryTest.php b/tests/Unit/OpenTelemetry/Transport/TransportFactoryTest.php
index 5a6952a..974f4d0 100644
--- a/tests/Unit/OpenTelemetry/Transport/TransportFactoryTest.php
+++ b/tests/Unit/OpenTelemetry/Transport/TransportFactoryTest.php
@@ -21,18 +21,17 @@
use OpenTelemetry\SDK\Common\Export\Http\PsrTransport;
use OpenTelemetry\SDK\Common\Export\Stream\StreamTransport;
use OpenTelemetry\SDK\Common\Export\TransportInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\TransportFactory
- */
+#[CoversClass(TransportFactory::class)]
class TransportFactoryTest extends TestCase
{
/**
- * @dataProvider transportProvider
- *
* @param array, bool> $supportedEndpoints
*/
+ #[DataProvider('transportProvider')]
public function testCreateTransport(
ExporterDsn $dsn,
ExporterOptionsInterface $options,
@@ -68,7 +67,7 @@ public function testCreateTransport(
* 3: ?class-string>,
* }>
*/
- public function transportProvider(): \Generator
+ public static function transportProvider(): \Generator
{
yield [
ExporterDsn::fromString('stream+console://default'),
diff --git a/tests/Unit/OpenTelemetry/Transport/TransportParamsTest.php b/tests/Unit/OpenTelemetry/Transport/TransportParamsTest.php
index d51a7a1..b1604f0 100644
--- a/tests/Unit/OpenTelemetry/Transport/TransportParamsTest.php
+++ b/tests/Unit/OpenTelemetry/Transport/TransportParamsTest.php
@@ -6,11 +6,11 @@
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\OtlpExporterFormatEnum;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Exporter\OtlpExporterOptions;
use FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\TransportParams;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
-/**
- * @coversDefaultClass \FriendsOfOpenTelemetry\OpenTelemetryBundle\OpenTelemetry\Transport\TransportParams
- */
+#[CoversClass(TransportParams::class)]
class TransportParamsTest extends TestCase
{
public function testCreateDefault(): void
@@ -29,8 +29,6 @@ public function testCreateDefault(): void
}
/**
- * @dataProvider otlpExporterOptionProvider
- *
* @param array{
* contentType: string,
* headers: array,
@@ -43,6 +41,7 @@ public function testCreateDefault(): void
* key: ?string,
* } $expected
*/
+ #[DataProvider('otlpExporterOptionProvider')]
public function testFromOtlpExporterOptions(OtlpExporterOptions $options, array $expected): void
{
$params = $options->toTransportParams();
@@ -74,7 +73,7 @@ public function testFromOtlpExporterOptions(OtlpExporterOptions $options, array
* }
* }>
*/
- public function otlpExporterOptionProvider(): \Generator
+ public static function otlpExporterOptionProvider(): \Generator
{
yield [
new OtlpExporterOptions(),