From dfd298064b20ed83622201abde1a738e658509a2 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Fri, 16 Jul 2021 10:30:48 -0600
Subject: [PATCH] Revert "updating changelogs and version to 1.4.0-0.23b0
 (#1956)" (#1962)

This reverts commit bb41b81093d4010dadb233f146e8ba04973ec5a3.
---
 .github/workflows/test.yml                               | 2 +-
 CHANGELOG.md                                             | 9 +++------
 eachdist.ini                                             | 4 ++--
 .../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 +-
 .../opentelemetry-exporter-otlp-proto-grpc/setup.cfg     | 2 +-
 .../opentelemetry/exporter/otlp/proto/grpc/version.py    | 2 +-
 exporter/opentelemetry-exporter-otlp/setup.cfg           | 2 +-
 .../src/opentelemetry/exporter/otlp/version.py           | 2 +-
 .../src/opentelemetry/exporter/zipkin/json/version.py    | 2 +-
 .../opentelemetry-exporter-zipkin-proto-http/setup.cfg   | 2 +-
 .../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-distro/setup.cfg                           | 6 +++---
 opentelemetry-distro/src/opentelemetry/distro/version.py | 2 +-
 opentelemetry-proto/src/opentelemetry/proto/version.py   | 2 +-
 opentelemetry-sdk/setup.cfg                              | 6 +++---
 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 +-
 29 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 04004e76e2..7e2acbe3a6 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: 7e9964d788c2f91697a682d5f0d01bcfeedf9524
+  CONTRIB_REPO_SHA: c100b21fa40727709bb31cf4e2b67b737a09ea2c
 
 jobs:
   build:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd7c46fa7a..3a311bbdae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,9 @@ 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.4.0-0.23b0...HEAD)
-
-## [1.4.0-0.23b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.4.0-0.23b0) - 2021-07-14
-
+## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.3.0-0.22b0...HEAD)
+- `opentelemetry-semantic-conventions` Generate semconv constants update for OTel Spec 1.5.0
+  ([#1946](https://github.com/open-telemetry/opentelemetry-python/pull/1946))
 
 ### Added
 - Dropped attributes/events/links count available exposed on ReadableSpans.
@@ -16,8 +15,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1893](https://github.com/open-telemetry/opentelemetry-python/pull/1893))
 
 ### Changed
-- `opentelemetry-semantic-conventions` Generate semconv constants update for OTel Spec 1.5.0
-  ([#1946](https://github.com/open-telemetry/opentelemetry-python/pull/1946))
 - Updated `opentelemetry-opencensus-exporter` to use `service_name` of spans instead of resource
   ([#1897](https://github.com/open-telemetry/opentelemetry-python/pull/1897))
 - Added descriptions to the env variables mentioned in the opentelemetry-specification
diff --git a/eachdist.ini b/eachdist.ini
index f574d5f830..ae202e7232 100644
--- a/eachdist.ini
+++ b/eachdist.ini
@@ -13,7 +13,7 @@ sortfirst=
     exporter/*
 
 [stable]
-version=1.4.0
+version=1.4.0.dev0
 
 packages=
     opentelemetry-sdk
@@ -31,7 +31,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.23b0
+version=0.23.dev0
 
 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 f8cc727b10..c173c28d8d 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.4.0"
+__version__ = "1.4.0.dev0"
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 f8cc727b10..c173c28d8d 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.4.0"
+__version__ = "1.4.0.dev0"
diff --git a/exporter/opentelemetry-exporter-jaeger/setup.cfg b/exporter/opentelemetry-exporter-jaeger/setup.cfg
index 3dc9b0c5ee..faa9d40a3a 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.4.0
-    opentelemetry-exporter-jaeger-thrift == 1.4.0
+    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
index f8cc727b10..c173c28d8d 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.4.0"
+__version__ = "1.4.0.dev0"
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 7318f8dca8..c829b95757 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.23b0"
+__version__ = "0.23.dev0"
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg b/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg
index 147b4869fd..a9b5c5b558 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.4.0
+    opentelemetry-proto == 1.4.0.dev0
     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 e0982da0fa..48c4fb840e 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.4.0"
+__version__ = "1.4.0.dev0"
diff --git a/exporter/opentelemetry-exporter-otlp/setup.cfg b/exporter/opentelemetry-exporter-otlp/setup.cfg
index 4cd76408ec..d4a891e173 100644
--- a/exporter/opentelemetry-exporter-otlp/setup.cfg
+++ b/exporter/opentelemetry-exporter-otlp/setup.cfg
@@ -38,4 +38,4 @@ classifiers =
 python_requires = >=3.6
 packages=find_namespace:
 install_requires =
-    opentelemetry-exporter-otlp-proto-grpc == 1.4.0
+    opentelemetry-exporter-otlp-proto-grpc == 1.4.0.dev0
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 e0982da0fa..48c4fb840e 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.4.0"
+__version__ = "1.4.0.dev0"
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 e0982da0fa..48c4fb840e 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.4.0"
+__version__ = "1.4.0.dev0"
diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg b/exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg
index 507693ef4f..bee166fd53 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.4.0
+    opentelemetry-exporter-zipkin-json == 1.4.0.dev0
 
 [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 e0982da0fa..48c4fb840e 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.4.0"
+__version__ = "1.4.0.dev0"
diff --git a/exporter/opentelemetry-exporter-zipkin/setup.cfg b/exporter/opentelemetry-exporter-zipkin/setup.cfg
index 529a0e5bc0..0b1a832ed7 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.4.0
-    opentelemetry-exporter-zipkin-proto-http == 1.4.0
+    opentelemetry-exporter-zipkin-json == 1.4.0.dev0
+    opentelemetry-exporter-zipkin-proto-http == 1.4.0.dev0
 
 [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 e0982da0fa..48c4fb840e 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.4.0"
+__version__ = "1.4.0.dev0"
diff --git a/opentelemetry-api/src/opentelemetry/version.py b/opentelemetry-api/src/opentelemetry/version.py
index e0982da0fa..48c4fb840e 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.4.0"
+__version__ = "1.4.0.dev0"
diff --git a/opentelemetry-distro/setup.cfg b/opentelemetry-distro/setup.cfg
index e616635e7f..74b3436f1d 100644
--- 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.23b0
-    opentelemetry-sdk == 1.4.0
+    opentelemetry-instrumentation == 0.23.dev0
+    opentelemetry-sdk == 1.4.0.dev0
 
 [options.packages.find]
 where = src
@@ -57,4 +57,4 @@ opentelemetry_configurator =
 [options.extras_require]
 test =
 otlp =
-    opentelemetry-exporter-otlp == 1.4.0
+    opentelemetry-exporter-otlp == 1.4.0.dev0
diff --git a/opentelemetry-distro/src/opentelemetry/distro/version.py b/opentelemetry-distro/src/opentelemetry/distro/version.py
index 7318f8dca8..c829b95757 100644
--- 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.23b0"
+__version__ = "0.23.dev0"
diff --git a/opentelemetry-proto/src/opentelemetry/proto/version.py b/opentelemetry-proto/src/opentelemetry/proto/version.py
index e0982da0fa..48c4fb840e 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.4.0"
+__version__ = "1.4.0.dev0"
diff --git a/opentelemetry-sdk/setup.cfg b/opentelemetry-sdk/setup.cfg
index 62c7155f1a..3df5e31ed4 100644
--- 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.4.0
-    opentelemetry-semantic-conventions == 0.23b0
-    opentelemetry-instrumentation == 0.23b0
+    opentelemetry-api == 1.4.0.dev0
+    opentelemetry-semantic-conventions == 0.23.dev0
+    opentelemetry-instrumentation == 0.23.dev0
 
 [options.packages.find]
 where = src
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/version.py b/opentelemetry-sdk/src/opentelemetry/sdk/version.py
index e0982da0fa..48c4fb840e 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.4.0"
+__version__ = "1.4.0.dev0"
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version.py
index 7318f8dca8..c829b95757 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.23b0"
+__version__ = "0.23.dev0"
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 e0982da0fa..48c4fb840e 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.4.0"
+__version__ = "1.4.0.dev0"
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 e0982da0fa..48c4fb840e 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.4.0"
+__version__ = "1.4.0.dev0"
diff --git a/shim/opentelemetry-opentracing-shim/setup.cfg b/shim/opentelemetry-opentracing-shim/setup.cfg
index 54d50f7b73..2b7db534bf 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.23b0
+    opentelemetry-test == 0.23.dev0
     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 7318f8dca8..c829b95757 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.23b0"
+__version__ = "0.23.dev0"
diff --git a/tests/util/src/opentelemetry/test/version.py b/tests/util/src/opentelemetry/test/version.py
index 08a78866dc..12f7794562 100644
--- a/tests/util/src/opentelemetry/test/version.py
+++ b/tests/util/src/opentelemetry/test/version.py
@@ -1 +1 @@
-__version__ = "0.23b0"
+__version__ = "0.23.dev0"