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

[7.7] Instrument Kibana with APM RUM agent (#44281) #62484

Merged
merged 3 commits into from
Apr 3, 2020

Conversation

smith
Copy link
Contributor

@smith smith commented Apr 3, 2020

Backports the following commits to 7.7:

* Instrument Kibana with APM RUM agent

* make route-change transaction work with properl url

* extract page-load transaction url from app link

* check if app is hidden and set active:false

* make distributed tracing work and merge config

* remove config/apm.js and address review

* address review comments

* add apm.js to build tassks

* move apm from dev to src

* add @types/hoist-non-react-statics which is required by react rum

* apply changes correctly from master
@smith smith added the backport label Apr 3, 2020
@@ -88,6 +88,9 @@ export interface InjectedMetadataParams {
user?: Record<string, UserProvidedValues>;
};
};
apm: {
Copy link
Member

@vigneshshanmugam vigneshshanmugam Apr 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

apm was moved inside vars metadata which is done on this PR - #53832, so this change is not required here.

@@ -26,11 +28,22 @@ export const appEntryTemplate = bundle => `
* context: ${bundle.getContext()}
*/
// import global polyfills
Copy link
Member

@vigneshshanmugam vigneshshanmugam Apr 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Polyfills were not added as part of the RUM instrumentation PR. This doesnt seem to be correct.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does ${apmImport()} still go there?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes that should still be there.

Copy link
Member

@vigneshshanmugam vigneshshanmugam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good Thanks @smith

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@smith smith merged commit b602bed into elastic:7.7 Apr 3, 2020
@smith smith deleted the backport/7.7/pr-44281 branch April 3, 2020 21:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants