Skip to content

Commit a407d11

Browse files
committed
fix: add #[\Override] attributes to interface implementations
Add Override attributes to methods implementing: - ResourceDetectorInterface (getResource) - SamplerInterface (shouldSample, getDescription) - TextMapPropagatorInterface (fields, inject, extract) - PropagationGetterInterface (keys, get) - PropagationSetterInterface (set) - InstrumentationInterface (multiple methods) - RuleSetInterface (samplingRules, delegate)
1 parent 5dbe813 commit a407d11

File tree

26 files changed

+76
-0
lines changed

26 files changed

+76
-0
lines changed

src/Aws/src/AwsSdkInstrumentation.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,46 +37,55 @@ class AwsSdkInstrumentation implements InstrumentationInterface
3737

3838
private array $spanStorage = [];
3939

40+
#[\Override]
4041
public function getName(): string
4142
{
4243
return self::NAME;
4344
}
4445

46+
#[\Override]
4547
public function getVersion(): ?string
4648
{
4749
return self::VERSION;
4850
}
4951

52+
#[\Override]
5053
public function getSchemaUrl(): ?string
5154
{
5255
return null;
5356
}
5457

58+
#[\Override]
5559
public function init(): bool
5660
{
5761
return true;
5862
}
5963

64+
#[\Override]
6065
public function setPropagator(TextMapPropagatorInterface $propagator): void
6166
{
6267
$this->propagator = $propagator;
6368
}
6469

70+
#[\Override]
6571
public function getPropagator(): TextMapPropagatorInterface
6672
{
6773
return $this->propagator;
6874
}
6975

76+
#[\Override]
7077
public function setTracerProvider(TracerProviderInterface $tracerProvider): void
7178
{
7279
$this->tracerProvider = $tracerProvider;
7380
}
7481

82+
#[\Override]
7583
public function getTracerProvider(): TracerProviderInterface
7684
{
7785
return $this->tracerProvider;
7886
}
7987

88+
#[\Override]
8089
public function getTracer(): TracerInterface
8190
{
8291
return $this->tracerProvider->getTracer('io.opentelemetry.contrib.php');
@@ -88,6 +97,7 @@ public function instrumentClients($clientsArray): void
8897
$this->clients = $clientsArray;
8998
}
9099

100+
#[\Override]
91101
public function activate(): bool
92102
{
93103
try {

src/Aws/src/Ec2/Detector.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public function __construct(ClientInterface $client, RequestFactoryInterface $re
6363
* if the connection or parsing of the identity document fails.
6464
*
6565
*/
66+
#[\Override]
6667
public function getResource(): ResourceInfo
6768
{
6869
try {

src/Aws/src/Ecs/Detector.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ public function __construct(
9292
* - aws.log.stream.names
9393
* - aws.log.stream.arns
9494
*/
95+
#[\Override]
9596
public function getResource(): ResourceInfo
9697
{
9798
$metadataEndpointV4 = getenv(self::ECS_METADATA_KEY_V4);

src/Aws/src/Eks/Detector.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ public function __construct(
5959
$this->requestFactory = $requestFactory;
6060
}
6161

62+
#[\Override]
63+
6264
public function getResource(): ResourceInfo
6365
{
6466
try {

src/Aws/src/Lambda/Detector.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ class Detector implements ResourceDetectorInterface
3838
private const AWS_REGION_ENV = 'AWS_REGION';
3939
private const CLOUD_PROVIDER = 'aws';
4040

41+
#[\Override]
42+
4143
public function getResource(): ResourceInfo
4244
{
4345
$lambdaName = getenv(self::LAMBDA_NAME_ENV);

src/Aws/src/Xray/Propagator.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ class Propagator implements TextMapPropagatorInterface
6464
/**
6565
* Returns list of fields used by HTTPTextFormat
6666
*/
67+
#[\Override]
6768
public function fields(): array
6869
{
6970
return [self::AWSXRAY_TRACE_ID_HEADER];
@@ -74,6 +75,7 @@ public function fields(): array
7475
* X-Amzn-Trace-Id: Root={traceId};Parent={parentId};Sampled={samplingFlag}
7576
* X-Amzn-Trace-Id: Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8;Sampled=1
7677
*/
78+
#[\Override]
7779
public function inject(&$carrier, ?PropagationSetterInterface $setter = null, ?ContextInterface $context = null): void
7880
{
7981
$setter = $setter ?? ArrayAccessGetterSetter::getInstance();
@@ -103,6 +105,7 @@ public function inject(&$carrier, ?PropagationSetterInterface $setter = null, ?C
103105
* This function will parse all parts of the header and validate that it is
104106
* formatted properly to AWS X-ray standards
105107
*/
108+
#[\Override]
106109
public function extract($carrier, ?PropagationGetterInterface $getter = null, ?ContextInterface $context = null): ContextInterface
107110
{
108111
$getter = $getter ?? ArrayAccessGetterSetter::getInstance();

src/Instrumentation/CodeIgniter/src/RequestPropagationGetter.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,16 @@ public static function instance(): self
2121
}
2222

2323
/** @psalm-suppress InvalidReturnType */
24+
#[\Override]
2425
public function keys($carrier): array
2526
{
2627
assert($carrier instanceof MessageInterface);
2728

2829
return array_keys($carrier->headers());
2930
}
3031

32+
#[\Override]
33+
3134
public function get($carrier, string $key) : ?string
3235
{
3336
assert($carrier instanceof MessageInterface);

src/Instrumentation/CodeIgniter/src/ResponsePropagationSetter.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ public function keys($carrier): array
3030
return array_keys($carrier->headers());
3131
}
3232

33+
#[\Override]
34+
3335
public function set(&$carrier, string $key, string $value): void
3436
{
3537
assert($carrier instanceof MessageInterface);

src/Instrumentation/Laravel/src/Propagators/ResponsePropagationSetter.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ public static function instance(): self
2020
return $instance ??= new self();
2121
}
2222

23+
#[\Override]
24+
2325
public function set(&$carrier, string $key, string $value): void
2426
{
2527
assert($carrier instanceof Response);

src/Instrumentation/Slim/src/PsrResponsePropagationSetter.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ public function keys($carrier): array
2929
return array_keys($carrier->getHeaders());
3030
}
3131

32+
#[\Override]
33+
3234
public function set(&$carrier, string $key, string $value): void
3335
{
3436
assert($carrier instanceof ResponseInterface);

0 commit comments

Comments
 (0)