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

Use more inclusive language #3903

Merged
merged 3 commits into from
Jun 23, 2020
Merged

Use more inclusive language #3903

merged 3 commits into from
Jun 23, 2020

Conversation

axw
Copy link
Member

@axw axw commented Jun 18, 2020

Motivation/summary

Remove use of "whitelist" and "blacklist".

I have not changed the testdata (sourcemaps), nor the docs copied from beats. The latter should be changed upstream.

Checklist

I have considered changes for:

How to test these changes

make test

Related issues

#3896

Remove use of "whitelist" and "blacklist".

I have not changed the testdata (sourcemaps),
nor the docs copied from beats. The latter should
be changed upstream.
@axw
Copy link
Member Author

axw commented Jun 18, 2020

@bmorelli25 there's a very minor change to docs here, could you please take a quick glance?

@apmmachine
Copy link
Contributor

apmmachine commented Jun 18, 2020

💔 Tests Failed

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #3903 updated]

  • Start Time: 2020-06-19T01:21:08.247+0000

  • Duration: 47 min 6 sec

Test stats 🧪

Test Results
Failed 1
Passed 3216
Skipped 147
Total 3364

Test errors

Expand to view the tests failures

  • Name: Build and Test / APM Integration Tests / test_conc_req_all_agents – tests.agent.test_multiple_agents

    • Age: 1
    • Duration: 126.93415
    • Error Details: AssertionError: queried for [('processor.event', 'transaction'), ('service.name', ['dotnetapp', 'dotnetapp', 'flaskapp', 'flaskapp', 'djangoapp', 'djangoapp', 'expressapp', 'expressapp', 'railsapp', 'railsapp', 'gonethttpapp', 'gonethttpapp', 'springapp', 'springapp'])], expected 7000, got 6999

Steps errors

Expand to view the steps failures

  • Name: Compress

    • Description: tar --exclude=coverage-files.tgz -czf coverage-files.tgz coverage

    • Duration: 0 min 0 sec

    • Start Time: 2020-06-19T01:36:40.318+0000

    • log

  • Name: Compress

    • Description: tar --exclude=system-tests-linux-files.tgz -czf system-tests-linux-files.tgz system-tests

    • Duration: 0 min 0 sec

    • Start Time: 2020-06-19T01:51:21.562+0000

    • log

  • Name: Test Sync

    • Description: ./script/jenkins/sync.sh

    • Duration: 3 min 34 sec

    • Start Time: 2020-06-19T01:31:30.447+0000

    • log

Log output

Expand to view the last 100 lines of log output

[2020-06-19T01:54:33.997Z] Doing `require 'backports'` is deprecated and will not load any backport in the next major release.
[2020-06-19T01:54:33.997Z] Require just the needed backports instead, or 'backports/latest'.
[2020-06-19T01:54:36.568Z] >> package: Building apm-server-oss type=rpm for platform=linux/386
[2020-06-19T01:54:41.876Z] >> package: Building apm-server type=rpm for platform=linux/386
[2020-06-19T01:54:43.820Z] Doing `require 'backports'` is deprecated and will not load any backport in the next major release.
[2020-06-19T01:54:43.821Z] Require just the needed backports instead, or 'backports/latest'.
[2020-06-19T01:54:51.989Z] Doing `require 'backports'` is deprecated and will not load any backport in the next major release.
[2020-06-19T01:54:51.989Z] Require just the needed backports instead, or 'backports/latest'.
[2020-06-19T01:55:00.147Z] >> package: Building apm-server type=deb for platform=linux/386
[2020-06-19T01:55:04.367Z] >> package: Building apm-server-oss type=tar.gz for platform=linux/amd64
[2020-06-19T01:55:08.588Z] Doing `require 'backports'` is deprecated and will not load any backport in the next major release.
[2020-06-19T01:55:08.588Z] Require just the needed backports instead, or 'backports/latest'.
[2020-06-19T01:55:09.162Z] >> package: Building apm-server type=deb for platform=linux/arm64
[2020-06-19T01:55:12.480Z] >> package: Building apm-server-oss type=deb for platform=linux/amd64
[2020-06-19T01:55:19.085Z] Doing `require 'backports'` is deprecated and will not load any backport in the next major release.
[2020-06-19T01:55:19.085Z] Require just the needed backports instead, or 'backports/latest'.
[2020-06-19T01:55:21.645Z] Doing `require 'backports'` is deprecated and will not load any backport in the next major release.
[2020-06-19T01:55:21.646Z] Require just the needed backports instead, or 'backports/latest'.
[2020-06-19T01:55:29.796Z] >> Testing package contents
[2020-06-19T01:55:56.393Z] package ran for 21m20.341537647s
[2020-06-19T01:55:57.008Z] + ./script/jenkins/test-install-packages.sh
[2020-06-19T01:55:57.008Z] + export MAGEFILE_VERBOSE=1
[2020-06-19T01:55:57.008Z] + MAGEFILE_VERBOSE=1
[2020-06-19T01:55:57.008Z] + ./build/linux/mage -v testPackagesInstall
[2020-06-19T01:55:57.008Z] Running target: TestPackagesInstall
[2020-06-19T01:55:57.008Z] exec: go test -v tests/packaging/package_test.go -timeout 20m -files /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-3903/src/github.com/elastic/apm-server/build/distributions/* -tags=package
[2020-06-19T02:00:48.766Z] [INFO] getVaultSecret: Getting secrets
[2020-06-19T02:00:48.827Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-06-19T02:00:50.062Z] + set +x
[2020-06-19T02:00:50.643Z] Login Succeeded
[2020-06-19T02:00:51.412Z] + ./script/jenkins/package-docker-snapshot.sh 0f37b4d9170b558fb0ce3b79d1565757f6e9bfc6 docker.elastic.co/observability-ci/apm-server
[2020-06-19T02:00:51.412Z] INFO: Build docker images
[2020-06-19T02:00:51.681Z] ./build/linux/mage package
[2020-06-19T02:00:52.272Z] >> Building apm-server.yml for linux/amd64
[2020-06-19T02:00:52.272Z] >> Building apm-server.docker.yml for linux/amd64
[2020-06-19T02:00:52.884Z] Generated fields.yml for apm-server to /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-3903/src/github.com/elastic/apm-server/build/fields/fields.yml
[2020-06-19T02:00:54.280Z] Generated fields.yml for apm-server to /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-3903/src/github.com/elastic/apm-server/build/fields/fields.all.yml
[2020-06-19T02:00:58.499Z] >> buildGoDaemon: Building for linux/amd64
[2020-06-19T02:00:58.499Z] >> golangCrossBuild: Building for linux/amd64
[2020-06-19T02:00:58.499Z] >> golangCrossBuild: Building for linux/amd64
[2020-06-19T02:00:59.894Z] >> Building using: cmd='build/mage-linux-amd64 buildGoDaemon', env=[CC=gcc, CXX=g++, GOARCH=amd64, GOARM=, GOOS=linux, PLATFORM_ID=linux-amd64]
[2020-06-19T02:00:59.894Z] >> Building using: cmd='build/mage-linux-amd64 golangCrossBuild', env=[CC=gcc, CXX=g++, GOARCH=amd64, GOARM=, GOOS=linux, PLATFORM_ID=linux-amd64]
[2020-06-19T02:00:59.894Z] >> Building using: cmd='../../build/mage-linux-amd64 golangCrossBuild', env=[CC=gcc, CXX=g++, GOARCH=amd64, GOARM=, GOOS=linux, PLATFORM_ID=linux-amd64]
[2020-06-19T02:03:51.575Z] >> package: Building apm-server type=docker for platform=linux/amd64
[2020-06-19T02:03:51.575Z] >> package: Building apm-server type=tar.gz for platform=linux/amd64
[2020-06-19T02:03:51.575Z] >> package: Building apm-server-oss type=deb for platform=linux/amd64
[2020-06-19T02:03:51.575Z] >> package: Building apm-server-oss type=tar.gz for platform=linux/amd64
[2020-06-19T02:03:51.575Z] >> package: Building apm-server type=deb for platform=linux/amd64
[2020-06-19T02:03:51.840Z] >> package: Building apm-server-oss type=rpm for platform=linux/amd64
[2020-06-19T02:03:52.106Z] Doing `require 'backports'` is deprecated and will not load any backport in the next major release.
[2020-06-19T02:03:52.106Z] Require just the needed backports instead, or 'backports/latest'.
[2020-06-19T02:04:02.177Z] Doing `require 'backports'` is deprecated and will not load any backport in the next major release.
[2020-06-19T02:04:02.177Z] Require just the needed backports instead, or 'backports/latest'.
[2020-06-19T02:04:02.177Z] Doing `require 'backports'` is deprecated and will not load any backport in the next major release.
[2020-06-19T02:04:02.177Z] Require just the needed backports instead, or 'backports/latest'.
[2020-06-19T02:04:03.199Z] >> package: Building apm-server type=rpm for platform=linux/amd64
[2020-06-19T02:04:15.478Z] >> package: Building apm-server-oss type=docker for platform=linux/amd64
[2020-06-19T02:04:15.478Z] Doing `require 'backports'` is deprecated and will not load any backport in the next major release.
[2020-06-19T02:04:15.478Z] Require just the needed backports instead, or 'backports/latest'.
[2020-06-19T02:05:11.887Z] >> Testing package contents
[2020-06-19T02:05:30.028Z] package ran for 4m35.454094841s
[2020-06-19T02:05:30.028Z] INFO: Get the just built docker image
[2020-06-19T02:05:30.028Z] INFO: Retag docker image (docker.elastic.co/apm/apm-server:8.0.0-SNAPSHOT)
[2020-06-19T02:05:30.028Z] INFO: Push docker image (docker.elastic.co/observability-ci/apm-server:0f37b4d9170b558fb0ce3b79d1565757f6e9bfc6)
[2020-06-19T02:05:30.028Z] The push refers to repository [docker.elastic.co/observability-ci/apm-server]
[2020-06-19T02:05:30.028Z] 49182b383ab0: Preparing
[2020-06-19T02:05:30.028Z] 8a4b3f2928d9: Preparing
[2020-06-19T02:05:30.028Z] 60ccf1839caf: Preparing
[2020-06-19T02:05:30.028Z] 23e9fdbd5428: Preparing
[2020-06-19T02:05:30.028Z] b63fd244c5b8: Preparing
[2020-06-19T02:05:30.028Z] 4ae47fa063ca: Preparing
[2020-06-19T02:05:30.028Z] b61f3cbeaeb6: Preparing
[2020-06-19T02:05:30.028Z] edf3aa290fb3: Preparing
[2020-06-19T02:05:30.028Z] 4ae47fa063ca: Waiting
[2020-06-19T02:05:30.028Z] b61f3cbeaeb6: Waiting
[2020-06-19T02:05:30.028Z] edf3aa290fb3: Waiting
[2020-06-19T02:05:30.028Z] 49182b383ab0: Pushed
[2020-06-19T02:05:30.028Z] b63fd244c5b8: Pushed
[2020-06-19T02:05:30.028Z] 60ccf1839caf: Pushed
[2020-06-19T02:05:30.028Z] edf3aa290fb3: Layer already exists
[2020-06-19T02:05:30.289Z] 23e9fdbd5428: Pushed
[2020-06-19T02:05:38.446Z] b61f3cbeaeb6: Pushed
[2020-06-19T02:05:38.446Z] 8a4b3f2928d9: Pushed
[2020-06-19T02:05:43.753Z] 4ae47fa063ca: Pushed
[2020-06-19T02:05:47.068Z] 0f37b4d9170b558fb0ce3b79d1565757f6e9bfc6: digest: sha256:96d3d250acacb2d03609550027d9e2a7aba35ef79016230f7c4688bb4462a8ff size: 1994
[2020-06-19T02:05:47.113Z] $ docker stop --time=1 e0d10cd604364b10ff9b1d177f0ddeb5aaeee8f5da4e314a9ddcf4dab979390b
[2020-06-19T02:05:48.478Z] $ docker rm -f e0d10cd604364b10ff9b1d177f0ddeb5aaeee8f5da4e314a9ddcf4dab979390b
[2020-06-19T02:05:49.589Z] Stage "Publish" skipped due to when conditional
[2020-06-19T02:08:08.297Z] [INFO] For detailed information see: https://apm-ci.elastic.co/job/apm-integration-tests-selector-mbp/job/master/9102/display/redirect
[2020-06-19T02:08:11.298Z] Copied 51 artifacts from "APM Integration Test MBP Selector » master" build number 9102
[2020-06-19T02:08:12.335Z] Post stage
[2020-06-19T02:08:12.347Z] Recording test results
[2020-06-19T02:08:13.627Z] Running on Jenkins in /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-3903
[2020-06-19T02:08:13.694Z] [INFO] getVaultSecret: Getting secrets
[2020-06-19T02:08:13.764Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-06-19T02:08:14.471Z] + chmod 755 generate-build-data.sh
[2020-06-19T02:08:14.471Z] + ./generate-build-data.sh https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-3903/ https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-3903/runs/5 UNSTABLE 2825962
[2020-06-19T02:08:15.022Z] INFO: curl https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-3903/runs/5/steps/?limit=10000 -o steps-info.json
[2020-06-19T02:08:15.272Z] INFO: curl https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-3903/runs/5/tests/?status=FAILED -o tests-errors.json
[2020-06-19T02:08:15.523Z] INFO: curl https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-3903/runs/5/log/ -o pipeline-log.txt

@codecov-commenter
Copy link

Codecov Report

Merging #3903 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #3903   +/-   ##
=======================================
  Coverage   79.74%   79.74%           
=======================================
  Files         137      137           
  Lines        6239     6239           
=======================================
  Hits         4975     4975           
  Misses       1264     1264           

Copy link
Member

@bmorelli25 bmorelli25 left a comment

Choose a reason for hiding this comment

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

Thank you!

@axw axw merged commit 3d62fee into elastic:master Jun 23, 2020
@axw axw deleted the inclusive-language branch June 23, 2020 03:03
axw added a commit to axw/apm-server that referenced this pull request Jul 1, 2020
Remove use of "whitelist" and "blacklist".

I have not changed the testdata (sourcemaps),
nor the docs copied from beats. The latter should
be changed upstream.
axw added a commit that referenced this pull request Jul 1, 2020
Remove use of "whitelist" and "blacklist".

I have not changed the testdata (sourcemaps),
nor the docs copied from beats. The latter should
be changed upstream.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants