Skip to content

Commit a8815b3

Browse files
gechetsprgechetspr
authored
Merge pull request #27 from spryker/bugfix/frw-10377-fixed-deprecated-code
FRW-10377 Fixed errors after the update
2 parents 1692dcb + e0bbbbc commit a8815b3

File tree

4 files changed

+15
-139
lines changed

4 files changed

+15
-139
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"open-telemetry/exporter-otlp": "^1.0",
99
"open-telemetry/gen-otlp-protobuf": "^1.1",
1010
"open-telemetry/transport-grpc": "^1.0",
11-
"open-telemetry/sdk": "^1.0",
11+
"open-telemetry/sdk": "~1.3.0",
1212
"open-telemetry/sem-conv": "~1.30.0",
1313
"php": ">=8.2",
1414
"spryker/kernel": "^3.30.0",

‎src/Spryker/Service/Opentelemetry/Instrumentation/Resource/ResourceInfoFactory.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use OpenTelemetry\SDK\Resource\Detectors\ProcessRuntime;
1717
use OpenTelemetry\SDK\Resource\Detectors\Sdk;
1818
use OpenTelemetry\SDK\Resource\Detectors\SdkProvided;
19+
use OpenTelemetry\SDK\Resource\Detectors\Service;
1920
use Spryker\Service\Opentelemetry\Instrumentation\Span\Attributes;
2021

2122
class ResourceInfoFactory
@@ -32,14 +33,12 @@ public static function defaultResource(): ResourceInfo
3233
{
3334
return (new CompositeResourceDetector([
3435
new Host(),
35-
new OperatingSystem(),
3636
new Process(),
37-
new ProcessRuntime(),
38-
new Sdk(),
39-
new SdkProvided(),
4037
new Composer(),
4138
...Registry::resourceDetectors(),
4239
new Environment(),
40+
new Sdk(),
41+
new Service(),
4342
]))->getResource();
4443
}
4544

‎src/Spryker/Service/Opentelemetry/Instrumentation/Span/SpanLimitBuilder.php

Lines changed: 7 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -7,156 +7,30 @@
77

88
namespace Spryker\Service\Opentelemetry\Instrumentation\Span;
99

10-
use OpenTelemetry\SDK\Common\Attribute\FilteredAttributesFactory;
1110
use OpenTelemetry\SDK\Common\Configuration\Configuration;
1211
use OpenTelemetry\SDK\Common\Configuration\Variables as Env;
1312
use OpenTelemetry\SDK\Trace\SpanLimits;
14-
use OpenTelemetry\SemConv\TraceAttributes;
1513

1614
class SpanLimitBuilder
1715
{
18-
/**
19-
* @var int|null
20-
*/
21-
protected ?int $attributeCountLimit = null;
22-
23-
/**
24-
* @var int|null
25-
*/
26-
protected ?int $attributeValueLengthLimit = null;
27-
28-
/**
29-
* @var int|null
30-
*/
31-
protected ?int $eventCountLimit = null;
32-
33-
/**
34-
* @var int|null
35-
*/
36-
protected ?int $linkCountLimit = null;
37-
38-
/**
39-
* @var int|null
40-
*/
41-
protected ?int $attributePerEventCountLimit = null;
42-
43-
/**
44-
* @var int|null
45-
*/
46-
protected ?int $attributePerLinkCountLimit = null;
47-
48-
/**
49-
* @param int $attributeCountLimit
50-
*
51-
* @return $this
52-
*/
53-
public function setAttributeCountLimit(int $attributeCountLimit)
54-
{
55-
$this->attributeCountLimit = $attributeCountLimit;
56-
57-
return $this;
58-
}
59-
60-
/**
61-
* @param int $attributeValueLengthLimit
62-
*
63-
* @return $this
64-
*/
65-
public function setAttributeValueLengthLimit(int $attributeValueLengthLimit)
66-
{
67-
$this->attributeValueLengthLimit = $attributeValueLengthLimit;
68-
69-
return $this;
70-
}
71-
72-
/**
73-
* @param int $eventCountLimit
74-
*
75-
* @return $this
76-
*/
77-
public function setEventCountLimit(int $eventCountLimit)
78-
{
79-
$this->eventCountLimit = $eventCountLimit;
80-
81-
return $this;
82-
}
83-
84-
/**
85-
* @param int $linkCountLimit
86-
*
87-
* @return $this
88-
*/
89-
public function setLinkCountLimit(int $linkCountLimit)
90-
{
91-
$this->linkCountLimit = $linkCountLimit;
92-
93-
return $this;
94-
}
95-
96-
/**
97-
* @param int $attributePerEventCountLimit
98-
* @return $this
99-
*/
100-
public function setAttributePerEventCountLimit(int $attributePerEventCountLimit)
101-
{
102-
$this->attributePerEventCountLimit = $attributePerEventCountLimit;
103-
104-
return $this;
105-
}
106-
107-
/**
108-
* @param int $attributePerLinkCountLimit
109-
*
110-
* @return $this
111-
*/
112-
public function setAttributePerLinkCountLimit(int $attributePerLinkCountLimit)
113-
{
114-
$this->attributePerLinkCountLimit = $attributePerLinkCountLimit;
115-
116-
return $this;
117-
}
118-
119-
/**
120-
* @param bool $retain
121-
*
122-
* @return $this
123-
*/
124-
public function retainGeneralIdentityAttributes(bool $retain = true)
125-
{
126-
$this->retainGeneralIdentityAttributes = $retain;
127-
128-
return $this;
129-
}
130-
13116
/**
13217
* @return \OpenTelemetry\SDK\Trace\SpanLimits
13318
*/
13419
public function build(): SpanLimits
13520
{
136-
$attributeCountLimit = $this->attributeCountLimit
137-
?: Configuration::getInt(Env::OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT, SpanLimits::DEFAULT_SPAN_ATTRIBUTE_COUNT_LIMIT);
138-
$attributeValueLengthLimit = $this->attributeValueLengthLimit
139-
?: Configuration::getInt(Env::OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT, SpanLimits::DEFAULT_SPAN_ATTRIBUTE_LENGTH_LIMIT);
140-
$eventCountLimit = $this->eventCountLimit
141-
?: Configuration::getInt(Env::OTEL_SPAN_EVENT_COUNT_LIMIT, SpanLimits::DEFAULT_SPAN_EVENT_COUNT_LIMIT);
142-
$linkCountLimit = $this->linkCountLimit
143-
?: Configuration::getInt(Env::OTEL_SPAN_LINK_COUNT_LIMIT, SpanLimits::DEFAULT_SPAN_LINK_COUNT_LIMIT);
144-
$attributePerEventCountLimit = $this->attributePerEventCountLimit
145-
?: Configuration::getInt(Env::OTEL_EVENT_ATTRIBUTE_COUNT_LIMIT, SpanLimits::DEFAULT_EVENT_ATTRIBUTE_COUNT_LIMIT);
146-
$attributePerLinkCountLimit = $this->attributePerLinkCountLimit
147-
?: Configuration::getInt(Env::OTEL_LINK_ATTRIBUTE_COUNT_LIMIT, SpanLimits::DEFAULT_LINK_ATTRIBUTE_COUNT_LIMIT);
21+
$attributeCountLimit = Configuration::getInt(Env::OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT, SpanLimits::DEFAULT_SPAN_ATTRIBUTE_COUNT_LIMIT);
22+
$attributeValueLengthLimit = Configuration::getInt(Env::OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT, SpanLimits::DEFAULT_SPAN_ATTRIBUTE_LENGTH_LIMIT);
23+
$eventCountLimit = Configuration::getInt(Env::OTEL_SPAN_EVENT_COUNT_LIMIT, SpanLimits::DEFAULT_SPAN_EVENT_COUNT_LIMIT);
24+
$linkCountLimit = Configuration::getInt(Env::OTEL_SPAN_LINK_COUNT_LIMIT, SpanLimits::DEFAULT_SPAN_LINK_COUNT_LIMIT);
25+
$attributePerEventCountLimit = Configuration::getInt(Env::OTEL_EVENT_ATTRIBUTE_COUNT_LIMIT, SpanLimits::DEFAULT_EVENT_ATTRIBUTE_COUNT_LIMIT);
26+
$attributePerLinkCountLimit = Configuration::getInt(Env::OTEL_LINK_ATTRIBUTE_COUNT_LIMIT, SpanLimits::DEFAULT_LINK_ATTRIBUTE_COUNT_LIMIT);
14827

14928
if ($attributeValueLengthLimit === PHP_INT_MAX) {
15029
$attributeValueLengthLimit = null;
15130
}
15231

153-
$spanAttributesFactory = new FilteredAttributesFactory(Attributes::factory($attributeCountLimit, $attributeValueLengthLimit), [
154-
TraceAttributes::USER_ID,
155-
TraceAttributes::USER_ROLES,
156-
]);
157-
15832
return new SpanLimits(
159-
$spanAttributesFactory,
33+
Attributes::factory($attributeCountLimit, $attributeValueLengthLimit),
16034
Attributes::factory($attributePerEventCountLimit, $attributeValueLengthLimit),
16135
Attributes::factory($attributePerLinkCountLimit, $attributeValueLengthLimit),
16236
$eventCountLimit,

‎src/Spryker/Service/Opentelemetry/Instrumentation/SprykerInstrumentationBootstrap.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class SprykerInstrumentationBootstrap
7272
/**
7373
* @var string
7474
*/
75-
public const INSTRUMENTATION_VERSION = '1.12.1';
75+
public const INSTRUMENTATION_VERSION = '1.13.0';
7676

7777
/**
7878
* @var string
@@ -129,6 +129,9 @@ class SprykerInstrumentationBootstrap
129129
*/
130130
public static function register(): void
131131
{
132+
//Disabling error reporting for Otel. Will be overwritten by the application.
133+
error_reporting(0);
134+
132135
$request = RequestProcessor::getRequest();
133136

134137
TraceSampleResult::shouldSample($request);

0 commit comments

Comments
 (0)