updating changelogs and version to 1.6.0-0.25b0 (#2193)

lzchen · web-flow · commit e1c4a5b49e30 · 2021-10-13T23:11:59.000Z
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,7 +10,14 @@ 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: 36275f3cbf00c2021caa1d922bd98215c50b9af3
+  CONTRIB_REPO_SHA: 4a4d889b1876323d7f70507b5e4d079f454fe0d6
+  # 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
+  # contrib builds are run directly from contrib (since test.yml is executed, which sets CORE_REPO_SHA)
+  # The solution is to include CORE_REPO_SHA as part of THIS environment so it can be accessed
+  # from within the contrib build.
+  CORE_REPO_SHA: ${{ github.sha }}
 
 jobs:
   build:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,11 @@ 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.5.0-0.24b0...HEAD)
+## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.6.0-0.25b0...HEAD)
+
+## [1.6.0-0.25b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.6.0-0.25b0) - 2021-10-13
+
+
 - Fix race in `set_tracer_provider()`
   ([#2182](https://github.com/open-telemetry/opentelemetry-python/pull/2182))
 - Automatically load OTEL environment variables as options for `opentelemetry-instrument`
diff --git a/eachdist.ini b/eachdist.ini
@@ -12,7 +12,7 @@ sortfirst=
     exporter/*
 
 [stable]
-version=1.5.0
+version=1.6.0
 
 packages=
     opentelemetry-sdk
@@ -31,7 +31,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.24b0
+version=0.25b0
 
 packages=
     opentelemetry-opentracing-shim
diff --git a/exporter/opentelemetry-exporter-jaeger-proto-grpc/src/opentelemetry/exporter/jaeger/proto/grpc/version.py b/exporter/opentelemetry-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.5.0"
+__version__ = "1.6.0"
diff --git a/exporter/opentelemetry-exporter-jaeger-thrift/src/opentelemetry/exporter/jaeger/thrift/version.py b/exporter/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.5.0"
+__version__ = "1.6.0"
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.5.0
-    opentelemetry-exporter-jaeger-thrift == 1.5.0
+    opentelemetry-exporter-jaeger-proto-grpc == 1.6.0
+    opentelemetry-exporter-jaeger-thrift == 1.6.0
 
 [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.5.0"
+__version__ = "1.6.0"
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.24b0"
+__version__ = "0.25b0"
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg b/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg
@@ -43,7 +43,7 @@ install_requires =
     googleapis-common-protos ~= 1.52
     opentelemetry-api ~= 1.3
     opentelemetry-sdk ~= 1.3
-    opentelemetry-proto == 1.5.0
+    opentelemetry-proto == 1.6.0
     backoff ~= 1.10.0
 
 [options.extras_require]
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version.py b/exporter/opentelemetry-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.5.0"
+__version__ = "1.6.0"
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg b/exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg
@@ -43,7 +43,7 @@ install_requires =
     googleapis-common-protos ~= 1.52
     opentelemetry-api ~= 1.3
     opentelemetry-sdk ~= 1.3
-    opentelemetry-proto == 1.5.0
+    opentelemetry-proto == 1.6.0
     backoff ~= 1.10.0
 
 [options.extras_require]
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version.py b/exporter/opentelemetry-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.5.0"
+__version__ = "1.6.0"
diff --git a/exporter/opentelemetry-exporter-otlp/setup.cfg b/exporter/opentelemetry-exporter-otlp/setup.cfg
@@ -38,8 +38,8 @@ classifiers =
 python_requires = >=3.6
 packages=find_namespace:
 install_requires =
-    opentelemetry-exporter-otlp-proto-grpc == 1.5.0
-    opentelemetry-exporter-otlp-proto-http == 1.5.0
+    opentelemetry-exporter-otlp-proto-grpc == 1.6.0
+    opentelemetry-exporter-otlp-proto-http == 1.6.0
 
 [options.entry_points]
 opentelemetry_traces_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.5.0"
+__version__ = "1.6.0"
diff --git a/exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version.py b/exporter/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.5.0"
+__version__ = "1.6.0"
diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg b/exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg
@@ -45,7 +45,7 @@ install_requires =
     requests ~= 2.7
     opentelemetry-api ~= 1.3
     opentelemetry-sdk ~= 1.3
-    opentelemetry-exporter-zipkin-json == 1.5.0
+    opentelemetry-exporter-zipkin-json == 1.6.0
 
 [options.packages.find]
 where = src
diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version.py b/exporter/opentelemetry-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.5.0"
+__version__ = "1.6.0"
diff --git a/exporter/opentelemetry-exporter-zipkin/setup.cfg b/exporter/opentelemetry-exporter-zipkin/setup.cfg
@@ -38,8 +38,8 @@ classifiers =
 python_requires = >=3.6
 packages=find_namespace:
 install_requires =
-    opentelemetry-exporter-zipkin-json == 1.5.0
-    opentelemetry-exporter-zipkin-proto-http == 1.5.0
+    opentelemetry-exporter-zipkin-json == 1.6.0
+    opentelemetry-exporter-zipkin-proto-http == 1.6.0
 
 [options.extras_require]
 test =
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.5.0"
+__version__ = "1.6.0"
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.5.0"
+__version__ = "1.6.0"
diff --git a/opentelemetry-distro/setup.cfg b/opentelemetry-distro/setup.cfg
@@ -42,8 +42,8 @@ zip_safe = False
 include_package_data = True
 install_requires =
     opentelemetry-api ~= 1.3
-    opentelemetry-instrumentation == 0.24b0
-    opentelemetry-sdk == 1.5.0
+    opentelemetry-instrumentation == 0.25b0
+    opentelemetry-sdk == 1.6.0
 
 [options.packages.find]
 where = src
@@ -57,4 +57,4 @@ opentelemetry_configurator =
 [options.extras_require]
 test =
 otlp =
-    opentelemetry-exporter-otlp == 1.5.0
+    opentelemetry-exporter-otlp == 1.6.0
diff --git a/opentelemetry-distro/src/opentelemetry/distro/version.py b/opentelemetry-distro/src/opentelemetry/distro/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.24b0"
+__version__ = "0.25b0"
diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py
@@ -18,125 +18,125 @@
 libraries = {
     "aiohttp": {
         "library": "aiohttp ~= 3.0",
-        "instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.25b0",
     },
     "aiopg": {
         "library": "aiopg >= 0.13.0, < 1.3.0",
-        "instrumentation": "opentelemetry-instrumentation-aiopg==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-aiopg==0.25b0",
     },
     "asgiref": {
         "library": "asgiref ~= 3.0",
-        "instrumentation": "opentelemetry-instrumentation-asgi==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-asgi==0.25b0",
     },
     "asyncpg": {
         "library": "asyncpg >= 0.12.0",
-        "instrumentation": "opentelemetry-instrumentation-asyncpg==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-asyncpg==0.25b0",
     },
     "boto": {
         "library": "boto~=2.0",
-        "instrumentation": "opentelemetry-instrumentation-boto==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-boto==0.25b0",
     },
     "botocore": {
         "library": "botocore ~= 1.0",
-        "instrumentation": "opentelemetry-instrumentation-botocore==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-botocore==0.25b0",
     },
     "celery": {
         "library": "celery >= 4.0, < 6.0",
-        "instrumentation": "opentelemetry-instrumentation-celery==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-celery==0.25b0",
     },
     "django": {
         "library": "django >= 1.10",
-        "instrumentation": "opentelemetry-instrumentation-django==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-django==0.25b0",
     },
     "elasticsearch": {
         "library": "elasticsearch >= 2.0",
-        "instrumentation": "opentelemetry-instrumentation-elasticsearch==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-elasticsearch==0.25b0",
     },
     "falcon": {
         "library": "falcon >= 2.0.0, < 4.0.0",
-        "instrumentation": "opentelemetry-instrumentation-falcon==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-falcon==0.25b0",
     },
     "fastapi": {
         "library": "fastapi ~= 0.58",
-        "instrumentation": "opentelemetry-instrumentation-fastapi==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-fastapi==0.25b0",
     },
     "flask": {
         "library": "flask >= 1.0, < 3.0",
-        "instrumentation": "opentelemetry-instrumentation-flask==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-flask==0.25b0",
     },
     "grpcio": {
         "library": "grpcio ~= 1.27",
-        "instrumentation": "opentelemetry-instrumentation-grpc==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-grpc==0.25b0",
     },
     "httpx": {
         "library": "httpx >= 0.18.0, < 0.19.0",
-        "instrumentation": "opentelemetry-instrumentation-httpx==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-httpx==0.25b0",
     },
     "jinja2": {
         "library": "jinja2 >= 2.7, < 4.0",
-        "instrumentation": "opentelemetry-instrumentation-jinja2==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-jinja2==0.25b0",
     },
     "mysql-connector-python": {
         "library": "mysql-connector-python ~= 8.0",
-        "instrumentation": "opentelemetry-instrumentation-mysql==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-mysql==0.25b0",
     },
     "pika": {
         "library": "pika >= 1.1.0",
-        "instrumentation": "opentelemetry-instrumentation-pika==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-pika==0.25b0",
     },
     "psycopg2": {
         "library": "psycopg2 >= 2.7.3.1",
-        "instrumentation": "opentelemetry-instrumentation-psycopg2==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-psycopg2==0.25b0",
     },
     "pymemcache": {
         "library": "pymemcache ~= 1.3",
-        "instrumentation": "opentelemetry-instrumentation-pymemcache==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-pymemcache==0.25b0",
     },
     "pymongo": {
         "library": "pymongo ~= 3.1",
-        "instrumentation": "opentelemetry-instrumentation-pymongo==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-pymongo==0.25b0",
     },
     "PyMySQL": {
         "library": "PyMySQL ~= 0.10.1",
-        "instrumentation": "opentelemetry-instrumentation-pymysql==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-pymysql==0.25b0",
     },
     "pyramid": {
         "library": "pyramid >= 1.7",
-        "instrumentation": "opentelemetry-instrumentation-pyramid==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-pyramid==0.25b0",
     },
     "redis": {
         "library": "redis >= 2.6",
-        "instrumentation": "opentelemetry-instrumentation-redis==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-redis==0.25b0",
     },
     "requests": {
         "library": "requests ~= 2.0",
-        "instrumentation": "opentelemetry-instrumentation-requests==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-requests==0.25b0",
     },
     "scikit-learn": {
         "library": "scikit-learn ~= 0.24.0",
-        "instrumentation": "opentelemetry-instrumentation-sklearn==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-sklearn==0.25b0",
     },
     "sqlalchemy": {
         "library": "sqlalchemy",
-        "instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.25b0",
     },
     "starlette": {
         "library": "starlette ~= 0.13.0",
-        "instrumentation": "opentelemetry-instrumentation-starlette==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-starlette==0.25b0",
     },
     "tornado": {
         "library": "tornado >= 6.0",
-        "instrumentation": "opentelemetry-instrumentation-tornado==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-tornado==0.25b0",
     },
     "urllib3": {
         "library": "urllib3 >= 1.0.0, < 2.0.0",
-        "instrumentation": "opentelemetry-instrumentation-urllib3==0.24b0",
+        "instrumentation": "opentelemetry-instrumentation-urllib3==0.25b0",
     },
 }
 default_instrumentations = [
-    "opentelemetry-instrumentation-dbapi==0.24b0",
-    "opentelemetry-instrumentation-logging==0.24b0",
-    "opentelemetry-instrumentation-sqlite3==0.24b0",
-    "opentelemetry-instrumentation-urllib==0.24b0",
-    "opentelemetry-instrumentation-wsgi==0.24b0",
+    "opentelemetry-instrumentation-dbapi==0.25b0",
+    "opentelemetry-instrumentation-logging==0.25b0",
+    "opentelemetry-instrumentation-sqlite3==0.25b0",
+    "opentelemetry-instrumentation-urllib==0.25b0",
+    "opentelemetry-instrumentation-wsgi==0.25b0",
 ]
diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/version.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.24b0"
+__version__ = "0.25b0"
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.5.0"
+__version__ = "1.6.0"
diff --git a/opentelemetry-sdk/setup.cfg b/opentelemetry-sdk/setup.cfg
@@ -42,9 +42,9 @@ packages=find_namespace:
 zip_safe = False
 include_package_data = True
 install_requires =
-    opentelemetry-api == 1.5.0
-    opentelemetry-semantic-conventions == 0.24b0
-    opentelemetry-instrumentation == 0.24b0
+    opentelemetry-api == 1.6.0
+    opentelemetry-semantic-conventions == 0.25b0
+    opentelemetry-instrumentation == 0.25b0
 
 [options.packages.find]
 where = src
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.5.0"
+__version__ = "1.6.0"
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.24b0"
+__version__ = "0.25b0"
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.5.0"
+__version__ = "1.6.0"
diff --git a/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version.py b/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version.py
diff --git a/shim/opentelemetry-opentracing-shim/setup.cfg b/shim/opentelemetry-opentracing-shim/setup.cfg
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
diff --git a/tests/util/src/opentelemetry/test/version.py b/tests/util/src/opentelemetry/test/version.py
diff --git a/tox.ini b/tox.ini
