Update approval files #3867

jalvz · 2020-06-10T12:09:49Z

Motivation/summary

Fixes test suite. This was missed in #3857 (sorry)

Checklist

I have signed the Contributor License Agreement.
I have updated CHANGELOG.asciidoc

I have considered changes for:

documentation
logging (add log lines, choose appropriate log selector, etc.)
metrics and monitoring (create issue for Kibana team to add metrics to visualizations, e.g. Kibana#44001)
automated tests (add tests for the code changes, all unit tests pass locally)
telemetry
Elasticsearch Service (https://cloud.elastic.co)
Elastic Cloud Enterprise (https://www.elastic.co/products/ece)
Elastic Cloud on Kubernetes (https://www.elastic.co/elastic-cloud-kubernetes)

Related issues

Follow up from #3857

apmmachine · 2020-06-10T12:16:32Z

💔 Build Failed

Expand to view the summary

Build stats

Build Cause: [Pull request #3867 opened]
Start Time: 2020-06-10T12:10:01.941+0000
Duration: 6 min 27 sec

Steps errors

Expand to view the steps failures

Name: Run intake
- Description: ./script/jenkins/intake.sh
- Duration: 3 min 0 sec
- Start Time: 2020-06-10T12:13:24.430+0000
- log

Log output

Expand to view the last 100 lines of log output

[2020-06-10T12:14:44.568Z] go: extracting github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f
[2020-06-10T12:14:44.568Z] go: downloading code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a
[2020-06-10T12:14:44.568Z] go: extracting code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a
[2020-06-10T12:14:44.829Z] go: downloading github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4
[2020-06-10T12:14:44.829Z] go: extracting github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4
[2020-06-10T12:14:44.829Z] go: downloading github.com/mailru/easyjson v0.7.1
[2020-06-10T12:14:44.829Z] go: extracting github.com/mailru/easyjson v0.7.1
[2020-06-10T12:14:44.829Z] go: downloading github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797
[2020-06-10T12:14:44.829Z] go: extracting github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797
[2020-06-10T12:14:44.829Z] go: downloading github.com/urso/diag-ecs v0.0.0-20200210114345-ab085841dcb9
[2020-06-10T12:14:44.829Z] go: extracting github.com/urso/diag-ecs v0.0.0-20200210114345-ab085841dcb9
[2020-06-10T12:14:44.829Z] go: downloading github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec
[2020-06-10T12:14:44.829Z] go: extracting github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec
[2020-06-10T12:14:44.829Z] go: downloading code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f
[2020-06-10T12:14:44.829Z] go: extracting code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f
[2020-06-10T12:14:44.829Z] go: downloading code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee
[2020-06-10T12:14:44.829Z] go: extracting code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee
[2020-06-10T12:14:44.829Z] go: downloading github.com/Masterminds/semver v1.4.2
[2020-06-10T12:14:44.829Z] go: extracting github.com/Masterminds/semver v1.4.2
[2020-06-10T12:14:46.213Z] go: extracting github.com/aws/aws-sdk-go-v2 v0.9.0
[2020-06-10T12:14:47.152Z] go: downloading github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af
[2020-06-10T12:14:47.152Z] go: extracting github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af
[2020-06-10T12:14:47.412Z] go: finding github.com/stretchr/testify v1.5.1
[2020-06-10T12:14:47.672Z] go: finding github.com/pmezard/go-difflib v1.0.0
[2020-06-10T12:14:47.672Z] go: finding github.com/elastic/go-hdrhistogram v0.1.0
[2020-06-10T12:14:47.672Z] go: finding github.com/aws/aws-sdk-go-v2 v0.9.0
[2020-06-10T12:14:47.672Z] go: finding code.cloudfoundry.org/go-loggregator v7.4.0+incompatible
[2020-06-10T12:14:47.672Z] go: finding github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af
[2020-06-10T12:14:47.672Z] go: finding code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee
[2020-06-10T12:14:47.672Z] go: finding code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a
[2020-06-10T12:14:47.672Z] go: finding github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4
[2020-06-10T12:14:47.672Z] go: finding github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f
[2020-06-10T12:14:47.673Z] go: finding github.com/mailru/easyjson v0.7.1
[2020-06-10T12:14:47.673Z] go: finding code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f
[2020-06-10T12:14:47.673Z] go: finding github.com/urso/ecslog v0.0.1
[2020-06-10T12:14:47.673Z] go: finding github.com/Masterminds/semver v1.4.2
[2020-06-10T12:14:47.673Z] go: finding github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797
[2020-06-10T12:14:47.937Z] go: finding github.com/urso/diag-ecs v0.0.0-20200210114345-ab085841dcb9
[2020-06-10T12:14:47.937Z] go: finding github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec
[2020-06-10T12:16:24.509Z] exec: git update-index -q --refresh
[2020-06-10T12:16:24.509Z] exec: git diff-index HEAD -- .
[2020-06-10T12:16:24.509Z] exec: git --no-pager diff --minimal
[2020-06-10T12:16:24.509Z] diff --git a/docs/data/elasticsearch/generated/errors.json b/docs/data/elasticsearch/generated/errors.json
[2020-06-10T12:16:24.509Z] index bb9d8dcd0..041a2eebf 100644
[2020-06-10T12:16:24.509Z] --- a/docs/data/elasticsearch/generated/errors.json
[2020-06-10T12:16:24.509Z] +++ b/docs/data/elasticsearch/generated/errors.json
[2020-06-10T12:16:24.509Z] @@ -310,6 +310,7 @@
[2020-06-10T12:16:24.509Z]                      ]
[2020-06-10T12:16:24.509Z]                  },
[2020-06-10T12:16:24.509Z]                  "method": "post",
[2020-06-10T12:16:24.509Z] +                "referrer": "http://localhost:8000/test/e2e/",
[2020-06-10T12:16:24.509Z]                  "socket": {
[2020-06-10T12:16:24.509Z]                      "encrypted": true,
[2020-06-10T12:16:24.509Z]                      "remote_address": "8.8.8.8"
[2020-06-10T12:16:24.509Z] diff --git a/docs/data/elasticsearch/generated/transactions.json b/docs/data/elasticsearch/generated/transactions.json
[2020-06-10T12:16:24.509Z] index 242998897..17e67dac1 100644
[2020-06-10T12:16:24.509Z] --- a/docs/data/elasticsearch/generated/transactions.json
[2020-06-10T12:16:24.509Z] +++ b/docs/data/elasticsearch/generated/transactions.json
[2020-06-10T12:16:24.509Z] @@ -357,6 +357,7 @@
[2020-06-10T12:16:24.509Z]                      ]
[2020-06-10T12:16:24.509Z]                  },
[2020-06-10T12:16:24.509Z]                  "method": "post",
[2020-06-10T12:16:24.509Z] +                "referrer": "http://localhost:8000/test/e2e/",
[2020-06-10T12:16:24.509Z]                  "socket": {
[2020-06-10T12:16:24.509Z]                      "encrypted": true,
[2020-06-10T12:16:24.510Z]                      "remote_address": "8.8.8.8"
[2020-06-10T12:16:24.510Z] Error: some files are not up-to-date. Run 'make fmt update' then review and commit the changes. Modified: [docs/data/elasticsearch/generated/errors.json docs/data/elasticsearch/generated/transactions.json]
[2020-06-10T12:16:24.510Z] Makefile:76: recipe for target 'check' failed
[2020-06-10T12:16:24.510Z] make: *** [check] Error 1
[2020-06-10T12:16:24.510Z] + cleanup
[2020-06-10T12:16:24.510Z] + rm -rf /tmp/tmp.oV2UlJERh4
[2020-06-10T12:16:25.783Z] Stage "Build and Test" skipped due to earlier failure(s)
[2020-06-10T12:16:26.197Z] Stage "linux build" skipped due to earlier failure(s)
[2020-06-10T12:16:26.208Z] Stage "windows build-test" skipped due to earlier failure(s)
[2020-06-10T12:16:26.219Z] Stage "OSX build-test" skipped due to earlier failure(s)
[2020-06-10T12:16:26.229Z] Stage "Unit Test" skipped due to earlier failure(s)
[2020-06-10T12:16:26.240Z] Stage "System and Environment Tests" skipped due to earlier failure(s)
[2020-06-10T12:16:26.251Z] Stage "Benchmarking" skipped due to earlier failure(s)
[2020-06-10T12:16:26.262Z] Stage "Check kibana Obj. Updated" skipped due to earlier failure(s)
[2020-06-10T12:16:26.272Z] Stage "Hey-Apm" skipped due to earlier failure(s)
[2020-06-10T12:16:26.283Z] Stage "Package" skipped due to earlier failure(s)
[2020-06-10T12:16:26.289Z] Stage "APM Integration Tests" skipped due to earlier failure(s)
[2020-06-10T12:16:26.364Z] Stage "Package" skipped due to earlier failure(s)
[2020-06-10T12:16:26.670Z] Failed in branch linux build
[2020-06-10T12:16:26.677Z] Failed in branch windows build-test
[2020-06-10T12:16:26.685Z] Failed in branch OSX build-test
[2020-06-10T12:16:26.693Z] Failed in branch Unit Test
[2020-06-10T12:16:26.700Z] Failed in branch System and Environment Tests
[2020-06-10T12:16:26.708Z] Failed in branch Benchmarking
[2020-06-10T12:16:26.715Z] Failed in branch Check kibana Obj. Updated
[2020-06-10T12:16:26.723Z] Failed in branch Hey-Apm
[2020-06-10T12:16:26.731Z] Failed in branch APM Integration Tests
[2020-06-10T12:16:26.835Z] Stage "Package" skipped due to earlier failure(s)
[2020-06-10T12:16:27.044Z] Failed in branch Package
[2020-06-10T12:16:27.880Z] Running on Jenkins in /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-3867
[2020-06-10T12:16:28.061Z] [INFO] getVaultSecret: Getting secrets
[2020-06-10T12:16:28.138Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-06-10T12:16:29.007Z] + chmod 755 generate-build-data.sh
[2020-06-10T12:16:29.007Z] + ./generate-build-data.sh https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-3867/ https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-3867/runs/1 FAILURE 386797
[2020-06-10T12:16:29.558Z] INFO: curl https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-3867/runs/1/steps/?limit=10000 -o steps-info.json

codecov-commenter · 2020-06-10T12:37:12Z

Codecov Report

Merging #3867 into master will decrease coverage by 0.08%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #3867      +/-   ##
==========================================
- Coverage   79.74%   79.65%   -0.09%     
==========================================
  Files         135      135              
  Lines        6175     6175              
==========================================
- Hits         4924     4919       -5     
- Misses       1251     1256       +5

Impacted Files	Coverage Δ
kibana/connecting_client.go	`64.51% <0.00%> (-8.07%)`	⬇️

apmmachine · 2020-06-10T13:52:43Z

💚 Build Succeeded

Expand to view the summary

Build stats

Build Cause: [Pull request #3867 updated]
Start Time: 2020-06-10T13:05:58.384+0000
Duration: 47 min 30 sec

Test stats 🧪

Test	Results
Failed	0
Passed	3210
Skipped	146
Total	3356

Steps errors

Expand to view the steps failures

Name: Test Sync
- Description: ./script/jenkins/sync.sh
- Duration: 3 min 34 sec
- Start Time: 2020-06-10T13:15:30.028+0000
- log

* Update approval files * make update * more approval files

* Index page URL and Referer as ECS fields (#3857) * Update approval files (#3867)

Update approval files

f86f8da

make update

18ad919

more approval files

dbe9b85

axw approved these changes Jun 11, 2020

View reviewed changes

jalvz merged commit f2a5410 into elastic:master Jun 11, 2020

jalvz added a commit to jalvz/apm-server that referenced this pull request Jun 11, 2020

Update approval files (elastic#3867)

d39aa92

* Update approval files * make update * more approval files

jalvz added a commit that referenced this pull request Jun 11, 2020

[7.x] Index page URL and Referer as ECS fields (#3857) (#3865)

e17593a

* Index page URL and Referer as ECS fields (#3857) * Update approval files (#3867)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update approval files #3867

Update approval files #3867

jalvz commented Jun 10, 2020 •

edited

Loading

apmmachine commented Jun 10, 2020

Build stats

codecov-commenter commented Jun 10, 2020 •

edited

Loading

apmmachine commented Jun 10, 2020

Build stats

Test stats 🧪

Update approval files #3867

Update approval files #3867

Conversation

jalvz commented Jun 10, 2020 • edited Loading

Motivation/summary

Checklist

Related issues

apmmachine commented Jun 10, 2020

💔 Build Failed

Build stats

Steps errors

Log output

codecov-commenter commented Jun 10, 2020 • edited Loading

Codecov Report

apmmachine commented Jun 10, 2020

💚 Build Succeeded

Build stats

Test stats 🧪

Steps errors

jalvz commented Jun 10, 2020 •

edited

Loading

codecov-commenter commented Jun 10, 2020 •

edited

Loading