Skip to content

Commit b4c3a24

Browse files
committed
Merge branch '2.0.x' into 1.0.x
# Conflicts: # composer.json # src/Tag/DebugRequestTag.php
2 parents ae07e90 + 0f5cc42 commit b4c3a24

File tree

3 files changed

+2
-23
lines changed

3 files changed

+2
-23
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"symfony/console": "~2 || ~3",
1313
"symfony/http-kernel": "~2 || ~3",
1414
"symfony/dependency-injection": "~2 || ~3",
15-
"code-tool/jaeger-client-php": "~1.1"
15+
"code-tool/jaeger-client-php": "~1.4"
1616
},
1717
"require-dev": {
1818
"php-ds/php-ds": "@stable",

src/Bridge/RequestSpanListener.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
use Jaeger\Http\HttpCodeTag;
55
use Jaeger\Http\HttpMethodTag;
66
use Jaeger\Http\HttpUriTag;
7-
use Jaeger\Symfony\Tag\DebugRequestTag;
87
use Jaeger\Symfony\Tag\SymfonyComponentTag;
98
use Jaeger\Symfony\Tag\SymfonyVersionTag;
109
use Jaeger\Symfony\Tag\TimeMicroTag;
@@ -76,10 +75,7 @@ public function onRequest(GetResponseEvent $event)
7675
->addTag(new TimeMicroTag($startTime))
7776
->start($startTime);
7877
}
79-
if ($requestSpan->getContext()->isDebug()
80-
&& ($requestId = (string)$requestSpan->getItem('debug.request'))) {
81-
$requestSpan->addTag(new DebugRequestTag($requestId));
82-
}
78+
8379
$this->spans->push($requestSpan);
8480

8581
return $this;

src/Tag/DebugRequestTag.php

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)