Skip to content

Commit 66cc0ab

Browse files
authored
Merge pull request #14 from andrew-demb/housekeeping
Housekeeping - cleanup readme, consistent composer.json, typo in DI service id
2 parents 7d3f068 + 19232af commit 66cc0ab

File tree

3 files changed

+22
-30
lines changed

3 files changed

+22
-30
lines changed

README.md

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
11
# Symfony Bridge for Jaeger library
22

33
## Getting started
4-
Register JaegerBundle like any other bundle for Symfony 4
5-
```
6-
bundles.php
7-
[
8-
...
9-
\Jaeger\Symfony\JaegerBundle::class => ['all' => true],
10-
...
11-
]
12-
```
13-
OR for Symfony >=2
14-
```
15-
public function registerBundles()
16-
{
17-
$bundles = [
18-
...
19-
new \Jaeger\Symfony\JaegerBundle(),
20-
...
21-
]
22-
}
4+
5+
Register JaegerBundle like any other bundle for Symfony 4+
6+
7+
```php
8+
// bundles.php
9+
return [
10+
// ...
11+
\Jaeger\Symfony\JaegerBundle::class => ['all' => true],
12+
// ...
13+
];
2314
```

composer.json

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@
88
},
99
"require": {
1010
"php": ">=7.1",
11-
"symfony/event-dispatcher": "^4.3||^5.0",
12-
"symfony/console": "^4.3||^5.0",
13-
"symfony/config": "^4.3||^5.0",
14-
"symfony/http-kernel": "^4.3||^5.0",
15-
"symfony/dependency-injection": "^4.3||^5.0",
16-
"code-tool/jaeger-client-php": "^3.1"
17-
},
18-
"require-dev": {
19-
"phpunit/phpunit": "@stable"
11+
"code-tool/jaeger-client-php": "^3.1",
12+
"symfony/config": "^4.3|^5.0",
13+
"symfony/console": "^4.3|^5.0",
14+
"symfony/dependency-injection": "^4.3|^5.0",
15+
"symfony/event-dispatcher": "^4.3|^5.0",
16+
"symfony/http-kernel": "^4.3|^5.0",
17+
"symfony/yaml": "^4.3|^5.0"
2018
},
2119
"minimum-stability": "dev",
2220
"prefer-stable": true

src/Resources/services.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@ services:
140140
class: Jaeger\Symfony\Bridge\BackgroundSpanHandler
141141
arguments: ['@jaeger.tracer']
142142
jaeger.span.handler.gloabal:
143+
alias: jaeger.span.handler.global
144+
deprecated: 'The "%alias_id%" service is deprecated. Use "jaeger.span.handler.global".'
145+
jaeger.span.handler.global:
143146
class: Jaeger\Symfony\Bridge\GlobalSpanHandler
144147
arguments: ['@jaeger.tracer', '@jaeger.name.generator']
145148
jaeger.debug.listener:
@@ -166,7 +169,7 @@ services:
166169
- {name: 'kernel.event_subscriber' }
167170
jaeger.global.span.listener:
168171
class: Jaeger\Symfony\Bridge\GlobalSpanListener
169-
arguments: ['@jaeger.span.handler.gloabal']
172+
arguments: ['@jaeger.span.handler.global']
170173
tags:
171174
- {name: 'kernel.event_subscriber' }
172175
jaeger.app.start.listener:
@@ -186,7 +189,7 @@ services:
186189
- {name: 'kernel.event_subscriber' }
187190
jaeger.span.handler.listener.flush:
188191
class: Jaeger\Symfony\Bridge\HandlerFlushListener
189-
arguments: ['@jaeger.span.handler.background', '@jaeger.span.handler.gloabal']
192+
arguments: ['@jaeger.span.handler.background', '@jaeger.span.handler.global']
190193
tags:
191194
- {name: 'kernel.event_subscriber' }
192195
jaeger.exception.listener:

0 commit comments

Comments
 (0)