Skip to content

Commit 8eedc5b

Browse files
v1vv1v
committed
Neutral naming for apm-agent-nodejs
1 parent cba071c commit 8eedc5b

20 files changed

Lines changed: 59 additions & 59 deletions

‎.ci/Jenkinsfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pipeline {
2828
issueCommentTrigger("(${obltGitHubComments()}|^run (module|benchmark) tests.*)")
2929
}
3030
parameters {
31-
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.')
31+
booleanParam(name: 'Run_As_Main_Branch', defaultValue: false, description: 'Allow to run any steps on a PR, some steps normally only run on main branch.')
3232
booleanParam(name: 'bench_ci', defaultValue: true, description: 'Enable benchmarks.')
3333
booleanParam(name: 'tav_ci', defaultValue: true, description: 'Enable TAV tests.')
3434
booleanParam(name: 'tests_ci', defaultValue: true, description: 'Enable tests.')
@@ -117,7 +117,7 @@ pipeline {
117117
branch '^greenkeeper/.*'
118118
}
119119
anyOf {
120-
expression { return params.Run_As_Master_Branch }
120+
expression { return params.Run_As_Main_Branch }
121121
triggeredBy 'TimerTrigger'
122122
changeRequest()
123123
expression { return env.TAV_UPDATED != "false" }
@@ -160,7 +160,7 @@ pipeline {
160160
beforeAgent true
161161
allOf {
162162
anyOf {
163-
expression { return params.Run_As_Master_Branch }
163+
expression { return params.Run_As_Main_Branch }
164164
triggeredBy 'TimerTrigger'
165165
}
166166
expression { return params.test_edge_ci }
@@ -254,7 +254,7 @@ pipeline {
254254
expression { return env.ONLY_DOCS == "false" }
255255
anyOf {
256256
changeRequest()
257-
expression { return !params.Run_As_Master_Branch }
257+
expression { return !params.Run_As_Main_Branch }
258258
}
259259
}
260260
}
@@ -287,7 +287,7 @@ pipeline {
287287
branch: 'main')
288288
// It's required to transform the tag value to the artifact version
289289
sh script: ".ci/bump-version.sh ${env.BRANCH_NAME.replaceAll('^v', '')}", label: 'Bump version'
290-
// The opbeans pipeline will trigger a release for the master branch
290+
// The opbeans pipeline will trigger a release for the main branch
291291
gitPush()
292292
// The opbeans pipeline will trigger a release for the release tag
293293
gitCreateTag(tag: "${env.BRANCH_NAME}")
@@ -312,9 +312,9 @@ pipeline {
312312
beforeAgent true
313313
allOf {
314314
anyOf {
315-
branch 'master'
315+
branch 'main'
316316
tag pattern: 'v\\d+\\.\\d+\\.\\d+.*', comparator: 'REGEXP'
317-
expression { return params.Run_As_Master_Branch }
317+
expression { return params.Run_As_Main_Branch }
318318
expression { return env.GITHUB_COMMENT?.contains('benchmark tests') }
319319
}
320320
expression { return params.bench_ci }
@@ -391,7 +391,7 @@ def getSmartTAVContext() {
391391
// Hard to debug what's going on as there are a few nested conditions. Let's then add more verbose output
392392
echo """\
393393
env.GITHUB_COMMENT=${env.GITHUB_COMMENT}
394-
params.Run_As_Master_Branch=${params.Run_As_Master_Branch}
394+
params.Run_As_Main_Branch=${params.Run_As_Main_Branch}
395395
env.CHANGE_ID=${env.CHANGE_ID}
396396
env.TAV_UPDATED=${env.TAV_UPDATED}""".stripIndent()
397397

@@ -410,7 +410,7 @@ def getSmartTAVContext() {
410410
context.tav = readYaml(text: """TAV:${modules.collect{ it.replaceAll('"', '').replaceAll("'", '') }.collect{ "\n - '${it}'"}.join("") }""")
411411
}
412412
}
413-
} else if (params.Run_As_Master_Branch) {
413+
} else if (params.Run_As_Main_Branch) {
414414
context.ghDescription = 'TAV Test param-triggered'
415415
context.tav = readYaml(file: '.ci/.jenkins_tav.yml')
416416
} else if (env.CHANGE_ID && env.TAV_UPDATED != "false") {

‎.ci/jobs/apm-agent-nodejs-mbp.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
discover-pr-origin: merge-current
1313
discover-tags: true
1414
notification-context: 'apm-ci'
15-
# Run CI builds only on master, PRs, and non-EOL version branches.
16-
head-filter-regex: '^(master|PR-.*|3\.x)$'
15+
# Run CI builds only on main, PRs, and non-EOL version branches.
16+
head-filter-regex: '^(main|PR-.*|3\.x)$'
1717
repo: apm-agent-nodejs
1818
repo-owner: elastic
1919
credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken

‎.ci/jobs/apm-agent-nodejs-schedule-daily.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
parameters:
99
- string:
1010
name: branch_specifier
11-
default: master
11+
default: main
1212
description: the Git branch specifier to build
1313
pipeline-scm:
1414
script-path: .ci/schedule-daily.groovy

‎.ci/jobs/apm-agent-nodejs-schedule-weekly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
parameters:
99
- string:
1010
name: branch_specifier
11-
default: master
11+
default: main
1212
description: the Git branch specifier to build
1313
pipeline-scm:
1414
script-path: .ci/schedule-weekly.groovy

‎.ci/schedule-daily.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ pipeline {
3838
stage('Run Tasks'){
3939
steps {
4040
script {
41-
['master'].each { branch ->
41+
['main'].each { branch ->
4242
build(
4343
job: "apm-agent-nodejs/apm-agent-nodejs-mbp/${branch}",
4444
parameters: [
45-
booleanParam(name: 'Run_As_Master_Branch', value: true),
45+
booleanParam(name: 'Run_As_Main_Branch', value: true),
4646
booleanParam(name: 'bench_ci', value: false),
4747
booleanParam(name: 'doc_ci', value: true),
4848
booleanParam(name: 'tav_ci', value: true),

‎.github/pull_request_template.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ https://help.github.com/articles/closing-issues-using-keywords/
1717
- [ ] Update TypeScript typings
1818
- [ ] Update documentation
1919
- [ ] Add CHANGELOG.asciidoc entry
20-
- [ ] Commit message follows [commit guidelines](https://github.com/elastic/apm-agent-nodejs/blob/master/CONTRIBUTING.md#commit-message-guidelines)
20+
- [ ] Commit message follows [commit guidelines](https://github.com/elastic/apm-agent-nodejs/blob/main/CONTRIBUTING.md#commit-message-guidelines)

‎.github/workflows/lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ name: Lint
55
on:
66
push:
77
branches:
8-
- master
8+
- main
99
paths-ignore:
1010
- '*.md'
1111
- '*.asciidoc'
1212
- 'docs/**'
1313
pull_request:
1414
branches:
15-
- master
15+
- main
1616
paths-ignore:
1717
- '*.md'
1818
- '*.asciidoc'

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ name: Test
1515
on:
1616
push:
1717
branches:
18-
- master
18+
- main
1919
paths-ignore:
2020
- '*.md'
2121
- '*.asciidoc'
2222
- 'docs/**'
2323
- 'examples/**'
2424
pull_request:
2525
branches:
26-
- master
26+
- main
2727
paths-ignore:
2828
- '*.md'
2929
- '*.asciidoc'

‎CHANGELOG.asciidoc‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ by the agent. There is no outward functionality change.
191191
[float]
192192
===== Features
193193
194-
* Gather https://github.com/elastic/apm/blob/master/specs/agents/tracing-instrumentation-aws-lambda.md#overwriting-metadata[AWS Lambda-specific metadata]
194+
* Gather https://github.com/elastic/apm/blob/main/specs/agents/tracing-instrumentation-aws-lambda.md#overwriting-metadata[AWS Lambda-specific metadata]
195195
on first function invocation and ensure no intake requests to APM Server are
196196
started before that metadata is available. ({issues}2404[#2404])
197197
@@ -211,7 +211,7 @@ This is similar to <<disable-send, `disableSend`>>, but differs in that
211211
212212
* In a Lambda enviornment we now collect a number of additional data fields
213213
on the Transaction object. See the spec for more information on fields collected.
214-
https://github.com/elastic/apm/blob/master/specs/agents/tracing-instrumentation-aws-lambda.md
214+
https://github.com/elastic/apm/blob/main/specs/agents/tracing-instrumentation-aws-lambda.md
215215
({issues}2156[#2156])
216216
217217
* Zero configuration support. The only required agent configuration option
@@ -435,7 +435,7 @@ The fields affected by `longFieldMaxLength` are:
435435
===== Bug fixes
436436
437437
* Fixed naming for outgoing HTTP spans to comply with the spec.
438-
https://github.com/elastic/apm/blob/master/specs/agents/tracing-instrumentation-http.md#http-client-spans
438+
https://github.com/elastic/apm/blob/main/specs/agents/tracing-instrumentation-http.md#http-client-spans
439439
Span names no longer include the path portion of the URL. ({pull}2161[#2161])
440440
441441
* Fix a header object re-use bug that prevented propagation of trace-context
@@ -538,7 +538,7 @@ The fields affected by `longFieldMaxLength` are:
538538
server that is unresponsive, the agent will buffer a number of events and
539539
*drop* them above a certain limit (configurable via <<max-queue-size>>).
540540
This helps ensure the agent does not overly consume memory and CPU. As well,
541-
the agent will now https://github.com/elastic/apm/blob/master/specs/agents/transport.md#transport-errors[backoff]
541+
the agent will now https://github.com/elastic/apm/blob/main/specs/agents/transport.md#transport-errors[backoff]
542542
when the APM server errors. Finally, improved error handling means it will
543543
terminate failing requests to the APM server more quickly.
544544
+
@@ -548,7 +548,7 @@ setting (also possibly as the `ELASTIC_APM_MAX_QUEUE_SIZE` environment
548548
variable), then it should be removed.
549549
550550
* Adds support for Amazon SQS queues via `aws-sdk` instrumentation that
551-
partially implements the https://github.com/elastic/apm/blob/master/specs/agents/tracing-instrumentation-messaging.md[APM messaging spec],
551+
partially implements the https://github.com/elastic/apm/blob/main/specs/agents/tracing-instrumentation-messaging.md[APM messaging spec],
552552
and adds `queue.latency.min.ms`, `queue.latency.max.ms`, and `queue.latency.avg.ms`
553553
metrics for SQS queues.
554554
@@ -617,7 +617,7 @@ as they are added over time.
617617
[float]
618618
===== Bug fixes
619619
620-
* fix: Update https://github.com/elastic/apm-nodejs-http-client/blob/master/CHANGELOG.md#v951[apm-server client]
620+
* fix: Update https://github.com/elastic/apm-nodejs-http-client/blob/main/CHANGELOG.md#v951[apm-server client]
621621
to fix a {issues}1749[possible crash] when polling for central config.
622622
623623
@@ -634,7 +634,7 @@ as they are added over time.
634634
adds a top level `setTransactionOutcome` and `setSpanOutcome` to set
635635
outcome values for the current active transaction or active span.
636636
* Limit the `transactionSampleRate` value to 4 decimal places of precision
637-
according to the shared https://github.com/elastic/apm/blob/master/specs/agents/tracing-sampling.md#transaction_sample_rate-configuration[APM spec]. This ensures that propagated sampling rate
637+
according to the shared https://github.com/elastic/apm/blob/main/specs/agents/tracing-sampling.md#transaction_sample_rate-configuration[APM spec]. This ensures that propagated sampling rate
638638
in the `tracestate` header is short and consistent. {pull}1979[#1979]
639639
640640
[float]
@@ -700,14 +700,14 @@ slightly to commonalize:
700700
{pull}1912[#1912]
701701
702702
* feat: Add `log_level` central config support. {pull}1908[#1908] +
703-
Spec: https://github.com/elastic/apm/blob/master/specs/agents/logging.md
703+
Spec: https://github.com/elastic/apm/blob/main/specs/agents/logging.md
704704
705705
* feat: Add `sanitize_field_names` configuration option. +
706706
Allows users to configure a list of wildcard patterns to _remove_ items
707707
from the agent's HTTP header and `application/x-www-form-urlencoded` payloads.
708708
{pull}1898[#1898]
709-
** https://github.com/elastic/apm/blob/master/specs/agents/sanitization.md[spec]
710-
** https://github.com/elastic/apm-agent-nodejs/blob/master/docs/configuration.asciidoc#sanitize-field-names[docs]
709+
** https://github.com/elastic/apm/blob/main/specs/agents/sanitization.md[spec]
710+
** https://github.com/elastic/apm-agent-nodejs/blob/main/docs/configuration.asciidoc#sanitize-field-names[docs]
711711
712712
[float]
713713
===== Bug fixes
@@ -764,8 +764,8 @@ Config vars affected are: `disableInstrumentations`, `transactionIgnoreUrls`
764764
transaction sample rate across a trace's service boundaries.
765765
* feat: add span and transaction outcome {pull}1824[#1824] +
766766
This adds an "outcome" field to HTTP(S)
767-
https://github.com/elastic/apm/blob/master/specs/agents/tracing-transactions.md#transaction-outcome[transactions]
768-
and https://github.com/elastic/apm/blob/master/specs/agents/tracing-spans.md#span-outcome[spans].
767+
https://github.com/elastic/apm/blob/main/specs/agents/tracing-transactions.md#transaction-outcome[transactions]
768+
and https://github.com/elastic/apm/blob/main/specs/agents/tracing-spans.md#span-outcome[spans].
769769
770770
[float]
771771
===== Bug fixes

‎CONTRIBUTING.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Once your changes are ready to submit for review:
5050
3. Rebase your changes
5151

5252
Update your local repository with the most recent code from the main repo,
53-
and rebase your branch on top of the latest master branch.
53+
and rebase your branch on top of the latest main branch.
5454
We prefer your initial changes to be squashed into a single commit.
5555
Later, if we ask you to make changes, add them as separate commits.
5656
This makes them easier to review.
@@ -137,7 +137,7 @@ npm run backport
137137

138138
### Workflow
139139

140-
All feature development and most bug fixes hit the master branch first.
140+
All feature development and most bug fixes hit the main branch first.
141141
Pull requests should be reviewed by someone with commit access.
142142
Once approved, the author of the pull request,
143143
or reviewer if the author does not have commit access,
@@ -172,7 +172,7 @@ If you have access to make releases, the process is as follows:
172172

173173
### Current major
174174

175-
1. Be sure you have checked out the `master` branch and have pulled latest changes
175+
1. Be sure you have checked out the `main` branch and have pulled latest changes
176176
1. Update the version in `package.json` according to the scale of the change. (major, minor or patch)
177177
1. Update `CHANGELOG.asciidoc`:
178178
- Change the "Unreleased" section title to:
@@ -183,9 +183,9 @@ If you have access to make releases, the process is as follows:
183183
- Add missing changelog entries, if any. (Typically commits will include changelog entries in the "Unreleased" section.)
184184
1. If a major or minor release, update the EOL table in `docs/upgrading.asciidoc`. EOL is 18 months after release date.
185185
1. Make a PR titled `x.y.z` -- where `x.y.z` is the new version in package.json -- with these changes.
186-
1. Ensure PR checks pass, then merge to master.
187-
1. Working on the elastic repo now (not a fork), tag the merged-to-master commit with `git tag vx.y.x && git push origin --tags`. For example: `git tag v1.2.3 && git push origin --tags`.
188-
1. Reset the latest major branch (currently `3.x`) to point to the current master, e.g. `git branch -f 3.x master && git push origin 3.x`
186+
1. Ensure PR checks pass, then merge to main.
187+
1. Working on the elastic repo now (not a fork), tag the merged-to-main commit with `git tag vx.y.x && git push origin --tags`. For example: `git tag v1.2.3 && git push origin --tags`.
188+
1. Reset the latest major branch (currently `3.x`) to point to the current main, e.g. `git branch -f 3.x main && git push origin 3.x`
189189
1. Publish to npm with `npm publish`
190190
191191
### Past major
@@ -204,4 +204,4 @@ If you have access to make releases, the process is as follows:
204204
1. Run tests with `npm test`
205205
1. Push commits and tags upstream with `git push upstream <major_branch> && git push upstream --tags` (and optionally to your own fork as well)
206206
1. Publish to npm with `npm publish --tag=2x` (where `2x` is the tag for the past major version being published)
207-
1. Make a PR against `master` containing the updates to `CHANGELOG.asciidoc` so that `master` always contain information about all releases
207+
1. Make a PR against `main` containing the updates to `CHANGELOG.asciidoc` so that `main` always contain information about all releases

0 commit comments

Comments
 (0)