From 0e12b8f9157a51ead168b63a4cb3b41bfc022540 Mon Sep 17 00:00:00 2001
From: Leighton Chen <lechen@microsoft.com>
Date: Mon, 18 Oct 2021 10:51:54 -0700
Subject: [PATCH 1/2] updating changelogs and version to 1.6.1-0.25b1

---
 CHANGELOG.md                                                | 6 +++++-
 eachdist.ini                                                | 4 ++--
 .../src/opentelemetry/exporter/jaeger/proto/grpc/version.py | 2 +-
 .../src/opentelemetry/exporter/jaeger/thrift/version.py     | 2 +-
 exporter/opentelemetry-exporter-jaeger/setup.cfg            | 4 ++--
 .../src/opentelemetry/exporter/jaeger/version.py            | 2 +-
 .../src/opentelemetry/exporter/opencensus/version.py        | 2 +-
 exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg   | 2 +-
 .../src/opentelemetry/exporter/otlp/proto/grpc/version.py   | 2 +-
 exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg   | 2 +-
 .../src/opentelemetry/exporter/otlp/proto/http/version.py   | 2 +-
 exporter/opentelemetry-exporter-otlp/setup.cfg              | 4 ++--
 .../src/opentelemetry/exporter/otlp/version.py              | 2 +-
 .../src/opentelemetry/exporter/zipkin/json/version.py       | 2 +-
 exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg | 2 +-
 .../src/opentelemetry/exporter/zipkin/proto/http/version.py | 2 +-
 exporter/opentelemetry-exporter-zipkin/setup.cfg            | 4 ++--
 .../src/opentelemetry/exporter/zipkin/version.py            | 2 +-
 opentelemetry-api/src/opentelemetry/version.py              | 2 +-
 opentelemetry-proto/src/opentelemetry/proto/version.py      | 2 +-
 opentelemetry-sdk/setup.cfg                                 | 4 ++--
 opentelemetry-sdk/src/opentelemetry/sdk/version.py          | 2 +-
 .../src/opentelemetry/semconv/version.py                    | 2 +-
 .../src/opentelemetry/propagators/b3/version.py             | 2 +-
 .../src/opentelemetry/propagators/jaeger/version.py         | 2 +-
 shim/opentelemetry-opentracing-shim/setup.cfg               | 2 +-
 .../src/opentelemetry/shim/opentracing_shim/version.py      | 2 +-
 tests/util/src/opentelemetry/test/version.py                | 2 +-
 28 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1f3b7737eb..c5541542e04 100644
--- 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.6.0-0.25b0...HEAD)
+## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.6.1-0.25b1...HEAD)
+
+## [1.6.1-0.25b1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.6.1-0.25b1) - 2021-10-18
+
+
 
 - Upgrade GRPC/protobuf related dependency and regenerate otlp protobufs
   ([#2201](https://github.com/open-telemetry/opentelemetry-python/pull/2201))
diff --git a/eachdist.ini b/eachdist.ini
index 52d5be769fa..93df7637b32 100644
--- a/eachdist.ini
+++ b/eachdist.ini
@@ -11,7 +11,7 @@ sortfirst=
     exporter/*
 
 [stable]
-version=1.6.0
+version=1.6.1
 
 packages=
     opentelemetry-sdk
@@ -30,7 +30,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.25b0
+version=0.25b1
 
 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
index 7373c3ac09b..632ab2dbf48 100644
--- 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.6.0"
+__version__ = "1.6.1"
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
index 7373c3ac09b..632ab2dbf48 100644
--- 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.6.0"
+__version__ = "1.6.1"
diff --git a/exporter/opentelemetry-exporter-jaeger/setup.cfg b/exporter/opentelemetry-exporter-jaeger/setup.cfg
index 91f4c8ba9b1..b88933fda81 100644
--- 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.6.0
-    opentelemetry-exporter-jaeger-thrift == 1.6.0
+    opentelemetry-exporter-jaeger-proto-grpc == 1.6.1
+    opentelemetry-exporter-jaeger-thrift == 1.6.1
 
 [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
index 7373c3ac09b..632ab2dbf48 100644
--- 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.6.0"
+__version__ = "1.6.1"
diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py
index 2a05c9b3611..45e421300da 100644
--- 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.25b0"
+__version__ = "0.25b1"
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg b/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg
index 9d0fd68d048..9fae85360d3 100644
--- 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.6.0
+    opentelemetry-proto == 1.6.1
     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
index e97f1318ecd..2c32b963d29 100644
--- 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.6.0"
+__version__ = "1.6.1"
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg b/exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg
index ad9311713a3..ff590043e0d 100644
--- 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.6.0
+    opentelemetry-proto == 1.6.1
     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
index e97f1318ecd..2c32b963d29 100644
--- 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.6.0"
+__version__ = "1.6.1"
diff --git a/exporter/opentelemetry-exporter-otlp/setup.cfg b/exporter/opentelemetry-exporter-otlp/setup.cfg
index 53ebc029753..091019e06f9 100644
--- 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.6.0
-    opentelemetry-exporter-otlp-proto-http == 1.6.0
+    opentelemetry-exporter-otlp-proto-grpc == 1.6.1
+    opentelemetry-exporter-otlp-proto-http == 1.6.1
 
 [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
index e97f1318ecd..2c32b963d29 100644
--- 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.6.0"
+__version__ = "1.6.1"
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
index e97f1318ecd..2c32b963d29 100644
--- 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.6.0"
+__version__ = "1.6.1"
diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg b/exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg
index 90d69c94782..a0942b8161f 100644
--- 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.6.0
+    opentelemetry-exporter-zipkin-json == 1.6.1
 
 [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
index e97f1318ecd..2c32b963d29 100644
--- 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.6.0"
+__version__ = "1.6.1"
diff --git a/exporter/opentelemetry-exporter-zipkin/setup.cfg b/exporter/opentelemetry-exporter-zipkin/setup.cfg
index f4f5c5e0830..a43f4ace892 100644
--- 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.6.0
-    opentelemetry-exporter-zipkin-proto-http == 1.6.0
+    opentelemetry-exporter-zipkin-json == 1.6.1
+    opentelemetry-exporter-zipkin-proto-http == 1.6.1
 
 [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
index e97f1318ecd..2c32b963d29 100644
--- 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.6.0"
+__version__ = "1.6.1"
diff --git a/opentelemetry-api/src/opentelemetry/version.py b/opentelemetry-api/src/opentelemetry/version.py
index e97f1318ecd..2c32b963d29 100644
--- 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.6.0"
+__version__ = "1.6.1"
diff --git a/opentelemetry-proto/src/opentelemetry/proto/version.py b/opentelemetry-proto/src/opentelemetry/proto/version.py
index e97f1318ecd..2c32b963d29 100644
--- 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.6.0"
+__version__ = "1.6.1"
diff --git a/opentelemetry-sdk/setup.cfg b/opentelemetry-sdk/setup.cfg
index bf063a237f7..e4d60a76bba 100644
--- a/opentelemetry-sdk/setup.cfg
+++ b/opentelemetry-sdk/setup.cfg
@@ -42,8 +42,8 @@ packages=find_namespace:
 zip_safe = False
 include_package_data = True
 install_requires =
-    opentelemetry-api == 1.6.0
-    opentelemetry-semantic-conventions == 0.25b0
+    opentelemetry-api == 1.6.1
+    opentelemetry-semantic-conventions == 0.25b1
 
 [options.packages.find]
 where = src
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/version.py b/opentelemetry-sdk/src/opentelemetry/sdk/version.py
index e97f1318ecd..2c32b963d29 100644
--- 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.6.0"
+__version__ = "1.6.1"
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version.py
index 2a05c9b3611..45e421300da 100644
--- 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.25b0"
+__version__ = "0.25b1"
diff --git a/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py b/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py
index e97f1318ecd..2c32b963d29 100644
--- 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.6.0"
+__version__ = "1.6.1"
diff --git a/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version.py b/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version.py
index e97f1318ecd..2c32b963d29 100644
--- 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.6.0"
+__version__ = "1.6.1"
diff --git a/shim/opentelemetry-opentracing-shim/setup.cfg b/shim/opentelemetry-opentracing-shim/setup.cfg
index 3e7277782d7..070289986e3 100644
--- a/shim/opentelemetry-opentracing-shim/setup.cfg
+++ b/shim/opentelemetry-opentracing-shim/setup.cfg
@@ -46,7 +46,7 @@ install_requires =
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.25b0
+    opentelemetry-test == 0.25b1
     opentracing ~= 2.2.0
 
 [options.packages.find]
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
index 2a05c9b3611..45e421300da 100644
--- 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.25b0"
+__version__ = "0.25b1"
diff --git a/tests/util/src/opentelemetry/test/version.py b/tests/util/src/opentelemetry/test/version.py
index 0d5c9e97857..0a930e84190 100644
--- a/tests/util/src/opentelemetry/test/version.py
+++ b/tests/util/src/opentelemetry/test/version.py
@@ -1 +1 @@
-__version__ = "0.25b0"
+__version__ = "0.25b1"

From 1ce2c7b685e918fb0dfcf606dc956f5303201f19 Mon Sep 17 00:00:00 2001
From: Leighton Chen <lechen@microsoft.com>
Date: Mon, 18 Oct 2021 11:33:25 -0700
Subject: [PATCH 2/2] sha

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 192a11d9ca2..f87613669c0 100644
--- 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: c2e674983a265e54c5eb14e376459a992498aae6
+  CONTRIB_REPO_SHA: 95187df38312671ea171b68de8247838d6be65c1
   # 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