Skip to content

Commit

Permalink
Update more links with main default branch (open-telemetry#2221)
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Drutu <[email protected]>
  • Loading branch information
bogdandrutu committed Jan 28, 2021
1 parent d0750a1 commit 2697302
Show file tree
Hide file tree
Showing 21 changed files with 36 additions and 36 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The OpenTelemetry Collector Contrib contains everything in the [opentelemetry-co
## 🚀 New components 🚀

- `f5cloud` exporter to export metric, trace, and log data to F5 Cloud
- `jmx` receiver to report metrics from a target MBean server in conjunction with the [JMX Metric Gatherer](https://github.com/open-telemetry/opentelemetry-java-contrib/blob/master/contrib/jmx-metrics/README.md)
- `jmx` receiver to report metrics from a target MBean server in conjunction with the [JMX Metric Gatherer](https://github.com/open-telemetry/opentelemetry-java-contrib/blob/main/contrib/jmx-metrics/README.md)

## 🛑 Breaking changes 🛑

Expand Down Expand Up @@ -186,7 +186,7 @@ The OpenTelemetry Collector Contrib contains everything in the [opentelemetry-co
- Move signalfx correlation code out of `sapm` to `signalfxcorrelation` exporter (#1376)
- Move Splunk specific utils outside of common (#1306)
- `stackdriver` exporter:
- Config options `metric_prefix` & `skip_create_metric_descriptor` are now nested under `metric`, see [README](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/master/exporter/stackdriverexporter/README.md).
- Config options `metric_prefix` & `skip_create_metric_descriptor` are now nested under `metric`, see [README](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/exporter/stackdriverexporter/README.md).
- Trace status codes no longer reflect gRPC codes as per spec changes: open-telemetry/opentelemetry-specification#1067
- `datadog` exporter: Remove option to change the namespace prefix (#1483)

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Contributing

If you would like to contribute please read OpenTelemetry Collector
[contributing guidelines](https://github.com/open-telemetry/opentelemetry-collector/blob/master/CONTRIBUTING.md)
[contributing guidelines](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CONTRIBUTING.md)
before you begin your work.

## Adding New Components
Expand Down Expand Up @@ -56,6 +56,6 @@ rigid rules and there are exceptions but in general try to follow them.
processors (that also can be reused by other receivers and exporters).
- When implementing exporters try to leverage the exporter helpers from the
core repo, see [exporterhelper
package](https://github.com/open-telemetry/opentelemetry-collector/tree/master/exporter/exporterhelper).
package](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/exporterhelper).
This will ensure that the exporter provides
[zPages](https://opencensus.io/zpages/) and a standard set of metrics.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@

<p align="center">
<strong>
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/master/CONTRIBUTING.md">Contributing<a/>
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/main/CONTRIBUTING.md">Contributing<a/>
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/master/docs/vision.md">Vision<a/>
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/vision.md">Vision<a/>
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/master/docs/design.md">Design<a/>
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/design.md">Design<a/>
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/master/docs/monitoring.md">Monitoring<a/>
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/monitoring.md">Monitoring<a/>
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/master/docs/performance.md">Performance<a/>
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/performance.md">Performance<a/>
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/master/docs/roadmap.md">Roadmap<a/>
<a href="https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/roadmap.md">Roadmap<a/>
</strong>
</p>

Expand Down Expand Up @@ -92,7 +92,7 @@ Learn more about roles in the [community repository](https://github.com/open-tel
## PRs and Reviews

When creating a PR please following the process [described
here](https://github.com/open-telemetry/opentelemetry-collector/blob/master/CONTRIBUTING.md#how-to-structure-prs-to-get-expedient-reviews).
here](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CONTRIBUTING.md#how-to-structure-prs-to-get-expedient-reviews).

News PRs will be automatically associated with the reviewers based on
[CODEOWNERS](.github/CODEOWNERS). PRs will be also automatically assigned to one of the
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsprometheusremotewriteexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ the AWS Signature Version 4 signing process. AWS region and service must be prov
credentials are retrieved from the [default credential chain](https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials)
of the AWS SDK for Go.

Note: this exporter imports and uses the [Prometheus remote write exporter](https://github.com/open-telemetry/opentelemetry-collector/tree/master/exporter/prometheusremotewriteexporter)
Note: this exporter imports and uses the [Prometheus remote write exporter](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/prometheusremotewriteexporter)
from upstream, and simply wraps it in Sigv4 authentication logic

Same as the Prometheus remote write exporter, this exporter checks the temporality and the type of each incoming metric
Expand Down
2 changes: 1 addition & 1 deletion exporter/datadogexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ See the sample configuration file under the `example` folder for other available
## Trace exporter
### **Important Pipeline Setup Details**

This exporter assumes a pipeline using the datadog exporter also includes a [batch processor](https://github.com/open-telemetry/opentelemetry-collector/tree/master/processor/batchprocessor) configured with the following:
This exporter assumes a pipeline using the datadog exporter also includes a [batch processor](https://github.com/open-telemetry/opentelemetry-collector/tree/main/processor/batchprocessor) configured with the following:
- a `timeout` setting of `10s`(10 seconds).

Please make sure to include this processor in your pipeline. An example pipeline can be found below.
Expand Down
6 changes: 3 additions & 3 deletions exporter/dynatraceexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ service:

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) except timeout which is handled by the HTTP settings
- [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) except timeout which is handled by the HTTP settings

```yaml
receivers:
Expand Down
2 changes: 1 addition & 1 deletion exporter/f5cloudexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ The full list of settings exposed for this exporter are documented [here](./conf
configurations [here](./testdata/config.yaml).

This exporter also offers proxy support as documented
[here](https://github.com/open-telemetry/opentelemetry-collector/tree/master/exporter#proxy-support).
[here](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter#proxy-support).
2 changes: 1 addition & 1 deletion exporter/jaegerthrifthttpexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ The full list of settings exposed for this exporter are documented [here](config
with detailed sample configurations [here](testdata/config.yaml).

This exporter also offers proxy support as documented
[here](https://github.com/open-telemetry/opentelemetry-collector/tree/master/exporter#proxy-support).
[here](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter#proxy-support).
4 changes: 2 additions & 2 deletions exporter/lokiexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@ configurations [here](./testdata/config.yaml).

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)
- [Queuing and retry 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)
- [Queuing and retry settings](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/exporterhelper/README.md)
4 changes: 2 additions & 2 deletions exporter/sapmexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ during final translation. Intended to be used in tandem with identical configur

In addition, this exporter offers queued retry which is enabled by default.
Information about queued retry configuration parameters can be found
[here](https://github.com/open-telemetry/opentelemetry-collector/blob/master/exporter/exporterhelper/README.md).
[here](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/exporterhelper/README.md).

Example:

Expand All @@ -51,4 +51,4 @@ The full list of settings exposed for this exporter are documented [here](config
with detailed sample configurations [here](testdata/config.yaml).

This exporter also offers proxy support as documented
[here](https://github.com/open-telemetry/opentelemetry-collector/tree/master/exporter#proxy-support).
[here](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter#proxy-support).
2 changes: 1 addition & 1 deletion exporter/sapmexporter/examples/signalfx-collector.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ processors:
# collector's memory up to 2GB. In addition, the "--mem-ballast-size-mib" CLI
# flag must be set to the same value as the "ballast_size_mib". For more
# information, see
# https://github.com/open-telemetry/opentelemetry-collector/blob/master/processor/memorylimiter/README.md
# https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/memorylimiter/README.md
memory_limiter:
ballast_size_mib: 683
check_interval: 2s
Expand Down
2 changes: 1 addition & 1 deletion exporter/sapmexporter/examples/signalfx-k8s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ data:
# collector's memory up to 2GB. In addition, the "--mem-ballast-size-mib" CLI
# flag must be set to the same value as the "ballast_size_mib". For more
# information, see
# https://github.com/open-telemetry/opentelemetry-collector/blob/master/processor/memorylimiter/README.md
# https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/memorylimiter/README.md
memory_limiter:
ballast_size_mib: 683
check_interval: 2s
Expand Down
4 changes: 2 additions & 2 deletions exporter/signalfxexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ The following configuration options can also be configured:

In addition, this exporter offers queued retry which is enabled by default.
Information about queued retry configuration parameters can be found
[here](https://github.com/open-telemetry/opentelemetry-collector/blob/master/exporter/exporterhelper/README.md).
[here](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/exporterhelper/README.md).

## Traces Configuration (correlation only)

Expand Down Expand Up @@ -146,4 +146,4 @@ The full list of settings exposed for this exporter are documented [here](config
with detailed sample configurations [here](testdata/config.yaml).

This exporter also offers proxy support as documented
[here](https://github.com/open-telemetry/opentelemetry-collector/tree/master/exporter#proxy-support).
[here](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter#proxy-support).
4 changes: 2 additions & 2 deletions exporter/splunkhecexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The following configuration options can also be configured:

In addition, this exporter offers queued retry which is enabled by default.
Information about queued retry configuration parameters can be found
[here](https://github.com/open-telemetry/opentelemetry-collector/blob/master/exporter/exporterhelper/README.md).
[here](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/exporterhelper/README.md).

Example:

Expand Down Expand Up @@ -56,4 +56,4 @@ The full list of settings exposed for this exporter are documented [here](config
with detailed sample configurations [here](testdata/config.yaml).

This exporter also offers proxy support as documented
[here](https://github.com/open-telemetry/opentelemetry-collector/tree/master/exporter#proxy-support).
[here](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter#proxy-support).
2 changes: 1 addition & 1 deletion processor/spanmetricsprocessor/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ type Config struct {
// - span.kind
// - status.code
// The dimensions will be fetched from the span's attributes. Examples of some conventionally used attributes:
// https://github.com/open-telemetry/opentelemetry-collector/blob/master/translator/conventions/opentelemetry.go.
// https://github.com/open-telemetry/opentelemetry-collector/blob/main/translator/conventions/opentelemetry.go.
Dimensions []Dimension `mapstructure:"dimensions"`
}
2 changes: 1 addition & 1 deletion receiver/jmxreceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### Overview

The JMX Receiver will work in conjunction with the [OpenTelemetry JMX Metric Gatherer](https://github.com/open-telemetry/opentelemetry-java-contrib/blob/master/contrib/jmx-metrics/README.md)
The JMX Receiver will work in conjunction with the [OpenTelemetry JMX Metric Gatherer](https://github.com/open-telemetry/opentelemetry-java-contrib/blob/main/contrib/jmx-metrics/README.md)
to report metrics from a target MBean server using a built-in or your custom `otel` helper-utilizing
Groovy script.

Expand Down
2 changes: 1 addition & 1 deletion receiver/k8sclusterreceiver/collection/collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
)

// TODO: Consider moving some of these constants to
// https://go.opentelemetry.io/collector/blob/master/translator/conventions/opentelemetry.go.
// https://go.opentelemetry.io/collector/blob/main/translator/conventions/opentelemetry.go.

// Resource label keys.
const (
Expand Down
4 changes: 2 additions & 2 deletions receiver/prometheusexecreceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ Supported pipeline types: metrics

> :information_source: If you do not need to spawn the binaries locally,
please consider using the [core Prometheus
receiver](https://github.com/open-telemetry/opentelemetry-collector/tree/master/receiver/prometheusreceiver)
receiver](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/prometheusreceiver)
or the [Simple Prometheus
receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/master/receiver/simpleprometheusreceiver).
receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/simpleprometheusreceiver).

## Configuration

Expand Down
2 changes: 1 addition & 1 deletion receiver/simpleprometheusreceiver/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Simple Prometheus Receiver

The `prometheus_simple` receiver is a wrapper around the [prometheus
receiver](https://github.com/open-telemetry/opentelemetry-collector/tree/master/receiver/prometheusreceiver).
receiver](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/prometheusreceiver).
This receiver provides a simple configuration interface to configure the
prometheus receiver to scrape metrics from a single target.

Expand Down
2 changes: 1 addition & 1 deletion receiver/wavefrontreceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

The Wavefront receiver accepts metrics and depends on [carbonreceiver proto
and
transport](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/master/receiver/carbonreceiver),
transport](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/carbonreceiver),
It's very similar to Carbon: it is TCP based in which each received text line
represents a single metric data point. They differ on the format of their
textual representation. The Wavefront receiver leverages the Carbon receiver
Expand Down
2 changes: 1 addition & 1 deletion receiver/windowsperfcountersreceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ service:

To report metrics in the desired output format, it's recommended you use this
receiver with the [metrics transform
processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/master/processor/metricstransformprocessor).
processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/metricstransformprocessor).

e.g. To output the `Memory/Committed Bytes` counter as a metric with the name
`system.memory.usage`:
Expand Down

0 comments on commit 2697302

Please sign in to comment.