Merge branch '2.0.x' into 1.0.x

# Conflicts:
#	src/Bridge/ContextInjector.php

Author: allflame

src/Bridge/ContextInjector.php

@@ -1,47 +1,24 @@
 <?php
 namespace Jaeger\Symfony\Bridge;
 
-use Jaeger\Codec\CodecInterface;
-use Jaeger\Codec\CodecRegistry;
+use Jaeger\Symfony\Context\Extractor\ContextExtractorInterface;
 use Jaeger\Tracer\InjectableInterface;
-use Jaeger\Tracer\TracerInterface;
 use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 class ContextInjector implements EventSubscriberInterface
 {
     private $injectable;
 
-    private $tracer;
-
-    /**
-     * @var CodecInterface[]
-     */
-    private $registry;
-
-    private $format;
-
-    private $envName;
-
-    private $headerName;
+    private $extractor;
 
     public function __construct(
         InjectableInterface $injectable,
-        TracerInterface $tracer,
-        CodecRegistry $registry,
-        $format,
-        $envName,
-        $headerName
+        ContextExtractorInterface $extractor
     ) {
         $this->injectable = $injectable;
-        $this->tracer = $tracer;
-        $this->registry = $registry;
-        $this->format = $format;
-        $this->envName = $envName;
-        $this->headerName = $headerName;
+        $this->extractor = $extractor;
     }
 
     public static function getSubscribedEvents()
@@ -52,26 +29,23 @@ public static function getSubscribedEvents()
         ];
     }
 
-    public function onCommand()
+    public function inject(): ContextInjector
     {
-        if (($data = $_ENV[$this->envName] ?  $_ENV[$this->envName]: null)
-            && $context = $this->registry[$this->format]->decode($data)) {
-            $this->injectable->assign($context);
+        if (null === ($context = $this->extractor->extract())) {
+            return $this;
         }
-
+        $this->injectable->assign($context);
 
         return $this;
     }
 
-    public function onRequest(GetResponseEvent $event)
+    public function onCommand()
     {
-        $request = $event->getRequest();
-        if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()
-            && $request->headers->has($this->headerName)
-            && ($context = $this->registry[$this->format]->decode($request->headers->get($this->headerName)))) {
-            $this->injectable->assign($context);
-        }
+        return $this->inject();
+    }
 
-        return $this;
+    public function onRequest()
+    {
+        return $this->inject();
     }
 }

src/Bridge/RequestSpanListener.php

@@ -91,7 +91,6 @@ public function onRequest(GetResponseEvent $event)
                 ->addTag(new LongTag('time.micro', $startTime))
                 ->start($startTime);
         }
-
         $this->spans->push($requestSpan);
 
         return $this;

src/Context/Extractor/ContextExtractorChain.php

@@ -0,0 +1,35 @@
+<?php
+declare(strict_types=1);
+
+namespace Jaeger\Symfony\Context\Extractor;
+
+use Jaeger\Span\Context\SpanContext;
+
+class ContextExtractorChain implements ContextExtractorInterface
+{
+    private $queue;
+
+    public function __construct(\SplPriorityQueue $queue)
+    {
+        $this->queue = $queue;
+    }
+
+    public function add(ContextExtractorInterface $extractor, int $priority = 0): ContextExtractorChain
+    {
+        $this->queue->insert($extractor, $priority);
+
+        return $this;
+    }
+
+    public function extract(): ?SpanContext
+    {
+        $queue = clone $this->queue;
+        while (false === $queue->isEmpty()) {
+            if (null !== ($context = $queue->extract()->extract())) {
+                return $context;
+            }
+        }
+
+        return null;
+    }
+}

src/Context/Extractor/ContextExtractorInterface.php

@@ -0,0 +1,11 @@
+<?php
+declare(strict_types=1);
+
+namespace Jaeger\Symfony\Context\Extractor;
+
+use Jaeger\Span\Context\SpanContext;
+
+interface ContextExtractorInterface
+{
+    public function extract() : ?SpanContext;
+}

src/Context/Extractor/EnvContextExtractor.php

@@ -0,0 +1,56 @@
+<?php
+declare(strict_types=1);
+
+namespace Jaeger\Symfony\Context\Extractor;
+
+use Jaeger\Codec\CodecInterface;
+use Jaeger\Codec\CodecRegistry;
+use Jaeger\Span\Context\SpanContext;
+use Symfony\Component\Console\ConsoleEvents;
+
+class EnvContextExtractor implements ContextExtractorInterface
+{
+    /**
+     * @var CodecInterface[]
+     */
+    private $registry;
+
+    private $format;
+
+    private $envName;
+
+    private $context;
+
+    public function __construct(CodecRegistry $registry, string $format, string $envName)
+    {
+        $this->registry = $registry;
+        $this->format = $format;
+        $this->envName = $envName;
+    }
+
+    public function extract(): ?SpanContext
+    {
+        return $this->context;
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return [
+            ConsoleEvents::COMMAND => ['onCommand', 2048],
+        ];
+    }
+
+    public function onCommand()
+    {
+        if (null === ($data = $_ENV[$this->envName] ?? null)) {
+            return $this;
+        }
+
+        if (null === ($context = $this->registry[$this->format]->decode($data))) {
+            return $this;
+        }
+        $this->context = $context;
+
+        return $this;
+    }
+}

src/Context/Extractor/HeaderContextExtractor.php

@@ -0,0 +1,64 @@
+<?php
+declare(strict_types=1);
+
+namespace Jaeger\Symfony\Context\Extractor;
+
+use Jaeger\Codec\CodecInterface;
+use Jaeger\Codec\CodecRegistry;
+use Jaeger\Span\Context\SpanContext;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+class HeaderContextExtractor implements ContextExtractorInterface
+{
+    /**
+     * @var CodecInterface[]
+     */
+    private $registry;
+
+    private $format;
+
+    private $headerName;
+
+    private $context;
+
+    public function __construct(CodecRegistry $registry, string $format, string $headerName)
+    {
+        $this->registry = $registry;
+        $this->format = $format;
+        $this->headerName = $headerName;
+    }
+
+    public function extract(): ?SpanContext
+    {
+        return $this->context;
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return [
+            KernelEvents::REQUEST => ['onRequest', 2048],
+        ];
+    }
+
+    public function onRequest(GetResponseEvent $event)
+    {
+        $request = $event->getRequest();
+        if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
+            $this->context = null;
+
+            return $this;
+        }
+
+        if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()
+            && $request->headers->has($this->headerName)
+            && ($context = $this->registry[$this->format]->decode($request->headers->get($this->headerName)))) {
+            $this->context = $context;
+
+            return $this;
+        }
+
+        return $this;
+    }
+}

src/Resources/DependencyInjection/ExtractorChainCompilerPass.php

@@ -0,0 +1,33 @@
+<?php
+declare(strict_types=1);
+
+namespace Jaeger\Symfony\Resources\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+class ExtractorChainCompilerPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        if (false === $container->hasDefinition('jaeger.context.extractor.chain')) {
+            throw new \RuntimeException(
+                sprintf('Required service %s is missing from container', 'jaeger.context.extractor.chain')
+            );
+        }
+
+        $definition = $container->getDefinition('jaeger.context.extractor.chain');
+        foreach ($container->findTaggedServiceIds('jaeger.context.extractor') as $id => $tags) {
+            foreach ($tags as $tag) {
+                if (false === array_key_exists('alias', $tag)) {
+                    throw new \RuntimeException(
+                        sprintf('Required tag field %s is missing from definition', 'alias')
+                    );
+                }
+                $priority = $tag['priority'] ?? 0;
+                $definition->addMethodCall('add', [new Reference($id), $priority]);
+            }
+        }
+    }
+}

src/Resources/config/services.yml

@@ -11,6 +11,9 @@ services:
   spl.stack:
     class: SplStack
     shared: false
+  spl.priority.queue:
+    class: SplPriorityQueue
+    shared: false
   id.generator.random:
     class: Jaeger\Id\RandomIntGenerator
   id.generator.span: '@id.generator.random'
@@ -68,13 +71,33 @@ services:
     class: Jaeger\Symfony\Bridge\ContextInjector
     arguments:
       - '@jaeger.tracer'
-      - '@jaeger.tracer'
+      - '@jaeger.context.extractor'
+    tags:
+      - {name: 'kernel.event_subscriber' }
+  jaeger.context.extractor.env:
+    class: Jaeger\Symfony\Context\Extractor\EnvContextExtractor
+    arguments:
       - '@jaeger.codec.registry'
       - '%env(JAEGER_CONTEXT_FORMAT)%'
       - '%env(JAEGER_CONTEXT_ENV)%'
+    tags:
+      - {name: 'kernel.event_subscriber' }
+      - {name: 'jaeger.context.extractor'}
+  jaeger.context.extractor.header:
+    class: Jaeger\Symfony\Context\Extractor\HeaderContextExtractor
+    arguments:
+      - '@jaeger.codec.registry'
+      - '%env(JAEGER_CONTEXT_FORMAT)%'
       - '%env(JAEGER_CONTEXT_HEADER)%'
     tags:
       - {name: 'kernel.event_subscriber' }
+      - {name: 'jaeger.context.extractor'}
+  jaeger.context.extractor.chain:
+    class: Jaeger\Symfony\Context\Extractor\ContextExtractorChain
+    arguments:
+      - '@spl.priority.queue'
+  jaeger.context.extractor:
+    alias: '@jaeger.context.extractor.chain'
   request.span.listener:
     class: Jaeger\Symfony\Bridge\RequestSpanListener
     arguments: