Merge branch 'master' into asyncpg-skip-params-by-default

open-telemetry · Jun 26, 2020 · 9bd26a2 · 9bd26a2
2 parents 0db856b + 3c366b2
commit 9bd26a2
Show file tree

Hide file tree

Showing 84 changed files with 184 additions and 145 deletions.
diff --git a/docs/examples/opentelemetry-example-app/setup.cfg b/docs/examples/opentelemetry-example-app/setup.cfg
@@ -43,10 +43,10 @@ zip_safe = False
 include_package_data = True
 install_requires = 
     typing; python_version<'3.5'
-    opentelemetry-api == 0.10.dev0
-    opentelemetry-sdk == 0.10.dev0
-    opentelemetry-ext-requests == 0.10.dev0
-    opentelemetry-ext-flask == 0.10.dev0
+    opentelemetry-api == 0.11.dev0
+    opentelemetry-sdk == 0.11.dev0
+    opentelemetry-ext-requests == 0.11.dev0
+    opentelemetry-ext-flask == 0.11.dev0
     flask
     requests
     protobuf~=3.11

diff --git a/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/version.py b/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.10.dev0"
+__version__ = "0.11.dev0"
diff --git a/ext/opentelemetry-exporter-cloud-monitoring/CHANGELOG.md b/ext/opentelemetry-exporter-cloud-monitoring/CHANGELOG.md
@@ -2,7 +2,11 @@
 
 ## Unreleased
 
-- Add ability for exporter to add unique identifier 
+## Version 0.10b0
+
+Released 2020-06-23
+
+- Add ability for exporter to add unique identifier
   ([#841](https://github.com/open-telemetry/opentelemetry-python/pull/841))
 - Added tests to tox coverage files
   ([#804](https://github.com/open-telemetry/opentelemetry-python/pull/804))

diff --git a/...elemetry-exporter-cloud-monitoring/src/opentelemetry/exporter/cloud_monitoring/version.py b/...elemetry-exporter-cloud-monitoring/src/opentelemetry/exporter/cloud_monitoring/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.10.dev0"
+__version__ = "0.11.dev0"
diff --git a/ext/opentelemetry-exporter-cloud-trace/CHANGELOG.md b/ext/opentelemetry-exporter-cloud-trace/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## Version 0.10b0
+
+Released 2020-06-23
+
 - Add g.co/agent label for Google internal metrics tracking
   ([#833](https://github.com/open-telemetry/opentelemetry-python/pull/833))
 - Adding trouble-shooting tips

diff --git a/ext/opentelemetry-exporter-cloud-trace/src/opentelemetry/exporter/cloud_trace/version.py b/ext/opentelemetry-exporter-cloud-trace/src/opentelemetry/exporter/cloud_trace/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.10.dev0"
+__version__ = "0.11.dev0"
diff --git a/ext/opentelemetry-ext-aiohttp-client/setup.cfg b/ext/opentelemetry-ext-aiohttp-client/setup.cfg
@@ -39,8 +39,8 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api >= 0.10.dev0
-    opentelemetry-instrumentation == 0.10.dev0
+    opentelemetry-api >= 0.11.dev0
+    opentelemetry-instrumentation == 0.11.dev0
     aiohttp ~= 3.0
 
 [options.packages.find]

diff --git a/ext/opentelemetry-ext-aiohttp-client/src/opentelemetry/ext/aiohttp_client/version.py b/ext/opentelemetry-ext-aiohttp-client/src/opentelemetry/ext/aiohttp_client/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.10.dev0"
+__version__ = "0.11.dev0"
diff --git a/ext/opentelemetry-ext-asgi/setup.cfg b/ext/opentelemetry-ext-asgi/setup.cfg
@@ -39,8 +39,8 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 0.10.dev0
-    opentelemetry-instrumentation == 0.10.dev0
+    opentelemetry-api == 0.11.dev0
+    opentelemetry-instrumentation == 0.11.dev0
     asgiref ~= 3.0
 
 [options.extras_require]

diff --git a/ext/opentelemetry-ext-asgi/src/opentelemetry/ext/asgi/version.py b/ext/opentelemetry-ext-asgi/src/opentelemetry/ext/asgi/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.10.dev0"
+__version__ = "0.11.dev0"
diff --git a/ext/opentelemetry-ext-asyncpg/CHANGELOG.md b/ext/opentelemetry-ext-asyncpg/CHANGELOG.md
@@ -2,4 +2,8 @@
 
 ## Unreleased
 
+## Version 0.10b0
+
+Released 2020-06-23
+
 - Initial Release ([#814](https://github.com/open-telemetry/opentelemetry-python/pull/814))
diff --git a/ext/opentelemetry-ext-asyncpg/setup.cfg b/ext/opentelemetry-ext-asyncpg/setup.cfg
@@ -39,13 +39,13 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 0.10.dev0
-    opentelemetry-instrumentation == 0.10.dev0
+    opentelemetry-api == 0.11.dev0
+    opentelemetry-instrumentation == 0.11.dev0
     asyncpg >= 0.12.0
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.10.dev0
+    opentelemetry-test == 0.11.dev0
 
 [options.packages.find]
 where = src

diff --git a/ext/opentelemetry-ext-asyncpg/src/opentelemetry/ext/asyncpg/version.py b/ext/opentelemetry-ext-asyncpg/src/opentelemetry/ext/asyncpg/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.10.dev0"
+__version__ = "0.11.dev0"
diff --git a/ext/opentelemetry-ext-boto/setup.cfg b/ext/opentelemetry-ext-boto/setup.cfg
@@ -41,14 +41,14 @@ package_dir=
 packages=find_namespace:
 install_requires =
     boto ~= 2.0
-    opentelemetry-api == 0.10.dev0
-    opentelemetry-instrumentation == 0.10.dev0
+    opentelemetry-api == 0.11.dev0
+    opentelemetry-instrumentation == 0.11.dev0
 
 [options.extras_require]
 test =
     boto~=2.0
     moto~=1.0
-    opentelemetry-test == 0.10.dev0
+    opentelemetry-test == 0.11.dev0
 
 [options.packages.find]
 where = src

diff --git a/ext/opentelemetry-ext-boto/src/opentelemetry/ext/boto/version.py b/ext/opentelemetry-ext-boto/src/opentelemetry/ext/boto/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.10.dev0"
+__version__ = "0.11.dev0"
diff --git a/ext/opentelemetry-ext-botocore/setup.cfg b/ext/opentelemetry-ext-botocore/setup.cfg
@@ -41,13 +41,13 @@ package_dir=
 packages=find_namespace:
 install_requires =
     botocore ~= 1.0
-    opentelemetry-api == 0.10.dev0
-    opentelemetry-instrumentation == 0.10.dev0
+    opentelemetry-api == 0.11.dev0
+    opentelemetry-instrumentation == 0.11.dev0
 
 [options.extras_require]
 test =
     moto ~= 1.0
-    opentelemetry-test == 0.10.dev0
+    opentelemetry-test == 0.11.dev0
 
 [options.packages.find]
 where = src

diff --git a/ext/opentelemetry-ext-botocore/src/opentelemetry/ext/botocore/version.py b/ext/opentelemetry-ext-botocore/src/opentelemetry/ext/botocore/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.10.dev0"
+__version__ = "0.11.dev0"
diff --git a/ext/opentelemetry-ext-celery/CHANGELOG.md b/ext/opentelemetry-ext-celery/CHANGELOG.md
@@ -2,4 +2,8 @@
 
 ## Unreleased
 
+## Version 0.10b0
+
+Released 2020-06-23
+
 - Add instrumentation for Celery ([#780](https://github.com/open-telemetry/opentelemetry-python/pull/780))
diff --git a/ext/opentelemetry-ext-celery/setup.cfg b/ext/opentelemetry-ext-celery/setup.cfg
@@ -39,14 +39,14 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 0.10.dev0
-    opentelemetry-instrumentation == 0.10.dev0
+    opentelemetry-api == 0.11.dev0
+    opentelemetry-instrumentation == 0.11.dev0
     celery ~= 4.0
 
 [options.extras_require]
 test =
     pytest
-    opentelemetry-test == 0.10.dev0
+    opentelemetry-test == 0.11.dev0
 
 [options.packages.find]
 where = src

diff --git a/ext/opentelemetry-ext-celery/src/opentelemetry/ext/celery/version.py b/ext/opentelemetry-ext-celery/src/opentelemetry/ext/celery/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.10.dev0"
+__version__ = "0.11.dev0"
diff --git a/ext/opentelemetry-ext-datadog/src/opentelemetry/ext/datadog/version.py b/ext/opentelemetry-ext-datadog/src/opentelemetry/ext/datadog/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.10.dev0"
+__version__ = "0.11.dev0"
diff --git a/ext/opentelemetry-ext-dbapi/setup.cfg b/ext/opentelemetry-ext-dbapi/setup.cfg
@@ -40,13 +40,13 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 0.10.dev0
-    opentelemetry-instrumentation == 0.10.dev0
+    opentelemetry-api == 0.11.dev0
+    opentelemetry-instrumentation == 0.11.dev0
     wrapt >= 1.0.0, < 2.0.0
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.10.dev0
+    opentelemetry-test == 0.11.dev0
 
 [options.packages.find]
 where = src
diff --git a/ext/opentelemetry-ext-dbapi/src/opentelemetry/ext/dbapi/version.py b/ext/opentelemetry-ext-dbapi/src/opentelemetry/ext/dbapi/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.10.dev0"
+__version__ = "0.11.dev0"
diff --git a/ext/opentelemetry-ext-django/setup.cfg b/ext/opentelemetry-ext-django/setup.cfg
@@ -41,13 +41,13 @@ package_dir=
 packages=find_namespace:
 install_requires =
     django >= 1.10
-    opentelemetry-ext-wsgi == 0.10.dev0
-    opentelemetry-instrumentation == 0.10.dev0
-    opentelemetry-api == 0.10.dev0
+    opentelemetry-ext-wsgi == 0.11.dev0
+    opentelemetry-instrumentation == 0.11.dev0
+    opentelemetry-api == 0.11.dev0
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.10.dev0
+    opentelemetry-test == 0.11.dev0
 
 [options.packages.find]
 where = src

diff --git a/ext/opentelemetry-ext-django/src/opentelemetry/ext/django/version.py b/ext/opentelemetry-ext-django/src/opentelemetry/ext/django/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.10.dev0"
+__version__ = "0.11.dev0"
diff --git a/ext/opentelemetry-ext-docker-tests/tests/celery/test_celery_functional.py b/ext/opentelemetry-ext-docker-tests/tests/celery/test_celery_functional.py
@@ -27,6 +27,9 @@
 from opentelemetry.sdk.trace import TracerProvider, export
 from opentelemetry.trace.status import StatusCanonicalCode
 
+# set a high timeout for async executions due to issues in CI
+ASYNC_GET_TIMEOUT = 120
+
 
 class MyException(Exception):
     pass
@@ -38,7 +41,7 @@ def fn_task():
         return 42
 
     result = fn_task.apply_async()
-    assert result.get() == 42
+    assert result.get(timeout=ASYNC_GET_TIMEOUT) == 42
 
     spans = memory_exporter.get_finished_spans()
     assert len(spans) == 2
@@ -144,7 +147,7 @@ def fn_task_parameters(user, force_logout=False):
     result = fn_task_parameters.apply_async(
         args=["user"], kwargs={"force_logout": True}
     )
-    assert result.get(timeout=10) == ["user", True]
+    assert result.get(timeout=ASYNC_GET_TIMEOUT) == ["user", True]
 
     spans = memory_exporter.get_finished_spans()
     assert len(spans) == 2
@@ -181,7 +184,7 @@ def fn_task():
     results = [fn_task.delay() for _ in range(100)]
 
     for result in results:
-        assert result.get(timeout=1) == 42
+        assert result.get(timeout=ASYNC_GET_TIMEOUT) == 42
 
     spans = memory_exporter.get_finished_spans()
 
@@ -194,7 +197,7 @@ def fn_task_parameters(user, force_logout=False):
         return (user, force_logout)
 
     result = fn_task_parameters.delay("user", force_logout=True)
-    assert result.get(timeout=10) == ["user", True]
+    assert result.get(timeout=ASYNC_GET_TIMEOUT) == ["user", True]
 
     spans = memory_exporter.get_finished_spans()
     assert len(spans) == 2
@@ -448,7 +451,7 @@ def run(self, *args, **kwargs):
                 # avoid call loop
                 return
             CelerySubClass.apply_async(args=[], kwargs={"stop": True}).get(
-                timeout=10
+                timeout=ASYNC_GET_TIMEOUT
             )
 
     class CelerySubClass(CelerySuperClass):

diff --git a/ext/opentelemetry-ext-elasticsearch/CHANGELOG.md b/ext/opentelemetry-ext-elasticsearch/CHANGELOG.md
@@ -2,4 +2,8 @@
 
 ## Unreleased
 
+## Version 0.10b0
+
+Released 2020-06-23
+
 - Initial release
diff --git a/ext/opentelemetry-ext-elasticsearch/setup.cfg b/ext/opentelemetry-ext-elasticsearch/setup.cfg
@@ -40,14 +40,14 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 0.10.dev0
-    opentelemetry-instrumentation == 0.10.dev0
+    opentelemetry-api == 0.11.dev0
+    opentelemetry-instrumentation == 0.11.dev0
     wrapt >= 1.0.0, < 2.0.0
     elasticsearch >= 2.0
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.10.dev0
+    opentelemetry-test == 0.11.dev0
     elasticsearch-dsl >= 2.0
 
 [options.packages.find]

diff --git a/ext/opentelemetry-ext-elasticsearch/src/opentelemetry/ext/elasticsearch/version.py b/ext/opentelemetry-ext-elasticsearch/src/opentelemetry/ext/elasticsearch/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.10.dev0"
+__version__ = "0.11.dev0"
diff --git a/ext/opentelemetry-ext-flask/setup.cfg b/ext/opentelemetry-ext-flask/setup.cfg
@@ -41,14 +41,14 @@ package_dir=
 packages=find_namespace:
 install_requires =
     flask ~= 1.0
-    opentelemetry-ext-wsgi == 0.10.dev0
-    opentelemetry-instrumentation == 0.10.dev0
-    opentelemetry-api == 0.10.dev0
+    opentelemetry-ext-wsgi == 0.11.dev0
+    opentelemetry-instrumentation == 0.11.dev0
+    opentelemetry-api == 0.11.dev0
 
 [options.extras_require]
 test =
     flask~=1.0
-    opentelemetry-test == 0.10.dev0
+    opentelemetry-test == 0.11.dev0
 
 [options.packages.find]
 where = src
diff --git a/ext/opentelemetry-ext-flask/src/opentelemetry/ext/flask/version.py b/ext/opentelemetry-ext-flask/src/opentelemetry/ext/flask/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.10.dev0"
+__version__ = "0.11.dev0"
diff --git a/ext/opentelemetry-ext-grpc/setup.cfg b/ext/opentelemetry-ext-grpc/setup.cfg
@@ -40,13 +40,13 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 0.10.dev0
+    opentelemetry-api == 0.11.dev0
     grpcio ~= 1.27
 
 [options.extras_require]
 test =
-    opentelemetry-test == 0.10.dev0
-    opentelemetry-sdk == 0.10.dev0
+    opentelemetry-test == 0.11.dev0
+    opentelemetry-sdk == 0.11.dev0
 
 [options.packages.find]
 where = src
diff --git a/ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/version.py b/ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.10.dev0"
+__version__ = "0.11.dev0"