Skip to content

Commit c337854

Browse files
committed
Add Override attribute
1 parent 925a66b commit c337854

11 files changed

+27
-1
lines changed

src/Instrumentation/HttpConfig/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
"open-telemetry/sdk-configuration": "^0.1.0",
2525
"phpunit/phpunit": "^10.5",
2626
"vimeo/psalm": "^6.7",
27-
"symfony/yaml": "^6.4"
27+
"symfony/yaml": "^6.4",
28+
"symfony/polyfill-php83": "^1.32"
2829
},
2930
"autoload": {
3031
"psr-4": {

src/Instrumentation/HttpConfig/src/Config/InstrumentationConfigurationHttpConfig.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer;
1717
use OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer\DefaultSanitizer;
1818
use OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer\MultiSanitizer;
19+
use Override;
1920
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
2021
use Symfony\Component\Config\Definition\Builder\NodeBuilder;
2122

@@ -53,6 +54,7 @@ final class InstrumentationConfigurationHttpConfig implements ComponentProvider
5354
* known_http_methods: list<string>,
5455
* } $properties
5556
*/
57+
#[Override]
5658
public function createPlugin(array $properties, Context $context): InstrumentationConfiguration
5759
{
5860
return new HttpConfig(
@@ -85,6 +87,7 @@ public function createPlugin(array $properties, Context $context): Instrumentati
8587
);
8688
}
8789

90+
#[Override]
8891
public function getConfig(ComponentProviderRegistry $registry, NodeBuilder $builder): ArrayNodeDefinition
8992
{
9093
$node = $builder->arrayNode('http');

src/Instrumentation/HttpConfig/src/Config/UriSanitizerDefault.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use OpenTelemetry\API\Configuration\Context;
1010
use OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer;
1111
use OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer\DefaultSanitizer;
12+
use Override;
1213
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
1314
use Symfony\Component\Config\Definition\Builder\NodeBuilder;
1415

@@ -22,11 +23,13 @@ final class UriSanitizerDefault implements ComponentProvider
2223
* @param array{
2324
* } $properties
2425
*/
26+
#[Override]
2527
public function createPlugin(array $properties, Context $context): UriSanitizer
2628
{
2729
return new DefaultSanitizer();
2830
}
2931

32+
#[Override]
3033
public function getConfig(ComponentProviderRegistry $registry, NodeBuilder $builder): ArrayNodeDefinition
3134
{
3235
return $builder->arrayNode('default');

src/Instrumentation/HttpConfig/src/Config/UriSanitizerRedactQueryStringValues.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use OpenTelemetry\API\Configuration\Context;
1010
use OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer;
1111
use OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer\RedactSensitiveQueryStringValuesSanitizer;
12+
use Override;
1213
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
1314
use Symfony\Component\Config\Definition\Builder\NodeBuilder;
1415

@@ -23,11 +24,13 @@ final class UriSanitizerRedactQueryStringValues implements ComponentProvider
2324
* query_keys: list<string>,
2425
* } $properties
2526
*/
27+
#[Override]
2628
public function createPlugin(array $properties, Context $context): UriSanitizer
2729
{
2830
return new RedactSensitiveQueryStringValuesSanitizer($properties['query_keys']);
2931
}
3032

33+
#[Override]
3134
public function getConfig(ComponentProviderRegistry $registry, NodeBuilder $builder): ArrayNodeDefinition
3235
{
3336
$node = $builder->arrayNode('redact_query_string_values');

src/Instrumentation/HttpConfig/src/Config/UriSanitizerRedactUserInfo.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use OpenTelemetry\API\Configuration\Context;
1010
use OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer;
1111
use OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer\RedactUsernamePasswordSanitizer;
12+
use Override;
1213
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
1314
use Symfony\Component\Config\Definition\Builder\NodeBuilder;
1415

@@ -22,11 +23,13 @@ final class UriSanitizerRedactUserInfo implements ComponentProvider
2223
* @param array{
2324
* } $properties
2425
*/
26+
#[Override]
2527
public function createPlugin(array $properties, Context $context): UriSanitizer
2628
{
2729
return new RedactUsernamePasswordSanitizer();
2830
}
2931

32+
#[Override]
3033
public function getConfig(ComponentProviderRegistry $registry, NodeBuilder $builder): ArrayNodeDefinition
3134
{
3235
return $builder->arrayNode('redact_userinfo');

src/Instrumentation/HttpConfig/src/ConfigEnv/InstrumentationConfigurationHttpConfig.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@
1313
use OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer\DefaultSanitizer;
1414
use OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer\MultiSanitizer;
1515
use OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer\RedactSensitiveQueryStringValuesSanitizer;
16+
use Override;
1617

1718
/**
1819
* @implements EnvComponentLoader<InstrumentationConfiguration>
1920
*/
2021
final class InstrumentationConfigurationHttpConfig implements EnvComponentLoader
2122
{
2223

24+
#[Override]
2325
public function load(EnvResolver $env, EnvComponentLoaderRegistry $registry, Context $context): InstrumentationConfiguration
2426
{
2527
$sanitizers = [new DefaultSanitizer()];
@@ -33,6 +35,7 @@ public function load(EnvResolver $env, EnvComponentLoaderRegistry $registry, Con
3335
);
3436
}
3537

38+
#[Override]
3639
public function name(): string
3740
{
3841
return HttpConfig::class;

src/Instrumentation/HttpConfig/src/UriSanitizer/DefaultSanitizer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer;
66

77
use OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer;
8+
use Override;
89
use Psr\Http\Message\UriInterface;
910

1011
/**
@@ -25,6 +26,7 @@ public function __construct()
2526
]);
2627
}
2728

29+
#[Override]
2830
public function sanitize(UriInterface $uri): UriInterface
2931
{
3032
return $this->sanitizer->sanitize($uri);

src/Instrumentation/HttpConfig/src/UriSanitizer/MultiSanitizer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use function array_key_first;
88
use function count;
99
use OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer;
10+
use Override;
1011
use Psr\Http\Message\UriInterface;
1112

1213
final class MultiSanitizer implements UriSanitizer
@@ -32,6 +33,7 @@ public static function composite(array $sanitizers): UriSanitizer
3233
};
3334
}
3435

36+
#[Override]
3537
public function sanitize(UriInterface $uri): UriInterface
3638
{
3739
foreach ($this->sanitizers as $sanitizer) {

src/Instrumentation/HttpConfig/src/UriSanitizer/NoopSanitizer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
namespace OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer;
66

77
use OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer;
8+
use Override;
89
use Psr\Http\Message\UriInterface;
910

1011
final class NoopSanitizer implements UriSanitizer
1112
{
1213

14+
#[Override]
1315
public function sanitize(UriInterface $uri): UriInterface
1416
{
1517
return $uri;

src/Instrumentation/HttpConfig/src/UriSanitizer/RedactSensitiveQueryStringValuesSanitizer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer;
66

77
use OpenTelemetry\Contrib\Instrumentation\HttpConfig\UriSanitizer;
8+
use Override;
89
use Psr\Http\Message\UriInterface;
910
use function strlen;
1011
use function strpos;
@@ -22,6 +23,7 @@ public function __construct(
2223
) {
2324
}
2425

26+
#[Override]
2527
public function sanitize(UriInterface $uri): UriInterface
2628
{
2729
$query = $uri->getQuery();

0 commit comments

Comments
 (0)