Merge branch 'main' into release/1.5.0-0.24b0

open-telemetry · Aug 25, 2021 · 3ad534c · 3ad534c
2 parents 2b1f099 + c6976fc
commit 3ad534c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,9 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.5.0-0.24b0...HEAD)
 
-## [1.5.0-0.24b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.5.0-0.24b0) - 2021-08-25
-
-
+## [1.5.0-0.24b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.5.0-0.24b0) - 2021-08-26
 
 ### Added
 - `opentelemetry-sdk-extension-aws` Add AWS resource detectors to extension package

diff --git a/tests/opentelemetry-docker-tests/tests/celery/conftest.py b/tests/opentelemetry-docker-tests/tests/celery/conftest.py
@@ -70,7 +70,7 @@ def instrument(tracer_provider, memory_exporter):
     CeleryInstrumentor().uninstrument()
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="function")
 def tracer_provider(memory_exporter):
     original_tracer_provider = trace_api.get_tracer_provider()
 
@@ -86,7 +86,7 @@ def tracer_provider(memory_exporter):
     trace_api.set_tracer_provider(original_tracer_provider)
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="function")
 def memory_exporter():
     memory_exporter = InMemorySpanExporter()
     return memory_exporter