Skip to content

Commit 4664bfd

Browse files
committed
Merge branch '2.0.x' into 1.0.x
2 parents 652333c + dfe260d commit 4664bfd

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/Bridge/ContextInjector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ public function getOperationName(Request $request)
7878
{
7979
if (null !== ($fragment = $request->attributes->get('is_fragment'))) {
8080
return ($controller = $request->attributes->get('_controller', null))
81-
? 'fragment'
82-
: sprintf('fragment.%s', $controller);
81+
? sprintf('fragment.%s', $controller)
82+
: 'fragment';
8383
}
8484

8585
if (null === ($routeName = $request->attributes->get('_route', null))) {

src/Resources/config/services.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ parameters:
66
env(jaeger_context_format): 'text'
77
env(jaeger_context_env): 'UBER_TRACE_ID'
88
env(jaeger_context_header): 'uber-trace-id'
9+
kernel.debug: false
10+
service_name: app
911
services:
1012
spl.stack:
11-
class: \SplStack
13+
class: SplStack
1214
shared: false
1315
id.generator.random:
1416
class: Jaeger\Id\RandomIntGenerator

0 commit comments

Comments
 (0)