Skip to content

Commit

Permalink
Update links after master -> main branch change (#2418)
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
  • Loading branch information
bogdandrutu authored Jan 28, 2021
1 parent 68c5961 commit dde2038
Show file tree
Hide file tree
Showing 24 changed files with 61 additions and 61 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ commands:
steps:
- when:
condition:
equal: [master, << pipeline.git.branch >>]
equal: [main, << pipeline.git.branch >>]
steps:
- run:
name: Generate GitHub Issue
Expand Down Expand Up @@ -218,7 +218,7 @@ workflows:
- rpm-package
filters:
branches:
only: master
only: main
tags:
ignore: /.*/
- build-package:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ assignees: ''

## Important (read before submitting)
We are currently preparing for the upcoming 1.0 GA release. Feature requests that are not aligned with
the current roadmap https://github.com/open-telemetry/opentelemetry-collector/blob/master/docs/roadmap.md
the current roadmap https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/roadmap.md
and are not aimed at stabilizing and preparing the Collector for the release will not be prioritized.

_Delete this paragraph before submitting._
Expand Down
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Important (read before submitting)
We are currently preparing for the upcoming 1.0 GA release. Pull requests that are not aligned with
the current roadmap https://github.com/open-telemetry/opentelemetry-collector/blob/master/docs/roadmap.md
the current roadmap https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/roadmap.md
and are not aimed at stabilizing and preparing the Collector for the release will not be accepted.

_Delete this paragraph before submitting._
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: build-and-test
on:
push:
branches: [master]
branches: [ main ]
tags:
- 'v[0-9]+.[0-9]+.[0-9]+*'
pull_request:
Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Run Unit tests
run: go test ./...
- name: GitHub Issue Generator
if: ${{ failure() && github.ref == 'ref/head/master' }}
if: ${{ failure() && github.ref == 'ref/head/main' }}
run: |
go run cmd/issuegenerator/main.go $TEST_RESULTS
setup-environment:
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
name: test-results
path: test_results.tar
- name: GitHub Issue Generator
if: ${{ failure() && github.ref == 'ref/head/master' }}
if: ${{ failure() && github.ref == 'ref/head/main' }}
run: |
go run cmd/issuegenerator/main.go $TEST_RESULTS
correctness:
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
- name: Loadtest
run: make testbed-correctness
- name: GitHub Issue Generator
if: ${{ failure() && github.ref == 'ref/head/master' }}
if: ${{ failure() && github.ref == 'ref/head/main' }}
run: |
go run cmd/issuegenerator/main.go $TEST_RESULTS
build-package:
Expand Down Expand Up @@ -345,7 +345,7 @@ jobs:
publish-dev:
runs-on: ubuntu-latest
needs: [build-package, windows-msi]
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'open-telemetry/opentelemetry-collector'
if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'open-telemetry/opentelemetry-collector'
steps:
- name: Checkout Repo
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-links.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: check-links
on:
push:
branches: [master]
branches: [ main ]
pull_request:

jobs:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-links/check-links.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
REPO_DIR="$( cd "${SCRIPT_DIR}/../../../" && pwd )"
GITHUB_REF=${GITHUB_REF:-}

diff_files="$( git diff HEAD origin/master --name-only )"
diff_files="$( git diff HEAD origin/main --name-only )"
check_all_files=1
if [[ "$GITHUB_REF" = "ref/heads/master" ]] || [[ -n "$( echo "$diff_files" | grep ".github/workflows/check-links" )" ]]; then
if [[ "$GITHUB_REF" = "ref/heads/main" ]] || [[ -n "$( echo "$diff_files" | grep ".github/workflows/check-links" )" ]]; then
check_all_files=0
fi

nfailed=0

# check all docs in master/tags or new/modified docs in PR
# check all docs in main/tags or new/modified docs in PR
for md in $(find "$REPO_DIR" -name "*.md" | sort); do
if [[ $check_all_files ]] || [[ -n "$( echo "$diff_files" | grep "^${md/#$REPO_DIR\//}" )" ]]; then
node $SCRIPT_DIR/markdown-link-check -c ${SCRIPT_DIR}/config.json -v "$md" || (( nfailed += $? ))
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/contrib-tests.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: contrib-tests
on:
push:
branches: [master]
branches: [ main ]
tags:
- v[0-9]+.[0-9]+.[0-9]+.*
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<a href="https://circleci.com/gh/open-telemetry/opentelemetry-collector">
<img alt="Build Status" src="https://img.shields.io/circleci/build/github/open-telemetry/opentelemetry-collector?style=for-the-badge">
</a>
<a href="https://codecov.io/gh/open-telemetry/opentelemetry-collector/branch/master/">
<a href="https://codecov.io/gh/open-telemetry/opentelemetry-collector/branch/main/">
<img alt="Codecov Status" src="https://img.shields.io/codecov/c/github/open-telemetry/opentelemetry-collector?style=for-the-badge">
</a>
<a href="https://github.com/open-telemetry/opentelemetry-collector/releases">
Expand Down
4 changes: 2 additions & 2 deletions config/configgrpc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ adjusted.

## Client Configuration

[Exporters](https://github.com/open-telemetry/opentelemetry-collector/blob/master/exporter/README.md)
[Exporters](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/README.md)
leverage client configuration.

Note that client configuration supports TLS configuration, however
Expand Down Expand Up @@ -39,7 +39,7 @@ exporters:
## Server Configuration
[Receivers](https://github.com/open-telemetry/opentelemetry-collector/blob/master/receiver/README.md)
[Receivers](https://github.com/open-telemetry/opentelemetry-collector/blob/main/receiver/README.md)
leverage server configuration.
Note that transport configuration can also be configured. For more information,
Expand Down
4 changes: 2 additions & 2 deletions config/confighttp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ receivers or exporters.

## Client Configuration

[Exporters](https://github.com/open-telemetry/opentelemetry-collector/blob/master/exporter/README.md)
[Exporters](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/README.md)
leverage client configuration.

Note that client configuration supports TLS configuration, however
Expand All @@ -33,7 +33,7 @@ exporter:
## Server Configuration
[Receivers](https://github.com/open-telemetry/opentelemetry-collector/blob/master/receiver/README.md)
[Receivers](https://github.com/open-telemetry/opentelemetry-collector/blob/main/receiver/README.md)
leverage server configuration.
- [`cors_allowed_origins`](https://github.com/rs/cors): An empty list means
Expand Down
2 changes: 1 addition & 1 deletion config/confignet/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Network Configuration Settings

[Receivers](https://github.com/open-telemetry/opentelemetry-collector/blob/master/receiver/README.md)
[Receivers](https://github.com/open-telemetry/opentelemetry-collector/blob/main/receiver/README.md)
leverage network configuration to set connection and transport information.

- `endpoint`: Configures the address for this network connection. For TCP and
Expand Down
4 changes: 2 additions & 2 deletions config/configtls/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ See below for examples.

## Client Configuration

[Exporters](https://github.com/open-telemetry/opentelemetry-collector/blob/master/exporter/README.md)
[Exporters](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/README.md)
leverage client configuration.

Note that client configuration supports TLS configuration, however
Expand Down Expand Up @@ -74,7 +74,7 @@ exporters:
## Server Configuration
[Receivers](https://github.com/open-telemetry/opentelemetry-collector/blob/master/receiver/README.md)
[Receivers](https://github.com/open-telemetry/opentelemetry-collector/blob/main/receiver/README.md)
leverage server configuration.
Beyond TLS configuration, the following setting can optionally be configured
Expand Down
20 changes: 10 additions & 10 deletions docs/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ service:
### zPages
The
[zpages](https://github.com/open-telemetry/opentelemetry-collector/tree/master/extension/zpagesextension/README.md)
[zpages](https://github.com/open-telemetry/opentelemetry-collector/tree/main/extension/zpagesextension/README.md)
extension, which if enabled is exposed locally on port `55679`, can be used to
check receivers and exporters trace operations via `/debug/tracez`. `zpages`
may contain error logs that the Collector does not emit.
Expand All @@ -80,7 +80,7 @@ extensions:
### Local exporters

[Local
exporters](https://github.com/open-telemetry/opentelemetry-collector/tree/master/exporter#general-information)
exporters](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter#general-information)
can be configured to inspect the data being processed by the Collector.

For live troubleshooting purposes consider leveraging the `logging` exporter,
Expand Down Expand Up @@ -168,7 +168,7 @@ Attributes:
### Health Check

The
[health_check](https://github.com/open-telemetry/opentelemetry-collector/tree/master/extension/healthcheckextension/README.md)
[health_check](https://github.com/open-telemetry/opentelemetry-collector/tree/main/extension/healthcheckextension/README.md)
extension, which by default is available on all interfaces on port `13133`, can
be used to ensure the Collector is functioning properly.

Expand All @@ -188,7 +188,7 @@ It returns a response like the following:
### pprof

The
[pprof](https://github.com/open-telemetry/opentelemetry-collector/tree/master/extension/pprofextension/README.md)
[pprof](https://github.com/open-telemetry/opentelemetry-collector/tree/main/extension/pprofextension/README.md)
extension, which by default is available locally on port `1777`, allows you to profile the
Collector as it runs. This is an advanced use-case that should not be needed in most circumstances.

Expand All @@ -199,9 +199,9 @@ Collector as it runs. This is an advanced use-case that should not be needed in
The Collector may exit/restart because:

- Memory pressure due to missing or misconfigured
[memory_limiter](https://github.com/open-telemetry/opentelemetry-collector/blob/master/processor/memorylimiter/README.md)
[memory_limiter](https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/memorylimiter/README.md)
processor.
- [Improperly sized](https://github.com/open-telemetry/opentelemetry-collector/blob/master/docs/performance.md)
- [Improperly sized](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/performance.md)
for load.
- Improperly configured (for example, a queue size configured higher
than available memory).
Expand All @@ -211,13 +211,13 @@ The Collector may exit/restart because:

Data may be dropped for a variety of reasons, but most commonly because of an:

- [Improperly sized Collector](https://github.com/open-telemetry/opentelemetry-collector/blob/master/docs/performance.md) resulting in Collector being unable to process and export the data as fast as it is received.
- [Improperly sized Collector](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/performance.md) resulting in Collector being unable to process and export the data as fast as it is received.
- Exporter destination unavailable or accepting the data too slowly.

To mitigate drops, it is highly recommended to configure the
[batch](https://github.com/open-telemetry/opentelemetry-collector/blob/master/processor/batchprocessor/README.md)
[batch](https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/batchprocessor/README.md)
processor. In addition, it may be necessary to configure the [queued retry
options](https://github.com/open-telemetry/opentelemetry-collector/tree/master/exporter/exporterhelper#configuration)
options](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/exporterhelper#configuration)
on enabled exporters.

### Receiving data not working
Expand Down Expand Up @@ -257,7 +257,7 @@ Check the collector logs as well as `zpages` for potential issues.
More often than not, exporting data does not work because of a network
configuration issue. This could be due to a firewall, DNS, or proxy
issue. Note that the Collector does have
[proxy support](https://github.com/open-telemetry/opentelemetry-collector/tree/master/exporter#proxy-support).
[proxy support](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter#proxy-support).

### Startup failing in Windows Docker containers

Expand Down
6 changes: 3 additions & 3 deletions exporter/jaegerexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ exporters:
Several helper files are leveraged to provide additional capabilities automatically:
- [gRPC settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/config/configgrpc/README.md)
- [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/config/configtls/README.md)
- [Queuing, retry and timeout settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/exporter/exporterhelper/README.md)
- [gRPC settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configgrpc/README.md)
- [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configtls/README.md)
- [Queuing, retry and timeout settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/exporterhelper/README.md)
6 changes: 3 additions & 3 deletions exporter/opencensusexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ exporters:
Several helper files are leveraged to provide additional capabilities automatically:
- [gRPC settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/config/configgrpc/README.md)
- [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/config/configtls/README.md)
- [Queuing, retry and timeout settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/exporter/exporterhelper/README.md)
- [gRPC settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configgrpc/README.md)
- [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configtls/README.md)
- [Queuing, retry and timeout settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/exporterhelper/README.md)
6 changes: 3 additions & 3 deletions exporter/otlpexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ exporters:
Several helper files are leveraged to provide additional capabilities automatically:
- [gRPC settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/config/configgrpc/README.md)
- [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/config/configtls/README.md)
- [Queuing, retry and timeout settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/exporter/exporterhelper/README.md)
- [gRPC settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configgrpc/README.md)
- [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configtls/README.md)
- [Queuing, retry and timeout settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/exporterhelper/README.md)
6 changes: 3 additions & 3 deletions exporter/prometheusremotewriteexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ exporters:
Several helper files are leveraged to provide additional capabilities automatically:
- [HTTP settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/config/confighttp/README.md)
- [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/config/configtls/README.md)
- [Queuing, retry and timeout settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/exporter/exporterhelper/README.md)
- [HTTP settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/confighttp/README.md)
- [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configtls/README.md)
- [Queuing, retry and timeout settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/exporterhelper/README.md)
6 changes: 3 additions & 3 deletions exporter/zipkinexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ exporters:
Several helper files are leveraged to provide additional capabilities automatically:
- [HTTP settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/config/confighttp/README.md)
- [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/config/configtls/README.md)
- [Queuing, retry and timeout settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/exporter/exporterhelper/README.md)
- [HTTP settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/confighttp/README.md)
- [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configtls/README.md)
- [Queuing, retry and timeout settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/exporterhelper/README.md)
2 changes: 1 addition & 1 deletion receiver/hostmetricsreceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ process:
If you are only interested in a subset of metrics from a particular source,
it is recommended you use this receiver with the
[Filter Processor](https://github.com/open-telemetry/opentelemetry-collector/tree/master/processor/filterprocessor).
[Filter Processor](https://github.com/open-telemetry/opentelemetry-collector/tree/main/processor/filterprocessor).
### Different Frequencies
Expand Down
4 changes: 2 additions & 2 deletions receiver/jaegerreceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ protocols:

Several helper files are leveraged to provide additional capabilities automatically:

- [gRPC settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/config/configgrpc/README.md) including CORS
- [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/config/configtls/README.md)
- [gRPC settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configgrpc/README.md) including CORS
- [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configtls/README.md)

## Remote Sampling

Expand Down
6 changes: 3 additions & 3 deletions receiver/opencensusreceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ The following settings are configurable:

Several helper files are leveraged to provide additional capabilities automatically:

- [gRPC settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/config/configgrpc/README.md) including CORS
- [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/config/configtls/README.md)
- [Queuing, retry and timeout settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/exporter/exporterhelper/README.md)
- [gRPC settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configgrpc/README.md) including CORS
- [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configtls/README.md)
- [Queuing, retry and timeout settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/exporterhelper/README.md)

## Writing with HTTP/JSON

Expand Down
6 changes: 3 additions & 3 deletions receiver/otlpreceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ The following settings are configurable:

Several helper files are leveraged to provide additional capabilities automatically:

- [gRPC settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/config/configgrpc/README.md) including CORS
- [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/config/configtls/README.md)
- [Queuing, retry and timeout settings](https://github.com/open-telemetry/opentelemetry-collector/blob/master/exporter/exporterhelper/README.md)
- [gRPC settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configgrpc/README.md) including CORS
- [TLS and mTLS settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/config/configtls/README.md)
- [Queuing, retry and timeout settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/exporterhelper/README.md)

## Writing with HTTP/JSON

Expand Down
Loading

0 comments on commit dde2038

Please sign in to comment.