Update main after 1.0.0rc1 release (#1603)

lzchen · web-flow · commit a3d23a892d59 · 2021-02-16T09:35:08.000-08:00
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: 74af6ab48505cdb148de46fb12cf0802a199f297
+  CONTRIB_REPO_SHA: 370afa618c30a9773b0594c2ea469518c8b2c274
 
 jobs:
   build:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,15 +4,21 @@ 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/v0.17b0...HEAD)
+## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.0.0rc1...HEAD)
+
+## [1.0.0rc1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.0.0rc1) - 2021-02-12
 
 ### Changed
-- Tracer and Meter provider environment variables are now consistent with the rest
+- Tracer provider environment variables are now consistent with the rest
   ([#1571](https://github.com/open-telemetry/opentelemetry-python/pull/1571)])
 - Rename `TRACE_` to `TRACES_` for environment variables
   ([#1595](https://github.com/open-telemetry/opentelemetry-python/pull/1595)])
 - Limits for Span attributes, events and links have been updated to 128
   ([1597](https://github.com/open-telemetry/opentelemetry-python/pull/1597)])
+- Read-only Span attributes have been moved to ReadableSpan class
+  ([#1560](https://github.com/open-telemetry/opentelemetry-python/pull/1560))
+- `BatchExportSpanProcessor` flushes export queue when it reaches `max_export_batch_size`
+  ([#1521])(https://github.com/open-telemetry/opentelemetry-python/pull/1521)
 
 ### Added
 - Added `end_on_exit` argument to `start_as_current_span`
@@ -23,14 +29,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1480](https://github.com/open-telemetry/opentelemetry-python/pull/1480))
 - Allow missing carrier headers to continue without raising AttributeError
   ([#1545](https://github.com/open-telemetry/opentelemetry-python/pull/1545))
-- Add urllib to opentelemetry-bootstrap target list
-  ([#1584])(https://github.com/open-telemetry/opentelemetry-python/pull/1584)
-
-### Changed
-- Read-only Span attributes have been moved to ReadableSpan class
-  ([#1560](https://github.com/open-telemetry/opentelemetry-python/pull/1560))
-- `BatchExportSpanProcessor` flushes export queue when it reaches `max_export_batch_size`
-  ([#1521])(https://github.com/open-telemetry/opentelemetry-python/pull/1521)
 
 ### Removed
 - Remove Configuration
diff --git a/docs/examples/error_handler/error_handler_0/setup.cfg b/docs/examples/error_handler/error_handler_0/setup.cfg
@@ -37,7 +37,7 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-sdk == 0.18.dev0
+    opentelemetry-sdk == 1.0.0.dev0
 
 [options.packages.find]
 where = src
diff --git a/docs/examples/error_handler/error_handler_1/setup.cfg b/docs/examples/error_handler/error_handler_1/setup.cfg
@@ -37,7 +37,7 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-sdk == 0.18.dev0
+    opentelemetry-sdk == 1.0.0.dev0
 
 [options.packages.find]
 where = src
diff --git a/exporter/opentelemetry-exporter-jaeger/setup.cfg b/exporter/opentelemetry-exporter-jaeger/setup.cfg
@@ -42,8 +42,8 @@ install_requires =
     grpcio >= 1.0.0, < 2.0.0
     googleapis-common-protos ~= 1.52.0
     thrift >= 0.10.0
-    opentelemetry-api == 0.18.dev0
-    opentelemetry-sdk == 0.18.dev0
+    opentelemetry-api == 1.0.0.dev0
+    opentelemetry-sdk == 1.0.0.dev0
 
 [options.packages.find]
 where = src
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__ = "0.18.dev0"
+__version__ = "1.0.0.dev0"
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 == 0.18.dev0
-    opentelemetry-sdk == 0.18.dev0
+    opentelemetry-api == 1.0.0.dev0
+    opentelemetry-sdk == 1.0.0.dev0
     protobuf >= 3.13.0
 
 [options.packages.find]
diff --git a/exporter/opentelemetry-exporter-otlp/setup.cfg b/exporter/opentelemetry-exporter-otlp/setup.cfg
@@ -42,9 +42,9 @@ packages=find_namespace:
 install_requires =
     grpcio >= 1.0.0, < 2.0.0
     googleapis-common-protos ~= 1.52.0
-    opentelemetry-api == 0.18.dev0
-    opentelemetry-sdk == 0.18.dev0
-    opentelemetry-proto == 0.18.dev0
+    opentelemetry-api == 1.0.0.dev0
+    opentelemetry-sdk == 1.0.0.dev0
+    opentelemetry-proto == 1.0.0.dev0
     backoff ~= 1.10.0
 
 [options.extras_require]
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__ = "0.18.dev0"
+__version__ = "1.0.0.dev0"
diff --git a/exporter/opentelemetry-exporter-zipkin/setup.cfg b/exporter/opentelemetry-exporter-zipkin/setup.cfg
@@ -42,8 +42,8 @@ packages=find_namespace:
 install_requires =
     protobuf >= 3.12
     requests ~= 2.7
-    opentelemetry-api == 0.18.dev0
-    opentelemetry-sdk == 0.18.dev0
+    opentelemetry-api == 1.0.0.dev0
+    opentelemetry-sdk == 1.0.0.dev0
 
 [options.packages.find]
 where = src
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__ = "0.18.dev0"
+__version__ = "1.0.0.dev0"
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__ = "0.18.dev0"
+__version__ = "1.0.0.dev0"
diff --git a/opentelemetry-distro/setup.cfg b/opentelemetry-distro/setup.cfg
@@ -41,8 +41,8 @@ packages=find_namespace:
 zip_safe = False
 include_package_data = True
 install_requires =
-    opentelemetry-api == 0.18.dev0
-    opentelemetry-sdk == 0.18.dev0
+    opentelemetry-api == 1.0.0.dev0
+    opentelemetry-sdk == 1.0.0.dev0
 
 [options.packages.find]
 where = src
@@ -56,4 +56,4 @@ opentelemetry_configurator =
 [options.extras_require]
 test =
 otlp =
-    opentelemetry-exporter-otlp == 0.18.dev0
+    opentelemetry-exporter-otlp == 1.0.0.dev0
diff --git a/opentelemetry-instrumentation/setup.cfg b/opentelemetry-instrumentation/setup.cfg
@@ -42,7 +42,7 @@ packages=find_namespace:
 zip_safe = False
 include_package_data = True
 install_requires =
-    opentelemetry-api == 0.18.dev0
+    opentelemetry-api == 1.0.0.dev0
     wrapt >= 1.0.0, < 2.0.0
 
 [options.packages.find]
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__ = "0.18.dev0"
+__version__ = "1.0.0.dev0"
diff --git a/opentelemetry-sdk/setup.cfg b/opentelemetry-sdk/setup.cfg
@@ -42,7 +42,7 @@ packages=find_namespace:
 zip_safe = False
 include_package_data = True
 install_requires =
-    opentelemetry-api == 0.18.dev0
+    opentelemetry-api == 1.0.0.dev0
 
 [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__ = "0.18.dev0"
+__version__ = "1.0.0.dev0"
diff --git a/propagator/opentelemetry-propagator-b3/setup.cfg b/propagator/opentelemetry-propagator-b3/setup.cfg
@@ -40,7 +40,7 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 0.18.dev0
+    opentelemetry-api == 1.0.0.dev0
 
 [options.extras_require]
 test =
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__ = "0.18.dev0"
+__version__ = "1.0.0.dev0"
diff --git a/propagator/opentelemetry-propagator-jaeger/setup.cfg b/propagator/opentelemetry-propagator-jaeger/setup.cfg
@@ -40,7 +40,7 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 0.18.dev0
+    opentelemetry-api == 1.0.0.dev0
 
 [options.extras_require]
 test =
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__ = "0.18.dev0"
+__version__ = "1.0.0.dev0"
diff --git a/shim/opentelemetry-opentracing-shim/setup.cfg b/shim/opentelemetry-opentracing-shim/setup.cfg
@@ -42,7 +42,7 @@ packages=find_namespace:
 install_requires =
     Deprecated >= 1.2.6
     opentracing ~= 2.0
-    opentelemetry-api == 0.18.dev0
+    opentelemetry-api == 1.0.0.dev0
 
 [options.extras_require]
 test =
diff --git a/tests/util/setup.cfg b/tests/util/setup.cfg
@@ -38,8 +38,8 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 0.18.dev0
-    opentelemetry-sdk == 0.18.dev0
+    opentelemetry-api == 1.0.0.dev0
+    opentelemetry-sdk == 1.0.0.dev0
 
 [options.extras_require]
 test = flask~=1.0
