Merge branch 'main' into upgrade-latest-langchain-version

Author: quinna-h

.gitlab/services.yml

@@ -12,7 +12,7 @@
       DD_REMOTE_CONFIGURATION_REFRESH_INTERVAL: 5s
       DD_DOGSTATSD_NON_LOCAL_TRAFFIC: true
   testagent:
-    name: registry.ddbuild.io/images/mirror/dd-apm-test-agent/ddapm-test-agent:v1.28.0
+    name: registry.ddbuild.io/images/mirror/dd-apm-test-agent/ddapm-test-agent:v1.29.1
     alias: testagent
     variables:
       LOG_LEVEL: ERROR

.riot/requirements/1911f94.txt

@@ -0,0 +1,51 @@
+#
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/1911f94.in
+#
+annotated-types==0.7.0
+anyio==4.9.0
+attrs==25.3.0
+certifi==2025.7.14
+charset-normalizer==3.4.2
+coverage[toml]==7.9.2
+distro==1.9.0
+exceptiongroup==1.3.0
+h11==0.16.0
+httpcore==1.0.9
+httpx==0.28.1
+hypothesis==6.45.0
+idna==3.10
+iniconfig==2.1.0
+jiter==0.10.0
+mock==5.2.0
+multidict==6.6.3
+openai==1.66.0
+opentracing==2.4.0
+packaging==25.0
+pillow==11.3.0
+pluggy==1.6.0
+propcache==0.3.2
+pydantic==2.11.7
+pydantic-core==2.33.2
+pygments==2.19.2
+pytest==8.4.1
+pytest-asyncio==0.21.1
+pytest-cov==6.2.1
+pytest-mock==3.14.1
+pytest-randomly==3.16.0
+pyyaml==6.0.2
+regex==2024.11.6
+requests==2.32.4
+sniffio==1.3.1
+sortedcontainers==2.4.0
+tiktoken==0.9.0
+tomli==2.2.1
+tqdm==4.67.1
+typing-extensions==4.14.1
+typing-inspection==0.4.1
+urllib3==1.26.20
+vcrpy==7.0.0
+wrapt==1.17.2
+yarl==1.20.1

.riot/requirements/1a0657d.txt

@@ -0,0 +1,49 @@
+#
+# This file is autogenerated by pip-compile with Python 3.13
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/1a0657d.in
+#
+annotated-types==0.7.0
+anyio==4.9.0
+attrs==25.3.0
+certifi==2025.7.14
+charset-normalizer==3.4.2
+coverage[toml]==7.9.2
+distro==1.9.0
+h11==0.16.0
+httpcore==1.0.9
+httpx==0.28.1
+hypothesis==6.45.0
+idna==3.10
+iniconfig==2.1.0
+jiter==0.10.0
+mock==5.2.0
+multidict==6.6.3
+openai==1.66.0
+opentracing==2.4.0
+packaging==25.0
+pillow==11.3.0
+pluggy==1.6.0
+propcache==0.3.2
+pydantic==2.11.7
+pydantic-core==2.33.2
+pygments==2.19.2
+pytest==8.4.1
+pytest-asyncio==0.21.1
+pytest-cov==6.2.1
+pytest-mock==3.14.1
+pytest-randomly==3.16.0
+pyyaml==6.0.2
+regex==2024.11.6
+requests==2.32.4
+sniffio==1.3.1
+sortedcontainers==2.4.0
+tiktoken==0.9.0
+tqdm==4.67.1
+typing-extensions==4.14.1
+typing-inspection==0.4.1
+urllib3==1.26.20
+vcrpy==7.0.0
+wrapt==1.17.2
+yarl==1.20.1

.riot/requirements/85ff44d.txt

@@ -0,0 +1,49 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/85ff44d.in
+#
+annotated-types==0.7.0
+anyio==4.9.0
+attrs==25.3.0
+certifi==2025.7.14
+charset-normalizer==3.4.2
+coverage[toml]==7.9.2
+distro==1.9.0
+h11==0.16.0
+httpcore==1.0.9
+httpx==0.28.1
+hypothesis==6.45.0
+idna==3.10
+iniconfig==2.1.0
+jiter==0.10.0
+mock==5.2.0
+multidict==6.6.3
+openai==1.66.0
+opentracing==2.4.0
+packaging==25.0
+pillow==11.3.0
+pluggy==1.6.0
+propcache==0.3.2
+pydantic==2.11.7
+pydantic-core==2.33.2
+pygments==2.19.2
+pytest==8.4.1
+pytest-asyncio==0.21.1
+pytest-cov==6.2.1
+pytest-mock==3.14.1
+pytest-randomly==3.16.0
+pyyaml==6.0.2
+regex==2024.11.6
+requests==2.32.4
+sniffio==1.3.1
+sortedcontainers==2.4.0
+tiktoken==0.9.0
+tqdm==4.67.1
+typing-extensions==4.14.1
+typing-inspection==0.4.1
+urllib3==1.26.20
+vcrpy==7.0.0
+wrapt==1.17.2
+yarl==1.20.1

.riot/requirements/b68c552.txt

@@ -0,0 +1,51 @@
+#
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/b68c552.in
+#
+annotated-types==0.7.0
+anyio==4.5.2
+attrs==25.3.0
+certifi==2025.7.14
+charset-normalizer==3.4.2
+coverage[toml]==7.6.1
+distro==1.9.0
+exceptiongroup==1.3.0
+h11==0.16.0
+httpcore==1.0.9
+httpx==0.28.1
+hypothesis==6.45.0
+idna==3.10
+importlib-metadata==8.5.0
+iniconfig==2.1.0
+jiter==0.9.1
+mock==5.2.0
+multidict==6.1.0
+openai==1.66.0
+opentracing==2.4.0
+packaging==25.0
+pillow==10.4.0
+pluggy==1.5.0
+propcache==0.2.0
+pydantic==2.10.6
+pydantic-core==2.27.2
+pytest==8.3.5
+pytest-asyncio==0.21.1
+pytest-cov==5.0.0
+pytest-mock==3.14.1
+pytest-randomly==3.15.0
+pyyaml==6.0.2
+regex==2024.11.6
+requests==2.32.4
+sniffio==1.3.1
+sortedcontainers==2.4.0
+tiktoken==0.7.0
+tomli==2.2.1
+tqdm==4.67.1
+typing-extensions==4.13.2
+urllib3==1.26.20
+vcrpy==6.0.2
+wrapt==1.17.2
+yarl==1.15.2
+zipp==3.20.2

.riot/requirements/c5399d2.txt

@@ -0,0 +1,49 @@
+#
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/c5399d2.in
+#
+annotated-types==0.7.0
+anyio==4.9.0
+attrs==25.3.0
+certifi==2025.7.14
+charset-normalizer==3.4.2
+coverage[toml]==7.9.2
+distro==1.9.0
+h11==0.16.0
+httpcore==1.0.9
+httpx==0.28.1
+hypothesis==6.45.0
+idna==3.10
+iniconfig==2.1.0
+jiter==0.10.0
+mock==5.2.0
+multidict==6.6.3
+openai==1.66.0
+opentracing==2.4.0
+packaging==25.0
+pillow==11.3.0
+pluggy==1.6.0
+propcache==0.3.2
+pydantic==2.11.7
+pydantic-core==2.33.2
+pygments==2.19.2
+pytest==8.4.1
+pytest-asyncio==0.21.1
+pytest-cov==6.2.1
+pytest-mock==3.14.1
+pytest-randomly==3.16.0
+pyyaml==6.0.2
+regex==2024.11.6
+requests==2.32.4
+sniffio==1.3.1
+sortedcontainers==2.4.0
+tiktoken==0.9.0
+tqdm==4.67.1
+typing-extensions==4.14.1
+typing-inspection==0.4.1
+urllib3==1.26.20
+vcrpy==7.0.0
+wrapt==1.17.2
+yarl==1.20.1

.riot/requirements/e9c67e1.txt

@@ -0,0 +1,53 @@
+#
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/e9c67e1.in
+#
+annotated-types==0.7.0
+anyio==4.9.0
+attrs==25.3.0
+certifi==2025.7.14
+charset-normalizer==3.4.2
+coverage[toml]==7.9.2
+distro==1.9.0
+exceptiongroup==1.3.0
+h11==0.16.0
+httpcore==1.0.9
+httpx==0.28.1
+hypothesis==6.45.0
+idna==3.10
+importlib-metadata==8.7.0
+iniconfig==2.1.0
+jiter==0.10.0
+mock==5.2.0
+multidict==6.6.3
+openai==1.66.0
+opentracing==2.4.0
+packaging==25.0
+pillow==11.3.0
+pluggy==1.6.0
+propcache==0.3.2
+pydantic==2.11.7
+pydantic-core==2.33.2
+pygments==2.19.2
+pytest==8.4.1
+pytest-asyncio==0.21.1
+pytest-cov==6.2.1
+pytest-mock==3.14.1
+pytest-randomly==3.16.0
+pyyaml==6.0.2
+regex==2024.11.6
+requests==2.32.4
+sniffio==1.3.1
+sortedcontainers==2.4.0
+tiktoken==0.9.0
+tomli==2.2.1
+tqdm==4.67.1
+typing-extensions==4.14.1
+typing-inspection==0.4.1
+urllib3==1.26.20
+vcrpy==7.0.0
+wrapt==1.17.2
+yarl==1.20.1
+zipp==3.23.0

ddtrace/_trace/_span_link.py

@@ -120,9 +120,8 @@ def to_dict(self):
 
         return d
 
-    def __str__(self) -> str:
-        attrs_str = ",".join([f"{k}:{v}" for k, v in self.attributes.items()])
+    def __repr__(self) -> str:
         return (
-            f"trace_id={self.trace_id} span_id={self.span_id} attributes={attrs_str} "
-            f"tracestate={self.tracestate} flags={self.flags} dropped_attributes={self._dropped_attributes}"
+            f"SpanLink(trace_id={self.trace_id}, span_id={self.span_id}, attributes={self.attributes}, "
+            f"tracestate={self.tracestate}, flags={self.flags}, dropped_attributes={self._dropped_attributes})"
         )

ddtrace/_trace/_span_pointer.py

@@ -61,6 +61,12 @@ def __post_init__(self):
         # Do not want to do the trace_id and span_id checks that SpanLink does.
         pass
 
+    def __repr__(self):
+        return (
+            f"SpanPointer(trace_id={self.trace_id}, span_id={self.span_id}, kind={self.kind}, "
+            f"direction={self.direction}, hash={self.hash}, attributes={self.attributes})"
+        )
+
 
 _STANDARD_HASHING_FUNCTION_FAILURE_PREFIX = "HashingFailure"
 

ddtrace/_trace/context.py

@@ -286,17 +286,11 @@ def __eq__(self, other: Any) -> bool:
         return False
 
     def __repr__(self) -> str:
-        return "Context(trace_id=%s, span_id=%s, _meta=%s, _metrics=%s, _span_links=%s, _baggage=%s, _is_remote=%s)" % (
-            self.trace_id,
-            self.span_id,
-            self._meta,
-            self._metrics,
-            self._span_links,
-            self._baggage,
-            self._is_remote,
+        return (
+            f"Context(trace_id={self.trace_id}, span_id={self.span_id}, _meta={self._meta}, "
+            f"_metrics={self._metrics}, _span_links={self._span_links}, _baggage={self._baggage}, "
+            f"_is_remote={self._is_remote})"
         )
 
     def __hash__(self) -> int:
         return hash(self.trace_id)
-
-    __str__ = __repr__