Skip to content

Commit 484700a

Browse files
authored
Move from master to main (step1) (#531)
1 parent ce89aa1 commit 484700a

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ about: Create a report to help us improve
44
labels: bug
55
---
66

7-
**Describe your environment** Describe any aspect of your environment relevant to the problem, including your platform, build system, version numbers of installed dependencies, etc. If you're reporting a problem with a specific version of a library in this repo, please check whether the problem has been fixed on master.
7+
**Describe your environment** Describe any aspect of your environment relevant to the problem, including your platform, build system, version numbers of installed dependencies, etc. If you're reporting a problem with a specific version of a library in this repo, please check whether the problem has been fixed on main branch.
88

99
**Steps to reproduce**
1010
Describe exactly how to reproduce the error. Include a code sample if applicable.

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CI
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main, master ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ main, master ]
88

99
jobs:
1010
cmake_test:

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ example-specific documentation for other build automation tools.
2828
Install the latest bazel version by following the steps listed
2929
[here](https://docs.bazel.build/versions/master/install.html).
3030

31-
Select an example of interest from the [examples folder](https://github.com/open-telemetry/opentelemetry-cpp/tree/master/examples).
31+
Select an example of interest from the [examples folder](https://github.com/open-telemetry/opentelemetry-cpp/tree/main/examples).
3232
Inside each example directory is a `BUILD` file containing instructions for
3333
Bazel. Find the binary name of your example by inspecting the contents of this
3434
`BUILD` file.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# OpenTelemetry C++
22

33
[![Gitter chat](https://badges.gitter.im/open-telemetry/opentelemetry-cpp.svg)](https://gitter.im/open-telemetry/opentelemetry-cpp?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
4-
[![codecov.io](https://codecov.io/gh/open-telemetry/opentelemetry-cpp/branch/master/graphs/badge.svg?)](https://codecov.io/gh/open-telemetry/opentelemetry-cpp/)
4+
[![codecov.io](https://codecov.io/gh/open-telemetry/opentelemetry-cpp/branch/main/graphs/badge.svg?)](https://codecov.io/gh/open-telemetry/opentelemetry-cpp/)
55
[![Build Status](https://action-badges.now.sh/open-telemetry/opentelemetry-cpp)](https://github.com/open-telemetry/opentelemetry-cpp/actions)
66
[![Release](https://img.shields.io/github/v/release/open-telemetry/opentelemetry-cpp?include_prereleases&style=)](https://github.com/open-telemetry/opentelemetry-cpp/releases/)
77

RELEASING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
```
1111
3. Verify that CHANGELOG.md is updated properly:
1212
```
13-
git diff master
13+
git diff main
1414
```
1515
4. Push the changes to upstream and create a Pull Request on GitHub.
1616
Be sure to include the curated changes from the [Changelog](./CHANGELOG.md) in the description.

examples/otlp/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This is an example of how to use the [OpenTelemetry Protocol](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/protocol/README.md) (OTLP) exporter.
44

5-
The application in `main.cc` initializes an `OtlpExporter` instance and uses it to register a tracer provider from the [OpenTelemetry SDK](https://github.com/open-telemetry/opentelemetry-cpp). The application then calls a `foo_library` which has been instrumented using the [OpenTelemetry API](https://github.com/open-telemetry/opentelemetry-cpp/tree/master/api).
5+
The application in `main.cc` initializes an `OtlpExporter` instance and uses it to register a tracer provider from the [OpenTelemetry SDK](https://github.com/open-telemetry/opentelemetry-cpp). The application then calls a `foo_library` which has been instrumented using the [OpenTelemetry API](https://github.com/open-telemetry/opentelemetry-cpp/tree/main/api).
66

77
Resulting spans are exported to the **OpenTelemetry Collector** using the OTLP exporter. The OpenTelemetry Collector can be configured to export to other backends (see list of [supported backends](https://github.com/open-telemetry/opentelemetry-collector/blob/master/exporter/README.md)).
88

examples/simple/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
In this example, the application in `main.cc` initializes and registers a tracer
55
provider from the [OpenTelemetry SDK](https://github.com/open-telemetry/opentelemetry-cpp).
66
The application then calls a `foo_library` which has been instrumented using
7-
the [OpenTelemetry API](https://github.com/open-telemetry/opentelemetry-cpp/tree/master/api).
7+
the [OpenTelemetry API](https://github.com/open-telemetry/opentelemetry-cpp/tree/main/api).
88
Resulting telemetry is directed to stdout through the StdoutSpanExporter.
99

1010
See [CONTRIBUTING.md](../../CONTRIBUTING.md) for instructions on building and running the example.

exporters/otlp/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ For a full list of backends supported by the Collector, see the [main Collector
88

99
## Configuration
1010

11-
The OTLP exporter offers some configuration options. To configure the exporter, create an `OtlpExporterOptions` struct (defined in [exporter.h](https://github.com/open-telemetry/opentelemetry-cpp/blob/master/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_exporter.h)), set the options inside, and pass the struct to the `OtlpExporter` constructor, like so:
11+
The OTLP exporter offers some configuration options. To configure the exporter, create an `OtlpExporterOptions` struct (defined in [exporter.h](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_exporter.h)), set the options inside, and pass the struct to the `OtlpExporter` constructor, like so:
1212

1313
```
1414
OtlpExporterOptions options;
@@ -24,4 +24,4 @@ auto exporter = std::unique_ptr<sdktrace::SpanExporter>(new otlp::OtlpExporter(o
2424

2525
## Example
2626

27-
For a complete example demonstrating how to use the OTLP exporter, see [examples/otlp](https://github.com/open-telemetry/opentelemetry-cpp/blob/master/examples/otlp/).
27+
For a complete example demonstrating how to use the OTLP exporter, see [examples/otlp](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/examples/otlp/).

ext/src/zpages/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ zPages are a quick and light way to view tracing and metrics information on stan
1414
bazel build //examples/zpages:zpages_example
1515
bazel-bin/examples/zpages/zpages_example
1616
```
17-
If you look at the [zPages example's source code](https://github.com/open-telemetry/opentelemetry-cpp/blob/master/examples/zpages/zpages_example.cc), it demonstrates adding zPages, manual application instrumentation (which sends data to zPages for viewing), and simulated use cases for zPages.
17+
If you look at the [zPages example's source code](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/examples/zpages/zpages_example.cc), it demonstrates adding zPages, manual application instrumentation (which sends data to zPages for viewing), and simulated use cases for zPages.
1818
3. View zPages at http://localhost:3000/tracez
1919

2020

0 commit comments

Comments
 (0)