Fixing tests (#189)

* Fixing Logs/Monolog. * Fixing Aws\Xray. * Fixing PropagatorTest. * Fixing MongoDBInstrumentation import of CachedInstrumentation. * Fixing Instrumentation/Laravel linting. * Fixing Instrumentation/Symfony linting. * Fixing Instrumentation/HttpAsyncClient linting. * Fixing Instrumentation/Symfony linting. * Fixing Symfony import. * Updating Symfony composer deps.
open-telemetry · Aug 28, 2023 · c8e79a8 · c8e79a8
1 parent 1bc2e84
commit c8e79a8
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 16 deletions.
diff --git a/src/Aws/tests/Unit/Xray/PropagatorTest.php b/src/Aws/tests/Unit/Xray/PropagatorTest.php
@@ -7,6 +7,7 @@
 use OpenTelemetry\API\Trace\SpanContext;
 use OpenTelemetry\API\Trace\SpanContextInterface;
 use OpenTelemetry\API\Trace\SpanContextValidator;
+use OpenTelemetry\API\Trace\TraceFlags;
 use OpenTelemetry\API\Trace\TraceState;
 use OpenTelemetry\Aws\Xray\Propagator;
 use OpenTelemetry\Context\Context;
@@ -45,7 +46,7 @@ public function InjectValidSampledTraceId()
             $carrier,
             null,
             $this->withSpanContext(
-                SpanContext::create(self::TRACE_ID, self::SPAN_ID, SpanContextInterface::TRACE_FLAG_SAMPLED),
+                SpanContext::create(self::TRACE_ID, self::SPAN_ID, TraceFlags::SAMPLED),
                 Context::getCurrent()
             )
         );
@@ -67,7 +68,7 @@ public function InjectValidNotSampledTraceId()
             $carrier,
             null,
             $this->withSpanContext(
-                SpanContext::create(self::TRACE_ID, self::SPAN_ID, SpanContextInterface::TRACE_FLAG_DEFAULT),
+                SpanContext::create(self::TRACE_ID, self::SPAN_ID),
                 Context::getCurrent()
             )
         );
@@ -89,7 +90,7 @@ public function InjectTraceIdWithTraceState()
             $carrier,
             null,
             $this->withSpanContext(
-                SpanContext::create(self::TRACE_ID, self::SPAN_ID, SpanContextInterface::TRACE_FLAG_SAMPLED, new TraceState('vendor1=opaqueValue1')),
+                SpanContext::create(self::TRACE_ID, self::SPAN_ID, TraceFlags::SAMPLED, new TraceState('vendor1=opaqueValue1')),
                 Context::getCurrent()
             )
         );
@@ -111,7 +112,7 @@ public function InjectTraceIdWithInvalidSpanContext()
             $carrier,
             null,
             $this->withSpanContext(
-                SpanContext::create(SpanContextValidator::INVALID_TRACE, SpanContextValidator::INVALID_SPAN, SpanContextInterface::TRACE_FLAG_SAMPLED, new TraceState('vendor1=opaqueValue1')),
+                SpanContext::create(SpanContextValidator::INVALID_TRACE, SpanContextValidator::INVALID_SPAN, TraceFlags::SAMPLED, new TraceState('vendor1=opaqueValue1')),
                 Context::getCurrent()
             )
         );

diff --git a/src/Instrumentation/HttpAsyncClient/tests/Integration/HttpAsyncClientInstrumentationTest.php b/src/Instrumentation/HttpAsyncClient/tests/Integration/HttpAsyncClientInstrumentationTest.php
@@ -64,6 +64,7 @@ public function test_send_async_requests(): void
         $this->client->sendAsyncRequest($request);
         $this->client->sendAsyncRequest($request);
         $this->assertCount(0, $this->storage, 'no spans exporter since promises are not resolved yet');
+
         //resolve promises
         try {
             $p2->wait();

diff --git a/src/Instrumentation/Laravel/src/HeadersPropagator.php b/src/Instrumentation/Laravel/src/HeadersPropagator.php
@@ -24,6 +24,7 @@ public static function instance(): self
     public function keys($carrier): array
     {
         assert($carrier instanceof Request);
+
         /** @psalm-suppress InvalidReturnStatement */
         return $carrier->headers->keys();
     }

diff --git a/src/Instrumentation/MongoDB/composer.json b/src/Instrumentation/MongoDB/composer.json
@@ -12,7 +12,7 @@
     "ext-mongodb": "*",
     "ext-json": "*",
     "mongodb/mongodb": "^1.15",
-    "open-telemetry/api": "^1.0.0beta10",
+    "open-telemetry/api": "^1.0.0beta12",
     "open-telemetry/sem-conv": "^1"
   },
   "require-dev": {

diff --git a/src/Instrumentation/MongoDB/src/MongoDBInstrumentation.php b/src/Instrumentation/MongoDB/src/MongoDBInstrumentation.php
@@ -5,7 +5,7 @@
 namespace OpenTelemetry\Contrib\Instrumentation\MongoDB;
 
 use function MongoDB\Driver\Monitoring\addSubscriber;
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 
 final class MongoDBInstrumentation
 {

diff --git a/src/Instrumentation/MongoDB/src/MongoDBInstrumentationSubscriber.php b/src/Instrumentation/MongoDB/src/MongoDBInstrumentationSubscriber.php
@@ -9,7 +9,7 @@
 use MongoDB\Driver\Monitoring\CommandStartedEvent;
 use MongoDB\Driver\Monitoring\CommandSubscriber;
 use MongoDB\Driver\Monitoring\CommandSucceededEvent;
-use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
+use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\SpanBuilderInterface;
 use OpenTelemetry\API\Trace\SpanKind;

diff --git a/src/Instrumentation/Symfony/src/RequestPropagationGetter.php b/src/Instrumentation/Symfony/src/RequestPropagationGetter.php
@@ -24,6 +24,7 @@ public static function instance(): self
     public function keys($carrier): array
     {
         assert($carrier instanceof Request);
+
         /** @psalm-suppress InvalidReturnStatement */
         return $carrier->headers->keys();
     }

diff --git a/src/Instrumentation/Symfony/src/ResponsePropagationSetter.php b/src/Instrumentation/Symfony/src/ResponsePropagationSetter.php
@@ -24,6 +24,7 @@ public static function instance(): self
     public function keys($carrier): array
     {
         assert($carrier instanceof Response);
+
         /** @psalm-suppress InvalidReturnStatement */
         return $carrier->headers->keys();
     }

diff --git a/src/Logs/Monolog/composer.json b/src/Logs/Monolog/composer.json
@@ -10,7 +10,7 @@
   "prefer-stable": true,
   "require": {
     "monolog/monolog": "^1.1|^2|^3",
-    "open-telemetry/api": "^1.0.0beta10"
+    "open-telemetry/api": "^1.0.0beta16"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/Logs/Monolog/tests/Integration/HandlerTest.php b/src/Logs/Monolog/tests/Integration/HandlerTest.php
@@ -12,7 +12,7 @@
 use OpenTelemetry\SDK\Common\Instrumentation\InstrumentationScopeFactory;
 use OpenTelemetry\SDK\Logs\Exporter\InMemoryExporter;
 use OpenTelemetry\SDK\Logs\LoggerProvider;
-use OpenTelemetry\SDK\Logs\Processor\SimpleLogsProcessor;
+use OpenTelemetry\SDK\Logs\Processor\SimpleLogRecordProcessor;
 use OpenTelemetry\SDK\Logs\ReadWriteLogRecord;
 use PHPUnit\Framework\TestCase;
 
@@ -29,7 +29,7 @@ public function setUp(): void
         $this->storage = new ArrayObject();
         $exporter = new InMemoryExporter($this->storage);
         $loggerProvider = new LoggerProvider(
-            new SimpleLogsProcessor($exporter),
+            new SimpleLogRecordProcessor($exporter),
             new InstrumentationScopeFactory(Attributes::factory()),
         );
         $handler = new Handler($loggerProvider, 200);

diff --git a/src/Propagation/TraceResponse/tests/Unit/PropagatorTest.php b/src/Propagation/TraceResponse/tests/Unit/PropagatorTest.php
@@ -7,6 +7,7 @@
 use OpenTelemetry\API\Trace\SpanContext;
 use OpenTelemetry\API\Trace\SpanContextInterface;
 use OpenTelemetry\API\Trace\SpanContextValidator;
+use OpenTelemetry\API\Trace\TraceFlags;
 use OpenTelemetry\API\Trace\TraceState;
 use OpenTelemetry\Context\Context;
 use OpenTelemetry\Context\ContextInterface;
@@ -43,7 +44,7 @@ public function test_inject_valid_sampled_trace_id()
             $carrier,
             null,
             $this->withSpanContext(
-                SpanContext::create(self::TRACE_ID, self::SPAN_ID, SpanContextInterface::TRACE_FLAG_SAMPLED),
+                SpanContext::create(self::TRACE_ID, self::SPAN_ID, TraceFlags::SAMPLED),
                 Context::getCurrent()
             )
         );
@@ -65,7 +66,7 @@ public function test_inject_valid_not_sampled_trace_id()
             $carrier,
             null,
             $this->withSpanContext(
-                SpanContext::create(self::TRACE_ID, self::SPAN_ID, SpanContextInterface::TRACE_FLAG_DEFAULT),
+                SpanContext::create(self::TRACE_ID, self::SPAN_ID),
                 Context::getCurrent()
             )
         );
@@ -87,7 +88,7 @@ public function test_inject_trace_id_with_trace_state()
             $carrier,
             null,
             $this->withSpanContext(
-                SpanContext::create(self::TRACE_ID, self::SPAN_ID, SpanContextInterface::TRACE_FLAG_SAMPLED, new TraceState('vendor1=opaqueValue1')),
+                SpanContext::create(self::TRACE_ID, self::SPAN_ID, TraceFlags::SAMPLED, new TraceState('vendor1=opaqueValue1')),
                 Context::getCurrent()
             )
         );
@@ -109,7 +110,7 @@ public function test_inject_trace_id_with_invalid_span_context()
             $carrier,
             null,
             $this->withSpanContext(
-                SpanContext::create(SpanContextValidator::INVALID_TRACE, SpanContextValidator::INVALID_SPAN, SpanContextInterface::TRACE_FLAG_SAMPLED, new TraceState('vendor1=opaqueValue1')),
+                SpanContext::create(SpanContextValidator::INVALID_TRACE, SpanContextValidator::INVALID_SPAN, TraceFlags::SAMPLED, new TraceState('vendor1=opaqueValue1')),
                 Context::getCurrent()
             )
         );

diff --git a/src/Symfony/composer.json b/src/Symfony/composer.json
@@ -10,7 +10,7 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "ext-json": "*",
-        "open-telemetry/api": "^1.0.0beta10",
+        "open-telemetry/api": "^1.0.0beta12",
         "open-telemetry/context": "^1",
         "open-telemetry/exporter-otlp": "^1",
         "open-telemetry/exporter-zipkin": "^1",

diff --git a/src/Symfony/src/OtelBundle/Console/ConsoleListener.php b/src/Symfony/src/OtelBundle/Console/ConsoleListener.php
@@ -5,7 +5,7 @@
 namespace OpenTelemetry\Contrib\Symfony\OtelBundle\Console;
 
 use function get_class;
-use OpenTelemetry\API\Trace\AbstractSpan as Span;
+use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\StatusCode;
 use OpenTelemetry\API\Trace\TracerInterface;
 use OpenTelemetry\API\Trace\TracerProviderInterface;