Fix psalm and cs

psalm.xml.dist

@@ -31,11 +31,11 @@
                 <directory name="./examples"/>
             </errorLevel>
         </ArgumentTypeCoercion>
-        <PossiblyUndefinedMethod>
+        <UndefinedInterfaceMethod>
             <errorLevel type="suppress">
                 <directory name="src/Config/SDK/ComponentProvider"/>
             </errorLevel>
-        </PossiblyUndefinedMethod>
+        </UndefinedInterfaceMethod>
         <PossiblyNullReference>
             <errorLevel type="suppress">
                 <directory name="src/Config/SDK/ComponentProvider"/>

src/Config/SDK/ComponentProvider/Logs/LogRecordExporterConsole.php

@@ -12,6 +12,9 @@
 use OpenTelemetry\SDK\Registry;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<LogRecordExporterInterface>
+ */
 final class LogRecordExporterConsole implements ComponentProvider
 {
 

src/Config/SDK/ComponentProvider/Logs/LogRecordExporterOtlp.php

@@ -17,6 +17,9 @@
 use OpenTelemetry\SDK\Registry;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<LogRecordExporterInterface>
+ */
 #[PackageDependency('open-telemetry/exporter-otlp', '^1.0.5')]
 final class LogRecordExporterOtlp implements ComponentProvider
 {

src/Config/SDK/ComponentProvider/Logs/LogRecordProcessorBatch.php

@@ -14,6 +14,9 @@
 use OpenTelemetry\SDK\Logs\Processor\BatchLogRecordProcessor;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<LogRecordProcessorInterface>
+ */
 final class LogRecordProcessorBatch implements ComponentProvider
 {
 

src/Config/SDK/ComponentProvider/Logs/LogRecordProcessorSimple.php

@@ -13,6 +13,9 @@
 use OpenTelemetry\SDK\Logs\Processor\SimpleLogRecordProcessor;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<LogRecordProcessorInterface>
+ */
 final class LogRecordProcessorSimple implements ComponentProvider
 {
 

src/Config/SDK/ComponentProvider/Metrics/AggregationResolverDefault.php

@@ -11,6 +11,9 @@
 use OpenTelemetry\SDK\Metrics\DefaultAggregationProviderTrait;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<DefaultAggregationProviderInterface>
+ */
 final class AggregationResolverDefault implements ComponentProvider
 {
 

src/Config/SDK/ComponentProvider/Metrics/MetricExporterConsole.php

@@ -11,6 +11,9 @@
 use OpenTelemetry\SDK\Metrics\MetricExporterInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<MetricExporterInterface>
+ */
 final class MetricExporterConsole implements ComponentProvider
 {
 

src/Config/SDK/ComponentProvider/Metrics/MetricExporterOtlp.php

@@ -18,6 +18,9 @@
 use OpenTelemetry\SDK\Registry;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<MetricExporterInterface>
+ */
 #[PackageDependency('open-telemetry/exporter-otlp', '^1.0.5')]
 final class MetricExporterOtlp implements ComponentProvider
 {

src/Config/SDK/ComponentProvider/Metrics/MetricReaderPeriodic.php

@@ -13,6 +13,9 @@
 use OpenTelemetry\SDK\Metrics\MetricReaderInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<MetricReaderInterface>
+ */
 final class MetricReaderPeriodic implements ComponentProvider
 {
 

src/Config/SDK/ComponentProvider/OpenTelemetrySdk.php

@@ -43,6 +43,8 @@
 
 /**
  * @internal
+ *
+ * @implements ComponentProvider<SdkBuilder>
  */
 final class OpenTelemetrySdk implements ComponentProvider
 {
@@ -82,7 +84,7 @@ final class OpenTelemetrySdk implements ComponentProvider
      *             },
      *             selector: array{
      *                 instrument_type: 'counter'|'histogram'|'observable_counter'|'observable_gauge'|'observable_up_down_counter'|'up_down_counter'|null,
-     *                 instrument_name: ?string,
+     *                 instrument_name: ?non-empty-string,
      *                 unit: ?string,
      *                 meter_name: ?string,
      *                 meter_version: ?string,
@@ -359,7 +361,7 @@ private function getMeterProviderConfig(ComponentProviderRegistry $registry): Ar
                                         ])
                                         ->defaultNull()
                                     ->end()
-                                    ->scalarNode('instrument_name')->defaultNull()->validate()->always(Validation::ensureString())->end()->end()
+                                    ->scalarNode('instrument_name')->defaultNull()->validate()->always(Validation::ensureString())->end()->cannotBeEmpty()->end()
                                     ->scalarNode('unit')->defaultNull()->validate()->always(Validation::ensureString())->end()->end()
                                     ->scalarNode('meter_name')->defaultNull()->validate()->always(Validation::ensureString())->end()->end()
                                     ->scalarNode('meter_version')->defaultNull()->validate()->always(Validation::ensureString())->end()->end()

src/Config/SDK/ComponentProvider/Propagator/TextMapPropagatorB3.php

@@ -12,6 +12,9 @@
 use OpenTelemetry\Extension\Propagator\B3\B3Propagator;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<TextMapPropagatorInterface>
+ */
 #[PackageDependency('open-telemetry/extension-propagator-b3', '^1.0.1')]
 final class TextMapPropagatorB3 implements ComponentProvider
 {

src/Config/SDK/ComponentProvider/Propagator/TextMapPropagatorB3Multi.php

@@ -12,6 +12,9 @@
 use OpenTelemetry\Extension\Propagator\B3\B3Propagator;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<TextMapPropagatorInterface>
+ */
 #[PackageDependency('open-telemetry/extension-propagator-b3', '^1.0.1')]
 final class TextMapPropagatorB3Multi implements ComponentProvider
 {

src/Config/SDK/ComponentProvider/Propagator/TextMapPropagatorBaggage.php

@@ -11,6 +11,9 @@
 use OpenTelemetry\Context\Propagation\TextMapPropagatorInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<TextMapPropagatorInterface>
+ */
 final class TextMapPropagatorBaggage implements ComponentProvider
 {
 

src/Config/SDK/ComponentProvider/Propagator/TextMapPropagatorComposite.php

@@ -12,6 +12,9 @@
 use OpenTelemetry\Context\Propagation\TextMapPropagatorInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<TextMapPropagatorInterface>
+ */
 final class TextMapPropagatorComposite implements ComponentProvider
 {
 

src/Config/SDK/ComponentProvider/Propagator/TextMapPropagatorJaeger.php

@@ -12,6 +12,9 @@
 use OpenTelemetry\Extension\Propagator\Jaeger\JaegerPropagator;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<TextMapPropagatorInterface>
+ */
 #[PackageDependency('open-telemetry/extension-propagator-jaeger', '^0.0.2')]
 final class TextMapPropagatorJaeger implements ComponentProvider
 {

src/Config/SDK/ComponentProvider/Propagator/TextMapPropagatorTraceContext.php

@@ -11,6 +11,9 @@
 use OpenTelemetry\Context\Propagation\TextMapPropagatorInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<TextMapPropagatorInterface>
+ */
 final class TextMapPropagatorTraceContext implements ComponentProvider
 {
 

src/Config/SDK/ComponentProvider/Trace/SamplerAlwaysOff.php

@@ -11,6 +11,9 @@
 use OpenTelemetry\SDK\Trace\SamplerInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<SamplerInterface>
+ */
 final class SamplerAlwaysOff implements ComponentProvider
 {
 

src/Config/SDK/ComponentProvider/Trace/SamplerAlwaysOn.php

@@ -11,6 +11,9 @@
 use OpenTelemetry\SDK\Trace\SamplerInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<SamplerInterface>
+ */
 final class SamplerAlwaysOn implements ComponentProvider
 {
 

src/Config/SDK/ComponentProvider/Trace/SamplerParentBased.php

@@ -14,6 +14,9 @@
 use OpenTelemetry\SDK\Trace\SamplerInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<SamplerInterface>
+ */
 final class SamplerParentBased implements ComponentProvider
 {
 

src/Config/SDK/ComponentProvider/Trace/SamplerTraceIdRatioBased.php

@@ -11,6 +11,9 @@
 use OpenTelemetry\SDK\Trace\SamplerInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<SamplerInterface>
+ */
 final class SamplerTraceIdRatioBased implements ComponentProvider
 {
 

src/Config/SDK/ComponentProvider/Trace/SpanExporterConsole.php

@@ -12,6 +12,9 @@
 use OpenTelemetry\SDK\Trace\SpanExporterInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<SpanExporterInterface>
+ */
 final class SpanExporterConsole implements ComponentProvider
 {
 

src/Config/SDK/ComponentProvider/Trace/SpanExporterOtlp.php

@@ -17,6 +17,9 @@
 use OpenTelemetry\SDK\Trace\SpanExporterInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<SpanExporterInterface>
+ */
 #[PackageDependency('open-telemetry/exporter-otlp', '^1.0.5')]
 final class SpanExporterOtlp implements ComponentProvider
 {

src/Config/SDK/ComponentProvider/Trace/SpanExporterZipkin.php

@@ -14,6 +14,9 @@
 use OpenTelemetry\SDK\Trace\SpanExporterInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<SpanExporterInterface>
+ */
 #[PackageDependency('open-telemetry/exporter-zipkin', '^1.0')]
 final class SpanExporterZipkin implements ComponentProvider
 {

src/Config/SDK/ComponentProvider/Trace/SpanProcessorBatch.php

@@ -14,6 +14,9 @@
 use OpenTelemetry\SDK\Trace\SpanProcessorInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<SpanProcessorInterface>
+ */
 final class SpanProcessorBatch implements ComponentProvider
 {
 

src/Config/SDK/ComponentProvider/Trace/SpanProcessorSimple.php

@@ -13,6 +13,9 @@
 use OpenTelemetry\SDK\Trace\SpanProcessorInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * @implements ComponentProvider<SpanProcessorInterface>
+ */
 final class SpanProcessorSimple implements ComponentProvider
 {
 

src/Config/SDK/Configuration.php

@@ -31,6 +31,9 @@ public function create(Context $context = new Context()): SdkBuilder
         return $this->sdkPlugin->create($context);
     }
 
+    /**
+     * @param string|list<string> $file
+     */
     public static function parseFile(
         string|array $file,
         ?string $cacheFile = null,

src/Contrib/Otlp/OtlpUtil.php

@@ -50,7 +50,7 @@ public static function path(string $signal, string $protocol): string
                 Signals::TRACE => '/v1/traces',
                 Signals::METRICS => '/v1/metrics',
                 Signals::LOGS => '/v1/logs',
-            }
+            },
         };
     }