Skip to content

Commit 711df01

Browse files
jawoszekcopybara-github
authored andcommitted
feat(otel): remove experimental status from otel_to_cloud
Co-authored-by: Kacper Jawoszek <[email protected]> PiperOrigin-RevId: 840703872
1 parent a9b853f commit 711df01

File tree

4 files changed

+7
-14
lines changed

4 files changed

+7
-14
lines changed

src/google/adk/cli/adk_web_server.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -313,11 +313,9 @@ def _setup_telemetry(
313313
# TODO - remove the else branch here once maybe_set_otel_providers is no
314314
# longer experimental.
315315
if otel_to_cloud:
316-
_setup_gcp_telemetry_experimental(internal_exporters=internal_exporters)
316+
_setup_gcp_telemetry(internal_exporters=internal_exporters)
317317
elif _otel_env_vars_enabled():
318-
_setup_telemetry_from_env_experimental(
319-
internal_exporters=internal_exporters
320-
)
318+
_setup_telemetry_from_env(internal_exporters=internal_exporters)
321319
else:
322320
# Old logic - to be removed when above leaves experimental.
323321
tracer_provider = TracerProvider()
@@ -339,7 +337,7 @@ def _otel_env_vars_enabled() -> bool:
339337
])
340338

341339

342-
def _setup_gcp_telemetry_experimental(
340+
def _setup_gcp_telemetry(
343341
internal_exporters: list[SpanProcessor] = None,
344342
):
345343
if typing.TYPE_CHECKING:
@@ -381,7 +379,7 @@ def _setup_gcp_telemetry_experimental(
381379
_setup_instrumentation_lib_if_installed()
382380

383381

384-
def _setup_telemetry_from_env_experimental(
382+
def _setup_telemetry_from_env(
385383
internal_exporters: list[SpanProcessor] = None,
386384
):
387385
from ..telemetry.setup import maybe_set_otel_providers
@@ -669,8 +667,8 @@ def get_fast_api_app(
669667
tear_down_observer: Callback for cleaning up the file system observer.
670668
register_processors: Callback for additional Span processors to be added
671669
to the TracerProvider.
672-
otel_to_cloud: EXPERIMENTAL. Whether to enable Cloud Trace
673-
and Cloud Logging integrations.
670+
otel_to_cloud: Whether to enable Cloud Trace and Cloud Logging
671+
integrations.
674672
675673
Returns:
676674
A FastAPI app instance.

src/google/adk/cli/cli_tools_click.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@ def decorator(func):
10321032
show_default=True,
10331033
default=False,
10341034
help=(
1035-
"EXPERIMENTAL Optional. Whether to write OTel data to Google Cloud"
1035+
"Optional. Whether to write OTel data to Google Cloud"
10361036
" Observability services - Cloud Trace and Cloud Logging."
10371037
),
10381038
)

src/google/adk/telemetry/google_cloud.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
from opentelemetry.sdk.trace import SpanProcessor
3131
from opentelemetry.sdk.trace.export import BatchSpanProcessor
3232

33-
from ..utils.feature_decorator import experimental
3433
from .setup import OTelHooks
3534

3635
if TYPE_CHECKING:
@@ -42,7 +41,6 @@
4241
_DEFAULT_LOG_NAME = 'adk-otel'
4342

4443

45-
@experimental
4644
def get_gcp_exporters(
4745
enable_cloud_tracing: bool = False,
4846
enable_cloud_metrics: bool = False,

src/google/adk/telemetry/setup.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
from opentelemetry.sdk.trace import TracerProvider
3838
from opentelemetry.sdk.trace.export import BatchSpanProcessor
3939

40-
from ..utils.feature_decorator import experimental
41-
4240

4341
@dataclass
4442
class OTelHooks:
@@ -47,7 +45,6 @@ class OTelHooks:
4745
log_record_processors: list[LogRecordProcessor] = field(default_factory=list)
4846

4947

50-
@experimental()
5148
def maybe_set_otel_providers(
5249
otel_hooks_to_setup: list[OTelHooks] = None,
5350
otel_resource: Optional[Resource] = None,

0 commit comments

Comments
 (0)