awslabs.cloudwatch-appsignals-mcp-server 0.1.8__tar.gz → 0.1.10__tar.gz

{awslabs_cloudwatch_appsignals_mcp_server-0.1.8 → awslabs_cloudwatch_appsignals_mcp_server-0.1.10}/Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # dependabot should continue to update this to the latest hash.
-FROM public.ecr.aws/docker/library/python:3.13.5-alpine3.21@sha256:c9a09c45a4bcc618c7f7128585b8dd0d41d0c31a8a107db4c8255ffe0b69375d AS uv
+FROM public.ecr.aws/docker/library/python:3.13-alpine@sha256:070342a0cc1011532c0e69972cce2bbc6cc633eba294bae1d12abea8bd05303b AS uv
 
 # Install the project into `/app`
 WORKDIR /app
@@ -61,7 +61,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
 # Make the directory just in case it doesn't exist
 RUN mkdir -p /root/.local
 
-FROM public.ecr.aws/docker/library/python:3.13.5-alpine3.21@sha256:c9a09c45a4bcc618c7f7128585b8dd0d41d0c31a8a107db4c8255ffe0b69375d
+FROM public.ecr.aws/docker/library/python:3.13-alpine@sha256:070342a0cc1011532c0e69972cce2bbc6cc633eba294bae1d12abea8bd05303b
 
 # Place executables in the environment at the front of the path and include other binaries
 ENV PATH="/app/.venv/bin:$PATH" \

{awslabs_cloudwatch_appsignals_mcp_server-0.1.8 → awslabs_cloudwatch_appsignals_mcp_server-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.cloudwatch-appsignals-mcp-server
-Version: 0.1.8
+Version: 0.1.10
 Summary: An AWS Labs Model Context Protocol (MCP) server for AWS Application Signals
 Project-URL: Homepage, https://awslabs.github.io/mcp/
 Project-URL: Documentation, https://awslabs.github.io/mcp/servers/cloudwatch-appsignals-mcp-server/
@@ -21,7 +21,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
-Requires-Dist: boto3>=1.37.24
+Requires-Dist: boto3>=1.40.41
 Requires-Dist: httpx>=0.24.0
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: mcp[cli]>=1.11.0

{awslabs_cloudwatch_appsignals_mcp_server-0.1.8 → awslabs_cloudwatch_appsignals_mcp_server-0.1.10}/awslabs/cloudwatch_appsignals_mcp_server/__init__.py

@@ -14,4 +14,4 @@
 
 """AWS Application Signals MCP Server."""
 
-__version__ = '0.1.8'
+__version__ = '0.1.10'

{awslabs_cloudwatch_appsignals_mcp_server-0.1.8 → awslabs_cloudwatch_appsignals_mcp_server-0.1.10}/awslabs/cloudwatch_appsignals_mcp_server/trace_tools.py

@@ -191,7 +191,7 @@ async def search_transaction_spans(
 
     try:
         # Use default log group if none provided
-        if log_group_name is None:
+        if not log_group_name:
             log_group_name = 'aws/spans'
             logger.debug('Using default log group: aws/spans')
 
@@ -402,6 +402,26 @@ async def query_sampled_traces(
                 return obj.isoformat()
             return obj
 
+        # Helper function to extract fault message from root causes for deduplication
+        def get_fault_message(trace_data):
+            """Extract fault message from a trace for deduplication.
+
+            Only checks FaultRootCauses (5xx server errors) since this is the primary
+            use case for root cause investigation. Traces without fault messages are
+            not deduplicated.
+            """
+            # Only check FaultRootCauses for deduplication
+            root_causes = trace_data.get('FaultRootCauses', [])
+            if root_causes:
+                for cause in root_causes:
+                    services = cause.get('Services', [])
+                    for service in services:
+                        exceptions = service.get('Exceptions', [])
+                        if exceptions and exceptions[0].get('Message'):
+                            return exceptions[0].get('Message')
+            return None
+
+        # Build trace summaries (original format)
         trace_summaries = []
         for trace in traces:
             # Create a simplified trace data structure to reduce size
@@ -417,17 +437,11 @@ async def query_sampled_traces(
 
             # Only include root causes if they exist (to save space)
             if trace.get('ErrorRootCauses'):
-                trace_data['ErrorRootCauses'] = trace.get('ErrorRootCauses', [])[
-                    :3
-                ]  # Limit to first 3
+                trace_data['ErrorRootCauses'] = trace.get('ErrorRootCauses', [])[:3]
             if trace.get('FaultRootCauses'):
-                trace_data['FaultRootCauses'] = trace.get('FaultRootCauses', [])[
-                    :3
-                ]  # Limit to first 3
+                trace_data['FaultRootCauses'] = trace.get('FaultRootCauses', [])[:3]
             if trace.get('ResponseTimeRootCauses'):
-                trace_data['ResponseTimeRootCauses'] = trace.get('ResponseTimeRootCauses', [])[
-                    :3
-                ]  # Limit to first 3
+                trace_data['ResponseTimeRootCauses'] = trace.get('ResponseTimeRootCauses', [])[:3]
 
             # Include limited annotations for key operations
             annotations = trace.get('Annotations', {})
@@ -447,15 +461,50 @@ async def query_sampled_traces(
             # Convert any datetime objects to ISO format strings
             for key, value in trace_data.items():
                 trace_data[key] = convert_datetime(value)
+
             trace_summaries.append(trace_data)
 
+        # Deduplicate trace summaries by fault message
+        seen_faults = {}
+        deduped_trace_summaries = []
+
+        for trace_summary in trace_summaries:
+            # Check if this trace has an error
+            has_issues = (
+                trace_summary.get('HasError')
+                or trace_summary.get('HasFault')
+                or trace_summary.get('HasThrottle')
+            )
+
+            if not has_issues:
+                # Always include healthy traces
+                deduped_trace_summaries.append(trace_summary)
+                continue
+
+            # Extract fault message for deduplication (only checks FaultRootCauses)
+            fault_msg = get_fault_message(trace_summary)
+
+            if fault_msg and fault_msg in seen_faults:
+                # Skip this trace - we already have one with the same fault message
+                seen_faults[fault_msg]['count'] += 1
+                logger.debug(
+                    f'Skipping duplicate trace {trace_summary.get("Id")} - fault message already seen: {fault_msg[:100]}...'
+                )
+                continue
+            else:
+                # First time seeing this fault (or no fault message) - include it
+                deduped_trace_summaries.append(trace_summary)
+                if fault_msg:
+                    seen_faults[fault_msg] = {'count': 1}
+
         # Check transaction search status
         is_tx_search_enabled, tx_destination, tx_status = check_transaction_search_enabled(region)
 
+        # Build response with original format but deduplicated traces
         result_data = {
-            'TraceSummaries': trace_summaries,
-            'TraceCount': len(trace_summaries),
-            'Message': f'Retrieved {len(trace_summaries)} traces (limited to prevent size issues)',
+            'TraceSummaries': deduped_trace_summaries,
+            'TraceCount': len(deduped_trace_summaries),
+            'Message': f'Retrieved {len(deduped_trace_summaries)} unique traces from {len(trace_summaries)} total (deduplicated by fault message)',
             'SamplingNote': "⚠️ This data is from X-Ray's 5% sampling. Results may not show all errors or issues.",
             'TransactionSearchStatus': {
                 'enabled': is_tx_search_enabled,
@@ -467,9 +516,18 @@ async def query_sampled_traces(
             },
         }
 
+        # Add dedup stats if we actually deduped anything
+        if len(deduped_trace_summaries) < len(trace_summaries):
+            duplicates_removed = len(trace_summaries) - len(deduped_trace_summaries)
+            result_data['DeduplicationStats'] = {
+                'OriginalTraceCount': len(trace_summaries),
+                'DuplicatesRemoved': duplicates_removed,
+                'UniqueFaultMessages': len(seen_faults),
+            }
+
         elapsed_time = timer() - start_time_perf
         logger.info(
-            f'query_sampled_traces completed in {elapsed_time:.3f}s - retrieved {len(trace_summaries)} traces'
+            f'query_sampled_traces completed in {elapsed_time:.3f}s - retrieved {len(deduped_trace_summaries)} unique traces from {len(trace_summaries)} total'
         )
         return json.dumps(result_data, indent=2)
 

{awslabs_cloudwatch_appsignals_mcp_server-0.1.8 → awslabs_cloudwatch_appsignals_mcp_server-0.1.10}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "awslabs.cloudwatch-appsignals-mcp-server"
-version = "0.1.8"
+version = "0.1.10"
 description = "An AWS Labs Model Context Protocol (MCP) server for AWS Application Signals"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "boto3>=1.37.24",
+    "boto3>=1.40.41",
     "httpx>=0.24.0",
     "loguru>=0.7.3",
     "mcp[cli]>=1.11.0",

{awslabs_cloudwatch_appsignals_mcp_server-0.1.8 → awslabs_cloudwatch_appsignals_mcp_server-0.1.10}/tests/test_server.py

@@ -1076,7 +1076,7 @@ async def test_search_transaction_spans_empty_log_group(mock_aws_clients):
         }
 
         await search_transaction_spans(
-            log_group_name='',  # Empty string will be used as-is
+            log_group_name='',  # Empty string should default to 'aws/spans'
             start_time='2024-01-01T00:00:00+00:00',
             end_time='2024-01-01T01:00:00+00:00',
             query_string='fields @timestamp',
@@ -1084,10 +1084,10 @@ async def test_search_transaction_spans_empty_log_group(mock_aws_clients):
             max_timeout=30,
         )
 
-        # Verify start_query was called with empty string (current behavior)
+        # Verify start_query was called with default 'aws/spans'
         mock_aws_clients['logs_client'].start_query.assert_called()
         call_args = mock_aws_clients['logs_client'].start_query.call_args[1]
-        assert '' in call_args['logGroupNames']
+        assert 'aws/spans' in call_args['logGroupNames']
 
 
 @pytest.mark.asyncio
@@ -1634,7 +1634,7 @@ async def test_query_sampled_traces_with_fault_causes(mock_aws_clients):
         'Duration': 100,
         'HasFault': True,
         'FaultRootCauses': [
-            {'Services': [{'Name': 'service1'}]},
+            {'Services': [{'Name': 'service1', 'Exceptions': [{'Message': 'Test fault error'}]}]},
             {'Services': [{'Name': 'service2'}]},
             {'Services': [{'Name': 'service3'}]},
             {'Services': [{'Name': 'service4'}]},  # Should be limited to 3
@@ -1709,6 +1709,157 @@ async def test_query_sampled_traces_datetime_conversion(mock_aws_clients):
         assert 'EndTime' not in trace_summary
 
 
+@pytest.mark.asyncio
+async def test_query_sampled_traces_deduplication(mock_aws_clients):
+    """Test query_sampled_traces deduplicates traces with same fault message.
+
+    Note: Only FaultRootCauses are deduplicated, not ErrorRootCauses.
+    This is because the primary use case is investigating server faults (5xx errors),
+    not client errors (4xx).
+    """
+    # Create 5 traces with the same fault message
+    mock_traces = [
+        {
+            'Id': f'trace{i}',
+            'Duration': 100 + i * 10,
+            'ResponseTime': 95 + i * 10,
+            'HasFault': True,
+            'FaultRootCauses': [
+                {
+                    'Services': [
+                        {
+                            'Name': 'test-service',
+                            'Exceptions': [{'Message': 'Database connection timeout'}],
+                        }
+                    ]
+                }
+            ],
+        }
+        for i in range(1, 6)
+    ]
+
+    # Add 2 traces with ErrorRootCauses (these should NOT be deduplicated)
+    mock_traces.extend(
+        [
+            {
+                'Id': 'trace6',
+                'Duration': 200,
+                'HasError': True,
+                'ErrorRootCauses': [
+                    {
+                        'Services': [
+                            {
+                                'Name': 'api-service',
+                                'Exceptions': [{'Message': 'Invalid API key'}],
+                            }
+                        ]
+                    }
+                ],
+            },
+            {
+                'Id': 'trace7',
+                'Duration': 210,
+                'HasError': True,
+                'ErrorRootCauses': [
+                    {
+                        'Services': [
+                            {
+                                'Name': 'api-service',
+                                'Exceptions': [{'Message': 'Invalid API key'}],
+                            }
+                        ]
+                    }
+                ],
+            },
+        ]
+    )
+
+    # Add 2 healthy traces
+    mock_traces.extend(
+        [
+            {
+                'Id': 'trace8',
+                'Duration': 50,
+                'ResponseTime': 45,
+                'HasError': False,
+                'HasFault': False,
+            },
+            {
+                'Id': 'trace9',
+                'Duration': 55,
+                'ResponseTime': 50,
+                'HasError': False,
+                'HasFault': False,
+            },
+        ]
+    )
+
+    with patch(
+        'awslabs.cloudwatch_appsignals_mcp_server.trace_tools.get_trace_summaries_paginated'
+    ) as mock_paginated:
+        mock_paginated.return_value = mock_traces
+
+        result_json = await query_sampled_traces(
+            start_time='2024-01-01T00:00:00Z', end_time='2024-01-01T01:00:00Z'
+        )
+
+        result = json.loads(result_json)
+
+        # Verify deduplication worked - should only have 5 traces
+        # 1 for database timeout fault (deduplicated from 5)
+        # 2 for API key errors (NOT deduplicated - only faults are deduped)
+        # 2 healthy traces (not deduplicated)
+        assert result['TraceCount'] == 5
+        assert len(result['TraceSummaries']) == 5
+
+        # Verify deduplication stats
+        assert 'DeduplicationStats' in result
+        assert result['DeduplicationStats']['OriginalTraceCount'] == 9
+        assert result['DeduplicationStats']['DuplicatesRemoved'] == 4  # 9 - 5 = 4
+        assert (
+            result['DeduplicationStats']['UniqueFaultMessages'] == 1
+        )  # Only counting FaultRootCauses
+
+        # Find the trace with fault
+        db_trace = next(
+            (
+                t
+                for t in result['TraceSummaries']
+                if t.get('FaultRootCauses')
+                and any(
+                    'Database connection timeout' in str(s.get('Exceptions', []))
+                    for cause in t['FaultRootCauses']
+                    for s in cause.get('Services', [])
+                )
+            ),
+            None,
+        )
+        assert db_trace is not None
+        assert db_trace['HasFault'] is True
+
+        # Verify both error traces are present (not deduplicated)
+        error_traces = [
+            t
+            for t in result['TraceSummaries']
+            if t.get('ErrorRootCauses')
+            and any(
+                'Invalid API key' in str(s.get('Exceptions', []))
+                for cause in t['ErrorRootCauses']
+                for s in cause.get('Services', [])
+            )
+        ]
+        assert len(error_traces) == 2  # Both error traces should be kept
+        assert all(t['HasError'] is True for t in error_traces)
+
+        # Verify healthy traces are included
+        healthy_count = sum(
+            1
+            for t in result['TraceSummaries']
+            if not t.get('HasError') and not t.get('HasFault') and not t.get('HasThrottle')
+        )
+        assert healthy_count == 2
+
+
 def test_main_success(mock_aws_clients):
     """Test main function normal execution."""
     with patch('awslabs.cloudwatch_appsignals_mcp_server.server.mcp') as mock_mcp:

{awslabs_cloudwatch_appsignals_mcp_server-0.1.8 → awslabs_cloudwatch_appsignals_mcp_server-0.1.10}/uv.lock

@@ -46,7 +46,7 @@ wheels = [
 
 [[package]]
 name = "awslabs-cloudwatch-appsignals-mcp-server"
-version = "0.1.8"
+version = "0.1.10"
 source = { editable = "." }
 dependencies = [
     { name = "boto3" },
@@ -72,7 +72,7 @@ dev = [
 
 [package.metadata]
 requires-dist = [
-    { name = "boto3", specifier = ">=1.37.24" },
+    { name = "boto3", specifier = ">=1.40.41" },
     { name = "httpx", specifier = ">=0.24.0" },
     { name = "loguru", specifier = ">=0.7.3" },
     { name = "mcp", extras = ["cli"], specifier = ">=1.11.0" },
@@ -110,16 +110,16 @@ wheels = [
 
 [[package]]
 name = "boto3"
-version = "1.37.24"
+version = "1.40.41"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "botocore" },
     { name = "jmespath" },
     { name = "s3transfer" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/f9/1c/3901ff3ea6a9ddc7de17aade70b4ee2c25edd91f0a772bdb3419b58014a2/boto3-1.37.24.tar.gz", hash = "sha256:1d3c6fc63a9efba0af8b531ec6b7f7c6b0ef197bf3dcd875f03c9097ac68b58f", size = 111368, upload-time = "2025-03-31T19:35:17.771Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/52/f7/d652732fd8fc28f427f3e698e488b7422ede535fe4d813c7988642c7734b/boto3-1.40.41.tar.gz", hash = "sha256:2ea2463fc42812f3cab66b53114579b1f4b9a378ee48921d4385511a94307b24", size = 111621, upload-time = "2025-09-29T19:21:14.928Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/2d/fa/8ea42eff98e02962473f60c11663282cd8b8c04cc66eab954184325516ac/boto3-1.37.24-py3-none-any.whl", hash = "sha256:2f2b8f82a5d7f89283973bf2cab771b90c09348799e78b2a25c60cd22c443514", size = 139561, upload-time = "2025-03-31T19:35:14.96Z" },
+    { url = "https://files.pythonhosted.org/packages/45/a8/d5c924e3dfce8804ff7119c1e84f423414851a82d30d744e81f4b61ddbff/boto3-1.40.41-py3-none-any.whl", hash = "sha256:02eac942aaa9f3a1c8a11f77e6f971b41c125973888f80f3eb177c2f21ad7a01", size = 139342, upload-time = "2025-09-29T19:21:12.728Z" },
 ]
 
 [[package]]
@@ -152,16 +152,16 @@ xray = [
 
 [[package]]
 name = "botocore"
-version = "1.37.38"
+version = "1.40.41"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "jmespath" },
     { name = "python-dateutil" },
     { name = "urllib3" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/34/79/4e072e614339727f79afef704e5993b5b4d2667c1671c757cc4deb954744/botocore-1.37.38.tar.gz", hash = "sha256:c3ea386177171f2259b284db6afc971c959ec103fa2115911c4368bea7cbbc5d", size = 13832365, upload-time = "2025-04-21T19:27:05.245Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/c8/55/fa23104e4352f28a457c452a3621b00fe2a7a1e096d04e2f4a9890250448/botocore-1.40.41.tar.gz", hash = "sha256:320873c6a34bfd64fb9bbc55e8ac38e7904a574cfc634d1f0f66b1490c62b89d", size = 14365601, upload-time = "2025-09-29T19:21:03.667Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/55/1b/93f3504afc7c523dcaa8a8147cfc75421983e30b08d9f93a533929589630/botocore-1.37.38-py3-none-any.whl", hash = "sha256:23b4097780e156a4dcaadfc1ed156ce25cb95b6087d010c4bb7f7f5d9bc9d219", size = 13499391, upload-time = "2025-04-21T19:27:00.869Z" },
+    { url = "https://files.pythonhosted.org/packages/c3/d2/1b5bc59c746413d3eca16bd659b8c00cf2d4eeb6274053d1ff3110d13670/botocore-1.40.41-py3-none-any.whl", hash = "sha256:8246bf73a2e20647cf1d4dae1e9a7c40f97f38a34a6a1fbfd49aa6b3dce5ffaa", size = 14034516, upload-time = "2025-09-29T19:20:59.792Z" },
 ]
 
 [[package]]
@@ -1405,14 +1405,14 @@ wheels = [
 
 [[package]]
 name = "s3transfer"
-version = "0.11.5"
+version = "0.14.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "botocore" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/c4/2b/5c9562795c2eb2b5f63536961754760c25bf0f34af93d36aa28dea2fb303/s3transfer-0.11.5.tar.gz", hash = "sha256:8c8aad92784779ab8688a61aefff3e28e9ebdce43142808eaa3f0b0f402f68b7", size = 149107, upload-time = "2025-04-17T19:23:19.051Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/62/74/8d69dcb7a9efe8baa2046891735e5dfe433ad558ae23d9e3c14c633d1d58/s3transfer-0.14.0.tar.gz", hash = "sha256:eff12264e7c8b4985074ccce27a3b38a485bb7f7422cc8046fee9be4983e4125", size = 151547, upload-time = "2025-09-09T19:23:31.089Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/45/39/13402e323666d17850eca87e4cd6ecfcf9fd7809cac9efdcce10272fc29d/s3transfer-0.11.5-py3-none-any.whl", hash = "sha256:757af0f2ac150d3c75bc4177a32355c3862a98d20447b69a0161812992fe0bd4", size = 84782, upload-time = "2025-04-17T19:23:17.516Z" },
+    { url = "https://files.pythonhosted.org/packages/48/f0/ae7ca09223a81a1d890b2557186ea015f6e0502e9b8cb8e1813f1d8cfa4e/s3transfer-0.14.0-py3-none-any.whl", hash = "sha256:ea3b790c7077558ed1f02a3072fb3cb992bbbd253392f4b6e9e8976941c7d456", size = 85712, upload-time = "2025-09-09T19:23:30.041Z" },
 ]
 
 [[package]]