Skip to content

Commit d2093ce

Browse files
committed
Addressed service.name issue
1 parent 81caf94 commit d2093ce

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/Propagation/ServiceName/src/ServiceNamePropagator.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@
2020
*/
2121
final class ServiceNamePropagator implements TextMapPropagatorInterface
2222
{
23-
private const SERVICE_NAME = 'service.name';
24-
2523
private const FIELDS = [
26-
self::SERVICE_NAME,
24+
ResourceAttributes::SERVICE_NAME,
2725
];
2826

2927
private static ?self $instance = null;
@@ -59,7 +57,7 @@ public function inject(&$carrier, ?PropagationSetterInterface $setter = null, ?C
5957
$resource = $detector->getResource();
6058

6159
if ($resource->getAttributes()->has(ResourceAttributes::SERVICE_NAME)) {
62-
$setter->set($carrier, self::SERVICE_NAME, $resource->getAttributes()->get(ResourceAttributes::SERVICE_NAME));
60+
$setter->set($carrier, ResourceAttributes::SERVICE_NAME, $resource->getAttributes()->get(ResourceAttributes::SERVICE_NAME));
6361
}
6462
}
6563

src/Propagation/ServiceName/tests/Unit/ServiceNamePropagatorTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use OpenTelemetry\Context\Context;
88
use OpenTelemetry\Contrib\Propagation\ServiceName\ServiceNamePropagator;
9+
use OpenTelemetry\SemConv\ResourceAttributes;
910
use Override;
1011
use PHPUnit\Framework\TestCase;
1112

@@ -22,7 +23,7 @@ protected function setUp(): void
2223
public function test_fields(): void
2324
{
2425
$this->assertSame(
25-
['service.name'],
26+
[ResourceAttributes::SERVICE_NAME],
2627
$this->serviceNamePropagator->fields()
2728
);
2829
}
@@ -39,7 +40,7 @@ public function test_inject(): void
3940
putenv('OTEL_SERVICE_NAME=foo-service');
4041
$carrier = [];
4142
$this->serviceNamePropagator->inject($carrier);
42-
$this->assertEquals($carrier, ['service.name'=>'foo-service']);
43+
$this->assertEquals($carrier, [ResourceAttributes::SERVICE_NAME=>'foo-service']);
4344
putenv('OTEL_SERVICE_NAME');
4445
}
4546

@@ -52,7 +53,7 @@ public function test_extract_empty(): void
5253

5354
public function test_no_extract(): void
5455
{
55-
$carrier = ['service.name' => 'foo-service'];
56+
$carrier = [ResourceAttributes::SERVICE_NAME => 'foo-service'];
5657
$context = $this->serviceNamePropagator->extract($carrier);
5758
$this->assertSame(Context::getCurrent(), $context);
5859
}

0 commit comments

Comments
 (0)