From dd3726eb4880666426b15066c53ddf00f02b9ac0 Mon Sep 17 00:00:00 2001 From: Carlos Crespo Date: Fri, 27 Dec 2024 10:21:21 +0100 Subject: [PATCH 1/2] fix stack trace syntax highlight --- .../errors/get_error_groups/get_error_sample_details.ts | 2 ++ .../apis/observability/apm/mobile/errors/generate_data.ts | 3 +++ .../observability/apm/mobile/errors/group_id_samples.spec.ts | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/x-pack/plugins/observability_solution/apm/server/routes/errors/get_error_groups/get_error_sample_details.ts b/x-pack/plugins/observability_solution/apm/server/routes/errors/get_error_groups/get_error_sample_details.ts index 954086ee53084..a3edca6d30740 100644 --- a/x-pack/plugins/observability_solution/apm/server/routes/errors/get_error_groups/get_error_sample_details.ts +++ b/x-pack/plugins/observability_solution/apm/server/routes/errors/get_error_groups/get_error_sample_details.ts @@ -27,6 +27,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'; @@ -82,6 +83,7 @@ export async function getErrorSampleDetails({ SPAN_ID, AGENT_VERSION, PROCESSOR_NAME, + SERVICE_LANGUAGE_NAME, ERROR_STACK_TRACE, ERROR_EXC_MESSAGE, ERROR_EXC_HANDLED, diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/mobile/errors/generate_data.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/mobile/errors/generate_data.ts index c1ae372335824..cf7623fc15257 100644 --- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/mobile/errors/generate_data.ts +++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/mobile/errors/generate_data.ts @@ -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'; diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/mobile/errors/group_id_samples.spec.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/mobile/errors/group_id_samples.spec.ts index 6e5a19327c24f..f82a8b1a3139f 100644 --- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/mobile/errors/group_id_samples.spec.ts +++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/mobile/errors/group_id_samples.spec.ts @@ -134,6 +134,10 @@ export default function ApiTest({ getService }: DeploymentAgnosticFtrProviderCon 'Error 1' ); }); + + it('displays correct language name', () => { + expect(errorSampleDetailsResponse.error.service.language?.name).to.equal('swift'); + }); }); }); From edf45921f394e24e5df443c86fd4d7d11d3802b7 Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Fri, 27 Dec 2024 11:44:06 +0000 Subject: [PATCH 2/2] [CI] Auto-commit changed files from 'node scripts/eslint --no-cache --fix' --- .../public/legacy/embeddable/visualize_embeddable.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/plugins/visualizations/public/legacy/embeddable/visualize_embeddable.tsx b/src/plugins/visualizations/public/legacy/embeddable/visualize_embeddable.tsx index e343fd535a85e..1f631f30f8eb5 100644 --- a/src/plugins/visualizations/public/legacy/embeddable/visualize_embeddable.tsx +++ b/src/plugins/visualizations/public/legacy/embeddable/visualize_embeddable.tsx @@ -22,11 +22,7 @@ import type { DataView } from '@kbn/data-views-plugin/public'; import { Warnings } from '@kbn/charts-plugin/public'; import { hasUnsupportedDownsampledAggregationFailure } from '@kbn/search-response-warnings'; import { Adapters } from '@kbn/inspector-plugin/public'; -import { - Embeddable, - EmbeddableInput, - EmbeddableOutput, -} from '@kbn/embeddable-plugin/public'; +import { Embeddable, EmbeddableInput, EmbeddableOutput } from '@kbn/embeddable-plugin/public'; import { SavedObjectEmbeddableInput } from '@kbn/embeddable-plugin/common'; import { ExpressionAstExpression,