Skip to content

Commit 73fde8d

Browse files
vertex-sdk-botcopybara-github
authored andcommitted
fix: remove OpenTelemetry event logger setup since the Events API/SDK has been deprecated and is soon being removed entirely.
PiperOrigin-RevId: 947777889
1 parent 852c546 commit 73fde8d

3 files changed

Lines changed: 22 additions & 30 deletions

File tree

  • agentplatform/agent_engines/templates
  • vertexai
    • agent_engines/templates
    • preview/reasoning_engines/templates

agentplatform/agent_engines/templates/adk.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@ def _detect_cloud_resource_id(project_id: str) -> Optional[str]:
371371
import opentelemetry
372372
import opentelemetry.trace
373373
import opentelemetry._logs
374-
import opentelemetry._events
375374
except (ImportError, AttributeError):
376375
return _warn_missing_dependency(
377376
"opentelemetry-api", needed_for_tracing=True, needed_for_logging=True
@@ -383,7 +382,6 @@ def _detect_cloud_resource_id(project_id: str) -> Optional[str]:
383382
import opentelemetry.sdk.trace.export
384383
import opentelemetry.sdk._logs
385384
import opentelemetry.sdk._logs.export
386-
import opentelemetry.sdk._events
387385
except (ImportError, AttributeError):
388386
return _warn_missing_dependency(
389387
"opentelemetry-sdk", needed_for_tracing=True, needed_for_logging=True
@@ -541,14 +539,8 @@ def force_flush(
541539
),
542540
)
543541
)
544-
event_logger_provider = opentelemetry.sdk._events.EventLoggerProvider(
545-
logger_provider=logger_provider
546-
)
547542

548543
opentelemetry._logs.set_logger_provider(logger_provider=logger_provider)
549-
opentelemetry._events.set_event_logger_provider(
550-
event_logger_provider=event_logger_provider
551-
)
552544

553545
try:
554546
from opentelemetry.instrumentation import google_genai

vertexai/agent_engines/templates/adk.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,6 @@ def _detect_cloud_resource_id(project_id: str) -> Optional[str]:
355355
import opentelemetry
356356
import opentelemetry.trace
357357
import opentelemetry._logs
358-
import opentelemetry._events
359358
except (ImportError, AttributeError):
360359
return _warn_missing_dependency(
361360
"opentelemetry-api", needed_for_tracing=True, needed_for_logging=True
@@ -367,7 +366,6 @@ def _detect_cloud_resource_id(project_id: str) -> Optional[str]:
367366
import opentelemetry.sdk.trace.export
368367
import opentelemetry.sdk._logs
369368
import opentelemetry.sdk._logs.export
370-
import opentelemetry.sdk._events
371369
except (ImportError, AttributeError):
372370
return _warn_missing_dependency(
373371
"opentelemetry-sdk", needed_for_tracing=True, needed_for_logging=True
@@ -525,14 +523,8 @@ def force_flush(
525523
),
526524
)
527525
)
528-
event_logger_provider = opentelemetry.sdk._events.EventLoggerProvider(
529-
logger_provider=logger_provider
530-
)
531526

532527
opentelemetry._logs.set_logger_provider(logger_provider=logger_provider)
533-
opentelemetry._events.set_event_logger_provider(
534-
event_logger_provider=event_logger_provider
535-
)
536528

537529
try:
538530
from opentelemetry.instrumentation import google_genai

vertexai/preview/reasoning_engines/templates/adk.py

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,8 @@ def _default_instrumentor_builder(
369369

370370
if project_id is None:
371371
_warn(
372-
"telemetry is only supported when project is specified, proceeding with no telemetry"
372+
"telemetry is only supported when project is specified, proceeding with"
373+
" no telemetry"
373374
)
374375
return None
375376

@@ -382,10 +383,19 @@ def _warn_missing_dependency(
382383
needed_for_tracing: bool = False,
383384
) -> None:
384385
_warn(
385-
f"{package} is not installed. Please call 'pip install google-cloud-aiplatform[agent_engines]'."
386+
f"{package} is not installed. Please call 'pip install"
387+
" google-cloud-aiplatform[agent_engines]'."
388+
)
389+
MISSING_TRACE_IMPORT_ERROR_MESSAGE = (
390+
"proceeding with tracing disabled because not all packages (i.e."
391+
" `google-cloud-trace`, `opentelemetry-sdk`,"
392+
" `opentelemetry-exporter-gcp-trace`) for tracing have been installed"
393+
)
394+
MISSING_LOGGING_IMPORT_ERROR_MESSAGE = (
395+
"proceeding with logging disabled because not all packages (i.e."
396+
" `google-cloud-logging`, `opentelemetry-sdk`,"
397+
" `opentelemetry-exporter-gcp-logging`) for tracing have been installed"
386398
)
387-
MISSING_TRACE_IMPORT_ERROR_MESSAGE = "proceeding with tracing disabled because not all packages (i.e. `google-cloud-trace`, `opentelemetry-sdk`, `opentelemetry-exporter-gcp-trace`) for tracing have been installed"
388-
MISSING_LOGGING_IMPORT_ERROR_MESSAGE = "proceeding with logging disabled because not all packages (i.e. `google-cloud-logging`, `opentelemetry-sdk`, `opentelemetry-exporter-gcp-logging`) for tracing have been installed"
389399

390400
if needed_for_tracing and enable_tracing:
391401
_warn(MISSING_TRACE_IMPORT_ERROR_MESSAGE)
@@ -406,7 +416,6 @@ def _detect_cloud_resource_id(project_id: str) -> Optional[str]:
406416
import opentelemetry
407417
import opentelemetry.trace
408418
import opentelemetry._logs
409-
import opentelemetry._events
410419
except (ImportError, AttributeError):
411420
return _warn_missing_dependency(
412421
"opentelemetry-api", needed_for_tracing=True, needed_for_logging=True
@@ -418,7 +427,6 @@ def _detect_cloud_resource_id(project_id: str) -> Optional[str]:
418427
import opentelemetry.sdk.trace.export
419428
import opentelemetry.sdk._logs
420429
import opentelemetry.sdk._logs.export
421-
import opentelemetry.sdk._events
422430
except (ImportError, AttributeError):
423431
return _warn_missing_dependency(
424432
"opentelemetry-sdk", needed_for_tracing=True, needed_for_logging=True
@@ -465,7 +473,10 @@ def _detect_cloud_resource_id(project_id: str) -> Optional[str]:
465473
credentials, _ = google.auth.default()
466474
vertex_sdk_version = aip_version.__version__
467475
otlp_http_version = opentelemetry.exporter.otlp.proto.http.version.__version__
468-
user_agent = f"Vertex-Agent-Engine/{vertex_sdk_version} OTel-OTLP-Exporter-Python/{otlp_http_version}"
476+
user_agent = (
477+
f"Vertex-Agent-Engine/{vertex_sdk_version}"
478+
f" OTel-OTLP-Exporter-Python/{otlp_http_version}"
479+
)
469480

470481
session = requests_auth.AuthorizedSession(credentials=credentials)
471482

@@ -534,6 +545,7 @@ def _detect_cloud_resource_id(project_id: str) -> Optional[str]:
534545
class _SimpleLogRecordProcessor(
535546
opentelemetry.sdk._logs.export.SimpleLogRecordProcessor
536547
):
548+
537549
def force_flush(
538550
self, timeout_millis: int = 30000
539551
) -> bool: # pylint: disable=no-self-use
@@ -572,22 +584,18 @@ def force_flush(
572584
),
573585
)
574586
)
575-
event_logger_provider = opentelemetry.sdk._events.EventLoggerProvider(
576-
logger_provider=logger_provider
577-
)
578587

579588
opentelemetry._logs.set_logger_provider(logger_provider=logger_provider)
580-
opentelemetry._events.set_event_logger_provider(
581-
event_logger_provider=event_logger_provider
582-
)
583589

584590
try:
585591
from opentelemetry.instrumentation import google_genai
586592

587593
google_genai.GoogleGenAiSdkInstrumentor().instrument()
588594
except (ImportError, AttributeError):
589595
_warn(
590-
"telemetry enabled but proceeding without GenAI instrumentation, because not all packages (i.e. opentelemetry-instrumentation-google-genai) have been installed"
596+
"telemetry enabled but proceeding without GenAI instrumentation,"
597+
" because not all packages (i.e."
598+
" opentelemetry-instrumentation-google-genai) have been installed"
591599
)
592600

593601
return None

0 commit comments

Comments
 (0)