Skip to content

Commit 6b997f2

Browse files
intuibaseintuibase
committed
Fixed deprecated attributes
1 parent f7e2e44 commit 6b997f2

File tree

30 files changed

+74
-74
lines changed

30 files changed

+74
-74
lines changed

‎src/Instrumentation/CakePHP/src/Hooks/Cake/Command/Command.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ public function instrument(): void
2626
$builder = $this->instrumentation
2727
->tracer()
2828
->spanBuilder(sprintf('Command %s', $command->getName() ?: 'unknown'))
29-
->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
29+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
3030
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
3131
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
32-
->setAttribute(TraceAttributes::CODE_LINENO, $lineno);
32+
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno);
3333

3434
$parent = Context::getCurrent();
3535
$span = $builder->startSpan();

‎src/Instrumentation/CakePHP/src/Hooks/CakeHookTrait.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ protected function buildSpan(?ServerRequestInterface $request, string $class, st
5757
: sprintf('%s', $request?->getMethod() ?? 'unknown')
5858
)
5959
->setSpanKind(SpanKind::KIND_SERVER)
60-
->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
60+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
6161
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
6262
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
63-
->setAttribute(TraceAttributes::CODE_LINENO, $lineno);
63+
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno);
6464
$parent = Context::getCurrent();
6565
if (!$root && $request) {
6666
$this->isRoot = true;

‎src/Instrumentation/CodeIgniter/src/CodeIgniterInstrumentation.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ public static function register(): void
6060
/** @phan-suppress-next-line PhanDeprecatedFunction */
6161
->spanBuilder(\sprintf('%s', $request?->getMethod() ?? 'unknown'))
6262
->setSpanKind(SpanKind::KIND_SERVER)
63-
->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
63+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
6464
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
6565
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
66-
->setAttribute(TraceAttributes::CODE_LINENO, $lineno);
66+
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno);
6767

6868
$parent = Context::getCurrent();
69-
69+
7070
if ($request) {
7171
$parent = Globals::propagator()->extract($request, RequestPropagationGetter::instance());
7272

@@ -135,7 +135,7 @@ public static function register(): void
135135
$prop->inject($response, ResponsePropagationSetter::instance(), $scope->context());
136136
}
137137
}
138-
138+
139139
$controller = $controllerProperty->getValue($igniter);
140140
$controllerClassName = CodeIgniterInstrumentation::getControllerClassName($controller);
141141
$controllerMethod = $controllerMethodProperty->getValue($igniter);
@@ -169,7 +169,7 @@ protected static function getControllerClassName(mixed $controller): ?string
169169
protected static function normalizeRouteName(string $controllerClassName, string $controllerMethod): string
170170
{
171171
$lastSegment = strrchr($controllerClassName, '\\');
172-
172+
173173
if ($lastSegment === false) {
174174
return $controllerClassName . '.' . $controllerMethod;
175175
}

‎src/Instrumentation/Curl/src/CurlInstrumentation.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ public static function register(): void
149149
->spanBuilder($spanName)
150150
->setParent($parent)
151151
->setSpanKind(SpanKind::KIND_CLIENT)
152-
->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
152+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
153153
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
154-
->setAttribute(TraceAttributes::CODE_LINENO, $lineno)
154+
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno)
155155
->setAttributes($curlHandleToAttributes[$params[0]]->getAttributes());
156156

157157
$span = $builder->startSpan();
@@ -283,7 +283,7 @@ public static function register(): void
283283
->spanBuilder($spanName)
284284
->setParent($parent)
285285
->setSpanKind(SpanKind::KIND_CLIENT)
286-
->setAttribute(TraceAttributes::CODE_FUNCTION, 'curl_multi_exec')
286+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, 'curl_multi_exec')
287287
->setAttributes($curlHandleToAttributes[$cHandle]->getAttributes());
288288

289289
$span = $builder->startSpan();

‎src/Instrumentation/Curl/tests/Integration/CurlMultiInstrumentationTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function test_curl_multi_error()
9393

9494
$this->assertCount(1, $this->storage);
9595
$span = $this->storage->offsetGet(0);
96-
$this->assertEquals('curl_multi_exec', $span->getAttributes()->get(TraceAttributes::CODE_FUNCTION));
96+
$this->assertEquals('curl_multi_exec', $span->getAttributes()->get(TraceAttributes::CODE_FUNCTION_NAME));
9797
$this->assertEquals('unknown://scheme.com/', actual: $span->getAttributes()->get(TraceAttributes::URL_FULL));
9898
$this->assertSame('GET', $span->getName());
9999
}

‎src/Instrumentation/ExtAmqp/src/ExtAmqpInstrumentation.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ public static function register(): void
4949
->spanBuilder(sprintf('%s%s', $exchange->getName() != '' ? $exchange->getName() . ' ': '', $routingKey) . ' publish')
5050
->setSpanKind(SpanKind::KIND_PRODUCER)
5151
// code
52-
->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
52+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
5353
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
5454
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
55-
->setAttribute(TraceAttributes::CODE_LINENO, $lineno)
55+
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno)
5656
// messaging
5757
->setAttribute(TraceAttributes::MESSAGING_SYSTEM, 'amqp')
5858
->setAttribute(TraceAttributes::MESSAGING_OPERATION, 'publish')
@@ -162,10 +162,10 @@ protected static function createInteractionWithQueueSpan(CachedInstrumentation $
162162
->spanBuilder($queueName . ' ' . $method)
163163
->setSpanKind(SpanKind::KIND_CLIENT)
164164
// code
165-
->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
165+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
166166
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
167167
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
168-
->setAttribute(TraceAttributes::CODE_LINENO, $lineno)
168+
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno)
169169
// messaging
170170
->setAttribute(TraceAttributes::MESSAGING_SYSTEM, 'amqp')
171171
->setAttribute(TraceAttributes::MESSAGING_OPERATION, $method)

‎src/Instrumentation/ExtRdKafka/src/ExtRdKafkaInstrumentation.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ private static function addProductionHooks($instrumentation)
7676
->tracer()
7777
->spanBuilder(sprintf('%s %s', $exchange->getName(), TraceAttributeValues::MESSAGING_OPERATION_TYPE_PUBLISH))
7878
->setSpanKind(SpanKind::KIND_PRODUCER)
79-
->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
79+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
8080
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
8181
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
82-
->setAttribute(TraceAttributes::CODE_LINENO, $lineno)
82+
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno)
8383
->setAttribute(TraceAttributes::MESSAGING_SYSTEM, TraceAttributeValues::MESSAGING_SYSTEM_KAFKA)
8484
->setAttribute(TraceAttributes::MESSAGING_OPERATION_TYPE, TraceAttributeValues::MESSAGING_OPERATION_TYPE_PUBLISH)
8585
;

‎src/Instrumentation/Guzzle/src/GuzzleInstrumentation.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ public static function register(): void
5858
->setAttribute(TraceAttributes::SERVER_ADDRESS, $request->getUri()->getHost())
5959
->setAttribute(TraceAttributes::SERVER_PORT, $request->getUri()->getPort())
6060
->setAttribute(TraceAttributes::URL_PATH, $request->getUri()->getPath())
61-
->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
61+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
6262
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
6363
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
64-
->setAttribute(TraceAttributes::CODE_LINENO, $lineno)
64+
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno)
6565
;
6666

6767
foreach ($propagator->fields() as $field) {

‎src/Instrumentation/HttpAsyncClient/src/HttpAsyncClientInstrumentation.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ public static function register(): void
5353
->setAttribute(TraceAttributes::HTTP_REQUEST_BODY_SIZE, $request->getHeaderLine('Content-Length'))
5454
->setAttribute(TraceAttributes::SERVER_ADDRESS, $request->getUri()->getHost())
5555
->setAttribute(TraceAttributes::SERVER_PORT, $request->getUri()->getPort())
56-
->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
56+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
5757
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
5858
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
59-
->setAttribute(TraceAttributes::CODE_LINENO, $lineno)
59+
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno)
6060
;
6161

6262
foreach ($propagator->fields() as $field) {

‎src/Instrumentation/IO/src/IOInstrumentation.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ private static function makeBuilder(
6767
/** @psalm-suppress ArgumentTypeCoercion */
6868
return $instrumentation->tracer()
6969
->spanBuilder($name)
70-
->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
70+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
7171
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
72-
->setAttribute(TraceAttributes::CODE_LINENO, $lineno);
72+
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno);
7373
}
7474
private static function end(?Throwable $exception): void
7575
{

0 commit comments

Comments
 (0)