open-telemetry
/
opentelemetry-php
mirror of https://github.com/open-telemetry/opentelemetry-php.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing default service name (#887) 

* fixing some sdk/default resource values
- default service name should contain runtime name if available; java just appends ":java" so I did the same

Co-authored-by: Tobias Bachert <git@b-privat.de>
This commit is contained in:
Brett McBride 2022-12-07 09:58:33 +11:00 committed by GitHub
parent dc5ef24bd3
commit 311afa265a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SDK/Resource/Detectors/SdkProvided.php
View File

@ -10,14 +10,14 @@ use OpenTelemetry\SDK\Resource\ResourceInfo;
use OpenTelemetry\SemConv\ResourceAttributes; use OpenTelemetry\SemConv\ResourceAttributes;
/** /**
* @see https://github.com/open-telemetry/opentelemetry-specification/blob/v1.8.0/specification/resource/semantic_conventions/README.md#semantic-attributes-with-sdk-provided-default-value * @see https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/semantic_conventions/README.md#semantic-attributes-with-sdk-provided-default-value
*/ */
final class SdkProvided implements ResourceDetectorInterface final class SdkProvided implements ResourceDetectorInterface
{ {
public function getResource(): ResourceInfo public function getResource(): ResourceInfo
{ {
$attributes = [ $attributes = [
ResourceAttributes::SERVICE_NAME => 'unknown_service', ResourceAttributes::SERVICE_NAME => 'unknown_service:php',
]; ];
return ResourceInfo::create(Attributes::create($attributes), ResourceAttributes::SCHEMA_URL); return ResourceInfo::create(Attributes::create($attributes), ResourceAttributes::SCHEMA_URL);

4
tests/Integration/SDK/ResourceInfoFactoryTest.php
View File

@ -46,7 +46,7 @@ class ResourceInfoFactoryTest extends TestCase
$this->assertEquals('opentelemetry', $resource->getAttributes()->get(ResourceAttributes::TELEMETRY_SDK_NAME)); $this->assertEquals('opentelemetry', $resource->getAttributes()->get(ResourceAttributes::TELEMETRY_SDK_NAME));
$this->assertEquals('php', $resource->getAttributes()->get(ResourceAttributes::TELEMETRY_SDK_LANGUAGE)); $this->assertEquals('php', $resource->getAttributes()->get(ResourceAttributes::TELEMETRY_SDK_LANGUAGE));
$this->assertEquals('unknown_service', $resource->getAttributes()->get(ResourceAttributes::SERVICE_NAME)); $this->assertEquals('unknown_service:php', $resource->getAttributes()->get(ResourceAttributes::SERVICE_NAME));
} }
public function test_none_default_resources(): void public function test_none_default_resources(): void
@ -182,6 +182,6 @@ class ResourceInfoFactoryTest extends TestCase
$this->assertEquals('opentelemetry', $resource->getAttributes()->get(ResourceAttributes::TELEMETRY_SDK_NAME)); $this->assertEquals('opentelemetry', $resource->getAttributes()->get(ResourceAttributes::TELEMETRY_SDK_NAME));
$this->assertEquals('php', $resource->getAttributes()->get(ResourceAttributes::TELEMETRY_SDK_LANGUAGE)); $this->assertEquals('php', $resource->getAttributes()->get(ResourceAttributes::TELEMETRY_SDK_LANGUAGE));
$this->assertEquals('unknown_service', $resource->getAttributes()->get(ResourceAttributes::SERVICE_NAME)); $this->assertEquals('unknown_service:php', $resource->getAttributes()->get(ResourceAttributes::SERVICE_NAME));
} }
} }

6
tests/Unit/SDK/Resource/Detectors/SdkProvidedTest.php
View File

@ -15,10 +15,10 @@ class SdkProvidedTest extends TestCase
{ {
public function test_sdk_provided_get_resource(): void public function test_sdk_provided_get_resource(): void
{ {
$resouceDetector = new Detectors\SdkProvided(); $resourceDetector = new Detectors\SdkProvided();
$resource = $resouceDetector->getResource(); $resource = $resourceDetector->getResource();
$this->assertSame(ResourceAttributes::SCHEMA_URL, $resource->getSchemaUrl()); $this->assertSame(ResourceAttributes::SCHEMA_URL, $resource->getSchemaUrl());
$this->assertSame('unknown_service', $resource->getAttributes()->get(ResourceAttributes::SERVICE_NAME)); $this->assertSame('unknown_service:php', $resource->getAttributes()->get(ResourceAttributes::SERVICE_NAME));
} }
} }

2
tests/Unit/SDK/Resource/ResourceInfoFactoryTest.php
View File

@ -74,7 +74,7 @@ class ResourceInfoFactoryTest extends TestCase
public function test_resource_service_name_default(): void public function test_resource_service_name_default(): void
{ {
$resource = ResourceInfoFactory::defaultResource(); $resource = ResourceInfoFactory::defaultResource();
$this->assertEquals('unknown_service', $resource->getAttributes()->get('service.name')); $this->assertEquals('unknown_service:php', $resource->getAttributes()->get('service.name'));
} }
/** /**