Merge branch 'main' into fix-2729-none-inferences

Author: ShaharKatz

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.

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."
         ),
     )

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,

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,

src/google/adk/utils/model_name_utils.py

@@ -34,12 +34,17 @@ def extract_model_name(model_string: str) -> str:
     The extracted model name (e.g., "gemini-2.5-pro")
   """
   # Pattern for path-based model names
-  path_pattern = (
-      r'^projects/[^/]+/locations/[^/]+/publishers/[^/]+/models/(.+)$'
+  # Need to support both Vertex/Gemini and Apigee model paths.
+  path_patterns = (
+      r'^projects/[^/]+/locations/[^/]+/publishers/[^/]+/models/(.+)$',
+      r'^apigee/(?:[^/]+/)?(?:[^/]+/)?(.+)$',
   )
-  match = re.match(path_pattern, model_string)
-  if match:
-    return match.group(1)
+  # Check against all path-based patterns
+  for pattern in path_patterns:
+    match = re.match(pattern, model_string)
+    if match:
+      # Return the captured group (the model name)
+      return match.group(1)
 
   # Handle 'models/' prefixed names like "models/gemini-2.5-pro"
   if model_string.startswith('models/'):

tests/unittests/utils/test_model_name_utils.py

@@ -42,6 +42,24 @@ def test_extract_model_name_path_based_model(self):
     path_model_3 = 'projects/test-project/locations/europe-west1/publishers/google/models/claude-3-sonnet'
     assert extract_model_name(path_model_3) == 'claude-3-sonnet'
 
+    path_model_4 = 'apigee/gemini-2.5-flash'
+    assert extract_model_name(path_model_4) == 'gemini-2.5-flash'
+
+    path_model_5 = 'apigee/v1/gemini-2.5-flash'
+    assert extract_model_name(path_model_5) == 'gemini-2.5-flash'
+
+    path_model_6 = 'apigee/gemini/gemini-2.5-flash'
+    assert extract_model_name(path_model_6) == 'gemini-2.5-flash'
+
+    path_model_7 = 'apigee/vertex_ai/gemini-2.5-flash'
+    assert extract_model_name(path_model_7) == 'gemini-2.5-flash'
+
+    path_model_8 = 'apigee/gemini/v1/gemini-2.5-flash'
+    assert extract_model_name(path_model_8) == 'gemini-2.5-flash'
+
+    path_model_9 = 'apigee/vertex_ai/v1beta/gemini-2.5-flash'
+    assert extract_model_name(path_model_9) == 'gemini-2.5-flash'
+
   def test_extract_model_name_with_models_prefix(self):
     """Test extraction of model names with 'models/' prefix."""
     assert extract_model_name('models/gemini-2.5-pro') == 'gemini-2.5-pro'