Skip to content

Commit f022385

Browse files
author
alrex
authored
update references to main (#306)
1 parent 5dd2412 commit f022385

File tree

45 files changed

+73
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+73
-68
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 Python version, [platform](https://docs.python.org/3/library/platform.html), version numbers of installed dependencies, information about your cloud hosting provider, 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 Python version, [platform](https://docs.python.org/3/library/platform.html), version numbers of installed dependencies, information about your cloud hosting provider, 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.
88

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

.github/pull_request_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Please describe the tests that you ran to verify your changes. Provide instructi
2626

2727
# Checklist:
2828

29-
See [contributing.md](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/master/CONTRIBUTING.md) for styleguide, changelog guidelines, and more.
29+
See [contributing.md](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CONTRIBUTING.md) for styleguide, changelog guidelines, and more.
3030

3131
- [ ] Followed the style guidelines of this project
3232
- [ ] Changelogs have been updated

.github/workflows/changelog.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This action requires that any PR targeting the master branch should touch at
1+
# This action requires that any PR targeting the main branch should touch at
22
# least one CHANGELOG file. If a CHANGELOG entry is not required, add the "Skip
33
# Changelog" label to disable this action.
44

@@ -8,7 +8,7 @@ on:
88
pull_request:
99
types: [opened, synchronize, reopened, labeled, unlabeled]
1010
branches:
11-
- master
11+
- main
1212

1313
jobs:
1414
changelog:

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
alert-threshold: 200%
7979
fail-on-alert: true
8080
# Make a commit on `gh-pages` with benchmarks from previous step
81-
auto-push: ${{ github.ref == 'refs/heads/master' }}
81+
auto-push: ${{ github.ref == 'refs/heads/main' }}
8282
gh-pages-branch: gh-pages
8383
benchmark-data-dir-path: benchmarks
8484
misc:

CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
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:

CONTRIBUTING.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ See the [public meeting notes](https://docs.google.com/document/d/1CIMGoIOZ-c3-i
88
for a summary description of past meetings. To request edit access, join the
99
meeting or get in touch on [Gitter](https://gitter.im/open-telemetry/opentelemetry-python).
1010

11-
See to the [community membership document](https://github.com/open-telemetry/community/blob/master/community-membership.md)
12-
on how to become a [**Member**](https://github.com/open-telemetry/community/blob/master/community-membership.md#member),
13-
[**Approver**](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver)
14-
and [**Maintainer**](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer).
11+
See to the [community membership document](https://github.com/open-telemetry/community/blob/main/community-membership.md)
12+
on how to become a [**Member**](https://github.com/open-telemetry/community/blob/main/community-membership.md#member),
13+
[**Approver**](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
14+
and [**Maintainer**](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
1515

1616
## Find a Buddy and get Started Quickly!
1717

@@ -46,7 +46,7 @@ You can run:
4646
- `tox -e lint` to run lint checks on all code
4747

4848
See
49-
[`tox.ini`](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/master/tox.ini)
49+
[`tox.ini`](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/tox.ini)
5050
for more detail on available tox commands.
5151

5252
### Benchmarks
@@ -121,8 +121,8 @@ Open a pull request against the main `opentelemetry-python-contrib` repo.
121121
### How to Get PRs Merged
122122

123123
A PR is considered to be **ready to merge** when:
124-
* It has received two approvals from [Approvers](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver)
125-
/ [Maintainers](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer)
124+
* It has received two approvals from [Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
125+
/ [Maintainers](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer)
126126
(at different companies).
127127
* Major feedbacks are resolved.
128128
* It has been open for review for at least one working day. This gives people
@@ -138,7 +138,7 @@ Any Approver / Maintainer can merge the PR once it is **ready to merge**.
138138
As with other OpenTelemetry clients, opentelemetry-python follows the
139139
[opentelemetry-specification](https://github.com/open-telemetry/opentelemetry-specification).
140140

141-
It's especially valuable to read through the [library guidelines](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/library-guidelines.md).
141+
It's especially valuable to read through the [library guidelines](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/library-guidelines.md).
142142

143143
### Focus on Capabilities, Not Structure Compliance
144144

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<a href="https://github.com/open-telemetry/opentelemetry-python-contrib/releases">
1414
<img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/open-telemetry/opentelemetry-python-contrib?include_prereleases&style=for-the-badge">
1515
</a>
16-
<a href="https://codecov.io/gh/open-telemetry/opentelemetry-python-contrib/branch/master/">
16+
<a href="https://codecov.io/gh/open-telemetry/opentelemetry-python-contrib/branch/main/">
1717
<img alt="Codecov Status" src="https://img.shields.io/codecov/c/github/open-telemetry/opentelemetry-python-contrib?style=for-the-badge">
1818
</a>
19-
<a href="https://github.com/open-telemetry/opentelemetry-python-contrib/blob/master/LICENSE">
19+
<a href="https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/LICENSE">
2020
<img alt="license" src="https://img.shields.io/badge/license-Apache_2.0-green.svg?style=for-the-badge">
2121
</a>
2222
<br/>
@@ -38,7 +38,7 @@
3838

3939
## OpenTelemetry Python Contrib
4040

41-
The Python auto-instrumentation libraries for [OpenTelemetry](https://opentelemetry.io/) (per [OTEP 0001](https://github.com/open-telemetry/oteps/blob/master/text/0001-telemetry-without-manual-instrumentation.md))
41+
The Python auto-instrumentation libraries for [OpenTelemetry](https://opentelemetry.io/) (per [OTEP 0001](https://github.com/open-telemetry/oteps/blob/main/text/0001-telemetry-without-manual-instrumentation.md))
4242

4343
### Installation
4444

@@ -50,7 +50,7 @@ depend on `opentelemetry-sdk` or another package that implements the API.
5050
generally be used in production environments.
5151

5252
The
53-
[`instrumentation/`](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation)
53+
[`instrumentation/`](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation)
5454
directory includes OpenTelemetry instrumentation packages, which can be installed
5555
separately as:
5656

@@ -84,14 +84,14 @@ Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telem
8484
- [Owais Lone](https://github.com/owais), Splunk
8585
- [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
8686

87-
*Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver).*
87+
*Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
8888

8989
Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-telemetry/teams/python-maintainers)):
9090

9191
- [Alex Boten](https://github.com/codeboten), Lightstep
9292
- [Leighton Chen](https://github.com/lzchen), Microsoft
9393

94-
*Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer).*
94+
*Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
9595

9696
## Running Tests Locally
9797

docs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def getlistcfg(strval):
157157
# Support external links to specific versions of the files in the Github repo
158158
branch = os.environ.get("READTHEDOCS_VERSION")
159159
if branch is None or branch == "latest":
160-
branch = "master"
160+
branch = "main"
161161

162162
REPO = "open-telemetry/opentelemetry-python-contrib/"
163163
scm_raw_web = "https://raw.githubusercontent.com/" + REPO + branch

docs/index.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ installed separately via pip:
2525
pip install opentelemetry-sdk-extension-{sdkextension}
2626
2727
A complete list of packages can be found at the
28-
`Contrib repo instrumentation <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation>`_
29-
and `Contrib repo exporter <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/exporter>`_ directories.
28+
`Contrib repo instrumentation <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation>`_
29+
and `Contrib repo exporter <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/exporter>`_ directories.
3030

3131
Extensions
3232
----------

exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
---
6767
.. _Datadog: https://www.datadoghq.com/
6868
.. _OpenTelemetry: https://github.com/open-telemetry/opentelemetry-python/
69-
.. _docs/examples/datadog_exporter: https://github.com/open-telemetry/opentelemetry-python/tree/master/docs/examples/datadog_exporter
69+
.. _docs/examples/datadog_exporter: https://github.com/open-telemetry/opentelemetry-python/tree/main/docs/examples/datadog_exporter
7070
"""
7171
# pylint: disable=import-error
7272

exporter/opentelemetry-exporter-prometheus-remote-write/README.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,10 @@ and key files in the ``tls_config`` parameter.
232232

233233
Supported Aggregators
234234
---------------------
235-
Behaviour of these aggregators is outlined in the `OpenTelemetry Specification <https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/metrics/api.md#aggregations>`_.
235+
Behaviour of these aggregators is outlined in the `OpenTelemetry Specification <https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md#aggregations>`_.
236236
All aggregators are converted into the `timeseries`_ data format. However, method in
237-
which they are converted `differs <https://github.com/open-telemetry/opentelemetry-python-contrib/blob/master/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/__init__.py#L196>`_ from aggregator to aggregator. A
238-
map of the conversion methods can be found `here <https://github.com/open-telemetry/opentelemetry-python-contrib/blob/master/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/__init__.py#L75>`_.
237+
which they are converted `differs <https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/__init__.py#L196>`_ from aggregator to aggregator. A
238+
map of the conversion methods can be found `here <https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/__init__.py#L75>`_.
239239

240240
+------------------------------+-------------------------------------+------------------------------------------------------------------------------------------------------------+
241241
| **OpenTelemetry Aggregator** | **Equivalent Prometheus Data Type** | **Behaviour** |
@@ -308,13 +308,13 @@ significantly increase the size of this repo.
308308
.. _RFC 7617: https://tools.ietf.org/html/rfc7617
309309
.. _RFC 6750: https://tools.ietf.org/html/rfc6750
310310
.. _Design Document: https://github.com/open-o11y/docs/blob/master/python-prometheus-remote-write/design-doc.md
311-
.. _OTLP: https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/protocol/otlp.md
311+
.. _OTLP: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/otlp.md
312312
.. _OpenTelemetry Python SDK: https://github.com/open-telemetry/opentelemetry-python
313-
.. _Prometheus "pull" exporter: https://github.com/open-telemetry/opentelemetry-python/tree/master/exporter/opentelemetry-exporter-prometheus
313+
.. _Prometheus "pull" exporter: https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-prometheus
314314
.. _Prometheus Remote Write integrated backend: https://prometheus.io/docs/operating/integrations/
315315
.. _types.proto: https://github.com/prometheus/prometheus/blob/master/prompb/types.proto
316316
.. _remote.proto: https://github.com/prometheus/prometheus/blob/master/prompb/remote.proto
317-
.. _push controller: https://github.com/open-telemetry/opentelemetry-python/blob/master/opentelemetry-sdk/src/opentelemetry/sdk/metrics/export/controller.py#L22
317+
.. _push controller: https://github.com/open-telemetry/opentelemetry-python/blob/main/opentelemetry-sdk/src/opentelemetry/sdk/metrics/export/controller.py#L22
318318
.. _timeseries: https://prometheus.io/docs/concepts/data_model/
319319
.. _Docker Compose: https://docs.docker.com/compose/
320320
.. _Cortex: https://cortexmetrics.io/

exporter/opentelemetry-exporter-prometheus-remote-write/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/exporter/opentelemetry-exporter-prometheus-remote-write
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/exporter/opentelemetry-exporter-prometheus-remote-write
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation/opentelemetry-instrumentation-aiopg
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aiopg
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

instrumentation/opentelemetry-instrumentation-boto/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation/opentelemetry-instrumentation-boto
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-boto
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

instrumentation/opentelemetry-instrumentation-botocore/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation/opentelemetry-instrumentation-botocore
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-botocore
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

instrumentation/opentelemetry-instrumentation-celery/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation/opentelemetry-instrumentation-celery
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-celery
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation/opentelemetry-instrumentation-dbapi
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-dbapi
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

instrumentation/opentelemetry-instrumentation-django/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation/opentelemetry-instrumentation-django
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-django
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation/opentelemetry-instrumentation-elasticsearch
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-elasticsearch
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

instrumentation/opentelemetry-instrumentation-falcon/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation/opentelemetry-instrumentation-falcon
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-falcon
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation/opentelemetry-instrumentation-fastapi
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-fastapi
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

instrumentation/opentelemetry-instrumentation-flask/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation/opentelemetry-instrumentation-flask
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-flask
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

instrumentation/opentelemetry-instrumentation-grpc/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation/opentelemetry-instrumentation-grpc
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-grpc
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

0 commit comments

Comments
 (0)