Skip to content

Derive operation from active spans #27

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
quinnmil wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Derive operation from active spans #27

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 pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "scout-apm-logging"
version = "1.0.1"
version = "1.0.2"
description = "Scout APM Python Logging Agent"
authors = ["Scout <support@scoutapm.com>"]
maintainers = ["Quinn Milionis <quinn@scoutapm.com>"]
Expand Down
2 changes: 1 addition & 1 deletion scout_apm_logging/utils/operation_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def extract_operation(operation: str) -> Optional[OperationDetail]:
return extract_operation(operation)

# Fall back to checking spans
spans = getattr(record, "complete_spans", None) or []
spans = getattr(record, "active_spans", None) or []
for span in reversed(spans):
result = extract_operation(span.operation)
if result:
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/test_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def test_emit_with_scout_request(mock_tracked_request, otel_scout_handler):
mock_request.end_time.isoformat.return_value = "2024-03-06T12:00:01"
mock_request.tags = {"key": "value"}
mock_request.operation = None
mock_request.complete_spans = [
mock_request.active_spans = [
Span(mock_request.id, "Middleware"),
Span(mock_request.id, "Controller/foobar"),
]
Expand Down Expand Up @@ -75,7 +75,7 @@ def test_emit_when_scout_request_contains_operation(
mock_request.start_time.isoformat.return_value = "2024-03-06T12:00:00"
mock_request.end_time.isoformat.return_value = "2024-03-06T12:00:01"
mock_request.tags = {"key": "value"}
mock_request.complete_spans = [
mock_request.active_spans = [
Span(mock_request.id, "Middleware"),
]
mock_request.operation = MagicMock().return_value = "Controller/foobar"
Expand Down
10 changes: 5 additions & 5 deletions tests/unit/test_operation_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class MockSpan:
@dataclass
class MockTrackedRequest:
operation: Optional[str] = None
complete_spans: Optional[List[MockSpan]] = None
active_spans: Optional[List[MockSpan]] = None


def test_operation_detail_entrypoint_attribute():
Expand All @@ -37,7 +37,7 @@ def test_get_operation_detail_from_spans():
MockSpan(operation="Job/TestJob"),
MockSpan(operation="Controller/TestController"),
]
record = MockTrackedRequest(complete_spans=spans)
record = MockTrackedRequest(active_spans=spans)
result = get_operation_detail(record)
assert result == OperationDetail(
name="TestController", type=OperationType.CONTROLLER
Expand All @@ -63,7 +63,7 @@ def test_get_operation_detail_no_operation_or_spans():


def test_get_operation_detail_empty_spans():
record = MockTrackedRequest(complete_spans=[])
record = MockTrackedRequest(active_spans=[])
result = get_operation_detail(record)
assert result is None

Expand All @@ -73,15 +73,15 @@ def test_get_operation_detail_spans_no_match():
MockSpan(operation="Other/Operation1"),
MockSpan(operation="Other/Operation2"),
]
record = MockTrackedRequest(complete_spans=spans)
record = MockTrackedRequest(active_spans=spans)
result = get_operation_detail(record)
assert result is None


def test_get_operation_detail_operation_priority():
spans = [MockSpan(operation="Job/TestJob")]
record = MockTrackedRequest(
operation="Controller/TestController", complete_spans=spans
operation="Controller/TestController", active_spans=spans
)
result = get_operation_detail(record)
assert result == OperationDetail(
Expand Down
Loading