Merge branch 'main' into issue_1494

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,7 +4,7 @@ about: Create a report to help us improve
 labels: bug
 ---
 
-**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.
+**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.
 
 **Steps to reproduce**
 Describe exactly how to reproduce the error. Include a code sample if applicable.

.github/workflows/changelog.yml

@@ -1,4 +1,4 @@
-# This action requires that any PR targeting the master branch should touch at
+# This action requires that any PR targeting the main branch should touch at
 # least one CHANGELOG file. If a CHANGELOG entry is not required, add the "Skip
 # Changelog" label to disable this action.
 
@@ -8,7 +8,7 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, labeled, unlabeled]
     branches:
-      - master
+      - main
 
 jobs:
   changelog:

.github/workflows/test.yml

@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  # Set variable to 'master' if your change will not affect Contrib.
+  # Set variable to 'main' if your change will not affect Contrib.
   # Otherwise, set variable to the commit of your branch on
   # opentelemetry-python-contrib which is compatible with these Core repo
   # changes.
@@ -82,7 +82,7 @@ jobs:
           alert-threshold: 200%
           fail-on-alert: true
           # Make a commit on `gh-pages` with benchmarks from previous step
-          auto-push: ${{ github.ref == 'refs/heads/master' }}
+          auto-push: ${{ github.ref == 'refs/heads/main' }}
           gh-pages-branch: gh-pages
           benchmark-data-dir-path: benchmarks
   misc:

CONTRIBUTING.md

@@ -8,10 +8,10 @@ See the [public meeting notes](https://docs.google.com/document/d/1CIMGoIOZ-c3-i
 for a summary description of past meetings. To request edit access, join the
 meeting or get in touch on [Gitter](https://gitter.im/open-telemetry/opentelemetry-python).
 
-See to the [community membership document](https://github.com/open-telemetry/community/blob/master/community-membership.md)
-on how to become a [**Member**](https://github.com/open-telemetry/community/blob/master/community-membership.md#member),
-[**Approver**](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver)
-and [**Maintainer**](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer).
+See to the [community membership document](https://github.com/open-telemetry/community/blob/main/community-membership.md)
+on how to become a [**Member**](https://github.com/open-telemetry/community/blob/main/community-membership.md#member),
+[**Approver**](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
+and [**Maintainer**](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
 
 # Find your right repo
 
@@ -63,7 +63,7 @@ You can run:
 - `tox -e lint` to run lint checks on all code
 
 See
-[`tox.ini`](https://github.com/open-telemetry/opentelemetry-python/blob/master/tox.ini)
+[`tox.ini`](https://github.com/open-telemetry/opentelemetry-python/blob/main/tox.ini)
 for more detail on available tox commands.
 
 ### Benchmarks
@@ -144,7 +144,7 @@ to equal the commit SHA of the Core repo PR to pass tests
 equal the commit SHA of the Contrib repo PR to pass Contrib repo tests (a sanity
 check for the Maintainers & Approvers)
 4. Merge the Contrib repo
-5. Restore the Core repo PR `CONTRIB_REPO_SHA` to point to `master`
+5. Restore the Core repo PR `CONTRIB_REPO_SHA` to point to `main`
 6. Merge the Core repo PR
 
 ### How to Receive Comments
@@ -156,8 +156,8 @@ check for the Maintainers & Approvers)
 ### How to Get PRs Merged
 
 A PR is considered to be **ready to merge** when:
-* It has received two approvals from [Approvers](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver)
-  / [Maintainers](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer)
+* It has received two approvals from [Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
+  / [Maintainers](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer)
   (at different companies).
 * Major feedbacks are resolved.
 * All tests are passing, including Contrib Repo tests which may require
@@ -174,7 +174,7 @@ Any Approver / Maintainer can merge the PR once it is **ready to merge**.
 As with other OpenTelemetry clients, opentelemetry-python follows the 
 [opentelemetry-specification](https://github.com/open-telemetry/opentelemetry-specification).
 
-It's especially valuable to read through the [library guidelines](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/library-guidelines.md).
+It's especially valuable to read through the [library guidelines](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/library-guidelines.md).
 
 ### Focus on Capabilities, Not Structure Compliance
 

README.md

@@ -13,10 +13,10 @@
   <a href="https://github.com/open-telemetry/opentelemetry-python/releases">
     <img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/open-telemetry/opentelemetry-python?include_prereleases&style=for-the-badge">
   </a>
-  <a href="https://codecov.io/gh/open-telemetry/opentelemetry-python/branch/master/">
+  <a href="https://codecov.io/gh/open-telemetry/opentelemetry-python/branch/main/">
     <img alt="Codecov Status" src="https://img.shields.io/codecov/c/github/open-telemetry/opentelemetry-python?style=for-the-badge">
   </a>
-  <a href="https://github.com/open-telemetry/opentelemetry-python/blob/master/LICENSE">
+  <a href="https://github.com/open-telemetry/opentelemetry-python/blob/main/LICENSE">
     <img alt="license" src="https://img.shields.io/badge/license-Apache_2.0-green.svg?style=for-the-badge">
   </a>
   <br/>
@@ -61,23 +61,23 @@ pip install opentelemetry-sdk
 ```
 
 The
-[`instrumentation/`](https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation)
+[`instrumentation/`](https://github.com/open-telemetry/opentelemetry-python/tree/main/instrumentation)
 directory includes OpenTelemetry instrumentation packages. You can install the packages separately with the following command:
 
 ```sh
 pip install opentelemetry-instrumentation-{instrumentation}
 ```
 
 The
-[`exporter/`](https://github.com/open-telemetry/opentelemetry-python/tree/master/exporter)
+[`exporter/`](https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter)
 directory includes OpenTelemetry exporter packages. You can install the packages separately with the following command:
 
 ```sh
 pip install opentelemetry-exporter-{exporter}
 ```
 
 The
-[`propagator/`](https://github.com/open-telemetry/opentelemetry-python/tree/master/propagator)
+[`propagator/`](https://github.com/open-telemetry/opentelemetry-python/tree/main/propagator)
 directory includes OpenTelemetry propagator packages. You can install the packages separately with the following command:
 
 ```sh
@@ -125,14 +125,14 @@ Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telem
 - [Reiley Yang](https://github.com/reyang), Microsoft
 - [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
 
-*For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver).*
+*For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
 
 Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-telemetry/teams/python-maintainers)):
 
 - [Alex Boten](https://github.com/codeboten), Lightstep
 - [Leighton Chen](https://github.com/lzchen), Microsoft
 
-*For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer).*
+*For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
 
 ### Thanks to all the people who already contributed!
 

RELEASING.md

@@ -7,7 +7,7 @@ Release Process:
 * [Open a Pull Request](#open-a-pull-request)
 * [Create a Release](#Create-a-Release)
 * [Move stable tag](#Move-stable-tag)
-* [Update master](#Update-master)
+* [Update main](#Update-main)
 * [Check PyPI](#Check-PyPI)
 * [Troubleshooting](#troubleshooting)
 
@@ -16,7 +16,7 @@ Release Process:
 
 ## Create a new branch
 The following script does the following:
-- update master locally
+- update main locally
 - creates a new release branch `release/<version>`
 - updates version and changelog files
 - commits the change to a new branch `release/<version>-auto`
@@ -39,7 +39,7 @@ The PR should be opened from the `release/<version>-auto` branch created as part
 
 ## Check PyPI
 
-This should be handled automatically on release by the [publish action](https://github.com/open-telemetry/opentelemetry-python/blob/master/.github/workflows/publish.yml).
+This should be handled automatically on release by the [publish action](https://github.com/open-telemetry/opentelemetry-python/blob/main/.github/workflows/publish.yml).
 
  - Check the [action logs](https://github.com/open-telemetry/opentelemetry-python/actions?query=workflow%3APublish) to make sure packages have been uploaded to PyPI
 - Check the release history (e.g. https://pypi.org/project/opentelemetry-api/#history) on PyPI
@@ -58,18 +58,18 @@ git push origin stable
 
 To validate this worked, ensure the stable build has run successfully: https://readthedocs.org/projects/opentelemetry-python/builds/. If the build has not run automatically, it can be manually trigger via the readthedocs interface.
 
-## Update master
+## Update main
 
-Ensure the version and changelog updates have been applied to master.
+Ensure the version and changelog updates have been applied to main.
 
 ```bash
-# checkout a new branch from master
-git checkout -b v0.7b0-master-update
+# checkout a new branch from main
+git checkout -b v0.7b0-main-update
 # cherry pick the change from the release branch
 git cherry-pick $(git log -n 1 origin/release/0.7b0 --format="%H")
 # update the version number, make it a "dev" greater than release number, e.g. 0.8.dev0
 perl -i -p -e 's/0.7b0/0.8.dev0/' $(git grep -l "0.7b0" | grep -vi CHANGELOG)
-# open a PR targeting master see #331
+# open a PR targeting main see #331
 git commit -m
 ```
 

docs/conf.py

@@ -144,7 +144,7 @@
 # Support external links to specific versions of the files in the Github repo
 branch = os.environ.get("READTHEDOCS_VERSION")
 if branch is None or branch == "latest":
-    branch = "master"
+    branch = "main"
 
 REPO = "open-telemetry/opentelemetry-python/"
 scm_raw_web = "https://raw.githubusercontent.com/" + REPO + branch

docs/examples/auto-instrumentation/README.rst

@@ -11,7 +11,7 @@ The example is based on a previous OpenTracing example that
 you can find
 `here <https://github.com/yurishkuro/opentracing-tutorial/tree/master/python>`__.
 
-The source files for these examples are available `here <https://github.com/open-telemetry/opentelemetry-python/tree/master/docs/examples/auto-instrumentation>`__.
+The source files for these examples are available `here <https://github.com/open-telemetry/opentelemetry-python/tree/main/docs/examples/auto-instrumentation>`__.
 
 This example uses two different scripts. The main difference between them is
 whether or not they're instrumented manually:

docs/examples/django/README.rst

@@ -111,4 +111,4 @@ References
 
 * `Django <https://djangoproject.com/>`_
 * `OpenTelemetry Project <https://opentelemetry.io/>`_
-* `OpenTelemetry Django extension <https://github.com/open-telemetry/opentelemetry-python-contib/tree/master/instrumentation/opentelemetry-instrumentation-django>`_
+* `OpenTelemetry Django extension <https://github.com/open-telemetry/opentelemetry-python-contib/tree/main/instrumentation/opentelemetry-instrumentation-django>`_

docs/getting-started.rst

@@ -3,7 +3,7 @@ Getting Started with OpenTelemetry Python
 
 This guide walks you through instrumenting a Python application with ``opentelemetry-python``.
 
-For more elaborate examples, see `examples <https://github.com/open-telemetry/opentelemetry-python/tree/master/docs/examples/>`_. 
+For more elaborate examples, see `examples <https://github.com/open-telemetry/opentelemetry-python/tree/main/docs/examples/>`_. 
 
 Hello world: emit a trace to your console
 ---------------------------------------------
@@ -149,7 +149,7 @@ While the example in the previous section is great, it's very manual. The follow
 * Database calls
 
 To track these common actions, OpenTelemetry has the concept of instrumentations. Instrumentations are packages designed to interface
-with a specific framework or library, such as Flask and psycopg2. You can find a list of the currently curated extension packages in the `Contrib repository <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation>`_.
+with a specific framework or library, such as Flask and psycopg2. You can find a list of the currently curated extension packages in the `Contrib repository <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation>`_.
 
 Instrument a basic Flask application that uses the requests library to send HTTP requests. First, install the instrumentation packages themselves:
 
@@ -180,7 +180,7 @@ A major feature of distributed tracing is the ability to correlate a trace acros
 multiple services. However, those services need to propagate information about a
 trace from one service to the other.
 
-To enable this propagation, OpenTelemetry has the concept of `propagators <https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/context/api-propagators.md>`_,
+To enable this propagation, OpenTelemetry has the concept of `propagators <https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/context/api-propagators.md>`_,
 which provide a common method to encode and decode span information from a request and response, respectively.
 
 By default, ``opentelemetry-python`` is configured to use the `W3C Trace Context <https://www.w3.org/TR/trace-context/>`_

docs/index.rst

@@ -32,8 +32,8 @@ In addition, there are several extension packages which can be installed separat
 These are for exporter and instrumentation packages respectively.
 Some packages can be found in :scm_web:`instrumentation <instrumentation/>` and :scm_web:`exporter <exporter/>`
 directory of the repository. The remaining packages can be found at the 
-`Contrib repo instrumentation <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation>`_
-and `Contrib repo exporter <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/exporter>`_ directories.
+`Contrib repo instrumentation <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation>`_
+and `Contrib repo exporter <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/exporter>`_ directories.
 
 Extensions
 ----------

exporter/opentelemetry-exporter-jaeger/README.rst

@@ -23,9 +23,9 @@ Configuration
 -------------
 
 OpenTelemetry Jaeger Exporter can be configured by setting `JaegerSpanExporter parameters
-<https://github.com/open-telemetry/opentelemetry-python/blob/master/exporter/opentelemetry-exporter-jaeger
+<https://github.com/open-telemetry/opentelemetry-python/blob/main/exporter/opentelemetry-exporter-jaeger
 /src/opentelemetry/exporter/jaeger/__init__.py#L88>`_ or by setting
-`environment variables <https://github.com/open-telemetry/opentelemetry-specification/blob/master/
+`environment variables <https://github.com/open-telemetry/opentelemetry-specification/blob/main/
 specification/sdk-environment-variables.md#jaeger-exporter>`_
 
 References

exporter/opentelemetry-exporter-jaeger/setup.cfg

@@ -19,7 +19,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/tree/master/exporter/opentelemetry-exporter-jaeger
+url = https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-jaeger
 platforms = any
 license = Apache-2.0
 classifiers =

exporter/opentelemetry-exporter-opencensus/setup.cfg

@@ -19,7 +19,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/tree/master/exporter/opentelemetry-exporter-opencensus
+url = https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-opencensus
 platforms = any
 license = Apache-2.0
 classifiers =

exporter/opentelemetry-exporter-otlp/README.rst

@@ -22,4 +22,4 @@ References
 * `OpenTelemetry Collector Exporter <https://opentelemetry-python.readthedocs.io/en/latest/exporter/otlp/otlp.html>`_
 * `OpenTelemetry Collector <https://github.com/open-telemetry/opentelemetry-collector/>`_
 * `OpenTelemetry <https://opentelemetry.io/>`_
-* `OpenTelemetry Protocol Specification <https://github.com/open-telemetry/oteps/blob/master/text/0035-opentelemetry-protocol.md>`_
+* `OpenTelemetry Protocol Specification <https://github.com/open-telemetry/oteps/blob/main/text/0035-opentelemetry-protocol.md>`_

exporter/opentelemetry-exporter-otlp/setup.cfg

@@ -19,7 +19,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/tree/master/exporter/opentelemetry-exporter-otlp
+url = https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp
 platforms = any
 license = Apache-2.0
 classifiers =

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

@@ -34,7 +34,7 @@
 be in the format of a string "gzip" for gzip compression, and no value specified
 if no compression is the desired choice.
 Additional details are available `in the specification
-<https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/protocol/exporter.md#opentelemetry-protocol-exporter>`_.
+<https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#opentelemetry-protocol-exporter>`_.
 
 .. code:: python
 

exporter/opentelemetry-exporter-prometheus/setup.cfg

@@ -19,7 +19,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/tree/master/exporter/opentelemetry-exporter-prometheus
+url = https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-prometheus
 platforms = any
 license = Apache-2.0
 classifiers =

exporter/opentelemetry-exporter-zipkin/setup.cfg

@@ -19,7 +19,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/tree/master/exporter/opentelemetry-exporter-zipkin
+url = https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-zipkin
 platforms = any
 license = Apache-2.0
 classifiers =