Skip to content

Commit 45b714e

Browse files
[8.16] [APM] Fix stack trace syntax highlight (#205187) (#205354)
# Backport This will backport the following commits from `main` to `8.16`: - [[APM] Fix stack trace syntax highlight (#205187)](#205187) <!--- Backport version: 8.9.8 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Carlos Crespo","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-12-30T15:48:38Z","message":"[APM] Fix stack trace syntax highlight (#205187)\n\nfixes: [#204957](https://github.com/elastic/kibana/issues/204957)\r\n\r\n## Summary\r\n\r\nThis PR fixes the stack trace syntax highlight\r\n\r\n<img width=\"1452\" alt=\"image\"\r\nsrc=\"https://github.com/user-attachments/assets/ee076fc6-c901-4e8f-a760-8c85a5470a26\"\r\n/>\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"a78f61691f6de231b76083a52bdcb3db602df1a0","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:prev-major","Team:obs-ux-infra_services","v8.18.0","v8.17.1"],"number":205187,"url":"https://github.com/elastic/kibana/pull/205187","mergeCommit":{"message":"[APM] Fix stack trace syntax highlight (#205187)\n\nfixes: [#204957](https://github.com/elastic/kibana/issues/204957)\r\n\r\n## Summary\r\n\r\nThis PR fixes the stack trace syntax highlight\r\n\r\n<img width=\"1452\" alt=\"image\"\r\nsrc=\"https://github.com/user-attachments/assets/ee076fc6-c901-4e8f-a760-8c85a5470a26\"\r\n/>\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"a78f61691f6de231b76083a52bdcb3db602df1a0"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/205187","number":205187,"mergeCommit":{"message":"[APM] Fix stack trace syntax highlight (#205187)\n\nfixes: [#204957](https://github.com/elastic/kibana/issues/204957)\r\n\r\n## Summary\r\n\r\nThis PR fixes the stack trace syntax highlight\r\n\r\n<img width=\"1452\" alt=\"image\"\r\nsrc=\"https://github.com/user-attachments/assets/ee076fc6-c901-4e8f-a760-8c85a5470a26\"\r\n/>\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"a78f61691f6de231b76083a52bdcb3db602df1a0"}},{"branch":"8.x","label":"v8.18.0","labelRegex":"^v8.18.0$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/205273","number":205273,"state":"MERGED","mergeCommit":{"sha":"29b636b1fdc0ee1af3582eea4a229a4a6a437be5","message":"[8.x] [APM] Fix stack trace syntax highlight (#205187) (#205273)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.x`:\n- [[APM] Fix stack trace syntax highlight\n(#205187)](https://github.com/elastic/kibana/pull/205187)\n\n<!--- Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT [{\"author\":{\"name\":\"Carlos\nCrespo\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2024-12-30T15:48:38Z\",\"message\":\"[APM]\nFix stack trace syntax highlight (#205187)\\n\\nfixes:\n[#204957](https://github.com/elastic/kibana/issues/204957)\\r\\n\\r\\n##\nSummary\\r\\n\\r\\nThis PR fixes the stack trace syntax\nhighlight\\r\\n\\r\\n<img width=\\\"1452\\\"\nalt=\\\"image\\\"\\r\\nsrc=\\\"https://github.com/user-attachments/assets/ee076fc6-c901-4e8f-a760-8c85a5470a26\\\"\\r\\n/>\\r\\n\\r\\n---------\\r\\n\\r\\nCo-authored-by:\nkibanamachine\n<[email protected]>\",\"sha\":\"a78f61691f6de231b76083a52bdcb3db602df1a0\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.18.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:skip\",\"v9.0.0\",\"backport:prev-major\",\"Team:obs-ux-infra_services\"],\"title\":\"[APM]\nFix stack trace syntax\nhighlight\",\"number\":205187,\"url\":\"https://github.com/elastic/kibana/pull/205187\",\"mergeCommit\":{\"message\":\"[APM]\nFix stack trace syntax highlight (#205187)\\n\\nfixes:\n[#204957](https://github.com/elastic/kibana/issues/204957)\\r\\n\\r\\n##\nSummary\\r\\n\\r\\nThis PR fixes the stack trace syntax\nhighlight\\r\\n\\r\\n<img width=\\\"1452\\\"\nalt=\\\"image\\\"\\r\\nsrc=\\\"https://github.com/user-attachments/assets/ee076fc6-c901-4e8f-a760-8c85a5470a26\\\"\\r\\n/>\\r\\n\\r\\n---------\\r\\n\\r\\nCo-authored-by:\nkibanamachine\n<[email protected]>\",\"sha\":\"a78f61691f6de231b76083a52bdcb3db602df1a0\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v9.0.0\",\"branchLabelMappingKey\":\"^v9.0.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/205187\",\"number\":205187,\"mergeCommit\":{\"message\":\"[APM]\nFix stack trace syntax highlight (#205187)\\n\\nfixes:\n[#204957](https://github.com/elastic/kibana/issues/204957)\\r\\n\\r\\n##\nSummary\\r\\n\\r\\nThis PR fixes the stack trace syntax\nhighlight\\r\\n\\r\\n<img width=\\\"1452\\\"\nalt=\\\"image\\\"\\r\\nsrc=\\\"https://github.com/user-attachments/assets/ee076fc6-c901-4e8f-a760-8c85a5470a26\\\"\\r\\n/>\\r\\n\\r\\n---------\\r\\n\\r\\nCo-authored-by:\nkibanamachine\n<[email protected]>\",\"sha\":\"a78f61691f6de231b76083a52bdcb3db602df1a0\"}}]}]\nBACKPORT-->\n\nCo-authored-by: Carlos Crespo <[email protected]>"}},{"branch":"8.17","label":"v8.17.1","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/205272","number":205272,"state":"MERGED","mergeCommit":{"sha":"249e5ba71ba9146555d501d6a1dd91e8aefcf92a","message":"[8.17] [APM] Fix stack trace syntax highlight (#205187) (#205272)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.17`:\n- [[APM] Fix stack trace syntax highlight\n(#205187)](https://github.com/elastic/kibana/pull/205187)\n\n<!--- Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT [{\"author\":{\"name\":\"Carlos\nCrespo\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2024-12-30T15:48:38Z\",\"message\":\"[APM]\nFix stack trace syntax highlight (#205187)\\n\\nfixes:\n[#204957](https://github.com/elastic/kibana/issues/204957)\\r\\n\\r\\n##\nSummary\\r\\n\\r\\nThis PR fixes the stack trace syntax\nhighlight\\r\\n\\r\\n<img width=\\\"1452\\\"\nalt=\\\"image\\\"\\r\\nsrc=\\\"https://github.com/user-attachments/assets/ee076fc6-c901-4e8f-a760-8c85a5470a26\\\"\\r\\n/>\\r\\n\\r\\n---------\\r\\n\\r\\nCo-authored-by:\nkibanamachine\n<[email protected]>\",\"sha\":\"a78f61691f6de231b76083a52bdcb3db602df1a0\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.18.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:skip\",\"v9.0.0\",\"backport:prev-major\",\"Team:obs-ux-infra_services\"],\"title\":\"[APM]\nFix stack trace syntax\nhighlight\",\"number\":205187,\"url\":\"https://github.com/elastic/kibana/pull/205187\",\"mergeCommit\":{\"message\":\"[APM]\nFix stack trace syntax highlight (#205187)\\n\\nfixes:\n[#204957](https://github.com/elastic/kibana/issues/204957)\\r\\n\\r\\n##\nSummary\\r\\n\\r\\nThis PR fixes the stack trace syntax\nhighlight\\r\\n\\r\\n<img width=\\\"1452\\\"\nalt=\\\"image\\\"\\r\\nsrc=\\\"https://github.com/user-attachments/assets/ee076fc6-c901-4e8f-a760-8c85a5470a26\\\"\\r\\n/>\\r\\n\\r\\n---------\\r\\n\\r\\nCo-authored-by:\nkibanamachine\n<[email protected]>\",\"sha\":\"a78f61691f6de231b76083a52bdcb3db602df1a0\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v9.0.0\",\"branchLabelMappingKey\":\"^v9.0.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/205187\",\"number\":205187,\"mergeCommit\":{\"message\":\"[APM]\nFix stack trace syntax highlight (#205187)\\n\\nfixes:\n[#204957](https://github.com/elastic/kibana/issues/204957)\\r\\n\\r\\n##\nSummary\\r\\n\\r\\nThis PR fixes the stack trace syntax\nhighlight\\r\\n\\r\\n<img width=\\\"1452\\\"\nalt=\\\"image\\\"\\r\\nsrc=\\\"https://github.com/user-attachments/assets/ee076fc6-c901-4e8f-a760-8c85a5470a26\\\"\\r\\n/>\\r\\n\\r\\n---------\\r\\n\\r\\nCo-authored-by:\nkibanamachine\n<[email protected]>\",\"sha\":\"a78f61691f6de231b76083a52bdcb3db602df1a0\"}}]}]\nBACKPORT-->\n\nCo-authored-by: Carlos Crespo <[email protected]>"}}]}] BACKPORT--> --------- Co-authored-by: kibanamachine <[email protected]>
1 parent e67d250 commit 45b714e

File tree

4 files changed

+10
-1
lines changed

4 files changed

+10
-1
lines changed

NOTICE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Kibana source code with Kibana X-Pack source code
2-
Copyright 2012-2024 Elasticsearch B.V.
2+
Copyright 2012-2025 Elasticsearch B.V.
33

44
---
55
Adapted from remote-web-worker, which was available under a "MIT" license.

x-pack/plugins/observability_solution/apm/server/routes/errors/get_error_groups/get_error_sample_details.ts

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import {
2828
TRANSACTION_ID,
2929
ERROR_STACK_TRACE,
3030
SPAN_ID,
31+
SERVICE_LANGUAGE_NAME,
3132
} from '../../../../common/es_fields/apm';
3233
import { environmentQuery } from '../../../../common/utils/environment_query';
3334
import { ApmDocumentType } from '../../../../common/document_type';
@@ -83,6 +84,7 @@ export async function getErrorSampleDetails({
8384
SPAN_ID,
8485
AGENT_VERSION,
8586
PROCESSOR_NAME,
87+
SERVICE_LANGUAGE_NAME,
8688
ERROR_CULPRIT,
8789
ERROR_STACK_TRACE,
8890
ERROR_EXC_MESSAGE,

x-pack/test/apm_api_integration/tests/errors/group_id_samples.spec.ts

+4
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@ export default function ApiTest({ getService }: FtrProviderContext) {
139139
it('displays correct error culprit info', () => {
140140
expect(errorSampleDetailsResponse.error.error.culprit).to.equal('Error culprit 1');
141141
});
142+
143+
it('displays correct language name', () => {
144+
expect(errorSampleDetailsResponse.error.service.language?.name).to.equal('swift');
145+
});
142146
});
143147
});
144148

x-pack/test/apm_api_integration/tests/mobile/errors/generate_data.ts

+3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ export async function generateData({
3333
}) {
3434
const serviceGoProdInstance = apm
3535
.service({ name: serviceName, environment: 'production', agentName: 'swift' })
36+
.defaults({
37+
'service.language.name': 'swift',
38+
})
3639
.instance('instance-a');
3740

3841
const interval = '1m';

0 commit comments

Comments
 (0)