WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

fix(qdrant): support 1.16+ of qdrant-client #3525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yizhao1998 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(qdrant): support 1.16+ of qdrant-client #3525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ges/opentelemetry-instrumentation-qdrant/opentelemetry/instrumentation/qdrant/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

logger = logging.getLogger(__name__)

_instruments = ("qdrant-client >= 1.7",)
_instruments = ("qdrant-client >= 1.16",)

p = Path(__file__).with_name("qdrant_client_methods.json")
with open(p, "r") as f:
Expand Down
62 changes: 26 additions & 36 deletions ...trumentation-qdrant/opentelemetry/instrumentation/qdrant/async_qdrant_client_methods.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,11 @@
"method": "upload_points",
"span_name": "qdrant.upload_points"
},
{
"object": "AsyncQdrantClient",
"method": "upload_records",
"span_name": "qdrant.upload_records"
},
{
"object": "AsyncQdrantClient",
"method": "upload_collection",
"span_name": "qdrant.upload_collection"
},
{
"object": "AsyncQdrantClient",
"method": "search",
"span_name": "qdrant.search"
},
{
"object": "AsyncQdrantClient",
"method": "search_batch",
"span_name": "qdrant.search_batch"
},
{
"object": "AsyncQdrantClient",
"method": "search_groups",
"span_name": "qdrant.search_groups"
},
{
"object": "AsyncQdrantClient",
"method": "query",
Expand All @@ -51,33 +31,28 @@
},
{
"object": "AsyncQdrantClient",
"method": "discover",
"span_name": "qdrant.discover"
},
{
"object": "AsyncQdrantClient",
"method": "discover_batch",
"span_name": "qdrant.discover_batch"
"method": "query_points",
"span_name": "qdrant.query_points"
},
{
"object": "AsyncQdrantClient",
"method": "recommend",
"span_name": "qdrant.recommend"
"method": "query_batch_points",
"span_name": "qdrant.query_batch_points"
},
{
"object": "AsyncQdrantClient",
"method": "recommend_batch",
"span_name": "qdrant.recommend_batch"
"method": "query_points_groups",
"span_name": "qdrant.query_points_groups"
},
{
"object": "AsyncQdrantClient",
"method": "recommend_groups",
"span_name": "qdrant.recommend_groups"
"method": "scroll",
"span_name": "qdrant.scroll"
},
{
"object": "AsyncQdrantClient",
"method": "scroll",
"span_name": "qdrant.scroll"
"method": "retrieve",
"span_name": "qdrant.retrieve"
},
{
"object": "AsyncQdrantClient",
Expand Down Expand Up @@ -113,5 +88,20 @@
"object": "AsyncQdrantClient",
"method": "batch_update_points",
"span_name": "qdrant.batch_update_points"
},
{
"object": "AsyncQdrantClient",
"method": "facet",
"span_name": "qdrant.facet"
},
{
"object": "AsyncQdrantClient",
"method": "search_matrix_offsets",
"span_name": "qdrant.search_matrix_offsets"
},
{
"object": "AsyncQdrantClient",
"method": "search_matrix_pairs",
"span_name": "qdrant.search_matrix_pairs"
}
]
]
62 changes: 26 additions & 36 deletions ...ry-instrumentation-qdrant/opentelemetry/instrumentation/qdrant/qdrant_client_methods.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,11 @@
"method": "upload_points",
"span_name": "qdrant.upload_points"
},
{
"object": "QdrantClient",
"method": "upload_records",
"span_name": "qdrant.upload_records"
},
{
"object": "QdrantClient",
"method": "upload_collection",
"span_name": "qdrant.upload_collection"
},
{
"object": "QdrantClient",
"method": "search",
"span_name": "qdrant.search"
},
{
"object": "QdrantClient",
"method": "search_batch",
"span_name": "qdrant.search_batch"
},
{
"object": "QdrantClient",
"method": "search_groups",
"span_name": "qdrant.search_groups"
},
{
"object": "QdrantClient",
"method": "query",
Expand All @@ -51,33 +31,28 @@
},
{
"object": "QdrantClient",
"method": "discover",
"span_name": "qdrant.discover"
},
{
"object": "QdrantClient",
"method": "discover_batch",
"span_name": "qdrant.discover_batch"
"method": "query_points",
"span_name": "qdrant.query_points"
},
{
"object": "QdrantClient",
"method": "recommend",
"span_name": "qdrant.recommend"
"method": "query_batch_points",
"span_name": "qdrant.query_batch_points"
},
{
"object": "QdrantClient",
"method": "recommend_batch",
"span_name": "qdrant.recommend_batch"
"method": "query_points_groups",
"span_name": "qdrant.query_points_groups"
},
{
"object": "QdrantClient",
"method": "recommend_groups",
"span_name": "qdrant.recommend_groups"
"method": "scroll",
"span_name": "qdrant.scroll"
},
{
"object": "QdrantClient",
"method": "scroll",
"span_name": "qdrant.scroll"
"method": "retrieve",
"span_name": "qdrant.retrieve"
},
{
"object": "QdrantClient",
Expand Down Expand Up @@ -113,5 +88,20 @@
"object": "QdrantClient",
"method": "batch_update_points",
"span_name": "qdrant.batch_update_points"
},
{
"object": "QdrantClient",
"method": "facet",
"span_name": "qdrant.facet"
},
{
"object": "QdrantClient",
"method": "search_matrix_offsets",
"span_name": "qdrant.search_matrix_offsets"
},
{
"object": "QdrantClient",
"method": "search_matrix_pairs",
"span_name": "qdrant.search_matrix_pairs"
}
]
]
19 changes: 7 additions & 12 deletions ...ages/opentelemetry-instrumentation-qdrant/opentelemetry/instrumentation/qdrant/wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,16 @@ def _wrap(tracer, to_wrap, wrapped, instance, args, kwargs):
_set_upload_attributes(span, args, kwargs, method, "documents")
elif method == "upload_points":
_set_upload_attributes(span, args, kwargs, method, "points")
elif method == "upload_records":
_set_upload_attributes(span, args, kwargs, method, "records")
elif method == "upload_collection":
_set_upload_attributes(span, args, kwargs, method, "vectors")
elif method in [
"search",
"search_groups",
"query",
"discover",
"recommend",
"recommend_groups",
"query_points",
"query_points_groups",
]:
_set_search_attributes(span, args, kwargs)
elif method in ["search_batch", "recommend_batch", "discover_batch"]:
_set_batch_search_attributes(span, args, kwargs, method)
_set_query_attributes(span, args, kwargs)
elif method in ["query_batch", "query_batch_points"]:
_set_batch_query_attributes(span, args, kwargs, method)

response = wrapped(*args, **kwargs)
if response:
Expand Down Expand Up @@ -103,12 +98,12 @@ def _set_upload_attributes(span, args, kwargs, method_name, param_name):


@dont_throw
def _set_search_attributes(span, args, kwargs):
def _set_query_attributes(span, args, kwargs):
limit = kwargs.get("limit") or 10
_set_span_attribute(span, SpanAttributes.VECTOR_DB_QUERY_TOP_K, limit)


@dont_throw
def _set_batch_search_attributes(span, args, kwargs, method):
def _set_batch_query_attributes(span, args, kwargs, method):
requests = kwargs.get("requests") or []
_set_span_attribute(span, f"qdrant.{method}.requests_count", len(requests))
Loading