updated more files

Author: AsakerMohd

src/Sampler/Xray/psalm.xml.dist

@@ -2,8 +2,6 @@
 <psalm
     errorLevel="3"
     cacheDirectory="var/cache/psalm"
-    findUnusedBaselineEntry="false"
-    findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd">
@@ -14,16 +12,4 @@
     <plugins>
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
     </plugins>
-    <issueHandlers>
-        <UndefinedInterfaceMethod>
-            <errorLevel type="suppress">
-                <directory name="src/ComponentProvider"/>
-            </errorLevel>
-        </UndefinedInterfaceMethod>
-        <MoreSpecificImplementedParamType>
-            <errorLevel type="suppress">
-                <directory name="src/ComponentProvider"/>
-            </errorLevel>
-        </MoreSpecificImplementedParamType>
-    </issueHandlers>
 </psalm>

src/Sampler/Xray/src/AWSXRaySamplerClient.php

@@ -6,7 +6,6 @@
 namespace OpenTelemetry\Contrib\Sampler\Xray;
 
 use GuzzleHttp\Client as HttpClient;
-use GuzzleHttp\Exception\GuzzleException;
 
 /**
  * A lightweight HTTP client for AWS X-Ray sampling endpoints.
@@ -34,7 +33,6 @@ public function __construct(string $host)
     /**
      * Fetches all sampling rules from X-Ray by paging through NextToken.
      *
-     * @throws GuzzleException on HTTP errors.
      * @return SamplingRule[]  Array of SamplingRule instances.
      */
     public function getSamplingRules(): array
@@ -70,7 +68,6 @@ public function getSamplingRules(): array
      * Sends current statistics documents to X-Ray and returns the decoded response.
      *
      * @param SamplingStatisticsDocument[] $statistics
-     * @throws GuzzleException on HTTP errors.
      * @return object|null  stdClass of the X-Ray GetSamplingTargets response.
      */
     public function getSamplingTargets(array $statistics): ?object

src/Sampler/Xray/src/Clock.php

@@ -14,6 +14,6 @@ public function now(): \DateTimeImmutable
 
     public function toUnixMillis(\DateTimeImmutable $dt): float
     {
-        return ($dt->getTimestamp() * 1000) + ($dt->format('v') / 1);
+        return $dt->getTimestamp() * 1000;
     }
 }

src/Sampler/Xray/src/Matcher.php

@@ -51,7 +51,7 @@ public static function wildcardMatch(?string $value, string $pattern): bool
     /**
      * Map OpenTelemetry cloud.platform values to X-Ray service type strings.
      */
-    public static function getXRayCloudPlatform(?string $platform): string
+    public static function getXRayCloudPlatform(string $platform): string
     {
         return self::$xrayCloudPlatform[$platform] ?? '';
     }

src/Sampler/Xray/src/SamplingRuleApplier.php

@@ -51,19 +51,19 @@ public function __construct(string $clientId, Clock $clock, SamplingRule $rule,
     public function matches(AttributesInterface $attributes, ResourceInfo $resource): bool
     {
         // Extract HTTP path
-        $httpTarget = $attributes->get(TraceAttributes::HTTP_TARGET) ?? $attributes->get(TraceAttributes::URL_PATH);
-        $httpUrl = $attributes->get(TraceAttributes::HTTP_URL) ?? $attributes->get(TraceAttributes::URL_FULL);
+        $httpTarget = $attributes->get(TraceAttributes::HTTP_TARGET) ?? $attributes->get(TraceAttributes::URL_PATH); // @phan-suppress-current-line PhanDeprecatedClassConstant
+        $httpUrl = $attributes->get(TraceAttributes::HTTP_URL) ?? $attributes->get(TraceAttributes::URL_FULL); // @phan-suppress-current-line PhanDeprecatedClassConstant
         if ($httpTarget == null && isset($httpUrl)) {
             $httpTarget = parse_url($httpUrl, PHP_URL_PATH);
         }
 
-        $httpMethod = $attributes->get(TraceAttributes::HTTP_METHOD) ?? $attributes->get(TraceAttributes::HTTP_REQUEST_METHOD);
+        $httpMethod = $attributes->get(TraceAttributes::HTTP_METHOD) ?? $attributes->get(TraceAttributes::HTTP_REQUEST_METHOD); // @phan-suppress-current-line PhanDeprecatedClassConstant
         if ($httpMethod == '_OTHER') {
             $httpMethod = $attributes->get(TraceAttributes::HTTP_REQUEST_METHOD_ORIGINAL);
         }
-        $httpHost   = $attributes->get(TraceAttributes::HTTP_HOST)   ?? $attributes->get(TraceAttributes::SERVER_ADDRESS) ;
+        $httpHost   = $attributes->get(TraceAttributes::HTTP_HOST)   ?? $attributes->get(TraceAttributes::SERVER_ADDRESS) ; // @phan-suppress-current-line PhanDeprecatedClassConstant
         $serviceName= $resource->getAttributes()->get(TraceAttributes::SERVICE_NAME) ?? '';
-        $cloudPlat  = $resource->getAttributes()->get(TraceAttributes::CLOUD_PLATFORM) ?? null;
+        $cloudPlat  = $resource->getAttributes()->get(TraceAttributes::CLOUD_PLATFORM) ?? '';
         $serviceType= Matcher::getXRayCloudPlatform($cloudPlat);
 
         // ARN: ECS container ARN or Lambda faas.id

src/Sampler/Xray/test/Unit/AWSXRayRemoteSamplerTest.php renamed to src/Sampler/Xray/tests/Unit/AWSXRayRemoteSamplerTest.php

@@ -1,11 +1,12 @@
 <?php
+
 declare(strict_types=1);
 
-use PHPUnit\Framework\TestCase;
-use OpenTelemetry\Contrib\Sampler\Xray\AWSXRaySamplerClient;
 use GuzzleHttp\Psr7\Response;
-use OpenTelemetry\Contrib\Sampler\Xray\SamplingStatisticsDocument;
+use OpenTelemetry\Contrib\Sampler\Xray\AWSXRaySamplerClient;
 use OpenTelemetry\Contrib\Sampler\Xray\SamplingRule;
+use OpenTelemetry\Contrib\Sampler\Xray\SamplingStatisticsDocument;
+use PHPUnit\Framework\TestCase;
 
 final class AWSXRaySamplerClientTest extends TestCase
 {
@@ -92,12 +93,12 @@ public function testGetSamplingTargets(): void
 
         $t1 = $resp->SamplingTargetDocuments[0];
         $this->assertSame('test', $t1->RuleName);
-        $this->assertSame(30,     $t1->ReservoirQuota);
-        $this->assertSame(0.10,   $t1->FixedRate);
+        $this->assertSame(30, $t1->ReservoirQuota);
+        $this->assertSame(0.10, $t1->FixedRate);
 
         $t2 = $resp->SamplingTargetDocuments[1];
         $this->assertSame('Default', $t2->RuleName);
-        $this->assertSame(0,         $t2->ReservoirQuota);
-        $this->assertSame(0.05,      $t2->FixedRate);
+        $this->assertSame(0, $t2->ReservoirQuota);
+        $this->assertSame(0.05, $t2->FixedRate);
     }
 }