Merge branch 'main' into logenv

open-telemetry · Dec 10, 2022 · c1c06e2 · c1c06e2
2 parents 55c17e9 + 0f9cfdd
commit c1c06e2
Show file tree

Hide file tree

Showing 33 changed files with 46 additions and 42 deletions.
diff --git a/.github/workflows/public-api-check.yml b/.github/workflows/public-api-check.yml
@@ -34,7 +34,7 @@ jobs:
           python-version: 3.9
 
       - name: Install tox
-        run: pip install -U tox-factor
+        run: pip install tox==3.27.1 -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: main
+  CONTRIB_REPO_SHA: ce5dac763790203d68217cd3870b6be5517692fe
   # This is needed because we do not clone the core repo in contrib builds anymore.
   # When running contrib builds as part of core builds, we use actions/checkout@v2 which
   # does not set an environment variable (simply just runs tox), which is different when
@@ -46,7 +46,7 @@ jobs:
           python-version: ${{ env[matrix.python-version] }}
           architecture: 'x64'
       - name: Install tox
-        run: pip install -U tox-factor
+        run: pip install tox==3.27.1 -U tox-factor
       - name: Cache tox environment
         # Preserves .tox directory between runs for faster installs
         uses: actions/cache@v2
@@ -99,7 +99,7 @@ jobs:
           python-version: 3.9
           architecture: 'x64'
       - name: Install tox
-        run: pip install -U tox
+        run: pip install tox==3.27.1
       - name: Cache tox environment
         # Preserves .tox directory between runs for faster installs
         uses: actions/cache@v2
@@ -142,7 +142,7 @@ jobs:
           python-version: ${{ env[matrix.python-version] }}
           architecture: 'x64'
       - name: Install tox
-        run: pip install -U tox-factor
+        run: pip install tox==3.27.1 -U tox-factor
       - name: Cache tox environment
         # Preserves .tox directory between runs for faster installs
         uses: actions/cache@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## Version 1.15.0/0.36b0 (2022-12-09)
+
 - Regenerate opentelemetry-proto to be compatible with protobuf 3 and 4
   ([#3070](https://github.com/open-telemetry/opentelemetry-python/pull/3070))
 - Rename parse_headers to parse_env_headers and improve error message

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -47,12 +47,14 @@ during their normal contribution hours.
 
 This project uses [tox](https://tox.readthedocs.io) to automate
 some aspects of development, including testing against multiple Python versions.
-To install `tox`, run:
+To install `tox`, run[^1]:
 
 ```console
-$ pip install tox
+$ pip install tox==3.27.1
 ```
 
+[^1]: Right now we are experiencing issues with `tox==4.x.y`, so we recommend you use this version.
+
 You can run `tox` with the following arguments:
 
 - `tox` to run all existing tox commands, including unit tests for all packages

diff --git a/eachdist.ini b/eachdist.ini
@@ -11,7 +11,7 @@ sortfirst=
     exporter/*
 
 [stable]
-version=1.15.0.dev
+version=1.16.0.dev
 
 packages=
     opentelemetry-sdk
@@ -30,7 +30,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.36b0.dev
+version=0.37b0.dev
 
 packages=
     opentelemetry-opentracing-shim

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.15.0.dev"
+__version__ = "1.16.0.dev"
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.15.0.dev"
+__version__ = "1.16.0.dev"
diff --git a/exporter/opentelemetry-exporter-jaeger/pyproject.toml b/exporter/opentelemetry-exporter-jaeger/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "opentelemetry-exporter-jaeger-proto-grpc == 1.15.0.dev",
-  "opentelemetry-exporter-jaeger-thrift == 1.15.0.dev",
+  "opentelemetry-exporter-jaeger-proto-grpc == 1.16.0.dev",
+  "opentelemetry-exporter-jaeger-thrift == 1.16.0.dev",
 ]
 
 [project.optional-dependencies]

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.15.0.dev"
+__version__ = "1.16.0.dev"
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.36b0.dev"
+__version__ = "0.37b0.dev"
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml
@@ -30,7 +30,7 @@ dependencies = [
   "googleapis-common-protos ~= 1.52",
   "grpcio >= 1.0.0, < 2.0.0",
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-proto == 1.15.0.dev",
+  "opentelemetry-proto == 1.16.0.dev",
   "opentelemetry-sdk ~= 1.12",
 ]
 

diff --git a/...ntelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version.py b/...ntelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.15.0.dev"
+__version__ = "1.16.0.dev"
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml
@@ -29,7 +29,7 @@ dependencies = [
   "backoff >= 1.10.0, < 3.0.0; python_version>='3.7'",
   "googleapis-common-protos ~= 1.52",
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-proto == 1.15.0.dev",
+  "opentelemetry-proto == 1.16.0.dev",
   "opentelemetry-sdk ~= 1.12",
   "requests ~= 2.7",
 ]

diff --git a/...ntelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version.py b/...ntelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.15.0.dev"
+__version__ = "1.16.0.dev"
diff --git a/exporter/opentelemetry-exporter-otlp/pyproject.toml b/exporter/opentelemetry-exporter-otlp/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "opentelemetry-exporter-otlp-proto-grpc == 1.15.0.dev",
-  "opentelemetry-exporter-otlp-proto-http == 1.15.0.dev",
+  "opentelemetry-exporter-otlp-proto-grpc == 1.16.0.dev",
+  "opentelemetry-exporter-otlp-proto-http == 1.16.0.dev",
 ]
 
 [project.entry-points.opentelemetry_logs_exporter]

diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.15.0.dev"
+__version__ = "1.16.0.dev"
diff --git a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version.py b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.36b0.dev"
+__version__ = "0.37b0.dev"
diff --git a/...rter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version.py b/...rter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.15.0.dev"
+__version__ = "1.16.0.dev"
diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml b/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml
@@ -27,7 +27,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.3",
-  "opentelemetry-exporter-zipkin-json == 1.15.0.dev",
+  "opentelemetry-exporter-zipkin-json == 1.16.0.dev",
   "opentelemetry-sdk ~= 1.11",
   "protobuf ~= 3.12",
   "requests ~= 2.7",

diff --git a/...emetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version.py b/...emetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.15.0.dev"
+__version__ = "1.16.0.dev"
diff --git a/exporter/opentelemetry-exporter-zipkin/pyproject.toml b/exporter/opentelemetry-exporter-zipkin/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "opentelemetry-exporter-zipkin-json == 1.15.0.dev",
-  "opentelemetry-exporter-zipkin-proto-http == 1.15.0.dev",
+  "opentelemetry-exporter-zipkin-json == 1.16.0.dev",
+  "opentelemetry-exporter-zipkin-proto-http == 1.16.0.dev",
 ]
 
 [project.optional-dependencies]

diff --git a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version.py b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.15.0.dev"
+__version__ = "1.16.0.dev"
diff --git a/opentelemetry-api/src/opentelemetry/version.py b/opentelemetry-api/src/opentelemetry/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.15.0.dev"
+__version__ = "1.16.0.dev"
diff --git a/opentelemetry-proto/src/opentelemetry/proto/version.py b/opentelemetry-proto/src/opentelemetry/proto/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.15.0.dev"
+__version__ = "1.16.0.dev"
diff --git a/opentelemetry-sdk/pyproject.toml b/opentelemetry-sdk/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "opentelemetry-api == 1.15.0.dev",
-  "opentelemetry-semantic-conventions == 0.36b0.dev",
+  "opentelemetry-api == 1.16.0.dev",
+  "opentelemetry-semantic-conventions == 0.37b0.dev",
   "setuptools >= 16.0",
   "typing-extensions >= 3.7.4",
 ]

diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/version.py b/opentelemetry-sdk/src/opentelemetry/sdk/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.15.0.dev"
+__version__ = "1.16.0.dev"
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.36b0.dev"
+__version__ = "0.37b0.dev"
diff --git a/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py b/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.15.0.dev"
+__version__ = "1.16.0.dev"
diff --git a/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version.py b/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.15.0.dev"
+__version__ = "1.16.0.dev"
diff --git a/shim/opentelemetry-opentracing-shim/pyproject.toml b/shim/opentelemetry-opentracing-shim/pyproject.toml
@@ -33,7 +33,7 @@ dependencies = [
 
 [project.optional-dependencies]
 test = [
-  "opentelemetry-test-utils == 0.36b0.dev",
+  "opentelemetry-test-utils == 0.37b0.dev",
   "opentracing ~= 2.2.0",
 ]
 

diff --git a/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version.py b/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.36b0.dev"
+__version__ = "0.37b0.dev"
diff --git a/tests/opentelemetry-test-utils/pyproject.toml b/tests/opentelemetry-test-utils/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "asgiref ~= 3.0",
-  "opentelemetry-api == 1.15.0.dev",
-  "opentelemetry-sdk == 1.15.0.dev",
+  "opentelemetry-api == 1.16.0.dev",
+  "opentelemetry-sdk == 1.16.0.dev",
 ]
 
 [project.optional-dependencies]

diff --git a/tests/opentelemetry-test-utils/src/opentelemetry/test/version.py b/tests/opentelemetry-test-utils/src/opentelemetry/test/version.py
@@ -1 +1 @@
-__version__ = "0.36b0.dev"
+__version__ = "0.37b0.dev"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = "0.36b0.dev"
		__version__ = "0.37b0.dev"