Merge branch 'main' into sabrenner/langchain-patching-fix

Author: sabrenner

tests/contrib/aiohttp/test_aiohttp_client.py

@@ -120,6 +120,7 @@ async def test():
         env["DD_AIOHTTP_CLIENT_DISTRIBUTED_TRACING"] = "false"
     out, err, status, pid = ddtrace_run_python_code_in_subprocess(code, env=env)
     assert status == 0, err
+    assert err == b""
 
 
 @pytest.mark.parametrize("schema_version", [None, "v0", "v1"])
@@ -147,6 +148,7 @@ async def test():
         env["DD_TRACE_SPAN_ATTRIBUTE_SCHEMA"] = schema_version
     out, err, status, pid = ddtrace_run_python_code_in_subprocess(code, env=env)
     assert status == 0, err
+    assert err == b""
 
 
 @pytest.mark.parametrize("schema_version", [None, "v0", "v1"])
@@ -173,6 +175,7 @@ async def test():
         env["DD_TRACE_SPAN_ATTRIBUTE_SCHEMA"] = schema_version
     out, err, status, pid = ddtrace_run_python_code_in_subprocess(code, env=env)
     assert status == 0, err
+    assert err == b""
 
 
 @pytest.mark.snapshot()
@@ -194,6 +197,7 @@ async def test():
     """
     out, err, status, pid = ddtrace_run_python_code_in_subprocess(code, env=os.environ.copy())
     assert status == 0, err
+    assert err == b""
 
 
 @pytest.mark.asyncio

tests/contrib/aiohttp/test_middleware.py

@@ -107,6 +107,7 @@ async def async_test(app_tracer, aiohttp_client):
         env["DD_TRACE_SPAN_ATTRIBUTE_SCHEMA"] = schema_version
     out, err, status, pid = ddtrace_run_python_code_in_subprocess(code, env=env)
     assert status == 0, (err.decode(), out.decode())
+    assert err == b""
 
 
 @pytest.mark.parametrize(

tests/contrib/aiomysql/test_aiomysql.py

@@ -135,6 +135,7 @@ async def test():
         env=env,
     )
     assert status == 0, err
+    assert out == err == b""
 
 
 @pytest.mark.asyncio
@@ -163,6 +164,7 @@ async def test():
         env=env,
     )
     assert status == 0, err
+    assert out == err == b""
 
 
 @pytest.mark.asyncio
@@ -189,6 +191,7 @@ async def test():
         env=env,
     )
     assert status == 0, err
+    assert out == err == b""
 
 
 @pytest.mark.asyncio
@@ -215,6 +218,7 @@ async def test():
         env=env,
     )
     assert status == 0, err
+    assert out == err == b""
 
 
 class AioMySQLTestCase(AsyncioTestCase):

tests/contrib/aredis/test_aredis.py

@@ -182,6 +182,7 @@ async def test(tracer, test_spans):
         env["DD_TRACE_SPAN_ATTRIBUTE_SCHEMA"] = schema
     out, err, status, _ = ddtrace_run_python_code_in_subprocess(code, env=env)
     assert status == 0, (err.decode(), out.decode())
+    assert err == b"", err.decode()
 
 
 @pytest.mark.asyncio

tests/contrib/asgi/test_asgi.py

@@ -237,6 +237,7 @@ async def test(scope, tracer, test_spans):
         env["DD_TRACE_SPAN_ATTRIBUTE_SCHEMA"] = schema_version
     out, err, status, pid = ddtrace_run_python_code_in_subprocess(code, env=env)
     assert status == 0, (err, out)
+    assert err == b"", f"STDOUT\n{out.decode()}\nSTDERR\n{err.decode()}"
 
 
 @pytest.mark.parametrize(
@@ -297,6 +298,7 @@ async def test(scope, tracer, test_spans):
         env["DD_TRACE_SPAN_ATTRIBUTE_SCHEMA"] = schema_version
     out, err, status, pid = ddtrace_run_python_code_in_subprocess(code, env=env)
     assert status == 0, (err, out)
+    assert err == b""
 
 
 @pytest.mark.asyncio

tests/contrib/asyncio/test_lazyimport.py

@@ -1,7 +1,7 @@
 import pytest  # noqa: I001
 
 
-@pytest.mark.subprocess(err=lambda _: True)
+@pytest.mark.subprocess()
 def test_lazy_import():
     import ddtrace.auto  # noqa: F401,I001
     from ddtrace.trace import tracer  # noqa: I001
@@ -18,7 +18,7 @@ def test_lazy_import():
     assert tracer.context_provider.active() is None
 
 
-@pytest.mark.subprocess(err=lambda _: True)
+@pytest.mark.subprocess()
 def test_asyncio_not_imported_by_auto_instrumentation():
     # Module unloading is not supported for asyncio, a simple workaround
     # is to ensure asyncio is not imported by ddtrace.auto or ddtrace-run.

tests/contrib/asyncpg/test_asyncpg.py

@@ -199,6 +199,7 @@ async def test():
     env["DD_TRACE_SPAN_ATTRIBUTE_SCHEMA"] = "v0"
     out, err, status, pid = ddtrace_run_python_code_in_subprocess(code, env=env)
     assert status == 0, err
+    assert err == b""
 
 
 @pytest.mark.snapshot()
@@ -227,6 +228,7 @@ async def test():
     env["DD_TRACE_SPAN_ATTRIBUTE_SCHEMA"] = "v1"
     out, err, status, pid = ddtrace_run_python_code_in_subprocess(code, env=env)
     assert status == 0, err
+    assert err == b""
 
 
 @pytest.mark.snapshot()
@@ -254,6 +256,7 @@ async def test():
     env["DD_TRACE_SPAN_ATTRIBUTE_SCHEMA"] = "v0"
     out, err, status, pid = ddtrace_run_python_code_in_subprocess(code, env=env)
     assert status == 0, err
+    assert err == b""
 
 
 @pytest.mark.snapshot()
@@ -281,6 +284,7 @@ async def test():
     env["DD_TRACE_SPAN_ATTRIBUTE_SCHEMA"] = "v1"
     out, err, status, pid = ddtrace_run_python_code_in_subprocess(code, env=env)
     assert status == 0, err
+    assert err == b""
 
 
 @pytest.mark.snapshot()
@@ -309,6 +313,7 @@ async def test():
     env["DD_TRACE_SPAN_ATTRIBUTE_SCHEMA"] = version
     out, err, status, pid = ddtrace_run_python_code_in_subprocess(code, env=env)
     assert status == 0, err
+    assert err == b""
 
 
 @pytest.mark.skipif(

tests/contrib/azure_servicebus/test_azure_servicebus_snapshot.py

@@ -68,3 +68,4 @@ async def test_producer(ddtrace_run_python_code_in_subprocess, env_vars):
     out, err, status, _ = ddtrace_run_python_code_in_subprocess(helper_path.read_text(), env=env)
 
     assert status == 0, (err.decode(), out.decode())
+    assert err == b"", err.decode()

tests/contrib/dogpile_cache/test_tracing.py

@@ -282,3 +282,4 @@ def test(tracer, single_cache, test_spans):
         env["DD_TRACE_SPAN_ATTRIBUTE_SCHEMA"] = schema_version
     out, err, status, _ = ddtrace_run_python_code_in_subprocess(code, env=env)
     assert status == 0, out.decode()
+    assert err == b"", err.decode()

tests/contrib/elasticsearch/test_async.py

@@ -59,7 +59,9 @@ def do_test(tmpdir, es_module, async_class):
         env=env,
     )
     p.wait()
+    stderr = p.stderr.read()
     stdout = p.stdout.read()
+    assert stderr == b"", stderr
     assert stdout == b"", stdout
     assert p.returncode == 0