Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion vertexai/agent_engines/templates/adk.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import asyncio
from collections.abc import Awaitable
import queue
import sys
import threading
import warnings

Expand Down Expand Up @@ -437,14 +438,25 @@ def _detect_cloud_resource_id(project_id: str) -> Optional[str]:
"opentelemetry-exporter-gcp-logging", needed_for_logging=True
)

class _SimpleLogRecordProcessor(
opentelemetry.sdk._logs.export.SimpleLogRecordProcessor
):
def force_flush(
self, timeout_millis: int = 30000
) -> bool: # pylint: disable=no-self-use
sys.stdout.flush()
sys.stderr.flush()
return True

logger_provider = opentelemetry.sdk._logs.LoggerProvider(resource=resource)
logger_provider.add_log_record_processor(
opentelemetry.sdk._logs.export.BatchLogRecordProcessor(
_SimpleLogRecordProcessor(
opentelemetry.exporter.cloud_logging.CloudLoggingExporter(
project_id=project_id,
default_log_name=os.getenv(
"GCP_DEFAULT_LOG_NAME", "adk-on-agent-engine"
),
structured_json_file=sys.stdout,
),
)
)
Expand Down
14 changes: 13 additions & 1 deletion vertexai/preview/reasoning_engines/templates/adk.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import asyncio
from collections.abc import Awaitable
import queue
import sys
import threading


Expand Down Expand Up @@ -439,14 +440,25 @@ def _detect_cloud_resource_id(project_id: str) -> Optional[str]:
"opentelemetry-exporter-gcp-logging", needed_for_logging=True
)

class _SimpleLogRecordProcessor(
opentelemetry.sdk._logs.export.SimpleLogRecordProcessor
):
def force_flush(
self, timeout_millis: int = 30000
) -> bool: # pylint: disable=no-self-use
sys.stdout.flush()
sys.stderr.flush()
return True

logger_provider = opentelemetry.sdk._logs.LoggerProvider(resource=resource)
logger_provider.add_log_record_processor(
opentelemetry.sdk._logs.export.BatchLogRecordProcessor(
_SimpleLogRecordProcessor(
opentelemetry.exporter.cloud_logging.CloudLoggingExporter(
project_id=project_id,
default_log_name=os.getenv(
"GCP_DEFAULT_LOG_NAME", "adk-on-agent-engine"
),
structured_json_file=sys.stdout,
),
)
)
Expand Down