mcp-instana 0.3.0__py3-none-any.whl → 0.6.2__py3-none-any.whl

{mcp_instana-0.3.0.dist-info → mcp_instana-0.6.2.dist-info}/METADATA

@@ -1,17 +1,18 @@
 Metadata-Version: 2.4
 Name: mcp-instana
-Version: 0.3.0
+Version: 0.6.2
 Summary: MCP server for Instana
 Author-email: Elina Priyadarshinee <Elina.priyadarshinee1@ibm.com>, Guangya Liu <gyliu@ibm.com>, Isabell Sippli <ischwert@de.ibm.com>, Jay Sharma <Jay.Sharma3@ibm.com>, Madhu Tadiparthi <madhu.tadiparthi@ibm.com>, Riya Kumari <Riya.Kumari3@ibm.com>
 License: Apache-2.0
 License-File: LICENSE.md
 Requires-Python: >=3.10
-Requires-Dist: fastmcp==2.10.3
-Requires-Dist: instana-client==1.0.0
+Requires-Dist: fastmcp==2.13.0
+Requires-Dist: instana-client==1.0.2
 Requires-Dist: mcp
 Requires-Dist: pydantic==2.11.7
 Requires-Dist: python-dotenv==1.1.0
 Requires-Dist: requests==2.32.4
+Requires-Dist: traceloop-sdk>=0.47.5
 Provides-Extra: dev
 Requires-Dist: coverage>=7.10.1; extra == 'dev'
 Requires-Dist: pytest-asyncio>=1.1.0; extra == 'dev'
@@ -24,7 +25,7 @@ Description-Content-Type: text/markdown
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-**Table of Contents**
+<!-- mcp-name: io.github.instana/mcp-instana -->
 
 - [MCP Server for IBM Instana](#mcp-server-for-ibm-instana)
   - [Architecture Overview](#architecture-overview)
@@ -71,23 +72,8 @@ Description-Content-Type: text/markdown
       - [**pyproject.toml** (Development)](#pyprojecttoml-development)
       - [**pyproject-runtime.toml** (Production)](#pyproject-runtimetoml-production)
     - [Building the Docker Image](#building-the-docker-image)
-      - [**Prerequisites**](#prerequisites-1)
+      - [**Prerequisites**](#prerequisites)
       - [**Build Command**](#build-command)
-      - [**What the Build Does**](#what-the-build-does)
-    - [Running the Docker Container](#running-the-docker-container)
-      - [**Basic Usage**](#basic-usage)
-      - [**Environment Variables**](#environment-variables)
-      - [**Docker Compose Example**](#docker-compose-example)
-    - [Docker Security Features](#docker-security-features)
-      - [**Security Best Practices Implemented**](#security-best-practices-implemented)
-      - [**Image Size Optimization**](#image-size-optimization)
-    - [Testing the Docker Container](#testing-the-docker-container)
-      - [**Health Check**](#health-check)
-      - [**MCP Inspector Testing**](#mcp-inspector-testing)
-      - [**Logs and Debugging**](#logs-and-debugging)
-    - [Production Deployment](#production-deployment)
-      - [**Recommended Production Setup**](#recommended-production-setup)
-      - [**Kubernetes Example**](#kubernetes-example)
   - [Troubleshooting](#troubleshooting)
     - [**Docker Issues**](#docker-issues)
       - [**Container Won't Start**](#container-wont-start)
@@ -1024,164 +1010,23 @@ The project uses a **two-file dependency management strategy**:
 #### **Prerequisites**
 - Docker installed and running
 - Access to the project source code
+- Docker BuildKit for multi-architecture builds (enabled by default in recent Docker versions)
 
 #### **Build Command**
 ```bash
 # Build the optimized production image
-docker build -t mcp-instana .
+docker build -t mcp-instana:latest .
 
 # Build with a specific tag
-docker build -t mcp-instana:v1.0.0 .
-```
-
-#### **What the Build Does**
-1. **Multi-stage build** for optimal size and security
-2. **Builder stage**: Installs only runtime dependencies from `pyproject-runtime.toml`
-3. **Runtime stage**: Creates minimal production image with non-root user
-4. **Security**: No hardcoded secrets, proper user permissions
-5. **Optimization**: Only essential dependencies (20 vs 95+ in development)
+docker build -t mcp-instana:< image_tag > .
 
-### Running the Docker Container
-
-#### **Basic Usage**
+#### **Run Command**
 ```bash
-# Run with environment variables (recommended)
-docker run -p 8080:8080 \
-  -e INSTANA_API_TOKEN=your_instana_token \
-  -e INSTANA_BASE_URL=https://your-instana-instance.instana.io \
-  mcp-instana
+# Run the container (no credentials needed in the container)
+docker run -p 8080:8080 mcp-instana
 
 # Run with custom port
-docker run -p 8081:8080 \
-  -e INSTANA_API_TOKEN=your_instana_token \
-  -e INSTANA_BASE_URL=https://your-instana-instance.instana.io \
-  mcp-instana
-```
-
-#### **Environment Variables**
-The container requires the following environment variables:
-
-| Variable | Description | Example |
-|----------|-------------|---------|
-| `INSTANA_API_TOKEN` | Your Instana API token | `your_instana_token` |
-| `INSTANA_BASE_URL` | Your Instana instance URL | `https://your-instana-instance.instana.io` |
-| `PORT` | Server port (optional, defaults to 8080) | `8080` |
-
-#### **Docker Compose Example**
-```yaml
-version: '3.8'
-services:
-  mcp-instana:
-    build: .
-    ports:
-      - "8080:8080"
-    environment:
-      - INSTANA_API_TOKEN=${INSTANA_API_TOKEN}
-      - INSTANA_BASE_URL=${INSTANA_BASE_URL}
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD", "python", "-c", "import requests; requests.get('http://127.0.0.1:8080/health', timeout=5)"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 40s
-```
-
-### Docker Security Features
-
-#### **Security Best Practices Implemented**
-- ✅ **Non-root user**: Container runs as `mcpuser` (not root)
-- ✅ **No hardcoded secrets**: All credentials passed via environment variables
-- ✅ **Minimal dependencies**: Only 20 essential runtime dependencies
-- ✅ **Multi-stage build**: Build tools don't make it to final image
-- ✅ **Health checks**: Built-in container health monitoring
-- ✅ **Optimized base image**: Uses `python:3.11-slim`
-
-#### **Image Size Optimization**
-- **Original approach**: 95+ dependencies → ~1-2GB+ image
-- **Optimized approach**: 20 dependencies → ~266MB image
-- **Size reduction**: ~70-80% smaller images
-- **Benefits**: Faster deployments, lower storage costs, reduced attack surface
-
-### Testing the Docker Container
-
-#### **Health Check**
-```bash
-# Check if container is healthy
-docker ps
-
-# Test the MCP endpoint
-curl http://localhost:8080/mcp/
-```
-
-#### **MCP Inspector Testing**
-```bash
-# Test with MCP Inspector
-npx @modelcontextprotocol/inspector http://localhost:8080/mcp/
-```
-
-#### **Logs and Debugging**
-```bash
-# View container logs
-docker logs <container_id>
-
-# Follow logs in real-time
-docker logs -f <container_id>
-
-# Execute commands in running container
-docker exec -it <container_id> /bin/bash
-```
-
-### Production Deployment
-
-#### **Recommended Production Setup**
-1. **Use environment variables** for all secrets
-2. **Set up proper logging** and monitoring
-3. **Configure health checks** for container orchestration
-4. **Use container orchestration** (Kubernetes, Docker Swarm, etc.)
-5. **Implement proper backup** and disaster recovery
-
-#### **Kubernetes Example**
-```yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: mcp-instana
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: mcp-instana
-  template:
-    metadata:
-      labels:
-        app: mcp-instana
-    spec:
-      containers:
-      - name: mcp-instana
-        image: mcp-instana:latest
-        ports:
-        - containerPort: 8080
-        env:
-        - name: INSTANA_API_TOKEN
-          valueFrom:
-            secretKeyRef:
-              name: instana-secrets
-              key: api-token
-        - name: INSTANA_BASE_URL
-          value: "https://your-instana-instance.instana.io"
-        livenessProbe:
-          httpGet:
-            path: /health
-            port: 8080
-          initialDelaySeconds: 30
-          periodSeconds: 10
-        readinessProbe:
-          httpGet:
-            path: /health
-            port: 8080
-          initialDelaySeconds: 5
-          periodSeconds: 5
+docker run -p 8081:8080 mcp-instana
 ```
 
 ## Troubleshooting
@@ -1192,18 +1037,17 @@ spec:
 ```bash
 # Check container logs
 docker logs <container_id>
-
 # Common issues:
-# 1. Missing environment variables
-# 2. Port already in use
-# 3. Invalid Instana credentials
+# 1. Port already in use
+# 2. Invalid container image
+# 3. Missing dependencies
+# Credentials are passed via HTTP headers from the MCP client
 ```
 
 #### **Connection Issues**
 ```bash
 # Test container connectivity
 docker exec -it <container_id> curl http://127.0.0.1:8080/health
-
 # Check port mapping
 docker port <container_id>
 ```
@@ -1212,7 +1056,6 @@ docker port <container_id>
 ```bash
 # Check container resource usage
 docker stats <container_id>
-
 # Monitor container health
 docker inspect <container_id> | grep -A 10 Health
 ```
@@ -1228,3 +1071,4 @@ docker inspect <container_id> | grep -A 10 Health
       - If that works, your Python environment may not be able to verify the certificate and might not have access to the same certificates as your shell or system. Ensure your Python environment uses system certificates (macOS). You can do this by installing certificates to Python:
       `//Applications/Python\ 3.13/Install\ Certificates.command`
     - If you cannot reach the endpoint with SSL verification, try without it. If that works, check your system's CA certificates and ensure they are up-to-date.
+```

{mcp_instana-0.3.0.dist-info → mcp_instana-0.6.2.dist-info}/RECORD

@@ -1,26 +1,27 @@
 src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+src/observability.py,sha256=FQIMF4reR-UtXqnBSa3Ub0wuPvlf9VNSTeMieJmFdMM,959
 src/application/__init__.py,sha256=cfWHjA5NzAvL0jcekaIO3NTe5DRtznYRqg9_8hVwSzc,37
-src/application/application_alert_config.py,sha256=dbYGzUNZdfcEp_-zLLLm8_AfJZHoSPamLp4eHNYQ42I,31196
-src/application/application_analyze.py,sha256=EXOaGRn8wEoFUltAmAnzFRiTrkLzh7c_RHdP5Nj2-Hk,26947
+src/application/application_alert_config.py,sha256=LDUgkpMBx_5tX88dzE0emr31kydzMZWDCi36JzZDyEw,31590
+src/application/application_analyze.py,sha256=cb5kbt2GYntyFAHXvix9r7nFthoftCa9haWmXjxpDEM,27046
 src/application/application_catalog.py,sha256=MVjU1CyYf6NSeCt2o0aTlNDAKeMUY3vr-wDOprnt2D8,6540
-src/application/application_global_alert_config.py,sha256=HqBlLLhMmpwy8pJlz9SDkHJ6w1vHH0LD7_LX4YWe7uk,31684
-src/application/application_metrics.py,sha256=swuoMk6fWNbW-IzivxJv8C7CgJie66u9d0JvtZ2jU4Y,15476
-src/application/application_resources.py,sha256=USbIrPnkokUBOiack7EChOTH2vqJM2D0EF-9MjGbn5w,18279
-src/application/application_settings.py,sha256=UZHZwY3GNW4JMl1Q6gGtGCE4iYERR7ijK0hslCYBMTo,76210
+src/application/application_global_alert_config.py,sha256=PGDPXAuSu_J6uKohMhKWh1gpPOUkk4COvQF4mXsEPZI,31474
+src/application/application_metrics.py,sha256=M8OymCr2TxlckpnUtASFaLb5kZD1AbnZy2ApvfQgGbI,15466
+src/application/application_resources.py,sha256=3cZEOaAppDwSMG_DItR1BTbjuz_JkxedorvbvxzDcbw,20262
+src/application/application_settings.py,sha256=gwkGKeiKpXLGmRe_MYtSvGglXHsgP9JakaBkm8TeKbo,83655
 src/application/application_topology.py,sha256=WinVNHSSTF771vq5hl2GxTLm3bdpehAQJ1AMumfy7M0,4870
 src/automation/action_catalog.py,sha256=jivR73riqBt-MGDnhSoEsshG7bHk7JpxvVuRx7FCtOA,17493
 src/automation/action_history.py,sha256=aMHUd5RLMrgdDvJXv0x6dkUA7I_35O0A89RPhFUfORI,16494
 src/core/__init__.py,sha256=gZdGV4TVETqe3XV-_lzQMw0IgyTTCqYYgP3PH9YdWbU,30
-src/core/server.py,sha256=WvkxAWYBiKdo3mdxoc6v_9SCO8Ij6hS2vCSMSlIvbTY,25022
+src/core/server.py,sha256=LSdYYO-G9g1k_2yRqZVta2e8ZaGr3hFvj0duSbc7o-Y,25107
 src/core/utils.py,sha256=vB2ArNkOy0YIHk8Xv8nYHGEeTpw79pStJz6HL2aHWK8,11527
 src/event/__init__.py,sha256=ru-xCHU9xksGf9aJslvI37-6SI2yoBOpsoaED-vbaaQ,31
-src/event/events_tools.py,sha256=R17EYk1jUUIQl5706idtOKzLWWNLchv2fRd-U8S1Uno,42775
+src/event/events_tools.py,sha256=ajCARRjxd6tkqH_fdFC1cOg9TYRV_gJE4BBVqDmyLV0,45365
 src/infrastructure/__init__.py,sha256=xZuRO1Zb2iPyO5G3PRM90dfesaFheL7DMSSJMujtLVk,40
 src/infrastructure/infrastructure_analyze.py,sha256=eBo9Rq7DRzsIKup4LR-ar_1g4kr_IPWeKcHMb-w1hLA,29455
-src/infrastructure/infrastructure_catalog.py,sha256=rE_ySS-MHDwGc_msat6XsxKolgYbduZSnPp4adXFQKM,29827
-src/infrastructure/infrastructure_metrics.py,sha256=he_KAadNp5VAWdDM65ZuDavHOZvwOX4tEuXJYwXjm78,7081
-src/infrastructure/infrastructure_resources.py,sha256=gFxjzGbUdlFXVjbuWKUxC0NEuwkPsZNkrWhnZ2Zd2t0,29297
-src/infrastructure/infrastructure_topology.py,sha256=mVz9jrpjstDNh_iUxZfGo912Ze5I3zH3XlapFIwm_3A,14830
+src/infrastructure/infrastructure_catalog.py,sha256=tXrDAJ0ZzS6cfrx-aDJ63GkYGKUbePV_NLH-opm5bsE,31254
+src/infrastructure/infrastructure_metrics.py,sha256=P5uiy2uGLrmh8LuYcW1GG_DkOAvAb64nEpKD_lBeydo,7136
+src/infrastructure/infrastructure_resources.py,sha256=sVnYUkeMiaMAp3ln6ujHzRLOwceHr_XLE9LB0Qmrgbg,29240
+src/infrastructure/infrastructure_topology.py,sha256=rVY7QnLGANHPXlezAhbc6wJfOoUO2TRr_VlXtkifo4A,15456
 src/log/__init__.py,sha256=NwPZccMqR5aR6PrISe760gkABtpg7zpbwOK-uMPB-_Y,29
 src/log/log_alert_configuration.py,sha256=-8ORRo889n4X4GalwhTQa9uHU4JuERy2OfnhP7k6LOM,18430
 src/prompts/__init__.py,sha256=oXt7rf_EASRtgL43lKRgH8xhX6abJ3fhpHfarIlkFog,405
@@ -52,8 +53,8 @@ src/website/website_analyze.py,sha256=0VyK8f-9vW1LzZ70b7IxKzwqSL2bWw8wDFSOCx2pEr
 src/website/website_catalog.py,sha256=Z21urtdTf8sU2SZiCwGq5OyPLaswS9lw12TCD9pS__4,7127
 src/website/website_configuration.py,sha256=hBHSFgj6GXOfLvlq8p-tBU4KFQc99uS167DBz4cjjK0,35926
 src/website/website_metrics.py,sha256=6McxbVYZq5i61Ml3QcVeHS86y2rCIPzdDuUDOxNtnMM,10954
-mcp_instana-0.3.0.dist-info/METADATA,sha256=pBBWf3CzWNzeHE-5yRbEVJZ3ZV5EW2w34sVepEmiyjc,47089
-mcp_instana-0.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mcp_instana-0.3.0.dist-info/entry_points.txt,sha256=p1aZ9Ks0aJKpoIy6Mk-08cGYAfkXMNbwYIlokm513A4,140
-mcp_instana-0.3.0.dist-info/licenses/LICENSE.md,sha256=Ox7lseFP2kBRXBjsLweW1jLmWiCyrKjwF8ZUvCbKd70,11310
-mcp_instana-0.3.0.dist-info/RECORD,,
+mcp_instana-0.6.2.dist-info/METADATA,sha256=utEaEnN7t95AmdwuR4a-ODN_Q5WJEl-zeSJfRrP06bY,42334
+mcp_instana-0.6.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+mcp_instana-0.6.2.dist-info/entry_points.txt,sha256=p1aZ9Ks0aJKpoIy6Mk-08cGYAfkXMNbwYIlokm513A4,140
+mcp_instana-0.6.2.dist-info/licenses/LICENSE.md,sha256=Ox7lseFP2kBRXBjsLweW1jLmWiCyrKjwF8ZUvCbKd70,11310
+mcp_instana-0.6.2.dist-info/RECORD,,

{mcp_instana-0.3.0.dist-info → mcp_instana-0.6.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

src/application/application_alert_config.py

@@ -525,11 +525,16 @@ class ApplicationAlertMCPTools(BaseInstanaClient):
                 logger.debug(f"Error importing ApplicationAlertConfig: {e}")
                 return {"error": f"Failed to import ApplicationAlertConfig: {e!s}"}
 
-            # Create an ApplicationAlertConfig object from the request body
+            # Create an ApplicationAlertConfig object from the request body using from_dict
+            # This properly handles nested objects and discriminators
             try:
                 logger.debug(f"Creating ApplicationAlertConfig with params: {request_body}")
-                config_object = ApplicationAlertConfig(**request_body)
+                config_object = ApplicationAlertConfig.from_dict(request_body)
                 logger.debug("Successfully created config object")
+
+                # Debug: Log what will be sent to API
+                config_dict = config_object.to_dict()
+                logger.debug(f"Config object as dict (what will be sent to API): {config_dict}")
             except Exception as e:
                 logger.debug(f"Error creating ApplicationAlertConfig: {e}")
                 return {"error": f"Failed to create config object: {e!s}"}
@@ -655,10 +660,11 @@ class ApplicationAlertMCPTools(BaseInstanaClient):
                 logger.debug(f"Error importing ApplicationAlertConfig: {e}")
                 return {"error": f"Failed to import ApplicationAlertConfig: {e!s}"}
 
-            # Create an ApplicationAlertConfig object from the request body
+            # Create an ApplicationAlertConfig object from the request body using from_dict
+            # This properly handles nested objects and discriminators
             try:
                 logger.debug(f"Creating ApplicationAlertConfig with params: {request_body}")
-                config_object = ApplicationAlertConfig(**request_body)
+                config_object = ApplicationAlertConfig.from_dict(request_body)
                 logger.debug("Successfully created config object")
             except Exception as e:
                 logger.debug(f"Error creating ApplicationAlertConfig: {e}")

src/application/application_analyze.py

@@ -84,21 +84,24 @@ class ApplicationAnalyzeMCPTools(BaseInstanaClient):
                 return {"error": "Both trace_id and call_id must be provided"}
 
             logger.debug(f"Fetching call details for trace_id={trace_id}, call_id={call_id}")
-            result = api_client.get_call_details(
+            result = api_client.get_call_details_without_preload_content(
                 trace_id=trace_id,
                 call_id=call_id
             )
 
-            # Convert the result to a dictionary
-            if hasattr(result, 'to_dict'):
-                result_dict = result.to_dict()
-            else:
-                # If it's already a dict or another format, use it as is
-                result_dict = result
+            import json
 
-            logger.debug(f"Result from get_call_details: {result_dict}")
-            # Ensure we return a dictionary
-            return dict(result_dict) if not isinstance(result_dict, dict) else result_dict
+            try:
+                response_text = result.data.decode('utf-8')
+                result_dict = json.loads(response_text)
+                logger.debug("Successfully retrieved call details")
+                return result_dict
+
+            # Convert the result to a dictionary
+            except (json.JSONDecodeError, AttributeError) as json_err:
+                error_message = f"Failed to parse JSON response: {json_err}"
+                logger.error(error_message)
+                return {"error": error_message}
 
         except Exception as e:
             logger.error(f"Error getting call details: {e}", exc_info=True)

src/application/application_global_alert_config.py

@@ -41,7 +41,7 @@ class ApplicationGlobalAlertMCPTools(BaseInstanaClient):
     async def find_active_global_application_alert_configs(self,
                                             application_id: str,
                                             alert_ids: Optional[List[str]] = None,
-                                            ctx=None, api_client=None) -> List[Dict[str, Any]]:
+                                            ctx=None, api_client=None) -> Dict[str, Any]:
         """
         Get All Global Smart Alert Configuration.
 
@@ -63,36 +63,37 @@ class ApplicationGlobalAlertMCPTools(BaseInstanaClient):
 
             # Validate required parameters
             if not application_id:
-                return [{"error": "application_id is required"}]
+                return {"error": "application_id is required"}
 
             # Call the find_active_global_application_alert_configs method from the SDK
             logger.debug(f"Calling find_active_global_application_alert_configs with application_id={application_id}, alert_ids={alert_ids}")
-            result = api_client.find_active_global_application_alert_configs(
+            response = api_client.find_active_global_application_alert_configs_without_preload_content(
                 application_id=application_id,
                 alert_ids=alert_ids
             )
 
-            # Convert the result to a list format
-            if isinstance(result, list):
-                # If it's already a list, convert each item to dict if needed
-                result_list = []
-                for item in result:
-                    if hasattr(item, 'to_dict'):
-                        result_list.append(item.to_dict())
-                    else:
-                        result_list.append(item)
-            elif hasattr(result, 'to_dict'):
-                # If it's a single object, wrap it in a list
-                result_list = [result.to_dict()]
-            else:
-                # If it's already a dict or other format, wrap it in a list
-                result_list = [result] if result else []
+            import json
+
+            raw_data = response.data.decode('utf-8')
+            logger.debug(f"Raw data: {raw_data}")
+
+            try:
+                result = json.loads(raw_data)
+                logger.debug(f"Parsed JSON result: {result}")
+
+                if isinstance(result, list):
+                    return {"configs": result}
+                else:
+                    return {"configs": [result] if result else []}
+
+            except json.JSONDecodeError as e:
+                error_msg = f"Failed to parse response JSON: {e}"
+                logger.error(error_msg)
+                return {"error": error_msg}
 
-            logger.debug(f"Result from find_active_global_application_alert_configs: {result_list}")
-            return result_list
         except Exception as e:
             logger.error(f"Error in find_active_global_application_alert_configs: {e}", exc_info=True)
-            return [{"error": f"Failed to get active global application alert config: {e!s}"}]
+            return {"error": f"Failed to get active global application alert config: {e!s}"}
 
 
     @register_as_tool(

src/application/application_metrics.py

@@ -134,18 +134,18 @@ class ApplicationMetricsMCPTools(BaseInstanaClient):
     )
     @with_header_auth(ApplicationMetricsApi)
     async def get_application_metrics(self,
-                                      application_ids: Optional[List[str]] = None,
+                                      application_id: Optional[str] = None,
                                       metrics: Optional[List[Dict[str, str]]] = None,
                                       time_frame: Optional[Dict[str, int]] = None,
                                       fill_time_series: Optional[bool] = True,
                                       ctx=None, api_client=None) -> Dict[str, Any]:
         """
-        Get metrics for specific applications.
+        Get metrics for a specific application.
 
         This API endpoint retrieves one or more supported aggregations of metrics for an Application Perspective.
 
         Args:
-            application_ids: List of application IDs to get metrics for
+            application_id: Application ID to get metrics for (single application)
             metrics: List of metrics to retrieve with their aggregations
                 Example: [{"metric": "latency", "aggregation": "MEAN"}]
             time_frame: Dictionary with 'from' and 'to' timestamps in milliseconds
@@ -157,7 +157,7 @@ class ApplicationMetricsMCPTools(BaseInstanaClient):
             Dictionary containing application metrics data or error information
         """
         try:
-            logger.debug(f"get_application_metrics called with application_ids={application_ids}")
+            logger.debug(f"get_application_metrics called with application_id={application_id}")
 
             # Set default time range if not provided
             if not time_frame:
@@ -183,9 +183,9 @@ class ApplicationMetricsMCPTools(BaseInstanaClient):
                 "timeFrame": time_frame
             }
 
-            # Add application IDs if provided
-            if application_ids:
-                request_body["applicationIds"] = application_ids
+            # Add application ID if provided
+            if application_id:
+                request_body["applicationId"] = application_id
 
             # Create the GetApplications object
             get_applications = GetApplications(**request_body)
@@ -215,18 +215,18 @@ class ApplicationMetricsMCPTools(BaseInstanaClient):
     )
     @with_header_auth(ApplicationMetricsApi)
     async def get_endpoints_metrics(self,
-                                    endpoint_ids: Optional[List[str]] = None,
+                                    endpoint_id: Optional[str] = None,
                                     metrics: Optional[List[Dict[str, str]]] = None,
                                     time_frame: Optional[Dict[str, int]] = None,
                                     fill_time_series: Optional[bool] = True,
                                     ctx=None, api_client=None) -> Dict[str, Any]:
         """
-        Get metrics for specific endpoints.
+        Get metrics for a specific endpoint.
 
         This API endpoint retrieves one or more supported aggregations of metrics for an Endpoint.
 
         Args:
-            endpoint_ids: List of endpoint IDs to get metrics for
+            endpoint_id: Endpoint ID to get metrics for (single endpoint)
             metrics: List of metrics to retrieve with their aggregations
                 Example: [{"metric": "latency", "aggregation": "MEAN"}]
             time_frame: Dictionary with 'from' and 'to' timestamps in milliseconds
@@ -238,7 +238,7 @@ class ApplicationMetricsMCPTools(BaseInstanaClient):
             Dictionary containing endpoint metrics data or error information
         """
         try:
-            logger.debug(f"get_endpoints_metrics called with endpoint_ids={endpoint_ids}")
+            logger.debug(f"get_endpoints_metrics called with endpoint_id={endpoint_id}")
 
             # Set default time range if not provided
             if not time_frame:
@@ -264,9 +264,9 @@ class ApplicationMetricsMCPTools(BaseInstanaClient):
                 "timeFrame": time_frame
             }
 
-            # Add endpoint IDs if provided
-            if endpoint_ids:
-                request_body["endpointIds"] = endpoint_ids
+            # Add endpoint ID if provided
+            if endpoint_id:
+                request_body["endpointId"] = endpoint_id
 
             # Create the GetEndpoints object
             get_endpoints = GetEndpoints(**request_body)
@@ -296,19 +296,19 @@ class ApplicationMetricsMCPTools(BaseInstanaClient):
     )
     @with_header_auth(ApplicationMetricsApi)
     async def get_services_metrics(self,
-                                   service_ids: Optional[List[str]] = None,
+                                   service_id: Optional[str] = None,
                                    metrics: Optional[List[Dict[str, str]]] = None,
                                    time_frame: Optional[Dict[str, int]] = None,
                                    fill_time_series: Optional[bool] = True,
                                    include_snapshot_ids: Optional[bool] = False,
                                    ctx=None, api_client=None) -> Dict[str, Any]:
         """
-        Get metrics for specific services.
+        Get metrics for a specific service.
 
         This API endpoint retrieves one or more supported aggregations of metrics for a Service.
 
         Args:
-            service_ids: List of service IDs to get metrics for
+            service_id: Service ID to get metrics for (single service)
             metrics: List of metrics to retrieve with their aggregations
                 Example: [{"metric": "latency", "aggregation": "MEAN"}]
             time_frame: Dictionary with 'from' and 'to' timestamps in milliseconds
@@ -321,7 +321,7 @@ class ApplicationMetricsMCPTools(BaseInstanaClient):
             Dictionary containing service metrics data or error information
         """
         try:
-            logger.debug(f"get_services_metrics called with service_ids={service_ids}")
+            logger.debug(f"get_services_metrics called with service_id={service_id}")
 
             # Set default time range if not provided
             if not time_frame:
@@ -347,9 +347,9 @@ class ApplicationMetricsMCPTools(BaseInstanaClient):
                 "timeFrame": time_frame
             }
 
-            # Add service IDs if provided
-            if service_ids:
-                request_body["serviceIds"] = service_ids
+            # Add service ID if provided
+            if service_id:
+                request_body["serviceId"] = service_id
 
             # Create the GetServices object
             get_services = GetServices(**request_body)