Skip to content

Commit 2319ae8

Browse files
authored
Merge pull request open-telemetry#325 from dynatrace-oss-contrib/main-links
chore: change links to point to main
2 parents 80d1049 + 8b288d7 commit 2319ae8

File tree

50 files changed

+129
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+129
-125
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#####################################################
66
#
77
# Learn about membership in OpenTelemetry community:
8-
# https://github.com/open-telemetry/community/blob/master/community-membership.md
8+
# https://github.com/open-telemetry/community/blob/main/community-membership.md
99
#
1010
#
1111
# Learn about CODEOWNERS file format:

.github/ISSUE_TEMPLATE/plugin_request.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ labels: plugin-request
77
<!--
88
**NB:** Before opening a plugin support request against this repo, consider whether the plugin should/could be implemented in the [other OpenTelemetry client libraries](https://github.com/open-telemetry/). If so, please [open an issue on opentelemetry-specification](https://github.com/open-telemetry/opentelemetry-specification/issues/new) first.
99
10-
You are welcome to try out the [plugin api](https://github.com/open-telemetry/opentelemetry-js/blob/master/doc/plugin-guide.md) to build your own plugin. If you do try out the plugin api, please let us know if you have any questions/feedback.
10+
You are welcome to try out the [plugin api](https://github.com/open-telemetry/opentelemetry-js/blob/main/doc/plugin-guide.md) to build your own plugin. If you do try out the plugin api, please let us know if you have any questions/feedback.
1111
-->
1212

1313
**Is your plugin request related to a problem? Please describe.**

.github/PULL_REQUEST_TEMPLATE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Before creating a pull request, please make sure:
55
- Your PR is solving one problem
66
- Please provide enough information so that others can review your pull request
77
- You have read the guide for contributing
8-
- See https://github.com/open-telemetry/opentelemetry-js/blob/master/CONTRIBUTING.md
8+
- See https://github.com/open-telemetry/opentelemetry-js/blob/main/CONTRIBUTING.md
99
- You signed all your commits (otherwise we won't be able to merge the PR)
10-
- See https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md#sign-the-cla
10+
- See https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md#sign-the-cla
1111
- You added unit tests for the new functionality
1212
- You mention in the PR description which issue it is addressing, e.g. "Fixes #xxx". This will auto-close
1313
the issue that your PR fixes (if such)

.github/workflows/lint.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: Lint
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
48

59
jobs:
610
build:

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,4 @@ Released 2020-04-27
201201

202202
Released 2020-04-08
203203

204-
For details about this release and all previous releases, see https://github.com/open-telemetry/opentelemetry-js/blob/master/CHANGELOG.md
204+
For details about this release and all previous releases, see https://github.com/open-telemetry/opentelemetry-js/blob/main/CHANGELOG.md

CONTRIBUTING.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Reporting bugs is an important contribution. Please make sure to include:
1616
### Before you start
1717

1818
Please read project contribution
19-
[guide](https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md)
19+
[guide](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md)
2020
for general practices for OpenTelemetry project.
2121

2222
#### Conventional commit
@@ -42,16 +42,16 @@ git remote add upstream https://github.com/open-telemetry/opentelemetry-js-contr
4242
git remote -v
4343
```
4444

45-
To update your fork, fetch the upstream repo's branches and commits, then merge your master with upstream's master:
45+
To update your fork, fetch the upstream repo's branches and commits, then merge your main with upstream's main:
4646
```
4747
git fetch upstream
48-
git checkout master
49-
git merge upstream/master
48+
git checkout main
49+
git merge upstream/main
5050
```
5151

52-
Remember to always work in a branch of your local copy, as you might otherwise have to contend with conflicts in master.
52+
Remember to always work in a branch of your local copy, as you might otherwise have to contend with conflicts in main.
5353

54-
Please also see [GitHub workflow](https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md#github-workflow) section of general project contributing guide.
54+
Please also see [GitHub workflow](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md#github-workflow) section of general project contributing guide.
5555

5656
### Running the tests
5757

README.md

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
<p align="center">
33
<strong>
4-
<a href="https://github.com/open-telemetry/opentelemetry-js/blob/master/getting-started/README.md">Getting Started<a/>
4+
<a href="https://github.com/open-telemetry/opentelemetry-js/blob/main/getting-started/README.md">Getting Started<a/>
55
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
66
<a href="https://open-telemetry.github.io/opentelemetry-js">API Documentation<a/>
77
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
@@ -13,10 +13,10 @@
1313
<a href="https://github.com/open-telemetry/opentelemetry-js-contrib/releases">
1414
<img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/open-telemetry/opentelemetry-js?include_prereleases&style=for-the-badge">
1515
</a>
16-
<a href="https://codecov.io/gh/open-telemetry/opentelemetry-js-contrib/branch/master/">
16+
<a href="https://codecov.io/gh/open-telemetry/opentelemetry-js-contrib/branch/main/">
1717
<img alt="Codecov Status" src="https://img.shields.io/codecov/c/github/open-telemetry/opentelemetry-js-contrib?style=for-the-badge">
1818
</a>
19-
<a href="https://github.com/open-telemetry/opentelemetry-js-contrib/blob/master/LICENSE">
19+
<a href="https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/LICENSE">
2020
<img alt="license" src="https://img.shields.io/badge/license-Apache_2.0-green.svg?style=for-the-badge">
2121
</a>
2222
<br/>
@@ -115,25 +115,25 @@ We'd love your help!. Use tags [up-for-grabs][up-for-grabs-issues] and
115115
Apache 2.0 - See [LICENSE][license-url] for more information.
116116

117117
[node-gitter-url]: https://gitter.im/open-telemetry/opentelemetry-node?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
118-
[license-url]: https://github.com/open-telemetry/opentelemetry-js-contrib/blob/master/LICENSE
118+
[license-url]: https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/LICENSE
119119
[up-for-grabs-issues]: https://github.com/open-telemetry/opentelemetry-js-contrib/issues?q=is%3Aissue+is%3Aopen+label%3Aup-for-grabs
120120
[good-first-issues]: https://github.com/open-telemetry/openTelemetry-js-contrib/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22
121-
[otel-plugin-grpc]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-grpc
122-
[otel-plugin-http]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-http
123-
[otel-plugin-https]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-https
124-
[otel-plugin-dns]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-dns
125-
[otel-plugin-document-load]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-plugin-document-load
126-
[otel-plugin-react-load]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-plugin-react-load
127-
[otel-plugin-ioredis]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-ioredis
128-
[otel-plugin-mongodb]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-mongodb
129-
[otel-plugin-mysql]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-mysql
130-
[otel-plugin-pg-pool]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-pg-pool
131-
[otel-plugin-pg]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-pg
132-
[otel-plugin-redis]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-redis
133-
[otel-plugin-user-interaction]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-plugin-user-interaction
134-
[otel-plugin-xml-http-request]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-xml-http-request
135-
[otel-plugin-express]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-express
136-
[otel-plugins-node-core-and-contrib]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/metapackages/plugins-node-core-and-contrib
137-
[otel-contrib-hapi-instrumentation]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-hapi-instrumentation
138-
[otel-contrib-koa-instrumentation]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-koa-instrumentation
139-
[otel-contrib-instrumentation-graphql]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-instrumentation-graphql
121+
[otel-plugin-grpc]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-plugin-grpc
122+
[otel-plugin-http]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-plugin-http
123+
[otel-plugin-https]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-plugin-https
124+
[otel-plugin-dns]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-plugin-dns
125+
[otel-plugin-document-load]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-plugin-document-load
126+
[otel-plugin-react-load]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-plugin-react-load
127+
[otel-plugin-ioredis]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-plugin-ioredis
128+
[otel-plugin-mongodb]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-plugin-mongodb
129+
[otel-plugin-mysql]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-plugin-mysql
130+
[otel-plugin-pg-pool]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-plugin-pg-pool
131+
[otel-plugin-pg]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-plugin-pg
132+
[otel-plugin-redis]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-plugin-redis
133+
[otel-plugin-user-interaction]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-plugin-user-interaction
134+
[otel-plugin-xml-http-request]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-plugin-xml-http-request
135+
[otel-plugin-express]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-plugin-express
136+
[otel-plugins-node-core-and-contrib]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/plugins-node-core-and-contrib
137+
[otel-contrib-hapi-instrumentation]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-hapi-instrumentation
138+
[otel-contrib-koa-instrumentation]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-koa-instrumentation
139+
[otel-contrib-instrumentation-graphql]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-graphql

RELEASING.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Release Process:
1616

1717
## Update to latest locally
1818

19-
Use `git fetch` and `git checkout origin/master` to ensure you’re on the latest commit. Make sure you have no unstaged changes. Ideally, also use `git clean -dfx` to remove all ignored and untracked files.
19+
Use `git fetch` and `git checkout origin/main` to ensure you’re on the latest commit. Make sure you have no unstaged changes. Ideally, also use `git clean -dfx` to remove all ignored and untracked files.
2020

2121
## Create a new branch
2222

@@ -70,7 +70,7 @@ GITHUB_AUTH=xxxxx lerna-changelog --from=v1.0.0 --to=v2.0.0
7070

7171
From what `lerna-changelog` has generated, starts new Unreleased label. Follow the example set by recent Released label.
7272

73-
On [GitHub Releases](https://github.com/open-telemetry/opentelemetry-js/releases), follow the example set by recent releases to populate a summary of changes, as well as a list of commits that were applied since the last release. Save it as a draft, don’t publish it. Don’t forget the tag -- call it `vx.y.z` and leave it pointing at `master` for now (this can be changed as long as the GitHub release isn’t published).
73+
On [GitHub Releases](https://github.com/open-telemetry/opentelemetry-js/releases), follow the example set by recent releases to populate a summary of changes, as well as a list of commits that were applied since the last release. Save it as a draft, don’t publish it. Don’t forget the tag -- call it `vx.y.z` and leave it pointing at `main` for now (this can be changed as long as the GitHub release isn’t published).
7474

7575
## Create a new PR
7676

@@ -101,9 +101,9 @@ Publish the GitHub release, ensuring that the tag points to the newly landed com
101101

102102
## Update CHANGELOG
103103

104-
* After releasing is done, update the [CHANGELOG.md](https://github.com/open-telemetry/opentelemetry-js/blob/master/CHANGELOG.md) and start new Unreleased label.
104+
* After releasing is done, update the [CHANGELOG.md](https://github.com/open-telemetry/opentelemetry-js/blob/main/CHANGELOG.md) and start new Unreleased label.
105105
* Create a new commit with the exact title: `Post Release: update CHANGELOG.md`.
106-
* Go through PR review and merge it to GitHub master branch.
106+
* Go through PR review and merge it to GitHub main branch.
107107

108108

109109
## Known Issues

examples/dns/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Go to Jaeger with your browser [http://localhost:16686/trace/(your-trace-id)]()
5353

5454
## Useful links
5555
- For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
56-
- For more information on OpenTelemetry for Node.js, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-node>
56+
- For more information on OpenTelemetry for Node.js, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-node>
5757

5858
## LICENSE
5959

examples/express/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Go to Jaeger with your browser [http://localhost:16686/trace/(your-trace-id)]()
6969

7070
## Useful links
7171
- For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
72-
- For more information on OpenTelemetry for Node.js, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-node>
72+
- For more information on OpenTelemetry for Node.js, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-node>
7373

7474
## LICENSE
7575

examples/graphql/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ This example shows how to use 2 popular graphql servers
55
- [Apollo GraphQL](https://www.npmjs.com/package/apollo-server)
66
- [GraphQL HTTP Server Middleware](https://www.npmjs.com/package/express-graphql)
77

8-
and [@opentelemetry/instrumentation-graphql](https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-instrumentation-graphql) to instrument a simple Node.js application.
8+
and [@opentelemetry/instrumentation-graphql](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-instrumentation-graphql) to instrument a simple Node.js application.
99

1010
This instrumentation should work with any graphql server as it instruments graphql directly.
1111

12-
This example will export spans data simultaneously using [Exporter Collector](https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-exporter-collector).
12+
This example will export spans data simultaneously using [Exporter Collector](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-collector).
1313

1414
## Installation
1515

examples/graphql/schema.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const https = require('https');
44
const graphql = require('graphql');
55

6-
const url1 = 'https://raw.githubusercontent.com/open-telemetry/opentelemetry-js/master/package.json';
6+
const url1 = 'https://raw.githubusercontent.com/open-telemetry/opentelemetry-js/main/package.json';
77

88
function getData(url) {
99
return new Promise((resolve, reject) => {

examples/grpc-census-prop/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ that is already instrumented using OpenCensus.
1111
If both sides of gRPC communication are using OpenTelemetry instrumentation then
1212
the `propagator-grpc-census-binary` propagator isn't required. Context will be
1313
propagated using the `traceparent` header (thanks to the
14-
[HttpTraceContext](https://github.com/open-telemetry/opentelemetry-js/blob/master/packages/opentelemetry-core/src/context/propagation/HttpTraceContext.ts)
14+
[HttpTraceContext](https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-core/src/context/propagation/HttpTraceContext.ts)
1515
propagator from opentelemetry-core). If there is a mix of OpenCensus and OpenTelemetry
1616
instrumentation then the `propagator-grpc-census-binary` propagator allows OpenTelemetry
1717
to propagate context through the `grpc-trace-bin` binary header.
@@ -123,7 +123,7 @@ See [combination4](./combination4.md) for example output
123123

124124
## Useful links
125125
- For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
126-
- For more information on OpenTelemetry for Node.js, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-node-sdk>
126+
- For more information on OpenTelemetry for Node.js, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-node-sdk>
127127

128128
## LICENSE
129129

examples/grpc_dynamic_codegen/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Setup [Jaeger Tracing](https://www.jaegertracing.io/docs/latest/getting-started/
5353

5454
## Useful links
5555
- For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
56-
- For more information on OpenTelemetry for Node.js, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-node-sdk>
56+
- For more information on OpenTelemetry for Node.js, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-node-sdk>
5757

5858
## LICENSE
5959

examples/hapi/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Go to Jaeger with your browser [http://localhost:16686/trace/(your-trace-id)]()
6969

7070
## Useful links
7171
- For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
72-
- For more information on OpenTelemetry for Node.js, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-node>
72+
- For more information on OpenTelemetry for Node.js, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-node>
7373

7474
## LICENSE
7575

examples/koa/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Go to Jaeger with your browser [http://localhost:16686/trace/(your-trace-id)]()
6969

7070
## Useful links
7171
- For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
72-
- For more information on OpenTelemetry for Node.js, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-node>
72+
- For more information on OpenTelemetry for Node.js, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-node>
7373

7474
## LICENSE
7575

examples/mongodb/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Go to Jaeger with your browser [http://localhost:16686/trace/(your-trace-id)]()
6767

6868
## Useful links
6969
- For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
70-
- For more information on OpenTelemetry for Node.js, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-node>
70+
- For more information on OpenTelemetry for Node.js, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-node>
7171

7272
## LICENSE
7373

examples/mysql/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Go to Jaeger with your browser [http://localhost:16686/trace/(your-trace-id)]()
6767

6868
## Useful links
6969
- For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
70-
- For more information on OpenTelemetry for Node.js, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-node>
70+
- For more information on OpenTelemetry for Node.js, visit: <https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-node>
7171

7272
## LICENSE
7373

0 commit comments

Comments
 (0)