diff --git a/.clangd b/.clangd
new file mode 100644
index 000000000000..4c9b7baa6fc4
--- /dev/null
+++ b/.clangd
@@ -0,0 +1,4 @@
+CompileFlags:
+  Add:
+    - --include-directory=/Users/brett.langdon/src/cpython/
+    - --include-directory=/Users/brett.langdon/src/cpython/include/    
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47047c4a1c91..c8e7f92afcf1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 Changelogs for versions not listed here can be found at https://github.com/DataDog/dd-trace-py/releases
 
+---
+
+## 2.8.4
+
+
+### Bug Fixes
+
+- telemetry: This fix resolves an issue when using `pytest` + `gevent` where the telemetry writer was eager initialized by `pytest` entrypoints loading of our plugin causing a potential dead lock.
+
+
 ---
 
 ## 2.7.10
diff --git a/_get_version.py b/_get_version.py
new file mode 100644
index 000000000000..be21885de46c
--- /dev/null
+++ b/_get_version.py
@@ -0,0 +1,13 @@
+def get_version():
+    return "2.9.0"
+
+
+version: str
+
+
+def __getattr__(name: str) -> str:
+    if name == "version":
+        global version
+        version = get_version()
+        return version
+    raise AttributeError(name)
diff --git a/ddtrace/internal/_core.pyi b/ddtrace/internal/_core.pyi
new file mode 100644
index 000000000000..1445cce36e9f
--- /dev/null
+++ b/ddtrace/internal/_core.pyi
@@ -0,0 +1,26 @@
+import typing
+
+class Task:
+    target: typing.Callable[[], None]
+    on_shutdown: typing.Optional[typing.Callable[[], None]]
+
+    def __init__(
+        self,
+        target: typing.Callable[[], None],
+        on_shutdown: typing.Optional[typing.Callable[[], None]],
+    ): ...
+
+class Scheduler:
+    def __init__(self, auto_start: bool = False): ...
+    def register_task(self, task: Task, interval_ms: int) -> None: ...
+    def unregister_task(self, task: Task) -> None: ...
+    def schedule(
+        self,
+        interval_ms: float,
+        target: typing.Callable[[], None],
+        on_shutdown: typing.Optional[typing.Callable[[], None]],
+    ) -> None: ...
+    def start(self) -> None: ...
+    def join(self) -> None: ...
+    def stop(self) -> None: ...
+    def execute_all(self) -> None: ...
diff --git a/hello.zip b/hello.zip
new file mode 100644
index 000000000000..49458dd3fb2b
Binary files /dev/null and b/hello.zip differ
diff --git a/schedule.py b/schedule.py
new file mode 100644
index 000000000000..4aabef3e7320
--- /dev/null
+++ b/schedule.py
@@ -0,0 +1,15 @@
+import time
+
+from ddtrace import tracer
+
+
+for _ in range(100):
+    with tracer.trace("root"):
+        for _ in range(10):
+            with tracer.trace("child1"):
+                time.sleep(0.001)
+        for _ in range(10):
+            with tracer.trace("child2"):
+                time.sleep(0.002)
+
+print("done")