monocle-apptrace 0.4.0b2__tar.gz → 0.7.0__tar.gz

{monocle_apptrace-0.4.0b2 → monocle_apptrace-0.7.0}/.gitignore

@@ -14,4 +14,9 @@ dist
 .DS_Store
 Pipfile**
 launch.json
-monocle_trace**.json
+monocle_trace**.json
+
+# Ignore LICENSE files in specific subdirectories
+apptrace/LICENSE
+mcp/LICENSE
+test_tools/LICENSE

monocle_apptrace-0.7.0/PKG-INFO

@@ -0,0 +1,122 @@
+Metadata-Version: 2.4
+Name: monocle_apptrace
+Version: 0.7.0
+Summary: package with monocle genAI tracing
+Project-URL: Homepage, https://github.com/monocle2ai/monocle
+Project-URL: Issues, https://github.com/monocle2ai/monocle/issues
+Author-email: "Okahu Inc." <okahu-pypi@okahu.ai>
+License: Apache-2.0
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.8
+Requires-Dist: opentelemetry-api>=1.21.0
+Requires-Dist: opentelemetry-instrumentation
+Requires-Dist: opentelemetry-sdk>=1.21.0
+Requires-Dist: requests
+Requires-Dist: rfc3986>=2.0.0
+Requires-Dist: wrapt>=1.14.0
+Provides-Extra: ai-test
+Requires-Dist: bert-score; extra == 'ai-test'
+Requires-Dist: transformers; extra == 'ai-test'
+Provides-Extra: aws
+Requires-Dist: boto3==1.37.24; extra == 'aws'
+Provides-Extra: azure
+Requires-Dist: azure-ai-inference; extra == 'azure'
+Requires-Dist: azure-storage-blob==12.22.0; extra == 'azure'
+Provides-Extra: dev
+Requires-Dist: a2a-sdk==0.3.6; extra == 'dev'
+Requires-Dist: anthropic-haystack; extra == 'dev'
+Requires-Dist: anthropic==0.57.1; extra == 'dev'
+Requires-Dist: azure-storage-blob==12.22.0; extra == 'dev'
+Requires-Dist: boto3==1.39.0; extra == 'dev'
+Requires-Dist: chromadb==1.0.15; extra == 'dev'
+Requires-Dist: click==8.2.1; extra == 'dev'
+Requires-Dist: crewai==0.95.0; extra == 'dev'
+Requires-Dist: datasets==4.3.0; extra == 'dev'
+Requires-Dist: faiss-cpu==1.8.0; extra == 'dev'
+Requires-Dist: fastapi>=0.115.0; extra == 'dev'
+Requires-Dist: flask; extra == 'dev'
+Requires-Dist: google-adk==1.10.0; extra == 'dev'
+Requires-Dist: google-ai-haystack; extra == 'dev'
+Requires-Dist: google-generativeai==0.8.5; extra == 'dev'
+Requires-Dist: haystack-ai==2.3.0; extra == 'dev'
+Requires-Dist: httpx==0.28.1; extra == 'dev'
+Requires-Dist: huggingface-hub==0.35.3; extra == 'dev'
+Requires-Dist: instructorembedding==1.0.1; extra == 'dev'
+Requires-Dist: langchain-anthropic==0.3.13; extra == 'dev'
+Requires-Dist: langchain-aws==0.2.23; extra == 'dev'
+Requires-Dist: langchain-chroma==0.2.4; extra == 'dev'
+Requires-Dist: langchain-community==0.3.24; extra == 'dev'
+Requires-Dist: langchain-google-genai==2.0.10; extra == 'dev'
+Requires-Dist: langchain-mcp-adapters==0.1.8; extra == 'dev'
+Requires-Dist: langchain-mistralai==0.2.10; extra == 'dev'
+Requires-Dist: langchain-openai==0.3.18; extra == 'dev'
+Requires-Dist: langchain==0.3.25; extra == 'dev'
+Requires-Dist: langchainhub==0.1.21; extra == 'dev'
+Requires-Dist: langgraph-supervisor==0.0.28; extra == 'dev'
+Requires-Dist: langgraph==0.5.4; extra == 'dev'
+Requires-Dist: litellm==1.77.5; extra == 'dev'
+Requires-Dist: llama-index-embeddings-huggingface==0.6.0; extra == 'dev'
+Requires-Dist: llama-index-llms-anthropic==0.8.1; extra == 'dev'
+Requires-Dist: llama-index-llms-azure-openai==0.4.0; extra == 'dev'
+Requires-Dist: llama-index-llms-mistralai==0.7.0; extra == 'dev'
+Requires-Dist: llama-index-llms-openai==0.5.0; extra == 'dev'
+Requires-Dist: llama-index-tools-mcp==0.3.0; extra == 'dev'
+Requires-Dist: llama-index-vector-stores-chroma==0.5.0; extra == 'dev'
+Requires-Dist: llama-index-vector-stores-opensearch==0.6.0; extra == 'dev'
+Requires-Dist: llama-index==0.13.0; extra == 'dev'
+Requires-Dist: mcp==1.12.1; extra == 'dev'
+Requires-Dist: mistral-haystack==0.0.2; extra == 'dev'
+Requires-Dist: mistralai==1.9.9; extra == 'dev'
+Requires-Dist: numpy==1.26.4; extra == 'dev'
+Requires-Dist: openai-agents==0.2.6; extra == 'dev'
+Requires-Dist: opendal==0.45.14; extra == 'dev'
+Requires-Dist: opensearch-haystack==1.2.0; extra == 'dev'
+Requires-Dist: opentelemetry-instrumentation-flask; extra == 'dev'
+Requires-Dist: parameterized==0.9.0; extra == 'dev'
+Requires-Dist: pydantic==2.11.7; extra == 'dev'
+Requires-Dist: pytest-asyncio==0.26.0; extra == 'dev'
+Requires-Dist: pytest-venv; extra == 'dev'
+Requires-Dist: pytest==8.3.5; extra == 'dev'
+Requires-Dist: python-dotenv>=1.1.0; extra == 'dev'
+Requires-Dist: requests-aws4auth==1.2.3; extra == 'dev'
+Requires-Dist: types-requests==2.31.0.20240106; extra == 'dev'
+Requires-Dist: uvicorn==0.35.0; extra == 'dev'
+Provides-Extra: dev-gemini
+Requires-Dist: llama-index-llms-gemini==0.6.0; extra == 'dev-gemini'
+Provides-Extra: dev-strands
+Requires-Dist: strands-agents-tools==0.2.10; extra == 'dev-strands'
+Requires-Dist: strands-agents==1.11.0; extra == 'dev-strands'
+Provides-Extra: dev-tranformers
+Requires-Dist: sentence-transformers==3.3.0; extra == 'dev-tranformers'
+Description-Content-Type: text/markdown
+
+# Monocle Apptrace
+
+**Monocle** helps developers and platform engineers building or managing GenAI apps monitor these in prod by making it easy to instrument their code to capture traces that are compliant with open-source cloud-native observability ecosystem. 
+
+**Monocle** is a community-driven OSS framework for tracing GenAI app code governed as a [Linux Foundation AI & Data project](https://lfaidata.foundation/projects/monocle/). 
+
+## Use Monocle
+
+- Get the Monocle package
+  
+```
+    pip install monocle_apptrace 
+```
+- Instrument your app code
+     - Import the Monocle package
+       ```
+          from monocle_apptrace.instrumentor import setup_monocle_telemetry
+       ```
+     - Setup instrumentation in your ```main()``` function  
+       ``` 
+          setup_monocle_telemetry(workflow_name="your-app-name")
+       ```         
+- (Optionally) Modify config to alter where traces are sent
+
+See [Monocle user guide](Monocle_User_Guide.md) for more details.
+  
+
+

monocle_apptrace-0.7.0/README.md

@@ -0,0 +1,28 @@
+# Monocle Apptrace
+
+**Monocle** helps developers and platform engineers building or managing GenAI apps monitor these in prod by making it easy to instrument their code to capture traces that are compliant with open-source cloud-native observability ecosystem. 
+
+**Monocle** is a community-driven OSS framework for tracing GenAI app code governed as a [Linux Foundation AI & Data project](https://lfaidata.foundation/projects/monocle/). 
+
+## Use Monocle
+
+- Get the Monocle package
+  
+```
+    pip install monocle_apptrace 
+```
+- Instrument your app code
+     - Import the Monocle package
+       ```
+          from monocle_apptrace.instrumentor import setup_monocle_telemetry
+       ```
+     - Setup instrumentation in your ```main()``` function  
+       ``` 
+          setup_monocle_telemetry(workflow_name="your-app-name")
+       ```         
+- (Optionally) Modify config to alter where traces are sent
+
+See [Monocle user guide](Monocle_User_Guide.md) for more details.
+  
+
+

monocle_apptrace-0.7.0/pyproject.toml

@@ -0,0 +1,200 @@
+[build-system]
+requires = ["hatchling","hatch-build-scripts"]
+build-backend = "hatchling.build"
+
+[[tool.hatch.build.hooks.build-scripts.scripts]]
+commands = [
+    "echo 'Running a pre-build step..copying license'",
+    "if [ -f \"LICENSE\" ]; then echo \"✅ LICENSE already exists\"; elif [ -f \"../LICENSE\" ]; then cp \"../LICENSE\" \"LICENSE\" && echo \"✅ LICENSE copied from parent\"; else echo \"❌ ERROR: LICENSE not found\" && exit 1; fi"
+]
+
+[project]
+name = "monocle_apptrace"
+version = "0.7.0"
+authors = [
+  { name="Okahu Inc.", email="okahu-pypi@okahu.ai" },
+]
+description = "package with monocle genAI tracing"
+readme = "README.md"
+requires-python = ">=3.8"
+license = {text = "Apache-2.0"}
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: Apache Software License",
+    "Operating System :: OS Independent",
+]
+dependencies = [
+   'requests',
+   'wrapt>=1.14.0',
+   'rfc3986>=2.0.0',
+   'opentelemetry-api>=1.21.0',
+   'opentelemetry-sdk>=1.21.0',
+   'opentelemetry-instrumentation',
+]
+
+[tool.pytest.ini_options]
+log_cli = true
+log_cli_level = "INFO"
+# Enable file logging
+#log_file = "traces.log"
+#log_file_level = "INFO"
+log_format = "%(asctime)s %(levelname)s %(pathname)s:%(lineno)d %(message)s"
+log_date_format = "%Y-%m-%d %H:%M:%S"
+
+pythonpath = [
+  "src",
+  "tests"
+]
+
+# Simple ignore patterns - uncomment lines to ignore specific tests
+# Just uncomment the patterns you want to ignore:
+
+#ignore = [
+#  "tests/integration/",                    # Ignore ALL integration tests
+#  "tests/unit/",                          # Ignore ALL unit tests
+#]
+
+# Or ignore specific test files/patterns:
+#ignore = [
+#  "tests/integration/test_langchain_bedrock_sample.py",
+#  "tests/integration/test_anthropic_*.py",
+#  "tests/integration/test_azure_*.py", 
+#  "tests/integration/test_openai_*.py",
+#  "tests/unit/*_processor_test.py",
+#]
+
+# Test discovery patterns
+testpaths = [
+  "tests"
+]
+
+[project.optional-dependencies]
+ai_test = [
+   'bert-score',
+   'transformers'
+]
+
+dev = [
+  'langchain-openai==0.3.18',
+  'langchain-chroma==0.2.4',
+  'langchain-community==0.3.24',
+  'langchain==0.3.25',
+  'datasets==4.3.0',
+  'numpy==1.26.4',
+  'types-requests==2.31.0.20240106',
+  'InstructorEmbedding==1.0.1',
+  'faiss-cpu==1.8.0',
+  'pytest==8.3.5',
+  'pytest-venv',
+  'llama-index==0.13.0',
+  'llama-index-llms-openai==0.5.0',
+  'llama-index-tools-mcp==0.3.0',
+  'llama-index-embeddings-huggingface==0.6.0',
+  'llama-index-vector-stores-chroma==0.5.0',
+  'parameterized==0.9.0',
+  'llama-index-llms-mistralai==0.7.0',
+  'langchain-mistralai==0.2.10',
+  'mistral-haystack==0.0.2',
+  'langchain-aws==0.2.23',
+  'azure-storage-blob==12.22.0', # this is for blob exporter
+  'boto3==1.39.0', # this is for aws exporter
+  'llama-index-vector-stores-opensearch==0.6.0',
+  'haystack-ai==2.3.0',
+  'llama-index-llms-azure-openai==0.4.0',
+  'requests-aws4auth==1.2.3',
+  'opensearch-haystack==1.2.0',
+  'langchainhub==0.1.21',
+  'chromadb==1.0.15',
+  'flask',
+  'opentelemetry-instrumentation-flask',
+  'langgraph==0.5.4',
+  'langgraph-supervisor==0.0.28',
+  'opendal==0.45.14',
+  'anthropic==0.57.1',
+  'anthropic-haystack',
+  'pytest-asyncio==0.26.0',
+  'llama-index-llms-anthropic==0.8.1',
+  'langchain-anthropic==0.3.13',
+  'langchain-mcp-adapters==0.1.8',
+  'mcp==1.12.1',
+  'a2a-sdk==0.3.6',
+  'httpx==0.28.1',
+  'fastapi>=0.115.0',
+  'pydantic==2.11.7',
+  'uvicorn==0.35.0',
+  'click==8.2.1',
+  'python-dotenv>=1.1.0',
+  'langchain-google-genai==2.0.10',
+  'google-adk==1.10.0',
+  'google-generativeai==0.8.5',
+  'openai-agents==0.2.6',
+  'mistralai==1.9.9',
+  'huggingface_hub==0.35.3',
+  'litellm==1.77.5',
+  'google-ai-haystack',
+  'crewai==0.95.0'
+]
+
+dev_tranformers = [
+    'sentence-transformers==3.3.0'
+]
+
+dev_gemini = [
+  'llama-index-llms-gemini==0.6.0'
+]
+
+dev_strands = [
+  'strands-agents==1.11.0',
+  'strands-agents-tools==0.2.10'
+]
+
+azure = [
+    'azure-storage-blob==12.22.0',
+    'azure-ai-inference'
+]
+
+aws = [
+    'boto3==1.37.24',
+]
+
+[project.urls]
+Homepage = "https://github.com/monocle2ai/monocle"
+Issues = "https://github.com/monocle2ai/monocle/issues"
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/monocle_apptrace"]
+
+[tool.hatch.build.targets.sdist]
+ignore-vcs = true
+include = [
+  "pyproject.toml",
+  "README.md",
+  "LICENSE",
+  "src/**",
+]
+
+[tool.hatch.build]
+exclude = [
+  "/.*",
+  "*.txt",
+  "Pipfile",
+  "/data",
+  "/docs",
+  "/tests",
+  "*.yml",
+]
+
+[tool.pylint]
+max-line-length = 120
+disable = [
+    "C0103", # (invalid-name)
+    "C0114", # (missing-module-docstring)
+    "C0115", # (missing-class-docstring)
+    "C0116", # (missing-function-docstring)
+    "R0903", # (too-few-public-methods)
+    "R0913", # (too-many-arguments)
+    "W0105", # (pointless-string-statement)
+]
+
+[project.scripts]
+monocle_apptrace = "monocle_apptrace.mcp_server:main"

{monocle_apptrace-0.4.0b2 → monocle_apptrace-0.7.0}/src/monocle_apptrace/__main__.py

@@ -1,6 +1,6 @@
 import sys, os
 import runpy
-from monocle_apptrace.instrumentation.common.instrumentor import setup_monocle_telemetry
+from monocle_apptrace import setup_monocle_telemetry
 
 def main():
     if len(sys.argv) < 2 or not sys.argv[1].endswith(".py"):

{monocle_apptrace-0.4.0b2 → monocle_apptrace-0.7.0}/src/monocle_apptrace/exporters/aws/s3_exporter.py

@@ -1,6 +1,4 @@
 import os
-import time
-import random
 import datetime
 import logging
 import asyncio
@@ -15,12 +13,14 @@ from botocore.exceptions import (
 )
 from opentelemetry.sdk.trace import ReadableSpan
 from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
-from monocle_apptrace.exporters.base_exporter import SpanExporterBase
+from monocle_apptrace.exporters.base_exporter import SpanExporterBase, format_trace_id_without_0x
 from monocle_apptrace.exporters.exporter_processor import ExportTaskProcessor
-from typing import Sequence, Optional
+from typing import Sequence, Optional, Dict, List, Tuple
 import json
 logger = logging.getLogger(__name__)
 
+HANDLE_TIMEOUT_SECONDS = 60
+
 class S3SpanExporter(SpanExporterBase):
     def __init__(self, bucket_name=None, region_name=None, task_processor: Optional[ExportTaskProcessor] = None):
         super().__init__()
@@ -29,6 +29,8 @@ class S3SpanExporter(SpanExporterBase):
         DEFAULT_TIME_FORMAT = "%Y-%m-%d__%H.%M.%S"
         self.max_batch_size = 500
         self.export_interval = 1
+        # Dictionary to store spans by trace_id: {trace_id: (spans_list, creation_time, has_root_span)}
+        self.trace_spans: Dict[int, Tuple[List[ReadableSpan], datetime.datetime, bool]] = {}
         if(os.getenv('MONOCLE_AWS_ACCESS_KEY_ID') and os.getenv('MONOCLE_AWS_SECRET_ACCESS_KEY')):
             self.s3_client = boto3.client(
                 's3',
@@ -46,8 +48,6 @@ class S3SpanExporter(SpanExporterBase):
         self.bucket_name = bucket_name or os.getenv('MONOCLE_S3_BUCKET_NAME','default-bucket')
         self.file_prefix = os.getenv('MONOCLE_S3_KEY_PREFIX', DEFAULT_FILE_PREFIX)
         self.time_format = DEFAULT_TIME_FORMAT
-        self.export_queue = []
-        self.last_export_time = time.time()
         self.task_processor = task_processor
         if self.task_processor is not None:
             self.task_processor.start()
@@ -92,6 +92,47 @@ class S3SpanExporter(SpanExporterBase):
             logger.error(f"Type error while checking bucket existence: {e}")
             raise e
 
+    def _cleanup_expired_traces(self) -> None:
+        """Upload and remove traces that have exceeded the timeout."""
+        current_time = datetime.datetime.now()
+        expired_trace_ids = []
+        
+        for trace_id, (spans, creation_time, _) in self.trace_spans.items():
+            if (current_time - creation_time).total_seconds() > HANDLE_TIMEOUT_SECONDS:
+                expired_trace_ids.append(trace_id)
+        
+        for trace_id in expired_trace_ids:
+            self._upload_trace(trace_id)
+
+    def _add_spans_to_trace(self, trace_id: int, spans: List[ReadableSpan], has_root: bool = False) -> None:
+        """Add spans to a trace buffer, creating it if needed."""
+        if trace_id in self.trace_spans:
+            existing_spans, creation_time, existing_root = self.trace_spans[trace_id]
+            existing_spans.extend(spans)
+            has_root = has_root or existing_root
+            self.trace_spans[trace_id] = (existing_spans, creation_time, has_root)
+        else:
+            self.trace_spans[trace_id] = (spans.copy(), datetime.datetime.now(), has_root)
+
+    def _upload_trace(self, trace_id: int) -> None:
+        """Upload a specific trace to S3 and remove it from the buffer."""
+        if trace_id not in self.trace_spans:
+            return
+        
+        spans, _, _ = self.trace_spans[trace_id]
+        if len(spans) == 0:
+            del self.trace_spans[trace_id]
+            return
+        
+        serialized_data = self.__serialize_spans(spans)
+        if serialized_data:
+            try:
+                self.__upload_to_s3_with_trace_id(serialized_data, trace_id)
+            except Exception as e:
+                logger.error(f"Failed to upload trace {format_trace_id_without_0x(trace_id)}: {e}")
+        
+        del self.trace_spans[trace_id]
+
     def export(self, spans: Sequence[ReadableSpan]) -> SpanExportResult:
         """Synchronous export method that internally handles async logic."""
         try:
@@ -106,18 +147,44 @@ class S3SpanExporter(SpanExporterBase):
     async def __export_async(self, spans: Sequence[ReadableSpan]) -> SpanExportResult:
         try:
             logger.info(f"__export_async {len(spans)} spans to S3.")
-            # Add spans to the export queue
+            
+            # Cleanup expired traces first
+            self._cleanup_expired_traces()
+            
+            # Group spans by trace_id
+            spans_by_trace = {}
+            root_span_traces = set()
+            
             for span in spans:
-                self.export_queue.append(span)
-                # If the queue reaches MAX_BATCH_SIZE, export the spans
-                if len(self.export_queue) >= self.max_batch_size:
-                    await self.__export_spans()
-
-            # Check if it's time to force a flush
-            current_time = time.time()
-            if current_time - self.last_export_time >= self.export_interval:
-                await self.__export_spans()  # Export spans if time interval has passed
-                self.last_export_time = current_time  # Reset the last export time
+                if self.skip_export(span):
+                    continue
+                
+                trace_id = span.context.trace_id
+                if trace_id not in spans_by_trace:
+                    spans_by_trace[trace_id] = []
+                spans_by_trace[trace_id].append(span)
+                
+                # Check if this span is a root span (no parent)
+                if not span.parent:
+                    root_span_traces.add(trace_id)
+            
+            # Add spans to their respective trace buffers
+            for trace_id, trace_spans in spans_by_trace.items():
+                has_root = trace_id in root_span_traces
+                self._add_spans_to_trace(trace_id, trace_spans, has_root)
+            
+            # Upload complete traces (those with root spans)
+            for trace_id in root_span_traces:
+                if self.task_processor is not None and callable(getattr(self.task_processor, 'queue_task', None)):
+                    # Queue the upload task
+                    if trace_id in self.trace_spans:
+                        spans_to_upload, _, _ = self.trace_spans[trace_id]
+                        serialized_data = self.__serialize_spans(spans_to_upload)
+                        if serialized_data:
+                            self.task_processor.queue_task(self.__upload_to_s3_with_trace_id, serialized_data, trace_id, True)
+                        del self.trace_spans[trace_id]
+                else:
+                    self._upload_trace(trace_id)
 
             return SpanExportResult.SUCCESS
         except Exception as e:
@@ -140,44 +207,35 @@ class S3SpanExporter(SpanExporterBase):
             return ndjson_data
         except Exception as e:
             logger.warning(f"Error serializing spans: {e}")
-
-
-    async def __export_spans(self):
-        if len(self.export_queue) == 0:
-            return
-
-        # Take a batch of spans from the queue
-        batch_to_export = self.export_queue[:self.max_batch_size]
-        serialized_data = self.__serialize_spans(batch_to_export)
-        self.export_queue = self.export_queue[self.max_batch_size:]
-        # to calculate is_root_span loop over each span in batch_to_export and check if parent id is none or null
-        is_root_span = any(not span.parent for span in batch_to_export)
-        logger.info(f"Exporting {len(batch_to_export)} spans to S3 is_root_span : {is_root_span}.")
-        if self.task_processor is not None and callable(getattr(self.task_processor, 'queue_task', None)):
-            self.task_processor.queue_task(self.__upload_to_s3, serialized_data, is_root_span)
-        else:
-            try:
-                self.__upload_to_s3(serialized_data)
-            except Exception as e:
-                logger.error(f"Failed to upload span batch: {e}")
+            return ""
 
     @SpanExporterBase.retry_with_backoff(exceptions=(EndpointConnectionError, ConnectionClosedError, ReadTimeoutError, ConnectTimeoutError))
-    def __upload_to_s3(self, span_data_batch: str):
+    def __upload_to_s3_with_trace_id(self, span_data_batch: str, trace_id: int):
+        """Upload spans for a specific trace to S3 with trace ID in filename."""
         current_time = datetime.datetime.now().strftime(self.time_format)
         prefix = self.file_prefix + os.environ.get('MONOCLE_S3_KEY_PREFIX_CURRENT', '')
-        file_name = f"{prefix}{current_time}.ndjson"
+        file_name = f"{prefix}{current_time}_{format_trace_id_without_0x(trace_id)}.ndjson"
         self.s3_client.put_object(
             Bucket=self.bucket_name,
             Key=file_name,
             Body=span_data_batch
         )
-        logger.debug(f"Span batch uploaded to AWS S3 as {file_name}.")
+        logger.debug(f"Trace {format_trace_id_without_0x(trace_id)} uploaded to AWS S3 as {file_name}.")
 
     async def force_flush(self, timeout_millis: int = 30000) -> bool:
-        await self.__export_spans()  # Export any remaining spans in the queue
+        """Flush all pending traces to S3."""
+        trace_ids_to_upload = list(self.trace_spans.keys())
+        for trace_id in trace_ids_to_upload:
+            self._upload_trace(trace_id)
         return True
 
     def shutdown(self) -> None:
+        """Upload all pending traces and shutdown."""
+        # Upload all remaining traces
+        trace_ids_to_upload = list(self.trace_spans.keys())
+        for trace_id in trace_ids_to_upload:
+            self._upload_trace(trace_id)
+        
         if hasattr(self, 'task_processor') and self.task_processor is not None:
             self.task_processor.stop()
         logger.info("S3SpanExporter has been shut down.")