Update more links after master->main change (#2419)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
This commit is contained in:
Bogdan Drutu 2021-01-28 11:45:15 -08:00 committed by GitHub
parent f30f388877
commit f57f3bae32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 16 additions and 16 deletions

View File

@ -1,7 +1,7 @@
codecov:
notify:
require_ci_to_pass: yes
strict_yaml_branch: master # only use the latest copy on master branch
strict_yaml_branch: main # only use the latest copy on main branch
coverage:
precision: 2

View File

@ -74,16 +74,16 @@ Verify that the upstream exists:
`git remote -v`
To update your fork, fetch the upstream repo's branches and commits, then merge your master with upstream's master:
To update your fork, fetch the upstream repo's branches and commits, then merge your `main` with upstream's `main`:
```
git fetch upstream
git checkout master
git merge upstream/master
git checkout main
git merge upstream/main
```
Remember to always work in a branch of your local copy, as you might otherwise
have to contend with conflicts in master.
have to contend with conflicts in `main`.
Please also see [GitHub
workflow](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md#github-workflow)

View File

@ -105,7 +105,7 @@ var metricSlice = &sliceOfPtrs{
var metric = &messageValueStruct{
structName: "Metric",
description: "// Metric represents one metric as a collection of datapoints.\n" +
"// See Metric definition in OTLP: https://github.com/open-telemetry/opentelemetry-proto/blob/master/opentelemetry/proto/metrics/v1/metrics.proto",
"// See Metric definition in OTLP: https://github.com/open-telemetry/opentelemetry-proto/blob/main/opentelemetry/proto/metrics/v1/metrics.proto",
originFullName: "otlpmetrics.Metric",
fields: []baseField{
nameField,

View File

@ -89,7 +89,7 @@ var spanSlice = &sliceOfPtrs{
var span = &messageValueStruct{
structName: "Span",
description: "// Span represents a single operation within a trace.\n" +
"// See Span definition in OTLP: https://github.com/open-telemetry/opentelemetry-proto/blob/master/opentelemetry/proto/trace/v1/trace.proto#L37",
"// See Span definition in OTLP: https://github.com/open-telemetry/opentelemetry-proto/blob/main/opentelemetry/proto/trace/v1/trace.proto#L37",
originFullName: "otlptrace.Span",
fields: []baseField{
traceIDField,

View File

@ -448,7 +448,7 @@ func (es MetricSlice) Append(e Metric) {
}
// Metric represents one metric as a collection of datapoints.
// See Metric definition in OTLP: https://github.com/open-telemetry/opentelemetry-proto/blob/master/opentelemetry/proto/metrics/v1/metrics.proto
// See Metric definition in OTLP: https://github.com/open-telemetry/opentelemetry-proto/blob/main/opentelemetry/proto/metrics/v1/metrics.proto
//
// This is a reference type, if passed by value and callee modifies it the
// caller will see the modification.

View File

@ -449,7 +449,7 @@ func (es SpanSlice) Append(e Span) {
}
// Span represents a single operation within a trace.
// See Span definition in OTLP: https://github.com/open-telemetry/opentelemetry-proto/blob/master/opentelemetry/proto/trace/v1/trace.proto#L37
// See Span definition in OTLP: https://github.com/open-telemetry/opentelemetry-proto/blob/main/opentelemetry/proto/trace/v1/trace.proto#L37
//
// This is a reference type, if passed by value and callee modifies it the
// caller will see the modification.

View File

@ -16,9 +16,9 @@ Note: Youll need to be an approver for both the repos in order to be able to
1. Prepare Core for release. Update CHANGELOG.md file and rename the Unreleased section to the new release name. Add a new unreleased section at top.
<!-- markdown-link-check-disable-line --> Use commit history feature to get the list of commits since the last release to help understand what should be in the release notes, e.g.: https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/${last_release}...master. Submit a PR with the changes and get the PR approved and merged.
<!-- markdown-link-check-disable-line --> Use commit history feature to get the list of commits since the last release to help understand what should be in the release notes, e.g.: https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/${last_release}...main. Submit a PR with the changes and get the PR approved and merged.
1. Make sure the current master branch build successfully passes (Core and Contrib). For Contrib also check that the spawn-stability-tests-job triggered by the main build-publish job also passes. Check that the corresponding "-dev" images exist in Dockerhub (Core and Contrib).
1. Make sure the current main branch build successfully passes (Core and Contrib). For Contrib also check that the spawn-stability-tests-job triggered by the main build-publish job also passes. Check that the corresponding "-dev" images exist in Dockerhub (Core and Contrib).
1. Create a branch named release/<release-series> (e.g. release/v0.4.x) in Core from the changelog update commit and push to origin (not your fork). Wait for the release branch builds to pass successfully.

View File

@ -3,7 +3,7 @@
Exports data via gRPC to [Jaeger](https://www.jaegertracing.io/) destinations.
By default, this exporter requires TLS and offers queued retry capabilities. A
Jaeger Thrift HTTP exporter is available in the [contrib
repository](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/master/exporter/jaegerthrifthttpexporter).
repository](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/jaegerthrifthttpexporter).
Supported pipeline types: traces

View File

@ -1,7 +1,7 @@
# OTLP gRPC Exporter
Exports data via gRPC using [OTLP](
https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/protocol/otlp.md)
https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/otlp.md)
format. By default, this exporter requires TLS and offers queued retry capabilities.
:warning: OTLP metrics and logs formats are currently marked as "Alpha" and may change in

View File

@ -1,7 +1,7 @@
# OTLP/HTTP Exporter
Exports traces and/or metrics via HTTP using [OTLP](
https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/protocol/otlp.md)
https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/otlp.md)
format.
*Important: OTLP metrics format is currently marked as "Alpha" and may change in

View File

@ -131,7 +131,7 @@ func (tsp *tracesamplerprocessor) Shutdown(context.Context) error {
// parseSpanSamplingPriority checks if the span has the "sampling.priority" tag to
// decide if the span should be sampled or not. The usage of the tag follows the
// OpenTracing semantic tags:
// https://github.com/opentracing/specification/blob/master/semantic_conventions.md#span-tags-table
// https://github.com/opentracing/specification/blob/main/semantic_conventions.md#span-tags-table
func parseSpanSamplingPriority(span pdata.Span) samplingPriority {
attribMap := span.Attributes()
if attribMap.Len() <= 0 {

View File

@ -1,7 +1,7 @@
# OTLP Receiver
Receives data via gRPC or HTTP using [OTLP](
https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/protocol/otlp.md)
https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/otlp.md)
format.
Supported pipeline types: traces, metrics, logs