next bunch of psalm fixes

Author: intuibase

src/Instrumentation/PDO/src/PDOInstrumentation.php

@@ -10,8 +10,8 @@
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\API\Trace\StatusCode;
 use OpenTelemetry\Context\Context;
-use OpenTelemetry\SDK\Common\Configuration\Configuration;
 use function OpenTelemetry\Instrumentation\hook;
+use OpenTelemetry\SDK\Common\Configuration\Configuration;
 use OpenTelemetry\SemConv\TraceAttributes;
 use OpenTelemetry\SemConv\Version;
 use PDO;
@@ -203,7 +203,8 @@ public static function register(): void
             pre: static function (PDOStatement $statement, array $params, string $class, string $function, ?string $filename, ?int $lineno) use ($pdoTracker, $instrumentation) {
                 $attributes = $pdoTracker->trackedAttributesForStatement($statement);
                 if (self::isDistributeStatementToLinkedSpansEnabled()) {
-                    $attributes[TraceAttributes::DB_STATEMENT] = $statement->queryString;
+                    /** @psalm-suppress InvalidArrayAssignment */
+                    $attributes[TraceAttributes::DB_QUERY_TEXT] = $statement->queryString;
                 }
                 /** @psalm-suppress ArgumentTypeCoercion */
                 $builder = self::makeBuilder($instrumentation, 'PDOStatement::fetchAll', $function, $class, $filename, $lineno)
@@ -228,9 +229,10 @@ public static function register(): void
                 $attributes = $pdoTracker->trackedAttributesForStatement($statement);
 
                 if (self::isDistributeStatementToLinkedSpansEnabled()) {
-                    $attributes[TraceAttributes::DB_STATEMENT] = $statement->queryString;
+                    /** @psalm-suppress InvalidArrayAssignment */
+                    $attributes[TraceAttributes::DB_QUERY_TEXT] = $statement->queryString;
                 }
-                
+
                 /** @psalm-suppress ArgumentTypeCoercion */
                 $builder = self::makeBuilder($instrumentation, 'PDOStatement::execute', $function, $class, $filename, $lineno)
                     ->setSpanKind(SpanKind::KIND_CLIENT)
@@ -285,6 +287,6 @@ private static function isDistributeStatementToLinkedSpansEnabled(): bool
             return Configuration::getBoolean('OTEL_PHP_INSTRUMENTATION_PDO_DISTRIBUTE_STATEMENT_TO_LINKED_SPANS', false);
         }
 
-        return get_cfg_var('otel.instrumentation.pdo.distribute_statement_to_linked_spans');
+        return filter_var(get_cfg_var('otel.instrumentation.pdo.distribute_statement_to_linked_spans'), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) ?? false;
     }
 }

src/Sampler/RuleBased/src/ComponentProvider/SamplerRuleBased.php

@@ -52,6 +52,8 @@ public function createPlugin(array $properties, Context $context): SamplerInterf
     public function getConfig(ComponentProviderRegistry $registry): ArrayNodeDefinition
     {
         $node = new ArrayNodeDefinition('contrib_rule_based');
+
+        /** @psalm-suppress PossiblyNullReference */
         $node
             ->children()
                 ->arrayNode('rule_sets')

src/Sampler/RuleBased/src/ComponentProvider/SamplingRuleAttribute.php

@@ -36,6 +36,8 @@ public function createPlugin(array $properties, Context $context): SamplingRule
     public function getConfig(ComponentProviderRegistry $registry): ArrayNodeDefinition
     {
         $node = new ArrayNodeDefinition('attribute');
+
+        /** @psalm-suppress PossiblyNullReference */
         $node
             ->children()
                 ->scalarNode('key')

src/Sampler/RuleBased/src/ComponentProvider/SamplingRuleLink.php

@@ -34,6 +34,8 @@ public function createPlugin(array $properties, Context $context): SamplingRule
     public function getConfig(ComponentProviderRegistry $registry): ArrayNodeDefinition
     {
         $node = new ArrayNodeDefinition('link');
+
+        /** @psalm-suppress PossiblyNullReference */
         $node
             ->children()
                 ->booleanNode('sampled')->isRequired()->end()

src/Sampler/RuleBased/src/ComponentProvider/SamplingRuleParent.php

@@ -34,6 +34,8 @@ public function createPlugin(array $properties, Context $context): SamplingRule
     public function getConfig(ComponentProviderRegistry $registry): ArrayNodeDefinition
     {
         $node = new ArrayNodeDefinition('parent');
+
+        /** @psalm-suppress PossiblyNullReference */
         $node
             ->children()
                 ->booleanNode('sampled')->isRequired()->end()

src/Sampler/RuleBased/src/ComponentProvider/SamplingRuleSpanKind.php

@@ -39,6 +39,8 @@ public function createPlugin(array $properties, Context $context): SamplingRule
     public function getConfig(ComponentProviderRegistry $registry): ArrayNodeDefinition
     {
         $node = new ArrayNodeDefinition('span_kind');
+
+        /** @psalm-suppress PossiblyNullReference */
         $node
             ->children()
                 ->enumNode('kind')

src/Sampler/RuleBased/src/ComponentProvider/SamplingRuleSpanName.php

@@ -34,6 +34,8 @@ public function createPlugin(array $properties, Context $context): SamplingRule
     public function getConfig(ComponentProviderRegistry $registry): ArrayNodeDefinition
     {
         $node = new ArrayNodeDefinition('span_name');
+
+        /** @psalm-suppress PossiblyNullReference */
         $node
             ->children()
                 ->scalarNode('pattern')