Merge branch 'main' into jmacd/remove_subtract

.github/workflows/changelog.yml

@@ -1,4 +1,4 @@
-# This action requires that any PR targeting the master branch should touch at
+# This action requires that any PR targeting the main branch should touch at
 # least one CHANGELOG file. If a CHANGELOG entry is not required, add the "Skip
 # Changelog" label to disable this action.
 
@@ -8,7 +8,6 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, labeled, unlabeled]
     branches:
-      - master
       - main
 jobs:
   changelog:

.github/workflows/ci.yml

@@ -2,7 +2,6 @@ name: ci
 on:
   push:
     branches:
-      - master
       - main
   pull_request:
 env:

CHANGELOG.md

@@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ### Changed
 
+- Rename project default branch from `master` to `main`.
 - Reverse order in which `Resource` attributes are merged, per change in spec. (#1501)
 
 ## [0.16.0] - 2020-01-13

CODEOWNERS

@@ -5,7 +5,7 @@
 #####################################################
 #
 # Learn about membership in OpenTelemetry community:
-#  https://github.com/open-telemetry/community/blob/master/community-membership.md
+#  https://github.com/open-telemetry/community/blob/main/community-membership.md
 #
 #
 # Learn about CODEOWNERS file format:

CONTRIBUTING.md

@@ -118,7 +118,7 @@ As with other OpenTelemetry clients, opentelemetry-go follows the
 [opentelemetry-specification](https://github.com/open-telemetry/opentelemetry-specification).
 
 It's especially valuable to read through the [library
-guidelines](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/library-guidelines.md).
+guidelines](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/library-guidelines.md).
 
 ### Focus on Capabilities, Not Structure Compliance
 
@@ -371,4 +371,4 @@ Maintainers:
 ### Become an Approver or a Maintainer
 
 See the [community membership document in OpenTelemetry community
-repo](https://github.com/open-telemetry/community/blob/master/community-membership.md).
+repo](https://github.com/open-telemetry/community/blob/main/community-membership.md).

README.md

@@ -1,6 +1,6 @@
 # OpenTelemetry-Go
 
-[![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)
+[![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)
 [![PkgGoDev](https://pkg.go.dev/badge/go.opentelemetry.io/otel)](https://pkg.go.dev/go.opentelemetry.io/otel)
 [![Go Report Card](https://goreportcard.com/badge/go.opentelemetry.io/otel)](https://goreportcard.com/report/go.opentelemetry.io/otel)
 [![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
 it first needs to be instrumented. The easiest way to do this is by using an
 instrumentation library for your code. Be sure to check out [the officially
 supported instrumentation
-libraries](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/master/instrumentation).
+libraries](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/instrumentation).
 
 If you need to extend the telemetry an instrumentation library provides or want
 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.
 
 You can find officially supported exporters [here](./exporters/) and in the
 companion [contrib
-repository](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/master/exporters/metric).
+repository](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/exporters/metric).
 Additionally, there are many vendor specific or 3rd party exporters for
 OpenTelemetry. These exporters are broken down by
 [trace](https://pkg.go.dev/go.opentelemetry.io/otel/sdk/export/trace?tab=importedby)

RELEASING.md

@@ -13,7 +13,7 @@ Update go.mod for submodules to depend on the new release which will happen in t
 2. Verify the changes.
 
     ```
-    git diff master
+    git diff main
     ```
 
     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.
 It is critical you make sure the version you push upstream is correct.
 [Failure to do so will lead to minor emergencies and tough to work around](https://github.com/open-telemetry/opentelemetry-go/issues/331).
 
-1. Run the tag.sh script using the `<commit-hash>` of the commit on the master branch for the merged Pull Request.
+1. Run the tag.sh script using the `<commit-hash>` of the commit on the main branch for the merged Pull Request.
 
     ```
     ./tag.sh <new tag> <commit-hash>
@@ -78,4 +78,4 @@ This ensures they build with the published release, not the local copy.
 
 ## Contrib Repository
 
-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.
+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

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

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

@@ -11,9 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
-# Configuration based on otel-collector k8s demo:
-# https://github.com/open-telemetry/opentelemetry-collector/blob/master/examples/k8s.yaml
 
 apiVersion: v1
 kind: ConfigMap

exporters/otlp/otlphttp/driver.go

@@ -193,10 +193,10 @@ func (d *driver) send(ctx context.Context, rawRequest []byte, urlPath string) er
 				return ctx.Err()
 			}
 		default:
-			return fmt.Errorf("Failed with HTTP status %s", response.Status)
+			return fmt.Errorf("failed with HTTP status %s", response.Status)
 		}
 	}
-	return fmt.Errorf("Failed to send data to %s after %d tries", address, d.cfg.maxAttempts)
+	return fmt.Errorf("failed to send data to %s after %d tries", address, d.cfg.maxAttempts)
 }
 
 func (d *driver) getScheme() string {

metric/registry/registry.go

@@ -63,7 +63,7 @@ func (p *MeterProvider) Meter(instrumentationName string, opts ...metric.MeterOp
 // ErrMetricKindMismatch is the standard error for mismatched metric
 // instrument definitions.
 var ErrMetricKindMismatch = fmt.Errorf(
-	"A metric was already registered by this name with another kind or number type")
+	"a metric was already registered by this name with another kind or number type")
 
 // NewUniqueInstrumentMeterImpl returns a wrapped metric.MeterImpl with
 // the addition of uniqueness checking.
@@ -90,7 +90,7 @@ func keyOf(descriptor metric.Descriptor) key {
 // NewMetricKindMismatchError formats an error that describes a
 // mismatched metric instrument definition.
 func NewMetricKindMismatchError(desc metric.Descriptor) error {
-	return fmt.Errorf("Metric was %s (%s %s)registered as a %s %s: %w",
+	return fmt.Errorf("metric was %s (%s %s)registered as a %s %s: %w",
 		desc.Name(),
 		desc.InstrumentationName(),
 		desc.InstrumentationVersion(),

pre_release.sh

@@ -74,7 +74,7 @@ sed "s/\(return \"\)[0-9]*\.[0-9]*\.[0-9]*\"/\1${OTEL_VERSION}\"/" ./version.go.
 rm -f ./version.go.bak
 
 # Update go.mod
-git checkout -b pre_release_${TAG} master
+git checkout -b pre_release_${TAG} main
 PACKAGE_DIRS=$(find . -mindepth 2 -type f -name 'go.mod' -exec dirname {} \; | egrep -v 'tools' | sed 's/^\.\///' | sort)
 
 for dir in $PACKAGE_DIRS; do
@@ -91,5 +91,5 @@ git add .
 make ci
 git commit -m "Prepare for releasing $TAG"
 
-printf "Now run following to verify the changes.\ngit diff master\n"
+printf "Now run following to verify the changes.\ngit diff main\n"
 printf "\nThen push the changes to upstream\n"

sdk/instrumentation/library.go

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

trace.go

@@ -22,7 +22,7 @@ import (
 // Tracer creates a named tracer that implements Tracer interface.
 // If the name is an empty string then provider uses default name.
 //
-// This is short for TracerProvider().Tracer(name)
+// This is short for GetTracerProvider().Tracer(name)
 func Tracer(name string) trace.Tracer {
 	return GetTracerProvider().Tracer(name)
 }