Add support for concurrent exports (#790)

Nevay · web-flow · commit d0a600fb6803 · 2022-08-10T08:11:47.000-04:00
* Add support for concurrent exports

* Remove cancellation support from `::await()`
diff --git a/src/SDK/Common/Future/CompletedFuture.php b/src/SDK/Common/Future/CompletedFuture.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenTelemetry\SDK\Common\Future;
+
+/**
+ * @template T
+ * @template-implements FutureInterface<T>
+ */
+final class CompletedFuture implements FutureInterface
+{
+    /** @var T */
+    private $value;
+
+    /**
+     * @param T $value
+     */
+    public function __construct($value)
+    {
+        $this->value = $value;
+    }
+
+    public function await()
+    {
+        return $this->value;
+    }
+}
diff --git a/src/SDK/Common/Future/FutureInterface.php b/src/SDK/Common/Future/FutureInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenTelemetry\SDK\Common\Future;
+
+/**
+ * @template T
+ */
+interface FutureInterface
+{
+    /**
+     * @psalm-return T
+     */
+    public function await();
+}
diff --git a/src/SDK/Trace/Behavior/SpanExporterDecoratorTrait.php b/src/SDK/Trace/Behavior/SpanExporterDecoratorTrait.php
@@ -5,6 +5,7 @@
 namespace OpenTelemetry\SDK\Trace\Behavior;
 
 use OpenTelemetry\SDK\Common\Future\CancellationInterface;
+use OpenTelemetry\SDK\Common\Future\FutureInterface;
 use OpenTelemetry\SDK\Trace\SpanDataInterface;
 use OpenTelemetry\SDK\Trace\SpanExporterInterface;
 
@@ -14,16 +15,15 @@ trait SpanExporterDecoratorTrait
 
     /**
      * @param iterable<SpanDataInterface> $spans
-     * @return int
-     * @psalm-return SpanExporterInterface::STATUS_*
+     * @return FutureInterface<int>
      */
-    public function export(iterable $spans, ?CancellationInterface $cancellation = null): int
+    public function export(iterable $spans, ?CancellationInterface $cancellation = null): FutureInterface
     {
         $response = $this->decorated->export(
             $this->beforeExport($spans),
             $cancellation,
         );
-        $this->afterExport($spans, $response);
+        $this->afterExport($spans, $response->await());
 
         return $response;
     }
diff --git a/src/SDK/Trace/Behavior/SpanExporterTrait.php b/src/SDK/Trace/Behavior/SpanExporterTrait.php
@@ -5,6 +5,8 @@
 namespace OpenTelemetry\SDK\Trace\Behavior;
 
 use OpenTelemetry\SDK\Common\Future\CancellationInterface;
+use OpenTelemetry\SDK\Common\Future\CompletedFuture;
+use OpenTelemetry\SDK\Common\Future\FutureInterface;
 use OpenTelemetry\SDK\Trace\SpanDataInterface;
 use OpenTelemetry\SDK\Trace\SpanExporterInterface;
 
@@ -29,19 +31,16 @@ public function forceFlush(?CancellationInterface $cancellation = null): bool
     abstract public static function fromConnectionString(string $endpointUrl, string $name, string $args);
 
     /**
-     * @param iterable<SpanDataInterface> $spans Batch of spans to export
-     *
-     * @see https://github.com/open-telemetry/opentelemetry-specification/blob/v1.7.0/specification/trace/sdk.md#exportbatch
-     *
-     * @psalm-return SpanExporterInterface::STATUS_*
+     * @param iterable<SpanDataInterface> $spans
+     * @return FutureInterface<int>
      */
-    public function export(iterable $spans, ?CancellationInterface $cancellation = null): int
+    public function export(iterable $spans, ?CancellationInterface $cancellation = null): FutureInterface
     {
         if (!$this->running) {
-            return SpanExporterInterface::STATUS_FAILED_NOT_RETRYABLE;
+            return new CompletedFuture(SpanExporterInterface::STATUS_FAILED_NOT_RETRYABLE);
         }
 
-        return $this->doExport($spans); /** @phpstan-ignore-line */
+        return new CompletedFuture($this->doExport($spans)); /** @phpstan-ignore-line */
     }
 
     /**
diff --git a/src/SDK/Trace/SpanExporterInterface.php b/src/SDK/Trace/SpanExporterInterface.php
@@ -5,6 +5,7 @@
 namespace OpenTelemetry\SDK\Trace;
 
 use OpenTelemetry\SDK\Common\Future\CancellationInterface;
+use OpenTelemetry\SDK\Common\Future\FutureInterface;
 
 /**
  * @see https://github.com/open-telemetry/opentelemetry-specification/blob/v1.7.0/specification/trace/sdk.md#span-exporter
@@ -25,9 +26,9 @@ public static function fromConnectionString(string $endpointUrl, string $name, s
      *
      * @see https://github.com/open-telemetry/opentelemetry-specification/blob/v1.7.0/specification/trace/sdk.md#exportbatch
      *
-     * @psalm-return SpanExporterInterface::STATUS_*
+     * @psalm-return FutureInterface<int>
      */
-    public function export(iterable $spans, ?CancellationInterface $cancellation = null): int;
+    public function export(iterable $spans, ?CancellationInterface $cancellation = null): FutureInterface;
 
     /** @see https://github.com/open-telemetry/opentelemetry-specification/blob/v1.7.0/specification/trace/sdk.md#shutdown-2 */
     public function shutdown(?CancellationInterface $cancellation = null): bool;
diff --git a/src/SDK/Trace/SpanProcessor/BatchSpanProcessor.php b/src/SDK/Trace/SpanProcessor/BatchSpanProcessor.php
@@ -105,7 +105,7 @@ public function forceFlush(?CancellationInterface $cancellation = null): bool
             return true;
         }
 
-        $this->exporter->export($this->queue);
+        $this->exporter->export($this->queue)->await();
         $this->queue = [];
         $this->stopwatch->reset();
         $this->exporter->forceFlush();
diff --git a/src/SDK/Trace/SpanProcessor/SimpleSpanProcessor.php b/src/SDK/Trace/SpanProcessor/SimpleSpanProcessor.php
@@ -37,7 +37,7 @@ public function onEnd(ReadableSpanInterface $span): void
         }
 
         if (null !== $this->exporter) {
-            $this->exporter->export([$span->toSpanData()]);
+            $this->exporter->export([$span->toSpanData()])->await();
         }
     }
 
diff --git a/tests/Unit/Contrib/AbstractHttpExporterTest.php b/tests/Unit/Contrib/AbstractHttpExporterTest.php
@@ -53,7 +53,7 @@ public function test_exporter_response_status($responseStatus, $expected): void
             $expected,
             $this->createExporter()->export([
                 $this->createMock(SpanData::class),
-            ])
+            ])->await(),
         );
     }
 
@@ -107,7 +107,7 @@ public function test_client_exception_decides_return_code($exception, $expected)
             $expected,
             $this->createExporter()->export([
                 $this->createMock(SpanData::class),
-            ])
+            ])->await(),
         );
     }
 
diff --git a/tests/Unit/Contrib/AgentExporterTest.php b/tests/Unit/Contrib/AgentExporterTest.php
@@ -2,18 +2,18 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\Tests\Contrib\Unit;
+namespace OpenTelemetry\Tests\Unit\Contrib;
 
 use OpenTelemetry\Contrib\Jaeger\AgentExporter;
 use OpenTelemetry\SDK\Trace\SpanExporterInterface;
 use OpenTelemetry\Tests\Unit\SDK\Util\SpanData;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers OpenTelemetry\Contrib\Jaeger\AgentExporter
- * @covers OpenTelemetry\Contrib\Jaeger\JaegerTransport
- * @covers OpenTelemetry\Contrib\Jaeger\ThriftUdpTransport
- * @covers OpenTelemetry\Contrib\Jaeger\ParsedEndpointUrl
+ * @covers \OpenTelemetry\Contrib\Jaeger\AgentExporter
+ * @covers \OpenTelemetry\Contrib\Jaeger\JaegerTransport
+ * @covers \OpenTelemetry\Contrib\Jaeger\ThriftUdpTransport
+ * @covers \OpenTelemetry\Contrib\Jaeger\ParsedEndpointUrl
  */
 class AgentExporterTest extends TestCase
 {
@@ -24,7 +24,7 @@ public function test_happy_path()
             'someServiceName',
         );
 
-        $status = $exporter->export([new SpanData()]);
+        $status = $exporter->export([new SpanData()])->await();
 
         $this->assertSame(SpanExporterInterface::STATUS_SUCCESS, $status);
 
diff --git a/tests/Unit/Contrib/JaegerHttpCollectorExporterTest.php b/tests/Unit/Contrib/JaegerHttpCollectorExporterTest.php
@@ -10,12 +10,12 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers OpenTelemetry\Contrib\Jaeger\HttpCollectorExporter
- * @covers OpenTelemetry\Contrib\Jaeger\HttpSender
- * @covers OpenTelemetry\Contrib\Jaeger\ThriftHttpTransport
- * @covers OpenTelemetry\Contrib\Jaeger\ParsedEndpointUrl
- * @covers OpenTelemetry\Contrib\Jaeger\BatchAdapter\BatchAdapter
- * @covers OpenTelemetry\Contrib\Jaeger\BatchAdapter\BatchAdapterFactory
+ * @covers \OpenTelemetry\Contrib\Jaeger\HttpCollectorExporter
+ * @covers \OpenTelemetry\Contrib\Jaeger\HttpSender
+ * @covers \OpenTelemetry\Contrib\Jaeger\ThriftHttpTransport
+ * @covers \OpenTelemetry\Contrib\Jaeger\ParsedEndpointUrl
+ * @covers \OpenTelemetry\Contrib\Jaeger\BatchAdapter\BatchAdapter
+ * @covers \OpenTelemetry\Contrib\Jaeger\BatchAdapter\BatchAdapterFactory
  *
  */
 class JaegerHttpCollectorExporterTest extends TestCase
@@ -35,7 +35,7 @@ public function test_happy_path()
             $this->getStreamFactoryInterfaceMock()
         );
 
-        $status = $exporter->export([new SpanData()]);
+        $status = $exporter->export([new SpanData()])->await();
 
         $this->assertSame(SpanExporterInterface::STATUS_SUCCESS, $status);
     }
diff --git a/tests/Unit/Contrib/OTLPGrpcExporterTest.php b/tests/Unit/Contrib/OTLPGrpcExporterTest.php
@@ -16,7 +16,7 @@
 use org\bovigo\vfs\vfsStream;
 
 /**
- * @covers OpenTelemetry\Contrib\OtlpGrpc\Exporter
+ * @covers \OpenTelemetry\Contrib\OtlpGrpc\Exporter
  */
 class OTLPGrpcExporterTest extends AbstractExporterTest
 {
@@ -55,7 +55,7 @@ public function test_exporter_happy_path(): void
             ])
         );
 
-        $exporterStatusCode = $exporter->export([new SpanData()]);
+        $exporterStatusCode = $exporter->export([new SpanData()])->await();
 
         $this->assertSame(SpanExporterInterface::STATUS_SUCCESS, $exporterStatusCode);
     }
@@ -80,14 +80,14 @@ public function test_exporter_unexpected_grpc_response_status(): void
             ])
         );
 
-        $exporterStatusCode = $exporter->export([new SpanData()]);
+        $exporterStatusCode = $exporter->export([new SpanData()])->await();
 
         $this->assertSame(SpanExporterInterface::STATUS_FAILED_NOT_RETRYABLE, $exporterStatusCode);
     }
 
     public function test_exporter_grpc_responds_as_unavailable(): void
     {
-        $this->assertEquals(SpanExporterInterface::STATUS_FAILED_RETRYABLE, (new Exporter())->export([new SpanData()]));
+        $this->assertEquals(SpanExporterInterface::STATUS_FAILED_RETRYABLE, (new Exporter())->export([new SpanData()])->await());
     }
 
     public function test_set_headers_with_environment_variables(): void
diff --git a/tests/Unit/Contrib/OTLPHttpExporterTest.php b/tests/Unit/Contrib/OTLPHttpExporterTest.php
@@ -21,7 +21,7 @@
 use Psr\Http\Client\NetworkExceptionInterface;
 
 /**
- * @covers OpenTelemetry\Contrib\OtlpHttp\Exporter
+ * @covers \OpenTelemetry\Contrib\OtlpHttp\Exporter
  */
 class OTLPHttpExporterTest extends AbstractExporterTest
 {
@@ -59,7 +59,7 @@ public function test_exporter_response_status($responseStatus, $expected): void
 
         $this->assertEquals(
             $expected,
-            $exporter->export([new SpanData()])
+            $exporter->export([new SpanData()])->await(),
         );
     }
 
@@ -90,7 +90,7 @@ public function test_client_exceptions_should_decide_return_code($exception, $ex
 
         $this->assertEquals(
             $expected,
-            $exporter->export([new SpanData()])
+            $exporter->export([new SpanData()])->await(),
         );
     }
 
@@ -129,7 +129,7 @@ public function test_exporter_with_config_via_env_vars(?string $endpoint, string
         $client = new Client(['handler' => $stack]);
         $exporter = new Exporter($client, new HttpFactory(), new HttpFactory());
 
-        $exporter->export([new SpanData()]);
+        $exporter->export([new SpanData()])->await();
 
         $request = $container[0]['request'];
 
@@ -164,7 +164,7 @@ public function test_should_be_ok_to_exporter_empty_spans_collection(): void
                 $this->getClientInterfaceMock(),
                 $this->getRequestFactoryInterfaceMock(),
                 $this->getStreamFactoryInterfaceMock()
-            ))->export([])
+            ))->export([])->await(),
         );
     }
 
diff --git a/tests/Unit/SDK/Trace/SpanExporter/AbstractExporterTest.php b/tests/Unit/SDK/Trace/SpanExporter/AbstractExporterTest.php
@@ -38,6 +38,6 @@ public function test_fails_if_not_test_running(): void
         $span = $this->createMock(SpanData::class);
         $exporter->shutdown();
 
-        $this->assertSame(SpanExporterInterface::STATUS_FAILED_NOT_RETRYABLE, $exporter->export([$span]));
+        $this->assertSame(SpanExporterInterface::STATUS_FAILED_NOT_RETRYABLE, $exporter->export([$span])->await());
     }
 }
diff --git a/tests/Unit/SDK/Trace/SpanExporter/ConsoleSpanExporterTest.php b/tests/Unit/SDK/Trace/SpanExporter/ConsoleSpanExporterTest.php
@@ -10,7 +10,7 @@
 use OpenTelemetry\SDK\Trace\SpanExporterInterface;
 
 /**
- * @covers OpenTelemetry\SDK\Trace\SpanExporter\ConsoleSpanExporter
+ * @covers \OpenTelemetry\SDK\Trace\SpanExporter\ConsoleSpanExporter
  */
 class ConsoleSpanExporterTest extends AbstractExporterTest
 {
@@ -64,7 +64,7 @@ public function test_export_success(): void
             SpanExporterInterface::STATUS_SUCCESS,
             (new ConsoleSpanExporter($converter))->export([
                 $this->createMock(SpanDataInterface::class),
-            ])
+            ])->await(),
         );
 
         ob_end_clean();
@@ -84,7 +84,7 @@ public function test_export_failed(): void
             SpanExporterInterface::STATUS_FAILED_NOT_RETRYABLE,
             (new ConsoleSpanExporter($converter))->export([
                 $this->createMock(SpanDataInterface::class),
-            ])
+            ])->await(),
         );
 
         ob_end_clean();
@@ -108,7 +108,7 @@ public function test_export_output(): void
 
         (new ConsoleSpanExporter($converter))->export([
             $this->createMock(SpanDataInterface::class),
-        ]);
+        ])->await();
     }
 
     public function test_from_connection_string(): void
diff --git a/tests/Unit/SDK/Trace/SpanExporter/LoggerDecoratorTest.php b/tests/Unit/SDK/Trace/SpanExporter/LoggerDecoratorTest.php
diff --git a/tests/Unit/SDK/Trace/SpanExporter/LoggerExporterTest.php b/tests/Unit/SDK/Trace/SpanExporter/LoggerExporterTest.php
diff --git a/tests/Unit/SDK/Trace/SpanProcessor/BatchSpanProcessorTest.php b/tests/Unit/SDK/Trace/SpanProcessor/BatchSpanProcessorTest.php
diff --git a/tests/Unit/SDK/Trace/SpanProcessor/SimpleSpanProcessorTest.php b/tests/Unit/SDK/Trace/SpanProcessor/SimpleSpanProcessorTest.php

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function forceFlush(?CancellationInterface $cancellation = null): bool`
`105`	`105`	`return true;`
`106`	`106`	`}`
`107`	`107`
`108`		`- $this->exporter->export($this->queue);`
	`108`	`+ $this->exporter->export($this->queue)->await();`
`109`	`109`	`$this->queue = [];`
`110`	`110`	`$this->stopwatch->reset();`
`111`	`111`	`$this->exporter->forceFlush();`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function onEnd(ReadableSpanInterface $span): void`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`if (null !== $this->exporter) {`
`40`		`- $this->exporter->export([$span->toSpanData()]);`
	`40`	`+ $this->exporter->export([$span->toSpanData()])->await();`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`