Skip to content

Commit 04ad944

Browse files
carolabadeercarolabadeer
authored
Merge branch 'main' into aws-sdk-instrumentation-support
2 parents 8d7d83a + 9bbdb16 commit 04ad944

File tree

13 files changed

+81
-84
lines changed

13 files changed

+81
-84
lines changed

‎src/Aws/Ec2/Detector.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,50 +70,50 @@ public function getResource(): ResourceInfo
7070
if ($token === null) {
7171
return ResourceInfoFactory::emptyResource();
7272
}
73-
73+
7474
$hostName = $this->fetchHostname($token);
7575

7676
$identitiesJson = $this->fetchIdentity($token);
7777

7878
if (!$token || !$identitiesJson) {
7979
return ResourceInfoFactory::emptyResource();
8080
}
81-
82-
$attributes = new Attributes();
81+
82+
$attributes = [];
8383

8484
foreach ($identitiesJson as $key => $value) {
8585
switch ($key) {
8686
case 'instanceId':
87-
$attributes->setAttribute(ResourceAttributes::HOST_ID, $value);
87+
$attributes[ResourceAttributes::HOST_ID] = $value;
8888

8989
break;
9090
case 'availabilityZone':
91-
$attributes->setAttribute(ResourceAttributes::CLOUD_AVAILABILITY_ZONE, $value);
91+
$attributes[ResourceAttributes::CLOUD_AVAILABILITY_ZONE] = $value;
9292

9393
break;
9494
case 'instanceType':
95-
$attributes->setAttribute(ResourceAttributes::HOST_TYPE, $value);
95+
$attributes[ResourceAttributes::HOST_TYPE] = $value;
9696

9797
break;
9898
case 'imageId':
99-
$attributes->setAttribute(ResourceAttributes::HOST_IMAGE_ID, $value);
99+
$attributes[ResourceAttributes::HOST_IMAGE_ID] = $value;
100100

101101
break;
102102
case 'accountId':
103-
$attributes->setAttribute(ResourceAttributes::CLOUD_ACCOUNT_ID, $value);
103+
$attributes[ResourceAttributes::CLOUD_ACCOUNT_ID] = $value;
104104

105105
break;
106106
case 'region':
107-
$attributes->setAttribute(ResourceAttributes::CLOUD_REGION, $value);
107+
$attributes[ResourceAttributes::CLOUD_REGION] = $value;
108108

109109
break;
110110
}
111111
}
112112

113-
$attributes->setAttribute(ResourceAttributes::HOST_NAME, $hostName);
114-
$attributes->setAttribute(ResourceAttributes::CLOUD_PROVIDER, self::CLOUD_PROVIDER);
113+
$attributes[ResourceAttributes::HOST_NAME] = $hostName;
114+
$attributes[ResourceAttributes::CLOUD_PROVIDER] = self::CLOUD_PROVIDER;
115115

116-
return ResourceInfo::create(new Attributes($attributes), ResourceAttributes::SCHEMA_URL);
116+
return ResourceInfo::create(Attributes::create($attributes), ResourceAttributes::SCHEMA_URL);
117117
} catch (\Throwable $e) {
118118
//TODO: add 'Process is not running on K8S when logging is added
119119
return ResourceInfoFactory::emptyResource();
@@ -175,7 +175,7 @@ private function request(RequestInterface $request): ?string
175175
if (!empty($body) && $responseCode < 300 && $responseCode >= 200) {
176176
return $body;
177177
}
178-
178+
179179
return null;
180180
} catch (Throwable $e) {
181181
// TODO: add log for exception. The code below

‎src/Aws/Ecs/Detector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ class Detector implements ResourceDetectorInterface
3737
private const ECS_METADATA_KEY_V3 = 'ECS_CONTAINER_METADATA_URI';
3838

3939
private const CONTAINER_ID_LENGTH = 64;
40-
40+
4141
private DataProvider $processData;
4242

4343
public function __construct(DataProvider $processData)
4444
{
4545
$this->processData = $processData;
4646
}
47-
47+
4848
/**
4949
* If running on ECS, runs getContainerId(), getClusterName(), and
5050
* returns resource with valid extracted values
@@ -63,7 +63,7 @@ public function getResource(): ResourceInfo
6363

6464
return !$hostName && !$containerId
6565
? ResourceInfoFactory::emptyResource()
66-
: ResourceInfo::create(new Attributes([
66+
: ResourceInfo::create(Attributes::create([
6767
ResourceAttributes::CONTAINER_NAME => $hostName,
6868
ResourceAttributes::CONTAINER_ID => $containerId,
6969
]));

‎src/Aws/Eks/Detector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function __construct(
5858
$this->client = $client;
5959
$this->requestFactory = $requestFactory;
6060
}
61-
61+
6262
public function getResource(): ResourceInfo
6363
{
6464
try {
@@ -68,10 +68,10 @@ public function getResource(): ResourceInfo
6868

6969
$clusterName = $this->getClusterName();
7070
$containerId = $this->getContainerId();
71-
71+
7272
return !$clusterName && !$containerId
7373
? ResourceInfoFactory::emptyResource()
74-
: ResourceInfo::create(new Attributes([
74+
: ResourceInfo::create(Attributes::create([
7575
ResourceAttributes::CONTAINER_ID => $containerId,
7676
ResourceAttributes::K8S_CLUSTER_NAME => $clusterName,
7777
]));

‎src/Aws/Lambda/Detector.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function getResource(): ResourceInfo
4343
$lambdaName = getenv(self::LAMBDA_NAME_ENV);
4444
$functionVersion = getenv(self::LAMBDA_VERSION_ENV);
4545
$awsRegion = getenv(self::AWS_REGION_ENV);
46-
46+
4747
// The following ternary operations are created because
4848
// the attributes class will only NOT create a variable
4949
// when it is set to null. getenv returns false when unsuccessful
@@ -53,7 +53,7 @@ public function getResource(): ResourceInfo
5353

5454
return !$lambdaName && !$awsRegion && !$functionVersion
5555
? ResourceInfoFactory::emptyResource()
56-
: ResourceInfo::create(new Attributes([
56+
: ResourceInfo::create(Attributes::create([
5757
ResourceAttributes::FAAS_NAME => $lambdaName,
5858
ResourceAttributes::FAAS_VERSION => $functionVersion,
5959
ResourceAttributes::CLOUD_REGION => $awsRegion,

‎src/Symfony/OtelSdkBundle/DependencyInjection/OtelSdkExtension.php‎

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

55
namespace OpenTelemetry\Symfony\OtelSdkBundle\DependencyInjection;
66

7-
use OpenTelemetry\SDK\Common\Attribute\AttributeLimits;
87
use OpenTelemetry\SDK\Common\Attribute\Attributes;
98
use OpenTelemetry\SDK\Trace;
109
use OpenTelemetry\Symfony\OtelSdkBundle\DependencyInjection\Configuration as Conf;
@@ -97,13 +96,11 @@ private function configureResourceInfo(): void
9796
if (empty($config)) {
9897
return;
9998
}
100-
// configure resource attribute limits
101-
$limits = $this->getDefinitionByClass(AttributeLimits::class);
99+
// configure resource attributes limits
102100
if (isset($config[Conf::LIMITS_NODE])) {
103-
$limits->setArguments([
104-
$config[Conf::LIMITS_NODE][Conf::ATTR_COUNT_NODE],
105-
$config[Conf::LIMITS_NODE][Conf::ATTR_VALUE_LENGTH_NODE],
106-
]);
101+
$this->getDefinitionByClass(Trace\SpanLimitsBuilder::class)
102+
->addMethodCall('setAttributeCountLimit', [$config[Conf::LIMITS_NODE][Conf::ATTR_COUNT_NODE]])
103+
->addMethodCall('setAttributeValueLengthLimit', [$config[Conf::LIMITS_NODE][Conf::ATTR_VALUE_LENGTH_NODE]]);
107104
}
108105
// configure resource attributes
109106
$attributesParams = (array) $this->getContainer()->getParameter(Parameters::RESOURCE_ATTRIBUTES);
@@ -115,7 +112,7 @@ private function configureResourceInfo(): void
115112
$attributes = $this->getDefinitionByClass(Attributes::class);
116113
$attributes->setArguments([
117114
'%' . Parameters::RESOURCE_ATTRIBUTES . '%',
118-
self::createReferenceFromClass(AttributeLimits::class),
115+
0,
119116
]);
120117

121118
// reference service name for later use
@@ -403,7 +400,7 @@ private function resolveExporterClass(array $config): string
403400
{
404401
if (in_array($config[Conf::TYPE_NODE], Conf::EXPORTERS_NODE_VALUES, true)) {
405402
return ConfigMappings::SPAN_EXPORTERS[
406-
$config[Conf::TYPE_NODE]
403+
$config[Conf::TYPE_NODE]
407404
];
408405
}
409406
if ($config[Conf::TYPE_NODE] === Conf::CUSTOM_TYPE) {

‎src/Symfony/OtelSdkBundle/README.md‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -199,28 +199,31 @@ So our Listener class could look like this:
199199
namespace App\EventSubscriber;
200200
201201
use OpenTelemetry\API\Trace\SpanInterface;
202-
use OpenTelemetry\SDK\Trace\Tracer;
202+
use OpenTelemetry\SDK\Trace\TracerProvider;
203203
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
204-
use Symfony\Component\HttpKernel\KernelEvents;
205204
use Symfony\Component\HttpKernel\Event\RequestEvent;
206205
use Symfony\Component\HttpKernel\Event\TerminateEvent;
206+
use Symfony\Component\HttpKernel\KernelEvents;
207207
208208
class TracingKernelSubscriber implements EventSubscriberInterface
209209
{
210-
private Tracer $tracer;
210+
private TracerProvider $provider;
211211
private ?SpanInterface $mainSpan = null;
212212
213-
public function __construct(Tracer $tracer)
213+
public function __construct(TracerProvider $provider)
214214
{
215-
// store a reference to the Tracer instance in case we want to create
215+
// store a reference to the TracerProvider in case we want to create
216216
// more spans on different events (not covered in this example)
217-
$this->tracer = $tracer;
217+
$this->provider = $provider;
218218
}
219219
220220
public function onRequestEvent(RequestEvent $event)
221221
{
222222
// Create our main span and activate it
223-
$this->mainSpan = $this->tracer->spanBuilder('main')->startSpan();
223+
$this->mainSpan = $this->provider
224+
->getTracer('io.opentelemetry.contrib.php')
225+
->spanBuilder('main')
226+
->startSpan();
224227
$this->mainSpan->activate();
225228
}
226229
@@ -233,11 +236,11 @@ class TracingKernelSubscriber implements EventSubscriberInterface
233236
public static function getSubscribedEvents(): array
234237
{
235238
// return the subscribed events, their methods and priorities
236-
// use a very high integer for the Request priority and a
239+
// use a very high integer for the Request priority and a
237240
// very low negative integer for the Terminate priority, so the listener
238241
// will be the first and last one to be called respectively.
239242
return [
240-
KernelEvents::TERMINATE => [['onRequestEvent', 10000]],
243+
KernelEvents::REQUEST => [['onRequestEvent', 10000]],
241244
KernelEvents::TERMINATE => [['onTerminateEvent', -10000]],
242245
];
243246
}

‎src/Symfony/OtelSdkBundle/Resources/config/sdk.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace OpenTelemetry\Symfony\OtelSdkBundle\Resources;
66

7-
use OpenTelemetry\SDK\Common\Attribute\AttributeLimits;
87
use OpenTelemetry\SDK\Common\Attribute\Attributes;
98
use OpenTelemetry\SDK\Common\Time\SystemClock;
109
use OpenTelemetry\SDK\Resource;
@@ -44,12 +43,10 @@
4443

4544
// RESOURCE
4645

47-
$helper->setService(AttributeLimits::class);
48-
4946
$helper->setService(Attributes::class)
5047
->args([
5148
ConfigHelper::wrapParameter(Parameters::RESOURCE_ATTRIBUTES),
52-
ConfigHelper::createReferenceFromClass(AttributeLimits::class),
49+
0,
5350
]);
5451

5552
$helper->setService(Resource\ResourceInfo::class)

‎tests/Integration/Symfony/OtelSdkBundle/DependencyInjection/OtelSdkExtensionTest.php‎

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

77
use Exception;
88
use OpenTelemetry\SDK;
9-
use OpenTelemetry\SDK\Common\Attribute\AttributeLimits;
109
use OpenTelemetry\SDK\Common\Attribute\Attributes;
1110
use OpenTelemetry\SDK\Common\Time\SystemClock;
1211
use OpenTelemetry\SDK\Trace\SpanProcessor;
@@ -60,11 +59,14 @@ public function testResourceLimits(): void
6059
{
6160
$data = $this->loadTestData('resource');
6261

63-
$limits = $this->getDefinitionByClass(AttributeLimits::class);
62+
$spanLimitsBuilder = $this->getDefinitionByClass(SDK\Trace\SpanLimitsBuilder::class);
6463

6564
$this->assertEquals(
6665
array_values($data['resource']['limits']),
67-
$limits->getArguments()
66+
[
67+
$spanLimitsBuilder->getMethodCalls()[0][1][0],
68+
$spanLimitsBuilder->getMethodCalls()[1][1][0],
69+
]
6870
);
6971
}
7072

@@ -87,7 +89,7 @@ public function testResourceAttributes(): void
8789
ConfigHelper::wrapParameter(Parameters::RESOURCE_ATTRIBUTES),
8890
$arguments[0]
8991
);
90-
$this->assertReference(AttributeLimits::class, $arguments[1]);
92+
$this->assertEquals(0, $arguments[1]);
9193
}
9294

9395
public function testDefaultSampler(): void

‎tests/Integration/Symfony/OtelSdkBundle/Resources/SdkConfigTest.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace OpenTelemetry\Test\Integration\Symfony\OtelSdkBundle\Resources;
66

77
use Exception;
8-
use OpenTelemetry\SDK\Common\Attribute\AttributeLimits;
98
use OpenTelemetry\SDK\Common\Attribute\Attributes;
109
use OpenTelemetry\SDK\Common\Time\SystemClock;
1110
use OpenTelemetry\SDK\Resource;
@@ -63,7 +62,6 @@ public function testUtil()
6362
*/
6463
public function testResource()
6564
{
66-
$this->assertServiceSetup(AttributeLimits::class);
6765
$this->assertServiceSetup(Attributes::class);
6866
$this->assertServiceSetup(Resource\ResourceInfo::class);
6967
}

‎tests/Unit/Aws/Ec2/DetectorTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function TestValidEc2()
6464
$detector = new Detector($client, $requestFactory);
6565

6666
$this->assertEquals(
67-
new Attributes(
67+
Attributes::create(
6868
[
6969
ResourceAttributes::HOST_ID => self::HOST_ID,
7070
ResourceAttributes::CLOUD_AVAILABILITY_ZONE => self::CLOUD_ZONE,
@@ -147,7 +147,7 @@ public function TestInvalidHostName()
147147
$detector = new Detector($client, $requestFactory);
148148

149149
$this->assertEquals(
150-
new Attributes(
150+
Attributes::create(
151151
[
152152
ResourceAttributes::HOST_ID => self::HOST_ID,
153153
ResourceAttributes::CLOUD_AVAILABILITY_ZONE => self::CLOUD_ZONE,
@@ -206,7 +206,7 @@ public function TestInvalidIncompleteIdentities()
206206
$detector = new Detector($client, $requestFactory);
207207

208208
$this->assertEquals(
209-
new Attributes(
209+
Attributes::create(
210210
[
211211
ResourceAttributes::HOST_ID => self::HOST_ID,
212212
ResourceAttributes::CLOUD_AVAILABILITY_ZONE => self::CLOUD_ZONE,

0 commit comments

Comments
 (0)