Skip to content

Commit 30eecb6

Browse files
committed
remove legacy
1 parent 9c72563 commit 30eecb6

File tree

7 files changed

+38
-38
lines changed

7 files changed

+38
-38
lines changed

src/opentelemetry_mcp/attributes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# Note: We import constants for documentation but must use string literals for Pydantic aliases
88
# due to mypy strict mode requirements
9-
from .constants import GenAI, LegacyLLM, Service, Status # noqa: F401
9+
from .constants import GenAI
1010

1111

1212
class SpanAttributes(BaseModel):

src/opentelemetry_mcp/backends/jaeger.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ async def search_traces(self, query: TraceQuery) -> list[TraceData]:
5959
"Use list_services() to see available services, then specify one with service_name parameter."
6060
)
6161

62-
# Get all filters (legacy + explicit)
62+
# Get all filters (converted + explicit)
6363
all_filters = query.get_all_filters()
6464

6565
# Jaeger only supports service filtering via API (via query.to_backend_params())
@@ -98,7 +98,7 @@ async def _search_service_traces_with_filters(
9898
Returns:
9999
List of matching traces
100100
"""
101-
# Use legacy to_backend_params for now (handles service, operation, duration, time, tags)
101+
# Use to_backend_params for now (handles service, operation, duration, time, tags)
102102
params = query.to_backend_params()
103103

104104
logger.debug(f"Searching traces with params: {params}")
@@ -143,7 +143,7 @@ async def search_spans(self, query: SpanQuery) -> list[SpanData]:
143143
"Use list_services() to see available services, then specify one with service_name parameter."
144144
)
145145

146-
# Get all filters (legacy + explicit)
146+
# Get all filters (converted + explicit)
147147
all_filters = query.get_all_filters()
148148

149149
# Jaeger only supports service filtering via API

src/opentelemetry_mcp/backends/tempo.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ async def search_traces(self, query: TraceQuery) -> list[TraceData]:
6767
Raises:
6868
httpx.HTTPError: If API request fails
6969
"""
70-
# Get all filters (legacy + explicit)
70+
# Get all filters (converted + explicit)
7171
all_filters = query.get_all_filters()
7272

7373
# Separate supported and unsupported filters
@@ -153,7 +153,7 @@ async def search_spans(self, query: SpanQuery) -> list[SpanData]:
153153
Raises:
154154
httpx.HTTPError: If API request fails
155155
"""
156-
# Get all filters (legacy + explicit)
156+
# Get all filters (converted + explicit)
157157
all_filters = query.get_all_filters()
158158

159159
# For span queries, we need to be careful about which filters to push to TraceQL
@@ -485,7 +485,7 @@ def _filter_to_traceql(self, filter_obj: Filter) -> str | None:
485485
return None
486486

487487
def _build_traceql_query(self, query: TraceQuery) -> str:
488-
"""Build TraceQL query from query parameters (legacy method).
488+
"""Build TraceQL query from query parameters.
489489
490490
This method is kept for backward compatibility. New code should use
491491
_build_traceql_from_filters with query.get_all_filters().

src/opentelemetry_mcp/backends/traceloop.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ async def search_traces(self, query: TraceQuery) -> list[TraceData]:
9999
"""
100100
logger.debug(f"Searching traces with query: {query}")
101101

102-
# Get all filters (legacy + explicit)
102+
# Get all filters
103103
all_filters = query.get_all_filters()
104104

105105
# Separate supported and unsupported filters by operator
@@ -192,7 +192,7 @@ async def search_spans(self, query: SpanQuery) -> list[SpanData]:
192192
"""
193193
logger.debug(f"Searching spans with query: {query}")
194194

195-
# Get all filters (legacy + explicit)
195+
# Get all filters
196196
all_filters = query.get_all_filters()
197197

198198
# Separate supported and unsupported filters by operator

src/opentelemetry_mcp/models.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def validate_filter_values(self) -> "Filter":
8282
return self
8383

8484

85-
def _convert_legacy_params_to_filters(
85+
def _convert_params_to_filters(
8686
service_name: str | None = None,
8787
operation_name: str | None = None,
8888
min_duration_ms: int | None = None,
@@ -94,7 +94,7 @@ def _convert_legacy_params_to_filters(
9494
tags: dict[str, str] | None = None,
9595
explicit_filters: list[Filter] | None = None,
9696
) -> list[Filter]:
97-
"""Convert legacy query parameters to Filter objects and combine with explicit filters.
97+
"""Convert query parameters to Filter objects and combine with explicit filters.
9898
9999
This helper function is used by both TraceQuery and SpanQuery to avoid code duplication.
100100
@@ -111,11 +111,11 @@ def _convert_legacy_params_to_filters(
111111
explicit_filters: Explicit Filter objects to append
112112
113113
Returns:
114-
Combined list of all filters (legacy converted + explicit)
114+
Combined list of all filters (converted + explicit)
115115
"""
116116
all_filters: list[Filter] = []
117117

118-
# Convert legacy parameters to filters
118+
# Convert parameters to filters
119119
if service_name:
120120
all_filters.append(
121121
Filter(
@@ -460,7 +460,7 @@ def total_llm_tokens(self) -> int:
460460
class TraceQuery(BaseModel):
461461
"""Query parameters for searching traces."""
462462

463-
# Legacy simple parameters (for backward compatibility)
463+
# Simple parameters
464464
service_name: str | None = None
465465
operation_name: str | None = None
466466
start_time: datetime | None = None
@@ -471,7 +471,7 @@ class TraceQuery(BaseModel):
471471
limit: int = Field(default=100, ge=1, le=1000)
472472
has_error: bool | None = None
473473

474-
# Opentelemetry-specific filters (legacy)
474+
# Opentelemetry-specific filters
475475
gen_ai_system: str | None = None # Filter by LLM provider
476476
gen_ai_request_model: str | None = None # Filter by requested model
477477
gen_ai_response_model: str | None = None # Filter by actual model used
@@ -483,7 +483,7 @@ class TraceQuery(BaseModel):
483483
)
484484

485485
def has_filters(self) -> bool:
486-
"""Check if any filters (legacy or new) are specified."""
486+
"""Check if any filters are specified."""
487487
return bool(
488488
self.service_name
489489
or self.operation_name
@@ -498,12 +498,12 @@ def has_filters(self) -> bool:
498498
)
499499

500500
def get_all_filters(self) -> list[Filter]:
501-
"""Convert legacy parameters to Filter objects and combine with explicit filters.
501+
"""Convert parameters to Filter objects and combine with explicit filters.
502502
503503
Returns:
504-
Combined list of all filters (legacy converted + explicit)
504+
Combined list of all filters (converted + explicit)
505505
"""
506-
return _convert_legacy_params_to_filters(
506+
return _convert_params_to_filters(
507507
service_name=self.service_name,
508508
operation_name=self.operation_name,
509509
min_duration_ms=self.min_duration_ms,
@@ -631,12 +631,12 @@ def has_filters(self) -> bool:
631631
)
632632

633633
def get_all_filters(self) -> list[Filter]:
634-
"""Convert legacy parameters to Filter objects and combine with explicit filters.
634+
"""Convert parameters to Filter objects and combine with explicit filters.
635635
636636
Returns:
637-
Combined list of all filters (legacy converted + explicit)
637+
Combined list of all filters (converted + explicit)
638638
"""
639-
return _convert_legacy_params_to_filters(
639+
return _convert_params_to_filters(
640640
service_name=self.service_name,
641641
operation_name=self.operation_name,
642642
min_duration_ms=self.min_duration_ms,

src/opentelemetry_mcp/server.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,20 +151,20 @@ async def search_traces(
151151
) -> str:
152152
"""Search for OpenTelemetry traces with filters.
153153
154-
Supports both simple parameters (legacy) and advanced generic filter system.
154+
Supports both simple parameters and advanced generic filter system.
155155
156156
Args:
157-
service_name: Filter by service name (legacy - use filters for advanced queries)
158-
operation_name: Filter by operation/span name (legacy)
157+
service_name: Filter by service name (use filters for advanced queries)
158+
operation_name: Filter by operation/span name
159159
start_time: Start time in ISO 8601 format (e.g., 2024-01-01T00:00:00Z)
160160
end_time: End time in ISO 8601 format
161-
min_duration_ms: Minimum trace duration in milliseconds (legacy)
162-
max_duration_ms: Maximum trace duration in milliseconds (legacy)
163-
gen_ai_system: Filter by LLM provider (legacy - e.g., openai, anthropic)
161+
min_duration_ms: Minimum trace duration in milliseconds
162+
max_duration_ms: Maximum trace duration in milliseconds
163+
gen_ai_system: Filter by LLM provider (e.g., openai, anthropic)
164164
gen_ai_request_model: Filter by requested model name (e.g., gpt-4)
165165
gen_ai_response_model: Filter by actual model used (e.g., gpt-4-0613)
166-
has_error: Filter traces with errors (legacy)
167-
tags: Additional tag filters as key-value pairs (legacy)
166+
has_error: Filter traces with errors
167+
tags: Additional tag filters as key-value pairs
168168
filters: Generic filter conditions (advanced) - list of filter objects with:
169169
- field: Field name in dotted notation (e.g., "gen_ai.usage.prompt_tokens")
170170
- operator: Comparison operator (equals, not_equals, gt, lt, gte, lte, contains,

src/opentelemetry_mcp/tools/search.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,21 @@ async def search_traces(
2828
) -> str:
2929
"""Search for OpenTelemetry traces with optional filters.
3030
31-
Supports both legacy simple parameters and the new generic filter system.
31+
Supports both simple parameters and the new generic filter system.
3232
3333
Args:
3434
backend: Backend instance to query
35-
service_name: Filter by service name (legacy parameter)
36-
operation_name: Filter by operation/span name (legacy parameter)
35+
service_name: Filter by service name
36+
operation_name: Filter by operation/span name
3737
start_time: Start time (ISO 8601 format)
3838
end_time: End time (ISO 8601 format)
39-
min_duration_ms: Minimum trace duration in milliseconds (legacy parameter)
40-
max_duration_ms: Maximum trace duration in milliseconds (legacy parameter)
41-
gen_ai_system: Filter by LLM provider (legacy parameter)
39+
min_duration_ms: Minimum trace duration in milliseconds
40+
max_duration_ms: Maximum trace duration in milliseconds
41+
gen_ai_system: Filter by LLM provider
4242
gen_ai_request_model: Filter by requested model name
4343
gen_ai_response_model: Filter by actual model used
44-
has_error: Filter traces with errors (legacy parameter)
45-
tags: Additional tag filters as key-value pairs (legacy parameter)
44+
has_error: Filter traces with errors
45+
tags: Additional tag filters as key-value pairs
4646
filters: Generic filter conditions (list of filter objects)
4747
limit: Maximum number of traces to return (1-1000)
4848

0 commit comments

Comments
 (0)