Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.16] [APM] Fix stack trace syntax highlight (#205187) #205354

Merged
merged 2 commits into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NOTICE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Kibana source code with Kibana X-Pack source code
Copyright 2012-2024 Elasticsearch B.V.
Copyright 2012-2025 Elasticsearch B.V.

---
Adapted from remote-web-worker, which was available under a "MIT" license.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
TRANSACTION_ID,
ERROR_STACK_TRACE,
SPAN_ID,
SERVICE_LANGUAGE_NAME,
} from '../../../../common/es_fields/apm';
import { environmentQuery } from '../../../../common/utils/environment_query';
import { ApmDocumentType } from '../../../../common/document_type';
Expand Down Expand Up @@ -83,6 +84,7 @@ export async function getErrorSampleDetails({
SPAN_ID,
AGENT_VERSION,
PROCESSOR_NAME,
SERVICE_LANGUAGE_NAME,
ERROR_CULPRIT,
ERROR_STACK_TRACE,
ERROR_EXC_MESSAGE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ export default function ApiTest({ getService }: FtrProviderContext) {
it('displays correct error culprit info', () => {
expect(errorSampleDetailsResponse.error.error.culprit).to.equal('Error culprit 1');
});

it('displays correct language name', () => {
expect(errorSampleDetailsResponse.error.service.language?.name).to.equal('swift');
});
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ export async function generateData({
}) {
const serviceGoProdInstance = apm
.service({ name: serviceName, environment: 'production', agentName: 'swift' })
.defaults({
'service.language.name': 'swift',
})
.instance('instance-a');

const interval = '1m';
Expand Down
Loading