Skip to content

Commit ae31114

Browse files
authored
Update links/github actions after the master -> main rename (open-telemetry#1384)
Signed-off-by: Bogdan Drutu <[email protected]>
1 parent 63da3f4 commit ae31114

File tree

12 files changed

+41
-41
lines changed

12 files changed

+41
-41
lines changed

.github/CODEOWNERS

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
#####################################################
66
#
77
# Learn about membership in OpenTelemetry community:
8-
# https://github.com/open-telemetry/community/blob/master/community-membership.md
8+
# https://github.com/open-telemetry/community/blob/main/community-membership.md
99
#
1010
#
1111
# Learn about CODEOWNERS file format:
1212
# https://help.github.com/en/articles/about-code-owners
1313
#
1414

15-
# Global owners, will be the owners for everything in the repo. Membership is tracked via https://github.com/open-telemetry/community/blob/master/community-members.md
15+
# Global owners, will be the owners for everything in the repo. Membership is tracked via https://github.com/open-telemetry/community/blob/main/community-members.md
1616
* @open-telemetry/technical-committee @open-telemetry/specs-approvers
1717

1818
# Trace owners (global + trace)

.github/workflows/checks.yaml

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

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

99
jobs:
1010
markdownlint:

CHANGELOG.md

+21-21
Original file line numberDiff line numberDiff line change
@@ -248,19 +248,19 @@ Updates:
248248

249249
## v0.4.0 (05-12-2020)
250250

251-
- [OTEP-83](https://github.com/open-telemetry/oteps/blob/master/text/0083-component.md)
251+
- [OTEP-83](https://github.com/open-telemetry/oteps/blob/main/text/0083-component.md)
252252
Introduce the notion of InstrumentationLibrary.
253-
- [OTEP-88](https://github.com/open-telemetry/oteps/blob/master/text/metrics/0088-metric-instrument-optional-refinements.md)
253+
- [OTEP-88](https://github.com/open-telemetry/oteps/blob/main/text/metrics/0088-metric-instrument-optional-refinements.md)
254254
Metrics API instrument foundation.
255-
- [OTEP-91](https://github.com/open-telemetry/oteps/blob/master/text/logs/0091-logs-vocabulary.md)
255+
- [OTEP-91](https://github.com/open-telemetry/oteps/blob/main/text/logs/0091-logs-vocabulary.md)
256256
Logs vocabulary.
257-
- [OTEP-92](https://github.com/open-telemetry/oteps/blob/master/text/logs/0092-logs-vision.md)
257+
- [OTEP-92](https://github.com/open-telemetry/oteps/blob/main/text/logs/0092-logs-vision.md)
258258
Logs Vision.
259-
- [OTEP-90](https://github.com/open-telemetry/oteps/blob/master/text/metrics/0090-remove-labelset-from-metrics-api.md)
259+
- [OTEP-90](https://github.com/open-telemetry/oteps/blob/main/text/metrics/0090-remove-labelset-from-metrics-api.md)
260260
Remove LabelSet from the metrics API.
261-
- [OTEP-98](https://github.com/open-telemetry/oteps/blob/master/text/metrics/0098-metric-instruments-explained.md)
261+
- [OTEP-98](https://github.com/open-telemetry/oteps/blob/main/text/metrics/0098-metric-instruments-explained.md)
262262
Explain the metric instruments.
263-
- [OTEP-99](https://github.com/open-telemetry/oteps/blob/master/text/0099-otlp-http.md)
263+
- [OTEP-99](https://github.com/open-telemetry/oteps/blob/main/text/0099-otlp-http.md)
264264
OTLP/HTTP: HTTP Transport Extension for OTLP.
265265
- Define handling of null and empty attribute values.
266266
- Rename Setter.put to Setter.set
@@ -280,15 +280,15 @@ Updates:
280280

281281
## v0.3.0 (02-21-2020)
282282

283-
- [OTEP-0059](https://github.com/open-telemetry/oteps/blob/master/text/trace/0059-otlp-trace-data-format.md)
283+
- [OTEP-0059](https://github.com/open-telemetry/oteps/blob/main/text/trace/0059-otlp-trace-data-format.md)
284284
Add OTLP Trace Data Format specification.
285-
- [OTEP-0066](https://github.com/open-telemetry/oteps/blob/master/text/0066-separate-context-propagation.md)
285+
- [OTEP-0066](https://github.com/open-telemetry/oteps/blob/main/text/0066-separate-context-propagation.md)
286286
Separate Layer for Context Propagation.
287-
- [OTEP-0070](https://github.com/open-telemetry/oteps/blob/master/text/metrics/0070-metric-bound-instrument.md)
287+
- [OTEP-0070](https://github.com/open-telemetry/oteps/blob/main/text/metrics/0070-metric-bound-instrument.md)
288288
Rename metric instrument "Handles" to "Bound Instruments".
289-
- [OTEP-0072](https://github.com/open-telemetry/oteps/blob/master/text/metrics/0072-metric-observer.md)
289+
- [OTEP-0072](https://github.com/open-telemetry/oteps/blob/main/text/metrics/0072-metric-observer.md)
290290
Metric Observer instrument specification (refinement).
291-
- [OTEP-0080](https://github.com/open-telemetry/oteps/blob/master/text/metrics/0080-remove-metric-gauge.md)
291+
- [OTEP-0080](https://github.com/open-telemetry/oteps/blob/main/text/metrics/0080-remove-metric-gauge.md)
292292
Remove the Metric Gauge instrument, recommend use of other instruments.
293293
- Update 0003-measure-metric-type to match current Specification.
294294
- Update 0009-metric-handles to match current Specification.
@@ -308,23 +308,23 @@ Updates:
308308

309309
## v0.2.0 (10-22-2019)
310310

311-
- [OTEP-0001](https://github.com/open-telemetry/oteps/blob/master/text/0001-telemetry-without-manual-instrumentation.md)
311+
- [OTEP-0001](https://github.com/open-telemetry/oteps/blob/main/text/0001-telemetry-without-manual-instrumentation.md)
312312
Added Auto-Instrumentation.
313-
- [OTEP-0002](https://github.com/open-telemetry/oteps/blob/master/text/trace/0002-remove-spandata.md):
313+
- [OTEP-0002](https://github.com/open-telemetry/oteps/blob/main/text/trace/0002-remove-spandata.md):
314314
Removed SpanData interface in favor of Span Start and End options.
315-
- [OTEP-0003](https://github.com/open-telemetry/oteps/blob/master/text/metrics/0003-measure-metric-type.md)
315+
- [OTEP-0003](https://github.com/open-telemetry/oteps/blob/main/text/metrics/0003-measure-metric-type.md)
316316
Consolidatesd pre-aggregated and raw metrics APIs.
317-
- [OTEP-0008](https://github.com/open-telemetry/oteps/blob/master/text/metrics/0008-metric-observer.md)
317+
- [OTEP-0008](https://github.com/open-telemetry/oteps/blob/main/text/metrics/0008-metric-observer.md)
318318
Added Metrics Observers API.
319-
- [OTEP-0009](https://github.com/open-telemetry/oteps/blob/master/text/metrics/0009-metric-handles.md)
319+
- [OTEP-0009](https://github.com/open-telemetry/oteps/blob/main/text/metrics/0009-metric-handles.md)
320320
Added Metrics Handle API.
321-
- [OTEP-0010](https://github.com/open-telemetry/oteps/blob/master/text/metrics/0010-cumulative-to-counter.md)
321+
- [OTEP-0010](https://github.com/open-telemetry/oteps/blob/main/text/metrics/0010-cumulative-to-counter.md)
322322
Rename "Cumulative" to "Counter" in the Metrics API.
323-
- [OTEP-006](https://github.com/open-telemetry/oteps/blob/master/text/trace/0006-sampling.md)
323+
- [OTEP-006](https://github.com/open-telemetry/oteps/blob/main/text/trace/0006-sampling.md)
324324
Moved sampling from the API tp the SDK.
325-
- [OTEP-0007](https://github.com/open-telemetry/oteps/blob/master/text/0007-no-out-of-band-reporting.md)
325+
- [OTEP-0007](https://github.com/open-telemetry/oteps/blob/main/text/0007-no-out-of-band-reporting.md)
326326
Moved support for out-of-band telemetry from the API to the SDK.
327-
- [OTEP-0016](https://github.com/open-telemetry/oteps/blob/master/text/0016-named-tracers.md)
327+
- [OTEP-0016](https://github.com/open-telemetry/oteps/blob/main/text/0016-named-tracers.md)
328328
Added named providers for Tracers and Meters.
329329
- Added design goals and requirements for a telemetry data exchange protocol.
330330
- Added a Span Processor interface for intercepting span start and end

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Welcome to OpenTelemetry specifications repository!
44

55
Before you start - see OpenTelemetry general
6-
[contributing](https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md)
6+
[contributing](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md)
77
requirements and recommendations.
88

99
## Sign the CLA
@@ -139,7 +139,7 @@ A PR is considered to be **ready to merge** when:
139139
wait for two days.
140140

141141
Any [spec
142-
maintainer](https://github.com/open-telemetry/community/blob/master/community-members.md#specifications-and-proto) can
142+
maintainer](https://github.com/open-telemetry/community/blob/main/community-members.md#specifications-and-proto) can
143143
merge the PR once it is **ready to merge**.
144144

145145
If a PR has been stuck (e.g. there are lots of debates and people couldn't agree

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# OpenTelemetry Specification
22

3-
[![Checks](https://github.com/open-telemetry/opentelemetry-specification/workflows/Checks/badge.svg?branch=master)](https://github.com/open-telemetry/opentelemetry-specification/actions?query=workflow%3A%22Checks%22+branch%3Amaster)
3+
[![Checks](https://github.com/open-telemetry/opentelemetry-specification/workflows/Checks/badge.svg?branch=main)](https://github.com/open-telemetry/opentelemetry-specification/actions?query=workflow%3A%22Checks%22+branch%3Amain)
44
![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/open-telemetry/specification.svg)
55

66
![OpenTelemetry Logo](https://opentelemetry.io/img/logos/opentelemetry-horizontal-color.png)
@@ -83,4 +83,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on contribution process.
8383

8484
## License
8585

86-
By contributing to OpenTelemetry Specification repository, you agree that your contributions will be licensed under its [Apache 2.0 License](https://github.com/open-telemetry/specification/blob/master/LICENSE).
86+
By contributing to OpenTelemetry Specification repository, you agree that your contributions will be licensed under its [Apache 2.0 License](https://github.com/open-telemetry/specification/blob/main/LICENSE).

experimental/trace/zpages.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
zPages are an in-process alternative to external exporters. When included, they collect and aggregate tracing and metrics information in the background; this data is served on web pages when requested.
2626

27-
The idea of "zPages" originates from one of OpenTelemetry's predecessors, [OpenCensus](https://opencensus.io/). You can read more about zPages from the OpenCensus docs [here](https://opencensus.io/zpages) or the OTEP [here](https://github.com/open-telemetry/oteps/blob/master/text/0110-z-pages.md). OpenCensus has different zPage implementations in [Java](https://opencensus.io/zpages/java/), [Go](https://opencensus.io/zpages/go/), and [Node](https://opencensus.io/zpages/node/) and there has been similar internal solutions developed at companies like Uber. Within OpenTelemetry, zPages are also either developed or being developed in [C#](https://github.com/open-telemetry/opentelemetry-dotnet/tree/master/src/OpenTelemetry.Exporter.ZPages), Java, and C++. The OTel Collector also has [an implementation](https://github.com/open-telemetry/opentelemetry-collector/tree/master/extension/zpagesextension) of zPages.
27+
The idea of "zPages" originates from one of OpenTelemetry's predecessors, [OpenCensus](https://opencensus.io/). You can read more about zPages from the OpenCensus docs [here](https://opencensus.io/zpages) or the OTEP [here](https://github.com/open-telemetry/oteps/blob/main/text/0110-z-pages.md). OpenCensus has different zPage implementations in [Java](https://opencensus.io/zpages/java/), [Go](https://opencensus.io/zpages/go/), and [Node](https://opencensus.io/zpages/node/) and there has been similar internal solutions developed at companies like Uber. Within OpenTelemetry, zPages are also either developed or being developed in [C#](https://github.com/open-telemetry/opentelemetry-dotnet/tree/master/src/OpenTelemetry.Exporter.ZPages), Java, and C++. The OTel Collector also has [an implementation](https://github.com/open-telemetry/opentelemetry-collector/tree/master/extension/zpagesextension) of zPages.
2828

2929
zPages are uniquely useful in a couple of different ways. One is that they're more lightweight and quicker compared to installing external tracing systems like Jaeger and Zipkin, yet they still share useful ways to debug and gain insight into instrumented applications; these uses depend on the type of zPage, which is detailed below. For high throughput applications, zPages can also analyze more telemetry with the limited set of supported scenarios than external exporters; this is because zPages are in-memory while external exporters are typically configured to send a subset of telemetry for reach analysis to save costs.
3030

semantic_conventions/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ formattted Markdown tables for all semantic conventions in the specification. Ru
1313
make table-generation
1414
```
1515

16-
For more information, see the [semantic convention generator](https://github.com/open-telemetry/build-tools/tree/master/semantic-conventions)
16+
For more information, see the [semantic convention generator](https://github.com/open-telemetry/build-tools/tree/main/semantic-conventions)
1717
in the OpenTelemetry build tools repository.
1818
Using this build tool, it is also possible to generate code for use in OpenTelemetry
1919
language projects.
2020

2121
See also:
2222

23-
* [Markdown Tables](https://github.com/open-telemetry/build-tools/tree/master/semantic-conventions#markdown-tables)
24-
* [Code Generator](https://github.com/open-telemetry/build-tools/tree/master/semantic-conventions#code-generator)
23+
* [Markdown Tables](https://github.com/open-telemetry/build-tools/tree/main/semantic-conventions#markdown-tables)
24+
* [Code Generator](https://github.com/open-telemetry/build-tools/tree/main/semantic-conventions#code-generator)
2525

2626
## Description of the model
2727

specification/logs/data-model.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,7 @@ for an exhaustive list.
12401240

12411241
## References
12421242

1243-
- Log Data Model [OTEP 0097](https://github.com/open-telemetry/oteps/blob/master/text/logs/0097-log-data-model.md)
1243+
- Log Data Model [OTEP 0097](https://github.com/open-telemetry/oteps/blob/main/text/logs/0097-log-data-model.md)
12441244

12451245
- [Draft discussion of Data Model](https://docs.google.com/document/d/1ix9_4TQO3o-qyeyNhcOmqAc1MTyr-wnXxxsdWgCMn9c/edit#)
12461246

specification/metrics/sdk.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ consider these as separate instruments.
192192
The SDK is responsible for implementing any syntactic requirements for
193193
metric names included in the API specification. TODO: link to this
194194
after [OTEP
195-
108](https://github.com/open-telemetry/oteps/blob/master/text/metrics/0108-naming-guidelines.md)
195+
108](https://github.com/open-telemetry/oteps/blob/main/text/metrics/0108-naming-guidelines.md)
196196
is written into the API specification.
197197

198198
#### SDK: RecordBatch() function

specification/protocol/exporter.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# OpenTelemetry Protocol Exporter
22

3-
This document specifies the configuration options available to the OpenTelemetry Protocol ([OTLP](https://github.com/open-telemetry/oteps/blob/master/text/0035-opentelemetry-protocol.md)) Exporter as well as the retry behavior.
3+
This document specifies the configuration options available to the OpenTelemetry Protocol ([OTLP](https://github.com/open-telemetry/oteps/blob/main/text/0035-opentelemetry-protocol.md)) Exporter as well as the retry behavior.
44

55
## Configuration Options
66

@@ -82,6 +82,6 @@ Transient errors are errors which expect the backend to recover. The following s
8282
| 15 | Data Loss |
8383
| 16 | Unauthenticated |
8484

85-
Additional details on transient errors can be found in [otep-35](https://github.com/open-telemetry/oteps/blob/master/text/0035-opentelemetry-protocol.md#export-response) for gRPC and [otep-99](https://github.com/open-telemetry/oteps/blob/master/text/0099-otlp-http.md#failures) for HTTP
85+
Additional details on transient errors can be found in [otep-35](https://github.com/open-telemetry/oteps/blob/main/text/0035-opentelemetry-protocol.md#export-response) for gRPC and [otep-99](https://github.com/open-telemetry/oteps/blob/main/text/0099-otlp-http.md#failures) for HTTP
8686

8787
[otlphttp-req]: otlp.md#otlphttp-request

specification/protocol/otlp.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,6 @@ document when referring to either one.
550550

551551
## References
552552

553-
- [OTEP 0035](https://github.com/open-telemetry/oteps/blob/master/text/0035-opentelemetry-protocol.md) OpenTelemetry Protocol Specification
554-
- [OTEP 0099](https://github.com/open-telemetry/oteps/blob/master/text/0099-otlp-http.md) OTLP/HTTP: HTTP Transport Extension for OTLP
555-
- [OTEP 0122](https://github.com/open-telemetry/oteps/blob/master/text/0122-otlp-http-json.md) OTLP: JSON Encoding for OTLP/HTTP
553+
- [OTEP 0035](https://github.com/open-telemetry/oteps/blob/main/text/0035-opentelemetry-protocol.md) OpenTelemetry Protocol Specification
554+
- [OTEP 0099](https://github.com/open-telemetry/oteps/blob/main/text/0099-otlp-http.md) OTLP/HTTP: HTTP Transport Extension for OTLP
555+
- [OTEP 0122](https://github.com/open-telemetry/oteps/blob/main/text/0122-otlp-http-json.md) OTLP: JSON Encoding for OTLP/HTTP

specification/trace/sdk.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -580,4 +580,4 @@ public interface SpanExporter {
580580
```
581581

582582
[trace-flags]: https://www.w3.org/TR/trace-context/#trace-flags
583-
[otep-83]: https://github.com/open-telemetry/oteps/blob/master/text/0083-component.md
583+
[otep-83]: https://github.com/open-telemetry/oteps/blob/main/text/0083-component.md

0 commit comments

Comments
 (0)