Skip to content

Commit 635416b

Browse files
try option 3 to set cert and key explicilty for Update adk.py
1 parent 4b1eacf commit 635416b

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

  • vertexai/agent_engines/templates

vertexai/agent_engines/templates/adk.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ def _detect_cloud_resource_id(project_id: str) -> Optional[str]:
380380
import opentelemetry.exporter.otlp.proto.http.version
381381
import opentelemetry.exporter.otlp.proto.http.trace_exporter
382382
import google.auth.transport.requests
383-
from google.auth.transport import mtls
383+
from google.auth.transport import _mtls_helper
384384
from google.cloud.aiplatform import version as aip_version
385385
except (ImportError, AttributeError):
386386
return _warn_missing_dependency(
@@ -390,19 +390,21 @@ def _detect_cloud_resource_id(project_id: str) -> Optional[str]:
390390
import google.auth
391391

392392
credentials, _ = google.auth.default()
393-
client_cert_callback = mtls.default_client_cert_source()
394393
vertex_sdk_version = aip_version.__version__
395394
otlp_http_version = opentelemetry.exporter.otlp.proto.http.version.__version__
396395
user_agent = f"Vertex-Agent-Engine/{vertex_sdk_version} OTel-OTLP-Exporter-Python/{otlp_http_version}"
397396
session = google.auth.transport.requests.AuthorizedSession(
398397
credentials=credentials
399398
)
399+
_ , cert, key = _mtls_helper.get_client_cert_and_key()
400400
session.configure_mtls_channel(client_cert_callback)
401401
print("configure_mtls_channel done")
402402
span_exporter = (
403403
opentelemetry.exporter.otlp.proto.http.trace_exporter.OTLPSpanExporter(
404404
session=session,
405405
endpoint="https://telemetry.mtls.googleapis.com/v1/traces",
406+
client_certificate_file = cert,
407+
client_key_file = key,
406408
headers={"User-Agent": user_agent},
407409
)
408410
)
@@ -555,14 +557,12 @@ def _warn_if_telemetry_api_disabled():
555557
try:
556558
import google.auth.transport.requests
557559
import google.auth
558-
from google.auth.transport import mtls
559560
except (ImportError, AttributeError):
560561
return
561562
credentials, project = google.auth.default()
562563
print("in warn terlemetery before configure mtls")
563-
client_cert_callback = mtls.default_client_cert_source()
564564
session = google.auth.transport.requests.AuthorizedSession(credentials=credentials)
565-
session.configure_mtls_channel(client_cert_callback)
565+
session.configure_mtls_channel()
566566
print("post configure mtls")
567567
r = session.post("https://telemetry.mtls.googleapis.com/v1/traces", data=None)
568568
print("after session post call")

0 commit comments

Comments
 (0)