Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into feature/ci-cdn
Browse files Browse the repository at this point in the history
* upstream/master: (23 commits)
  feat(rum-core): capture XHR/Fetch spans using resource timing (elastic#825)
  docs: update set-up.asciidoc (elastic#814)
  chore: remove compressed size gh workflow (elastic#828)
  feat: use page visibilityState for browser responsiveness check (elastic#813)
  ci(jenkins): report bundlesize as a GitHub comment (elastic#826)
  docs: release notes for 5.2.1 (elastic#824)
  chore(release): publish
  fix(rum-core): protect aganist buggy navigation timing data (elastic#819)
  fix(rum-core): protect aganist buggy navigation timing data (elastic#819)
  chore(rum-core): use startTime for LCP marks (elastic#815)
  fix(rum-core): capture tbt after all task entries are observed (elastic#803)
  feat(rum-react): use correct path when route is path array (elastic#800)
  ci: enable benchmark on a PR basis (elastic#812)
  ci: use dockerLogs step (elastic#810)
  fix: env var invalid type (elastic#809)
  fix: workarount for elastic/beats#18858 (elastic#807)
  docs: add release notes for 5.2.0 (elastic#801)
  chore(release): publish
  fix(rum-core): consider user defined type of high precedence (elastic#798)
  fix(rum): use single instance of apm across all packages (elastic#796)
  ...
  • Loading branch information
v1v committed Jul 3, 2020
2 parents d023028 + 5983e71 commit 6ed7471
Show file tree
Hide file tree
Showing 53 changed files with 1,141 additions and 870 deletions.
17 changes: 0 additions & 17 deletions .github/workflows/bundle-size.yml

This file was deleted.

43 changes: 42 additions & 1 deletion CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,48 @@ See Conventional Commits (https://conventionalcommits.org) for commit guidelines
[[release-notes-5.x]]
=== RUM JS Agent version 5.x
[[release-notes-5.2.1]]
==== 5.2.1 (2020-06-24)
[float]
===== Features
* Added support for path array in `<ApmRoute>` React component that associates
the transaction based on the mounted path: {issue}702[#702]
[float]
===== Bug fixes
* Capture Total Blocking Time (TBT) only after all longtask entries
are observed: {issue}803[#803]
* Do not capture page load transaction marks when the NavigationTiming data from
the browsers are not trustable: {issue}818[#818]
[[release-notes-5.2.0]]
==== 5.2.0 (2020-05-28)
[float]
===== Features
* Agent now supports compressing events payload sent to the APM server
via new configuration <<api-version, apiVersion>>. It yeilds a huge reduction of
around ~45% in the payload size for average sized web pages: {issue}768[#768]
* Capture First Input Delay(FID) as Span for page-load transaction: {issue}732[#732]
* Capture Total Blocking Time(TBT) as Span for page-load transaction: {issue}781[#781]
[float]
===== Bug fixes
* Allow setting labels before agent is initialized: {issue}780[#780]
* Use single instance of apm across all packages: {issue}791[#791]
* User defined types for managed transactions are considered of
high precedence: {issue}758[#758]
* Add span subtype information in payload without camelcasing: {issue}753[#753]
* Treat truncated spans percentage as regular span in
breakdown calculation: {issue}776[#776]
[float]
===== Performance Improvements
* Refactor ServiceFactory class to use constant service names: {issue}238[#238]
[[release-notes-5.1.1]]
==== 5.1.1 (2020-04-15)
Expand All @@ -42,7 +84,6 @@ See Conventional Commits (https://conventionalcommits.org) for commit guidelines
`ApmRoute` inside child components: {issue}748[#748]
[[release-notes-5.1.0]]
==== 5.1.0 (2020-04-08)
Expand Down
35 changes: 24 additions & 11 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ pipeline {
REPO = 'apm-agent-rum-js'
BASE_DIR = "src/github.com/elastic/${env.REPO}"
NOTIFY_TO = credentials('notify-to')
PIPELINE_LOG_LEVEL='INFO'
JOB_GCS_BUCKET = credentials('gcs-bucket')
PIPELINE_LOG_LEVEL = 'INFO'
CODECOV_SECRET = 'secret/apm-team/ci/apm-agent-rum-codecov'
SAUCELABS_SECRET_CORE = 'secret/apm-team/ci/apm-agent-rum-saucelabs@elastic/apm-rum-core'
SAUCELABS_SECRET = 'secret/apm-team/ci/apm-agent-rum-saucelabs@elastic/apm-rum'
Expand All @@ -32,7 +33,7 @@ pipeline {
quietPeriod(10)
}
triggers {
issueCommentTrigger('(?i).*(?:jenkins\\W+)?run\\W+(?:the\\W+)?tests(?:\\W+please)?.*')
issueCommentTrigger('(?i).*(?:jenkins\\W+)?run\\W+(?:the\\W+)?(?:benchmark\\W+)?tests(?:\\W+please)?.*')
}
parameters {
booleanParam(name: 'Run_As_Master_Branch', defaultValue: false, description: 'Allow to run any steps on a PR, some steps normally only run on master branch.')
Expand Down Expand Up @@ -90,6 +91,10 @@ pipeline {
}
stash allowEmpty: true, name: 'cache', includes: "${BASE_DIR}/.npm/**", useDefaultExcludes: false
}
dir("${BASE_DIR}"){
// To run in the worker otherwise some tools won't be in place when using the above docker container
generateReport(id: 'bundlesize', input: 'packages/rum/reports/apm-*-report.html', template: true, compare: true, templateFormat: 'md')
}
}
}
}
Expand All @@ -106,7 +111,7 @@ pipeline {
name 'STACK_VERSION'
values (
'8.0.0-SNAPSHOT',
'7.6.0',
'7.7.0',
'7.0.0'
)
}
Expand Down Expand Up @@ -219,6 +224,7 @@ pipeline {
tag pattern: 'v\\d+\\.\\d+\\.\\d+.*', comparator: 'REGEXP'
expression { return params.Run_As_Master_Branch }
expression { return env.BENCHMARK_UPDATED != "false" }
expression { return env.GITHUB_COMMENT?.contains('benchmark tests') }
}
expression { return params.bench_ci }
expression { return env.ONLY_DOCS == "false" }
Expand Down Expand Up @@ -369,7 +375,8 @@ pipeline {
}
post {
cleanup {
notifyBuildResult()
// bundlesize id was generated previously with the generateReport step in the lint stage.
notifyBuildResult(prComment: true, newPRComment: [ 'bundlesize': 'bundlesize.md' ])
}
}
}
Expand Down Expand Up @@ -415,16 +422,22 @@ def runScript(Map args = [:]){
sleep randomNumber(min: 5, max: 10)
sh(label: 'Pull and build docker infra', script: '.ci/scripts/pull_and_build.sh')
}
// Another retry in case there are any environmental issues
retry(3) {
sleep randomNumber(min: 5, max: 10)
if(env.MODE == 'saucelabs'){
withSaucelabsEnv(){
try {
// Another retry in case there are any environmental issues
retry(3) {
sleep randomNumber(min: 5, max: 10)
if(env.MODE == 'saucelabs'){
withSaucelabsEnv(){
sh(label: "Start Elastic Stack ${stack} - ${scope} - ${env.MODE}", script: '.ci/scripts/test.sh')
}
} else {
sh(label: "Start Elastic Stack ${stack} - ${scope} - ${env.MODE}", script: '.ci/scripts/test.sh')
}
} else {
sh(label: "Start Elastic Stack ${stack} - ${scope} - ${env.MODE}", script: '.ci/scripts/test.sh')
}
} catch(e) {
throw e
} finally {
dockerLogs(step: "${label}-${stack}", failNever: true)
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions dev-utils/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ services:
image: docker.elastic.co/apm/apm-server:${STACK_VERSION}
ports:
- "127.0.0.1:${APM_SERVER_PORT:-8200}:8200"
environment:
BEAT_STRICT_PERMS: "false"
command: >
apm-server -e
-E apm-server.rum.enabled=true
Expand Down
2 changes: 1 addition & 1 deletion docs/set-up.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ const replace = require('rollup-plugin-replace')
plugins: [
replace({
'process.env.NODE_ENV': 'production'
'process.env.NODE_ENV': JSON.stringify('production')
})
]
----
Expand Down
Loading

0 comments on commit 6ed7471

Please sign in to comment.