move temporality into own interface (#1098)

per TC review, temporality is not part of MetricExporterInterface. Riffing on Java's solution, this moves
`temporality` into `AggregationTemporalitySelectorInterface`, and adds that interface to MetricExporter instances
that use it (everything except `NoopMetricExporter`).

Author: brettmc

src/Contrib/Otlp/MetricExporter.php

@@ -7,6 +7,7 @@
 use OpenTelemetry\API\Behavior\LogsMessagesTrait;
 use Opentelemetry\Proto\Collector\Metrics\V1\ExportMetricsServiceResponse;
 use OpenTelemetry\SDK\Common\Export\TransportInterface;
+use OpenTelemetry\SDK\Metrics\AggregationTemporalitySelectorInterface;
 use OpenTelemetry\SDK\Metrics\Data\Temporality;
 use OpenTelemetry\SDK\Metrics\MetricMetadataInterface;
 use OpenTelemetry\SDK\Metrics\PushMetricExporterInterface;
@@ -18,7 +19,7 @@
  * @see https://github.com/open-telemetry/opentelemetry-specification/blob/main/experimental/serialization/json.md#json-file-serialization
  * @psalm-import-type SUPPORTED_CONTENT_TYPES from ProtobufSerializer
  */
-final class MetricExporter implements PushMetricExporterInterface
+final class MetricExporter implements PushMetricExporterInterface, AggregationTemporalitySelectorInterface
 {
     use LogsMessagesTrait;
 

src/SDK/Metrics/AggregationTemporalitySelectorInterface.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenTelemetry\SDK\Metrics;
+
+use OpenTelemetry\SDK\Metrics\Data\Temporality;
+
+interface AggregationTemporalitySelectorInterface
+{
+    /**
+     * Returns the temporality to use for the given metric.
+     *
+     * It is recommended to return {@see MetricMetadataInterface::temporality()}
+     * if the exporter does not require a specific temporality.
+     *
+     * @return string|Temporality|null temporality to use, or null to signal
+     *         that the given metric should not be exported by this exporter
+     */
+    public function temporality(MetricMetadataInterface $metric);
+}

src/SDK/Metrics/MetricExporter/ConsoleMetricExporter.php

@@ -5,6 +5,7 @@
 namespace OpenTelemetry\SDK\Metrics\MetricExporter;
 
 use OpenTelemetry\SDK\Common\Instrumentation\InstrumentationScopeInterface;
+use OpenTelemetry\SDK\Metrics\AggregationTemporalitySelectorInterface;
 use OpenTelemetry\SDK\Metrics\Data\Metric;
 use OpenTelemetry\SDK\Metrics\Data\Temporality;
 use OpenTelemetry\SDK\Metrics\MetricMetadataInterface;
@@ -15,7 +16,7 @@
  * Console metrics exporter.
  * Note that the output is human-readable JSON, not compatible with OTLP.
  */
-class ConsoleMetricExporter implements PushMetricExporterInterface
+class ConsoleMetricExporter implements PushMetricExporterInterface, AggregationTemporalitySelectorInterface
 {
     /**
      * @var string|Temporality|null

src/SDK/Metrics/MetricExporter/InMemoryExporter.php

@@ -5,6 +5,7 @@
 namespace OpenTelemetry\SDK\Metrics\MetricExporter;
 
 use function array_push;
+use OpenTelemetry\SDK\Metrics\AggregationTemporalitySelectorInterface;
 use OpenTelemetry\SDK\Metrics\Data\Metric;
 use OpenTelemetry\SDK\Metrics\Data\Temporality;
 use OpenTelemetry\SDK\Metrics\MetricExporterInterface;
@@ -13,7 +14,7 @@
 /**
  * @see https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/sdk_exporters/in-memory.md
  */
-final class InMemoryExporter implements MetricExporterInterface
+final class InMemoryExporter implements MetricExporterInterface, AggregationTemporalitySelectorInterface
 {
     /**
      * @var list<Metric>

src/SDK/Metrics/MetricExporter/NoopMetricExporter.php

@@ -5,19 +5,9 @@
 namespace OpenTelemetry\SDK\Metrics\MetricExporter;
 
 use OpenTelemetry\SDK\Metrics\MetricExporterInterface;
-use OpenTelemetry\SDK\Metrics\MetricMetadataInterface;
 
 class NoopMetricExporter implements MetricExporterInterface
 {
-
-    /**
-     * @inheritDoc
-     */
-    public function temporality(MetricMetadataInterface $metric)
-    {
-        return $metric->temporality();
-    }
-
     /**
      * @inheritDoc
      */

src/SDK/Metrics/MetricExporterInterface.php

@@ -5,21 +5,9 @@
 namespace OpenTelemetry\SDK\Metrics;
 
 use OpenTelemetry\SDK\Metrics\Data\Metric;
-use OpenTelemetry\SDK\Metrics\Data\Temporality;
 
 interface MetricExporterInterface
 {
-    /**
-     * Returns the temporality to use for the given metric.
-     *
-     * It is recommended to return {@see MetricMetadataInterface::temporality()}
-     * if the exporter does not require a specific temporality.
-     *
-     * @return string|Temporality|null temporality to use, or null to signal
-     *         that the given metric should not be exported by this exporter
-     */
-    public function temporality(MetricMetadataInterface $metric);
-
     /**
      * @param iterable<int, Metric> $batch
      */

src/SDK/Metrics/MetricReader/ExportingReader.php

@@ -6,6 +6,7 @@
 
 use function array_keys;
 use OpenTelemetry\SDK\Metrics\AggregationInterface;
+use OpenTelemetry\SDK\Metrics\AggregationTemporalitySelectorInterface;
 use OpenTelemetry\SDK\Metrics\DefaultAggregationProviderInterface;
 use OpenTelemetry\SDK\Metrics\DefaultAggregationProviderTrait;
 use OpenTelemetry\SDK\Metrics\MetricExporterInterface;
@@ -54,6 +55,9 @@ public function add(MetricSourceProviderInterface $provider, MetricMetadataInter
         if ($this->closed) {
             return;
         }
+        if (!$this->exporter instanceof AggregationTemporalitySelectorInterface) {
+            return;
+        }
         if (!$temporality = $this->exporter->temporality($metadata)) {
             return;
         }

tests/Unit/Contrib/Otlp/MetricExporterFactoryTest.php

@@ -10,6 +10,7 @@
 use OpenTelemetry\SDK\Common\Configuration\Variables;
 use OpenTelemetry\SDK\Common\Export\TransportFactoryInterface;
 use OpenTelemetry\SDK\Common\Export\TransportInterface;
+use OpenTelemetry\SDK\Metrics\AggregationTemporalitySelectorInterface;
 use OpenTelemetry\SDK\Metrics\Data\Temporality;
 use OpenTelemetry\SDK\Metrics\MetricMetadataInterface;
 use PHPUnit\Framework\TestCase;
@@ -59,6 +60,7 @@ public function test_create_with_temporality(array $env, ?string $expected): voi
         $factory = new MetricExporterFactory($this->transportFactory);
         $exporter = $factory->create();
 
+        $this->assertInstanceOf(AggregationTemporalitySelectorInterface::class, $exporter);
         $this->assertSame($expected, $exporter->temporality($this->createMock(MetricMetadataInterface::class)));
     }
 

tests/Unit/SDK/Metrics/MetricReader/ExportingReaderTest.php

@@ -8,6 +8,7 @@
 use OpenTelemetry\SDK\Metrics\Aggregation\ExplicitBucketHistogramAggregation;
 use OpenTelemetry\SDK\Metrics\Aggregation\LastValueAggregation;
 use OpenTelemetry\SDK\Metrics\Aggregation\SumAggregation;
+use OpenTelemetry\SDK\Metrics\AggregationTemporalitySelectorInterface;
 use OpenTelemetry\SDK\Metrics\Data\DataInterface;
 use OpenTelemetry\SDK\Metrics\Data\Metric;
 use OpenTelemetry\SDK\Metrics\Data\Temporality;
@@ -78,7 +79,6 @@ public function test_add_creates_metric_source_with_exporter_temporality(): void
     public function test_add_does_not_create_metric_source_if_exporter_temporality_null(): void
     {
         $exporter = $this->createMock(MetricExporterInterface::class);
-        $exporter->method('temporality')->willReturn(null);
         $reader = new ExportingReader($exporter);
 
         $provider = $this->createMock(MetricSourceProviderInterface::class);
@@ -168,7 +168,7 @@ public function test_shutdown_does_not_export_empty_metrics(): void
 
     public function test_shutdown_exports_metrics(): void
     {
-        $exporter = $this->createMock(MetricExporterInterface::class);
+        $exporter = $this->createMock(MetricExporterWithTemporalityInterface::class);
         $provider = $this->createMock(MetricSourceProviderInterface::class);
         $source = $this->createMock(MetricSourceInterface::class);
         $source->method('collect')->willReturn($this->createMock(Metric::class));
@@ -224,3 +224,7 @@ public function test_closed_reader_does_not_call_exporter_methods(): void
 interface DefaultAggregationProviderExporterInterface extends MetricExporterInterface, DefaultAggregationProviderInterface
 {
 }
+
+interface MetricExporterWithTemporalityInterface extends MetricExporterInterface, AggregationTemporalitySelectorInterface
+{
+}