Skip to content

Commit e2291c5

Browse files
brettmcbrettmc
authored
update instrumentations to semconv 1.32 (#369)
SemConv 1.32 deprecates a couple of attributes which we use extensively: - code.function.name is now an FQN (including class name) - code.namespace is deprecated (included in code.function.name) - code.linenumber is deprecated and replaced with code.line.number Updated all packages to conform, updated min semconv to 1.32, and made a couple of minor changes"
1 parent 7cfb0b4 commit e2291c5

File tree

8 files changed

+28
-41
lines changed

8 files changed

+28
-41
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"ext-opentelemetry": "*",
1515
"laravel/framework": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
1616
"open-telemetry/api": "^1.0",
17-
"open-telemetry/sem-conv": "^1.30"
17+
"open-telemetry/sem-conv": "^1.32"
1818
},
1919
"require-dev": {
2020
"friendsofphp/php-cs-fixer": "^3.50",

‎src/Hooks/Illuminate/Console/Command.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ protected function hookExecute(): bool
3535
$builder = $this->instrumentation
3636
->tracer()
3737
->spanBuilder(sprintf('Command %s', $command->getName() ?: 'unknown'))
38-
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
39-
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
40-
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
38+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
39+
->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
4140
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno);
4241

4342
$parent = Context::getCurrent();

‎src/Hooks/Illuminate/Contracts/Console/Kernel.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@ private function hookHandle(): bool
4444
->tracer()
4545
->spanBuilder('Artisan handler')
4646
->setSpanKind(SpanKind::KIND_PRODUCER)
47-
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
48-
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
49-
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
47+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
48+
->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
5049
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno);
5150

5251
$parent = Context::getCurrent();

‎src/Hooks/Illuminate/Contracts/Http/Kernel.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,8 @@ protected function hookHandle(): bool
4646
->tracer()
4747
->spanBuilder(sprintf('%s', $request?->method() ?? 'unknown'))
4848
->setSpanKind(SpanKind::KIND_SERVER)
49-
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
50-
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
51-
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
49+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
50+
->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
5251
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno);
5352
$parent = Context::getCurrent();
5453
if ($request) {

‎src/Hooks/Illuminate/Contracts/Queue/Queue.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@ protected function hookBulk(): bool
3939
'bulk',
4040
pre: function (QueueContract $queue, array $params, string $class, string $function, ?string $filename, ?int $lineno) {
4141
$attributes = array_merge([
42-
TraceAttributes::CODE_FUNCTION_NAME => $function,
43-
TraceAttributes::CODE_NAMESPACE => $class,
44-
TraceAttributes::CODE_FILEPATH => $filename,
42+
TraceAttributes::CODE_FUNCTION_NAME => sprintf('%s::%s', $class, $function),
43+
TraceAttributes::CODE_FILE_PATH => $filename,
4544
TraceAttributes::CODE_LINE_NUMBER => $lineno,
4645
TraceAttributes::MESSAGING_BATCH_MESSAGE_COUNT => count($params[0] ?? []),
4746
], $this->contextualMessageSystemAttributes($queue, []));
@@ -83,9 +82,8 @@ protected function hookLater(): bool
8382
};
8483

8584
$attributes = [
86-
TraceAttributes::CODE_FUNCTION_NAME => $function,
87-
TraceAttributes::CODE_NAMESPACE => $class,
88-
TraceAttributes::CODE_FILEPATH => $filename,
85+
TraceAttributes::CODE_FUNCTION_NAME => sprintf('%s::%s', $class, $function),
86+
TraceAttributes::CODE_FILE_PATH => $filename,
8987
TraceAttributes::CODE_LINE_NUMBER => $lineno,
9088
'messaging.message.delivery_timestamp' => $estimateDeliveryTimestamp,
9189
];

‎src/Hooks/Illuminate/Database/Eloquent/Model.php‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@ private function hookFind(): void
4242
->tracer()
4343
->spanBuilder($model::class . '::find')
4444
->setSpanKind(SpanKind::KIND_INTERNAL)
45-
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
46-
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
47-
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
45+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
46+
->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
4847
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno)
4948
->setAttribute('laravel.eloquent.model', $model::class)
5049
->setAttribute('laravel.eloquent.table', $model->getTable())
@@ -73,9 +72,8 @@ private function hookPerformUpdate(): void
7372
->tracer()
7473
->spanBuilder($model::class . '::update')
7574
->setSpanKind(SpanKind::KIND_INTERNAL)
76-
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
77-
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
78-
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
75+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
76+
->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
7977
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno)
8078
->setAttribute('laravel.eloquent.model', $model::class)
8179
->setAttribute('laravel.eloquent.table', $model->getTable())
@@ -104,9 +102,8 @@ private function hookPerformInsert(): void
104102
->tracer()
105103
->spanBuilder($model::class . '::create')
106104
->setSpanKind(SpanKind::KIND_INTERNAL)
107-
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
108-
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
109-
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
105+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
106+
->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
110107
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno)
111108
->setAttribute('laravel.eloquent.model', $model::class)
112109
->setAttribute('laravel.eloquent.table', $model->getTable())
@@ -135,9 +132,8 @@ private function hookDelete(): void
135132
->tracer()
136133
->spanBuilder($model::class . '::delete')
137134
->setSpanKind(SpanKind::KIND_INTERNAL)
138-
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
139-
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
140-
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
135+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
136+
->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
141137
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno)
142138
->setAttribute('laravel.eloquent.model', $model::class)
143139
->setAttribute('laravel.eloquent.table', $model->getTable())
@@ -167,9 +163,8 @@ private function hookGetModels(): void
167163
->tracer()
168164
->spanBuilder($model::class . '::get')
169165
->setSpanKind(SpanKind::KIND_INTERNAL)
170-
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
171-
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
172-
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
166+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
167+
->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
173168
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno)
174169
->setAttribute('laravel.eloquent.model', $model::class)
175170
->setAttribute('laravel.eloquent.table', $model->getTable())
@@ -199,9 +194,8 @@ private function hookDestroy(): void
199194
->tracer()
200195
->spanBuilder($model::class . '::destroy')
201196
->setSpanKind(SpanKind::KIND_INTERNAL)
202-
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
203-
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
204-
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
197+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
198+
->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
205199
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno)
206200
->setAttribute('laravel.eloquent.model', $model::class)
207201
->setAttribute('laravel.eloquent.table', $model->getTable())
@@ -230,9 +224,8 @@ private function hookRefresh(): void
230224
->tracer()
231225
->spanBuilder($model::class . '::refresh')
232226
->setSpanKind(SpanKind::KIND_INTERNAL)
233-
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
234-
->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
235-
->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
227+
->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
228+
->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
236229
->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno)
237230
->setAttribute('laravel.eloquent.model', $model::class)
238231
->setAttribute('laravel.eloquent.table', $model->getTable())

‎src/Hooks/Illuminate/Queue/SyncQueue.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ protected function hookPush(): bool
4141
]))
4242
->setSpanKind(SpanKind::KIND_INTERNAL)
4343
->setAttributes([
44-
TraceAttributes::CODE_FUNCTION_NAME => $function,
45-
TraceAttributes::CODE_NAMESPACE => $class,
46-
TraceAttributes::CODE_FILEPATH => $filename,
44+
TraceAttributes::CODE_FUNCTION_NAME => sprintf('%s::%s', $class, $function),
45+
TraceAttributes::CODE_FILE_PATH => $filename,
4746
TraceAttributes::CODE_LINE_NUMBER => $lineno,
4847
])
4948
->startSpan();

‎src/LaravelInstrumentation.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public static function register(): void
1717
$instrumentation = new CachedInstrumentation(
1818
'io.opentelemetry.contrib.php.laravel',
1919
null,
20-
'https://opentelemetry.io/schemas/1.30.0',
20+
'https://opentelemetry.io/schemas/1.32.0',
2121
);
2222

2323
Hooks\Illuminate\Console\Command::hook($instrumentation);

0 commit comments

Comments
 (0)