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

[APM] Profiling #91818

Merged
merged 18 commits into from
Feb 22, 2021
Merged
Changes from 1 commit
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
Prev Previous commit
Merge branch 'master' of github.com:elastic/kibana into profiling-poc
  • Loading branch information
dgieselaar committed Feb 22, 2021
commit 231b1cfb96cf6e98d1736ad8d413a4992a874444
Original file line number Diff line number Diff line change
@@ -142,7 +142,7 @@ export function ServiceDetailTabs({ serviceName, tab }: Props) {
}
)}
tooltipContent={i18n.translate(
'xpack.apm.serviceDetails.profilingTabExperimentalDedcription',
'xpack.apm.serviceDetails.profilingTabExperimentalDescription',
{
defaultMessage:
'Profiling is highly experimental and for internal use only.',
Original file line number Diff line number Diff line change
@@ -269,6 +269,7 @@ export function ServiceProfilingFlamegraph({

if (
!node ||
// TODO: apply highlight to entire stack, not just node
(highlightFilter && !node.fqn.includes(highlightFilter))
) {
return rgba(0, 0, 0, 0.25);
@@ -323,8 +324,8 @@ export function ServiceProfilingFlamegraph({
config={{
fillLabel: {
fontFamily: theme.eui.euiCodeFontFamily,
// @ts-ignore (coming soon in Elastic charts)
clip: true,
// @ts-expect-error (coming soon in Elastic charts)
clipText: true,
},
drilldown: true,
fontFamily: theme.eui.euiCodeFontFamily,
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ function getProfilingStats({
filter: ESFilter[];
valueTypeField: string;
}) {
return withApmSpan('get_profile_stats', async () => {
return withApmSpan('get_profiling_stats', async () => {
const response = await apmEventClient.search({
apm: {
events: [ProcessorEvent.profile],
1 change: 1 addition & 0 deletions x-pack/plugins/apm/server/routes/create_apm_api.ts
Original file line number Diff line number Diff line change
@@ -135,6 +135,7 @@ const createApmApi = () => {
.add(serviceMetadataDetailsRoute)
.add(serviceMetadataIconsRoute)
.add(serviceInstancesRoute)
.add(serviceErrorGroupsComparisonStatisticsRoute)
.add(serviceProfilingTimelineRoute)
.add(serviceProfilingStatisticsRoute)

7 changes: 1 addition & 6 deletions x-pack/plugins/apm/server/routes/services.ts
Original file line number Diff line number Diff line change
@@ -182,12 +182,7 @@ export const serviceAnnotationsRoute = createRoute({
path: t.type({
serviceName: t.string,
}),
query: t.intersection([
rangeRt,
t.partial({
environment: t.string,
}),
]),
query: t.intersection([rangeRt, environmentRt]),
}),
options: { tags: ['access:apm'] },
handler: async ({ context, request }) => {
You are viewing a condensed version of this merge commit. You can view the full changes here.