diff --git a/src/google/adk/cli/adk_web_server.py b/src/google/adk/cli/adk_web_server.py index 78fe426628..3a471c1157 100644 --- a/src/google/adk/cli/adk_web_server.py +++ b/src/google/adk/cli/adk_web_server.py @@ -313,11 +313,9 @@ def _setup_telemetry( # TODO - remove the else branch here once maybe_set_otel_providers is no # longer experimental. if otel_to_cloud: - _setup_gcp_telemetry_experimental(internal_exporters=internal_exporters) + _setup_gcp_telemetry(internal_exporters=internal_exporters) elif _otel_env_vars_enabled(): - _setup_telemetry_from_env_experimental( - internal_exporters=internal_exporters - ) + _setup_telemetry_from_env(internal_exporters=internal_exporters) else: # Old logic - to be removed when above leaves experimental. tracer_provider = TracerProvider() @@ -339,7 +337,7 @@ def _otel_env_vars_enabled() -> bool: ]) -def _setup_gcp_telemetry_experimental( +def _setup_gcp_telemetry( internal_exporters: list[SpanProcessor] = None, ): if typing.TYPE_CHECKING: @@ -381,7 +379,7 @@ def _setup_gcp_telemetry_experimental( _setup_instrumentation_lib_if_installed() -def _setup_telemetry_from_env_experimental( +def _setup_telemetry_from_env( internal_exporters: list[SpanProcessor] = None, ): from ..telemetry.setup import maybe_set_otel_providers @@ -669,8 +667,8 @@ def get_fast_api_app( tear_down_observer: Callback for cleaning up the file system observer. register_processors: Callback for additional Span processors to be added to the TracerProvider. - otel_to_cloud: EXPERIMENTAL. Whether to enable Cloud Trace - and Cloud Logging integrations. + otel_to_cloud: Whether to enable Cloud Trace and Cloud Logging + integrations. Returns: A FastAPI app instance. diff --git a/src/google/adk/cli/cli_tools_click.py b/src/google/adk/cli/cli_tools_click.py index 5d228f72f3..66f4dbe455 100644 --- a/src/google/adk/cli/cli_tools_click.py +++ b/src/google/adk/cli/cli_tools_click.py @@ -1032,7 +1032,7 @@ def decorator(func): show_default=True, default=False, help=( - "EXPERIMENTAL Optional. Whether to write OTel data to Google Cloud" + "Optional. Whether to write OTel data to Google Cloud" " Observability services - Cloud Trace and Cloud Logging." ), ) diff --git a/src/google/adk/telemetry/google_cloud.py b/src/google/adk/telemetry/google_cloud.py index e815d71194..21f6fa30d5 100644 --- a/src/google/adk/telemetry/google_cloud.py +++ b/src/google/adk/telemetry/google_cloud.py @@ -30,7 +30,6 @@ from opentelemetry.sdk.trace import SpanProcessor from opentelemetry.sdk.trace.export import BatchSpanProcessor -from ..utils.feature_decorator import experimental from .setup import OTelHooks if TYPE_CHECKING: @@ -42,7 +41,6 @@ _DEFAULT_LOG_NAME = 'adk-otel' -@experimental def get_gcp_exporters( enable_cloud_tracing: bool = False, enable_cloud_metrics: bool = False, diff --git a/src/google/adk/telemetry/setup.py b/src/google/adk/telemetry/setup.py index eac5c96142..d94e5c45b0 100644 --- a/src/google/adk/telemetry/setup.py +++ b/src/google/adk/telemetry/setup.py @@ -37,8 +37,6 @@ from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor -from ..utils.feature_decorator import experimental - @dataclass class OTelHooks: @@ -47,7 +45,6 @@ class OTelHooks: log_record_processors: list[LogRecordProcessor] = field(default_factory=list) -@experimental() def maybe_set_otel_providers( otel_hooks_to_setup: list[OTelHooks] = None, otel_resource: Optional[Resource] = None,