move dummy component providers to tests dir

open-telemetry · Dec 17, 2024 · a9649f5 · a9649f5
1 parent b38bee9
commit a9649f5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -38,6 +38,7 @@ parameters:
             message: "#Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeParentInterface::.*#"
             paths:
                 - src/Config/SDK
+                - tests/Integration/Config
         -
             message: "#Cannot call method .* on null#"
             paths:

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -40,6 +40,7 @@
         <UndefinedInterfaceMethod>
             <errorLevel type="suppress">
                 <directory name="src/Config/SDK/ComponentProvider"/>
+                <directory name="tests/Integration/Config/ComponentProvider"/>
             </errorLevel>
         </UndefinedInterfaceMethod>
         <PossiblyNullReference>
@@ -50,6 +51,7 @@
         <MoreSpecificImplementedParamType>
             <errorLevel type="suppress">
                 <directory name="src/Config/SDK/ComponentProvider"/>
+                <directory name="tests/Integration/Config/ComponentProvider"/>
             </errorLevel>
         </MoreSpecificImplementedParamType>
         <InvalidDocblock>

diff --git a/...tegration/Config/ComponentProvider/Metrics/AggregationResolverExplicitBucketHistogram.php b/...tegration/Config/ComponentProvider/Metrics/AggregationResolverExplicitBucketHistogram.php
@@ -26,7 +26,6 @@ final class AggregationResolverExplicitBucketHistogram implements ComponentProvi
      */
     public function createPlugin(array $properties, Context $context): DefaultAggregationProviderInterface
     {
-        // TODO Implement proper aggregation providers (default, drop, explicit_bucket_histogram, last_value, sum) to handle advisory
         return new class() implements DefaultAggregationProviderInterface {
             use DefaultAggregationProviderTrait;
         };
@@ -38,9 +37,11 @@ public function getConfig(ComponentProviderRegistry $registry): ArrayNodeDefinit
         $node
             ->children()
                 ->arrayNode('boundaries')
-                    ->prototype('scalar')->validate()->always(Validation::ensureNumber())->end()->end()
+                    ->prototype('scalar')
+                        ->validate()->always(Validation::ensureNumber())->end()
+                    ->end()
                 ->end()
-                ->booleanNode('record_min_max')->defaultValue(false)->end()
+                ->booleanNode('record_min_max')->defaultTrue()->end()
             ->end();
 
         return $node;

diff --git a/tests/Integration/Config/ComponentProvider/Metrics/MetricExporterPrometheus.php b/tests/Integration/Config/ComponentProvider/Metrics/MetricExporterPrometheus.php
@@ -4,12 +4,10 @@
 
 namespace OpenTelemetry\Tests\Integration\Config\ComponentProvider\Metrics;
 
-use OpenTelemetry\API\Behavior\LogsMessagesTrait;
 use OpenTelemetry\Config\SDK\Configuration\ComponentProvider;
 use OpenTelemetry\Config\SDK\Configuration\ComponentProviderRegistry;
 use OpenTelemetry\Config\SDK\Configuration\Context;
 use OpenTelemetry\Config\SDK\Configuration\Validation;
-use OpenTelemetry\SDK\Metrics\MetricExporter\NoopMetricExporter;
 use OpenTelemetry\SDK\Metrics\MetricExporterInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
@@ -33,7 +31,7 @@ final class MetricExporterPrometheus implements ComponentProvider
      */
     public function createPlugin(array $properties, Context $context): MetricExporterInterface
     {
-        return new class implements MetricExporterInterface {
+        return new class() implements MetricExporterInterface {
 
             public function export(iterable $batch): bool
             {
@@ -68,6 +66,7 @@ public function getConfig(ComponentProviderRegistry $registry): ArrayNodeDefinit
                         ->end()
                     ->end()
                 ->end()
+            ->end()
         ;
 
         return $node;

diff --git a/tests/Integration/Config/ComponentProvider/Metrics/MetricReaderPull.php b/tests/Integration/Config/ComponentProvider/Metrics/MetricReaderPull.php
@@ -4,13 +4,11 @@
 
 namespace OpenTelemetry\Tests\Integration\Config\ComponentProvider\Metrics;
 
-use OpenTelemetry\API\Behavior\LogsMessagesTrait;
 use OpenTelemetry\Config\SDK\Configuration\ComponentPlugin;
 use OpenTelemetry\Config\SDK\Configuration\ComponentProvider;
 use OpenTelemetry\Config\SDK\Configuration\ComponentProviderRegistry;
 use OpenTelemetry\Config\SDK\Configuration\Context;
 use OpenTelemetry\SDK\Metrics\MetricExporterInterface;
-use OpenTelemetry\SDK\Metrics\MetricReader\NoopReader;
 use OpenTelemetry\SDK\Metrics\MetricReaderInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
@@ -27,7 +25,7 @@ final class MetricReaderPull implements ComponentProvider
      */
     public function createPlugin(array $properties, Context $context): MetricReaderInterface
     {
-        return new class implements MetricReaderInterface {
+        return new class() implements MetricReaderInterface {
 
             public function collect(): bool
             {
@@ -54,6 +52,7 @@ public function getConfig(ComponentProviderRegistry $registry): ArrayNodeDefinit
                 ->append($registry->component('exporter', MetricExporterInterface::class)->isRequired())
                 ->arrayNode('producers') //@todo
                     ->variablePrototype()->end()
+                ->end()
             ->end()
         ;
 

diff --git a/tests/Integration/Config/ComponentProvider/Propagator/TextMapPropagatorOtTrace.php b/tests/Integration/Config/ComponentProvider/Propagator/TextMapPropagatorOtTrace.php
@@ -21,7 +21,7 @@ final class TextMapPropagatorOtTrace implements ComponentProvider
 {
     public function createPlugin(array $properties, Context $context): TextMapPropagatorInterface
     {
-        return new class implements TextMapPropagatorInterface {
+        return new class() implements TextMapPropagatorInterface {
 
             public function fields(): array
             {

diff --git a/tests/Integration/Config/ComponentProvider/Propagator/TextMapPropagatorXray.php b/tests/Integration/Config/ComponentProvider/Propagator/TextMapPropagatorXray.php
@@ -21,7 +21,7 @@ final class TextMapPropagatorXray implements ComponentProvider
 {
     public function createPlugin(array $properties, Context $context): TextMapPropagatorInterface
     {
-        return new class implements TextMapPropagatorInterface {
+        return new class() implements TextMapPropagatorInterface {
 
             public function fields(): array
             {