Merge branch 'fix-opentracing-shim-exception-reporting' of https://gi…

…thub.com/robertsben/opentelemetry-python into fix-opentracing-shim-exception-reporting
open-telemetry · Jun 7, 2021 · 62f64f1 · 62f64f1
2 parents 85b93cd + 8e63355
commit 62f64f1
Show file tree

Hide file tree

Showing 91 changed files with 1,983 additions and 566 deletions.
diff --git a/.github/workflows/public-api-check.yml b/.github/workflows/public-api-check.yml
@@ -0,0 +1,40 @@
+name: Public API check
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, labeled, unlabeled]
+    branches:
+      - main
+
+jobs:
+  publicAPICheck:
+
+    runs-on: ubuntu-latest
+
+    if: "!contains(github.event.pull_request.labels.*.name, 'Approve Public API check')"
+
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Checkout main
+        run: git checkout main
+
+      - name: Pull origin
+        run: git pull --rebase=false origin main
+
+      - name: Checkout pull request
+        run: git checkout ${{ github.event.pull_request.head.sha }}
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+
+      - name: Install tox
+        run: pip install -U tox-factor
+
+      - name: Public API Check
+        run: tox -e public-symbols-check
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ env:
   # Otherwise, set variable to the commit of your branch on
   # opentelemetry-python-contrib which is compatible with these Core repo
   # changes.
-  CONTRIB_REPO_SHA: c46b39e4e94af5ae8f97e684960f1aec0595c33e
+  CONTRIB_REPO_SHA: 01bb63fb8cc429a17f1fb0c93f7ac72a3fc7b4fc
 
 jobs:
   build:
@@ -94,7 +94,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install tox
         run: pip install -U tox
       - name: Cache tox environment

diff --git a/.pylintrc b/.pylintrc
@@ -73,8 +73,9 @@ disable=missing-docstring,
       exec-used,
       super-with-arguments, # temp-pylint-upgrade
       isinstance-second-argument-not-valid-type, # temp-pylint-upgrade
-      raise-missing-from, # temp-pylint-upgrade 
-      unused-argument, # temp-pylint-upgrade 
+      raise-missing-from, # temp-pylint-upgrade
+      unused-argument, # temp-pylint-upgrade
+      redefined-builtin,
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.2.0-0.21b0...HEAD)
+## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.3.0-0.22b0...HEAD)
+
+## [1.3.0-0.22b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.3.0-0.22b0) - 2021-06-01
+
+### Added 
+- Allow span limits to be set programatically via TracerProvider.
+  ([#1877](https://github.com/open-telemetry/opentelemetry-python/pull/1877))
 
 ### Changed
 - Updated get_tracer to return an empty string when passed an invalid name
   ([#1854](https://github.com/open-telemetry/opentelemetry-python/pull/1854))
+- Changed AttributeValue sequences to warn mypy users on adding None values to array
+  ([#1855](https://github.com/open-telemetry/opentelemetry-python/pull/1855))
+- Fixed exporter OTLP header parsing to match baggage header formatting.
+  ([#1869](https://github.com/open-telemetry/opentelemetry-python/pull/1869))
+- Added optional `schema_url` field to `Resource` class
+  ([#1871](https://github.com/open-telemetry/opentelemetry-python/pull/1871))
+- Update protos to latest version release 0.9.0
+  ([#1873](https://github.com/open-telemetry/opentelemetry-python/pull/1873))
 
 ### Fixed
 - Updated `opentelementry-opentracing-shim` `ScopeShim` to report exceptions in
@@ -23,6 +37,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1823](https://github.com/open-telemetry/opentelemetry-python/pull/1823))
 - Added support for OTEL_SERVICE_NAME.
   ([#1829](https://github.com/open-telemetry/opentelemetry-python/pull/1829))
+- Lazily read/configure limits and allow limits to be unset.
+  ([#1839](https://github.com/open-telemetry/opentelemetry-python/pull/1839))
 
 ### Changed
 - Fixed OTLP gRPC exporter silently failing if scheme is not specified in endpoint.
@@ -46,6 +62,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1818](https://github.com/open-telemetry/opentelemetry-python/pull/1818))
 - Update transient errors retry timeout and retryable status codes
   ([#1842](https://github.com/open-telemetry/opentelemetry-python/pull/1842))
+- Apply validation of attributes to `Resource`, move attribute related logic to separate package.
+  ([#1834](https://github.com/open-telemetry/opentelemetry-python/pull/1834))
+- Fix start span behavior when excess links and attributes are included
+  ([#1856](https://github.com/open-telemetry/opentelemetry-python/pull/1856))
 
 ### Removed
 - Moved `opentelemetry-instrumentation` to contrib repository.

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -69,6 +69,14 @@ You can run:
   Python version
 - `tox -e lint` to run lint checks on all code
 
+We try to keep the amount of _public symbols_ in our code minimal. A public symbol is any Python identifier that does not start with an underscore.
+Every public symbol is something that has to be kept in order to maintain backwards compatibility, so we try to have as few as possible.
+
+To check if your PR is adding public symbols, run `tox -e public-symbols-check`. This will always fail if public symbols are being added. The idea
+behind this is that every PR that adds public symbols fails in CI, forcing reviewers to check the symbols to make sure they are strictly necessary.
+If after checking them, it is considered that they are indeed necessary, the PR will be labeled with `Skip Public API check` so that this check is not
+run.
+
 See
 [`tox.ini`](https://github.com/open-telemetry/opentelemetry-python/blob/main/tox.ini)
 for more detail on available tox commands.

diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright The OpenTelemetry Authors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/README.md b/README.md
@@ -131,7 +131,7 @@ Meeting notes are available as a public [Google doc](https://docs.google.com/doc
 Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
 
 - [Aaron Abbott](https://github.com/aabmass), Google
-- [Diego Hurtado](https://github.com/ocelotl)
+- [Diego Hurtado](https://github.com/ocelotl), Lightstep
 - [Owais Lone](https://github.com/owais), Splunk
 - [Srikanth Chekuri](https://github.com/lonewolf3739)
 

diff --git a/RELEASING.md b/RELEASING.md
@@ -59,6 +59,7 @@ This will ensure the docs are pointing at the stable release.
 ```bash
 git tag -d stable
 git tag stable
+git push --delete origin tagname
 git push origin stable
 ```
 

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,4 +1,4 @@
-pylint==2.6.0
+pylint==2.7.1
 flake8~=3.7
 isort~=5.8
 black~=20.8b1

diff --git a/docs/examples/error_handler/error_handler_0/setup.cfg b/docs/examples/error_handler/error_handler_0/setup.cfg
@@ -36,7 +36,7 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-sdk == 1.3.0.dev0
+    opentelemetry-sdk == 1.4.0.dev0
 
 [options.packages.find]
 where = src

diff --git a/docs/examples/error_handler/error_handler_0/src/error_handler_0/version.py b/docs/examples/error_handler/error_handler_0/src/error_handler_0/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.21.dev0"
+__version__ = "0.23.dev0"
diff --git a/docs/examples/error_handler/error_handler_1/setup.cfg b/docs/examples/error_handler/error_handler_1/setup.cfg
@@ -36,7 +36,7 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-sdk == 1.3.0.dev0
+    opentelemetry-sdk == 1.4.0.dev0
 
 [options.packages.find]
 where = src

diff --git a/docs/examples/error_handler/error_handler_1/src/error_handler_1/version.py b/docs/examples/error_handler/error_handler_1/src/error_handler_1/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.21.dev0"
+__version__ = "0.23.dev0"
diff --git a/docs/index.rst b/docs/index.rst
@@ -34,8 +34,8 @@ In addition, there are several extension packages which can be installed separat
     pip install opentelemetry-instrumentation-{instrumentation}
 
 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 
+The Jaeger, Zipkin, OTLP and OpenCensus Exporters can be found in the :scm_web:`exporter <exporter/>`
+directory of the repository. Instrumentations and additional exporters can be found in the 
 `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.
 

diff --git a/eachdist.ini b/eachdist.ini
@@ -13,29 +13,29 @@ sortfirst=
     exporter/*
 
 [stable]
-version=1.3.0.dev0
+version=1.4.0.dev0
 
 packages=
     opentelemetry-sdk
     opentelemetry-proto
-    propagator/opentelemetry-propagator-jaeger
-    propagator/opentelemetry-propagator-b3
-    exporter/opentelemetry-exporter-zipkin-proto-http
-    exporter/opentelemetry-exporter-zipkin-json
-    exporter/opentelemetry-exporter-zipkin
-    exporter/opentelemetry-exporter-otlp-proto-grpc
-    exporter/opentelemetry-exporter-otlp
-    exporter/opentelemetry-exporter-jaeger-thrift
-    exporter/opentelemetry-exporter-jaeger-proto-grpc
-    exporter/opentelemetry-exporter-jaeger
+    opentelemetry-propagator-jaeger
+    opentelemetry-propagator-b3
+    opentelemetry-exporter-zipkin-proto-http
+    opentelemetry-exporter-zipkin-json
+    opentelemetry-exporter-zipkin
+    opentelemetry-exporter-otlp-proto-grpc
+    opentelemetry-exporter-otlp
+    opentelemetry-exporter-jaeger-thrift
+    opentelemetry-exporter-jaeger-proto-grpc
+    opentelemetry-exporter-jaeger
     opentelemetry-api
 
 [prerelease]
-version=0.22.dev0
+version=0.23.dev0
 
 packages=
     opentelemetry-opentracing-shim
-    exporter/opentelemetry-exporter-opencensus
+    opentelemetry-exporter-opencensus
     opentelemetry-distro
     opentelemetry-semantic-conventions
     opentelemetry-test
@@ -46,12 +46,12 @@ packages=
 version=1.10a0
 
 packages=
-    exporter/opentelemetry-exporter-prometheus-remote-write
-    exporter/opentelemetry-exporter-prometheus
+    opentelemetry-exporter-prometheus-remote-write
+    opentelemetry-exporter-prometheus
     opentelemetry-api
     opentelemetry-sdk
-    exporter/opentelemetry-exporter-otlp-proto-grpc
-    exporter/opentelemetry-exporter-otlp
+    opentelemetry-exporter-otlp-proto-grpc
+    opentelemetry-exporter-otlp
 
 [lintroots]
 extraroots=examples/*,scripts/

diff --git a/exporter/opentelemetry-exporter-jaeger-proto-grpc/LICENSE b/exporter/opentelemetry-exporter-jaeger-proto-grpc/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright The OpenTelemetry Authors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/exporter/opentelemetry-exporter-jaeger-proto-grpc/setup.cfg b/exporter/opentelemetry-exporter-jaeger-proto-grpc/setup.cfg
@@ -42,8 +42,8 @@ packages=find_namespace:
 install_requires =
     grpcio >= 1.0.0, < 2.0.0
     googleapis-common-protos ~= 1.52
-    opentelemetry-api == 1.3.0.dev0
-    opentelemetry-sdk == 1.3.0.dev0
+    opentelemetry-api == 1.4.0.dev0
+    opentelemetry-sdk == 1.4.0.dev0
 
 [options.packages.find]
 where = src

diff --git a/...emetry-exporter-jaeger-proto-grpc/src/opentelemetry/exporter/jaeger/proto/grpc/version.py b/...emetry-exporter-jaeger-proto-grpc/src/opentelemetry/exporter/jaeger/proto/grpc/version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.3.0.dev0"
+__version__ = "1.4.0.dev0"
diff --git a/exporter/opentelemetry-exporter-jaeger-thrift/LICENSE b/exporter/opentelemetry-exporter-jaeger-thrift/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright The OpenTelemetry Authors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg b/exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg
@@ -41,8 +41,8 @@ package_dir=
 packages=find_namespace:
 install_requires =
     thrift >= 0.10.0
-    opentelemetry-api == 1.3.0.dev0
-    opentelemetry-sdk == 1.3.0.dev0
+    opentelemetry-api == 1.4.0.dev0
+    opentelemetry-sdk == 1.4.0.dev0
 
 [options.packages.find]
 where = src

diff --git a/.../opentelemetry-exporter-jaeger-thrift/src/opentelemetry/exporter/jaeger/thrift/version.py b/.../opentelemetry-exporter-jaeger-thrift/src/opentelemetry/exporter/jaeger/thrift/version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.3.0.dev0"
+__version__ = "1.4.0.dev0"
diff --git a/exporter/opentelemetry-exporter-jaeger/LICENSE b/exporter/opentelemetry-exporter-jaeger/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright The OpenTelemetry Authors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/exporter/opentelemetry-exporter-jaeger/setup.cfg b/exporter/opentelemetry-exporter-jaeger/setup.cfg
@@ -39,8 +39,8 @@ python_requires = >=3.6
 
 packages=find_namespace:
 install_requires =
-    opentelemetry-exporter-jaeger-proto-grpc == 1.3.0.dev0
-    opentelemetry-exporter-jaeger-thrift == 1.3.0.dev0
+    opentelemetry-exporter-jaeger-proto-grpc == 1.4.0.dev0
+    opentelemetry-exporter-jaeger-thrift == 1.4.0.dev0
 
 [options.extras_require]
 test =
diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/version.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.3.0.dev0"
+__version__ = "1.4.0.dev0"
diff --git a/exporter/opentelemetry-exporter-opencensus/LICENSE b/exporter/opentelemetry-exporter-opencensus/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright The OpenTelemetry Authors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/exporter/opentelemetry-exporter-opencensus/setup.cfg b/exporter/opentelemetry-exporter-opencensus/setup.cfg
@@ -42,8 +42,8 @@ packages=find_namespace:
 install_requires =
     grpcio >= 1.0.0, < 2.0.0
     opencensus-proto >= 0.1.0, < 1.0.0
-    opentelemetry-api == 1.3.0.dev0
-    opentelemetry-sdk == 1.3.0.dev0
+    opentelemetry-api == 1.4.0.dev0
+    opentelemetry-sdk == 1.4.0.dev0
     protobuf >= 3.13.0
 
 [options.packages.find]

diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.22.dev0"
+__version__ = "0.23.dev0"
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/LICENSE b/exporter/opentelemetry-exporter-otlp-proto-grpc/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright The OpenTelemetry Authors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg b/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg
@@ -41,9 +41,9 @@ packages=find_namespace:
 install_requires =
     grpcio >= 1.0.0, < 2.0.0
     googleapis-common-protos ~= 1.52
-    opentelemetry-api == 1.3.0.dev0
-    opentelemetry-sdk == 1.3.0.dev0
-    opentelemetry-proto == 1.3.0.dev0
+    opentelemetry-api == 1.4.0.dev0
+    opentelemetry-sdk == 1.4.0.dev0
+    opentelemetry-proto == 1.4.0.dev0
     backoff ~= 1.10.0
 
 [options.extras_require]