Skip to content

Commit 6b34050

Browse files
MrAliasAneurysm9
andauthored
Update default branch name (open-telemetry#1505)
* Update README master branch URL to main * Remove master branch from workflow triggers The master branch has been renamed to main. * Add changes to CHANGELOG * Rename other projects default branch All of OpenTelemetry is moving to rename `master` to `main`, this updates all other URLs for those projects. Co-authored-by: Anthony Mirabella <[email protected]>
1 parent b39fd05 commit 6b34050

File tree

11 files changed

+15
-19
lines changed

11 files changed

+15
-19
lines changed

.github/workflows/changelog.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This action requires that any PR targeting the master branch should touch at
1+
# This action requires that any PR targeting the main branch should touch at
22
# least one CHANGELOG file. If a CHANGELOG entry is not required, add the "Skip
33
# Changelog" label to disable this action.
44

@@ -8,7 +8,6 @@ on:
88
pull_request:
99
types: [opened, synchronize, reopened, labeled, unlabeled]
1010
branches:
11-
- master
1211
- main
1312
jobs:
1413
changelog:

.github/workflows/ci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: ci
22
on:
33
push:
44
branches:
5-
- master
65
- main
76
pull_request:
87
env:

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
1010

1111
### Changed
1212

13+
- Rename project default branch from `master` to `main`.
1314
- Reverse order in which `Resource` attributes are merged, per change in spec. (#1501)
1415

1516
## [0.16.0] - 2020-01-13

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:

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ As with other OpenTelemetry clients, opentelemetry-go follows the
118118
[opentelemetry-specification](https://github.com/open-telemetry/opentelemetry-specification).
119119

120120
It's especially valuable to read through the [library
121-
guidelines](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/library-guidelines.md).
121+
guidelines](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/library-guidelines.md).
122122

123123
### Focus on Capabilities, Not Structure Compliance
124124

@@ -371,4 +371,4 @@ Maintainers:
371371
### Become an Approver or a Maintainer
372372

373373
See the [community membership document in OpenTelemetry community
374-
repo](https://github.com/open-telemetry/community/blob/master/community-membership.md).
374+
repo](https://github.com/open-telemetry/community/blob/main/community-membership.md).

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# OpenTelemetry-Go
22

3-
[![CI](https://github.com/open-telemetry/opentelemetry-go/workflows/ci/badge.svg)](https://github.com/open-telemetry/opentelemetry-go/actions?query=workflow%3Aci+branch%3Amaster)
3+
[![CI](https://github.com/open-telemetry/opentelemetry-go/workflows/ci/badge.svg)](https://github.com/open-telemetry/opentelemetry-go/actions?query=workflow%3Aci+branch%3Amain)
44
[![PkgGoDev](https://pkg.go.dev/badge/go.opentelemetry.io/otel)](https://pkg.go.dev/go.opentelemetry.io/otel)
55
[![Go Report Card](https://goreportcard.com/badge/go.opentelemetry.io/otel)](https://goreportcard.com/report/go.opentelemetry.io/otel)
66
[![Gitter](https://badges.gitter.im/open-telemetry/opentelemetry-go.svg)](https://gitter.im/open-telemetry/opentelemetry-go?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
@@ -42,7 +42,7 @@ To start capturing distributed traces and metric events from your application
4242
it first needs to be instrumented. The easiest way to do this is by using an
4343
instrumentation library for your code. Be sure to check out [the officially
4444
supported instrumentation
45-
libraries](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/master/instrumentation).
45+
libraries](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/instrumentation).
4646

4747
If you need to extend the telemetry an instrumentation library provides or want
4848
to build your own instrumentation for your application directly you will need
@@ -58,7 +58,7 @@ export pipeline to send that telemetry to an observability platform.
5858

5959
You can find officially supported exporters [here](./exporters/) and in the
6060
companion [contrib
61-
repository](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/master/exporters/metric).
61+
repository](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/exporters/metric).
6262
Additionally, there are many vendor specific or 3rd party exporters for
6363
OpenTelemetry. These exporters are broken down by
6464
[trace](https://pkg.go.dev/go.opentelemetry.io/otel/sdk/export/trace?tab=importedby)

RELEASING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Update go.mod for submodules to depend on the new release which will happen in t
1313
2. Verify the changes.
1414
1515
```
16-
git diff master
16+
git diff main
1717
```
1818
1919
This should have changed the version for all modules to be `<new tag>`.
@@ -44,7 +44,7 @@ Failure to do so will leave things in a broken state.
4444
It is critical you make sure the version you push upstream is correct.
4545
[Failure to do so will lead to minor emergencies and tough to work around](https://github.com/open-telemetry/opentelemetry-go/issues/331).
4646
47-
1. Run the tag.sh script using the `<commit-hash>` of the commit on the master branch for the merged Pull Request.
47+
1. Run the tag.sh script using the `<commit-hash>` of the commit on the main branch for the merged Pull Request.
4848
4949
```
5050
./tag.sh <new tag> <commit-hash>
@@ -78,4 +78,4 @@ This ensures they build with the published release, not the local copy.
7878
7979
## Contrib Repository
8080
81-
Once verified be sure to [make a release for the `contrib` repository](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/master/RELEASING.md) that uses this release.
81+
Once verified be sure to [make a release for the `contrib` repository](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/RELEASING.md) that uses this release.

codes/doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ may be introduced in subsequent minor version releases as we work to track
2020
the evolving OpenTelemetry specification and user feedback.
2121
2222
It conforms to [the OpenTelemetry
23-
specification](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/api.md#statuscanonicalcode).
23+
specification](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/api.md#statuscanonicalcode).
2424
*/
2525
package codes // import "go.opentelemetry.io/otel/codes"

example/otel-collector/k8s/otel-collector.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
#
15-
# Configuration based on otel-collector k8s demo:
16-
# https://github.com/open-telemetry/opentelemetry-collector/blob/master/examples/k8s.yaml
1714

1815
apiVersion: v1
1916
kind: ConfigMap

pre_release.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ sed "s/\(return \"\)[0-9]*\.[0-9]*\.[0-9]*\"/\1${OTEL_VERSION}\"/" ./version.go.
7474
rm -f ./version.go.bak
7575

7676
# Update go.mod
77-
git checkout -b pre_release_${TAG} master
77+
git checkout -b pre_release_${TAG} main
7878
PACKAGE_DIRS=$(find . -mindepth 2 -type f -name 'go.mod' -exec dirname {} \; | egrep -v 'tools' | sed 's/^\.\///' | sort)
7979

8080
for dir in $PACKAGE_DIRS; do
@@ -91,5 +91,5 @@ git add .
9191
make ci
9292
git commit -m "Prepare for releasing $TAG"
9393

94-
printf "Now run following to verify the changes.\ngit diff master\n"
94+
printf "Now run following to verify the changes.\ngit diff main\n"
9595
printf "\nThen push the changes to upstream\n"

sdk/instrumentation/library.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ may be introduced in subsequent minor version releases as we work to track the
2121
evolving OpenTelemetry specification and user feedback.
2222
2323
For more information see
24-
[this](https://github.com/open-telemetry/oteps/blob/master/text/0083-component.md).
24+
[this](https://github.com/open-telemetry/oteps/blob/main/text/0083-component.md).
2525
*/
2626
package instrumentation // import "go.opentelemetry.io/otel/sdk/instrumentation"
2727

0 commit comments

Comments
 (0)