Skip to content

Commit bc8b54d

Browse files
authored
Update default branch name to main (#567)
* Update default branch name to main * Update README.md
1 parent e0fb74f commit bc8b54d

File tree

15 files changed

+23
-20
lines changed

15 files changed

+23
-20
lines changed

.github/ISSUE_TEMPLATE/instrumentation-request.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Instruments
5252
- [ ] Added to the [OpenTelemetry Registry](https://opentelemetry.io/registry/)
5353
- [ ] README included for the module describing high-level purpose.
5454
- [ ] Complete documentation of all public API including package documentation.
55-
- [ ] [Instrumentation documentation](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/master/instrumentation/README.md#instrumentation-packages) updated.
55+
- [ ] [Instrumentation documentation](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/instrumentation/README.md#instrumentation-packages) updated.
5656
- Examples
5757
- [ ] `Dockerfile` file to build example application.
5858
- [ ] `docker-compose.yml` to run example in a docker environment to demonstrate instrumentation.

.github/workflows/build_and_test.yml

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

CHANGELOG.md

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

99
## [Unreleased]
1010

11+
### Changed
12+
13+
- Rename project default branch from `master` to `main`.
14+
1115
## [0.16.0] - 2021-01-13
1216

1317
### Fixed

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
@@ -91,7 +91,7 @@ Any Maintainer can merge the PR once it is **ready to merge**.
9191

9292
* Make sure to run `make precommit` - this will find and fix the code
9393
formatting.
94-
* Check [opentelemetry-go Style Guide](https://github.com/open-telemetry/opentelemetry-go/blob/master/CONTRIBUTING.md#style-guide)
94+
* Check [opentelemetry-go Style Guide](https://github.com/open-telemetry/opentelemetry-go/blob/main/CONTRIBUTING.md#style-guide)
9595

9696
## Adding a new Contrib package
9797

@@ -126,4 +126,4 @@ Maintainers:
126126
### Become an Approver or a Maintainer
127127

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

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ ALL_GO_MOD_DIRS := $(filter-out $(TOOLS_MOD_DIR), $(shell find . -type f -name '
77
ALL_COVERAGE_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | egrep -v '^./example|^$(TOOLS_MOD_DIR)' | sort)
88

99
# URLs to check if all contrib entries exist in the registry.
10-
REGISTRY_BASE_URL = https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/master/content/en/registry
11-
CONTRIB_REPO_URL = https://github.com/open-telemetry/opentelemetry-go-contrib/tree/master
10+
REGISTRY_BASE_URL = https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/content/en/registry
11+
CONTRIB_REPO_URL = https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main
1212

1313
# Mac OS Catalina 10.5.x doesn't support 386. Hence skip 386 test
1414
SKIP_386_TEST = false

README.md

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

3-
[![build_and_test](https://github.com/open-telemetry/opentelemetry-go-contrib/workflows/build_and_test/badge.svg)](https://github.com/open-telemetry/opentelemetry-go-contrib/actions?query=workflow%3Abuild_and_test+branch%3Amaster)
3+
[![build_and_test](https://github.com/open-telemetry/opentelemetry-go-contrib/workflows/build_and_test/badge.svg)](https://github.com/open-telemetry/opentelemetry-go-contrib/actions?query=workflow%3Abuild_and_test+branch%3Amain)
44
[![Docs](https://godoc.org/go.opentelemetry.io/contrib?status.svg)](https://pkg.go.dev/go.opentelemetry.io/contrib)
55
[![Go Report Card](https://goreportcard.com/badge/go.opentelemetry.io/contrib)](https://goreportcard.com/report/go.opentelemetry.io/contrib)
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)

RELEASING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ In nearly all cases, `<new_contrib_tag>` should be the same as
5858
4. Push the changes to upstream.
5959

6060
```
61-
git diff master
61+
git diff main
6262
git push
6363
```
6464

exporters/metric/cortex/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ it is aimed at Cortex, it should work with other backends that ingest data with
66
API.
77

88
This exporter is push-based and integrates with the OpenTelemetry Go SDK's [push
9-
Controller](https://github.com/open-telemetry/opentelemetry-go/blob/master/sdk/metric/controller/push/push.go).
9+
Controller](https://github.com/open-telemetry/opentelemetry-go/blob/main/sdk/metric/controller/push/push.go).
1010
The Controller periodically collects data and passes it to this exporter. The exporter
1111
then converts this data into
1212
[`TimeSeries`](https://prometheus.io/docs/concepts/data_model/), a format that Cortex
@@ -310,7 +310,7 @@ The end result is the same since the aggregations are cumulative.
310310

311311
## Design Document
312312

313-
[Design Document](https://github.com/open-o11y/docs/blob/master/go-prometheus-remote-write/design-doc.md)
313+
[Design Document](https://github.com/open-o11y/docs/blob/main/go-prometheus-remote-write/design-doc.md)
314314

315315
The document is not in this module as it contains large images which will increase the
316316
size of the overall repo significantly.

exporters/metric/cortex/cortex.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func (e *Exporter) ConvertToTimeSeries(checkpointSet export.CheckpointSet) ([]*p
132132
// checked first.
133133
//
134134
// See the Aggregator Kind for more information
135-
// https://github.com/open-telemetry/opentelemetry-go/blob/master/sdk/export/metric/aggregation/aggregation.go#L123-L138
135+
// https://github.com/open-telemetry/opentelemetry-go/blob/main/sdk/export/metric/aggregation/aggregation.go#L123-L138
136136
if histogram, ok := agg.(aggregation.Histogram); ok {
137137
tSeries, err := convertFromHistogram(record, histogram)
138138
if err != nil {

exporters/metric/cortex/example/cortexConfig.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This Cortex Config is copied from the Cortex Project documentation
2-
# Source: https://github.com/cortexproject/cortex/blob/master/docs/configuration/single-process-config.yaml
2+
# Source: https://github.com/cortexproject/cortex/blob/main/docs/configuration/single-process-config.yaml
33

44
# Configuration for running Cortex in single-process mode.
55
# This configuration should not be used in production.

instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package otelgrpc
1616

1717
// gRPC tracing middleware
18-
// https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/semantic_conventions/rpc.md
18+
// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/rpc.md
1919
import (
2020
"context"
2121
"io"

instrumentation/host/doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
// system.memory.utilization state=used|available
3030
// system.network.io direction=transmit|receive
3131
//
32-
// See https://github.com/open-telemetry/oteps/blob/master/text/0119-standard-system-metrics.md
32+
// See https://github.com/open-telemetry/oteps/blob/main/text/0119-standard-system-metrics.md
3333
// for the definition of these metric instruments.
3434
package host // import "go.opentelemetry.io/contrib/instrumentation/host"

pre_release.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ patch_gomods() {
123123
done
124124
}
125125

126-
# branch off from existing master
127-
git checkout -b "${BRANCH_NAME}" master
126+
# branch off from existing main
127+
git checkout -b "${BRANCH_NAME}" main
128128

129129
# Update go.mods
130130
if [ -n "${OTEL_TAG}" ]; then
@@ -154,5 +154,5 @@ fi
154154
COMMIT_MSG+=". Prepare for releasing ${CONTRIB_TAG}"
155155
git commit -m "${COMMIT_MSG}"
156156

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

tools/should_build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# target directory. TARGET should be a unique package name in the directory
1919
# structure. For example, for the gocql integration, set TARGET=gocql so that
2020
# a diff in any of the files in the instrumentation/gocql/gocql directory
21-
# will be picked up by the grep. Diffs are compared against the master branch.
21+
# will be picked up by the grep. Diffs are compared against the main branch.
2222

2323
TARGET=$1
2424

@@ -27,7 +27,7 @@ if [ -z "$TARGET" ]; then
2727
exit 1
2828
fi
2929

30-
if git diff --name-only origin/master HEAD | grep -q "$TARGET"; then
30+
if git diff --name-only origin/main HEAD | grep -q "$TARGET"; then
3131
exit 0
3232
else
3333
echo "no changes found for $TARGET. skipping tests..."

0 commit comments

Comments
 (0)