Skip to content

Commit 0162898

Browse files
RKestcopybara-github
authored andcommitted
ADK changes
PiperOrigin-RevId: 814614027
1 parent 42db351 commit 0162898

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

src/google/adk/telemetry/google_cloud.py

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import logging
1818

1919
import google.auth
20-
from opentelemetry.resourcedetector.gcp_resource_detector import GoogleCloudResourceDetector
2120
from opentelemetry.sdk._logs import LogRecordProcessor
2221
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
2322
from opentelemetry.sdk.metrics.export import MetricReader
@@ -108,8 +107,19 @@ def get_gcp_resource() -> Resource:
108107
# Then the GCP detector adds attributes corresponding to a correct
109108
# monitored resource if ADK runs on one of supported platforms
110109
# (e.g. GCE, GKE, CloudRun).
111-
return (
112-
OTELResourceDetector()
113-
.detect()
114-
.merge(GoogleCloudResourceDetector(raise_on_error=False).detect())
115-
)
110+
111+
resource = OTELResourceDetector().detect()
112+
113+
try:
114+
from opentelemetry.resourcedetector.gcp_resource_detector import GoogleCloudResourceDetector
115+
116+
resource = resource.merge(
117+
GoogleCloudResourceDetector(raise_on_error=False).detect()
118+
)
119+
except ImportError:
120+
logger.warning(
121+
'Cloud not import opentelemetry.resourcedetector.gcp_resource_detector'
122+
' GCE, GKE or CloudRun related resource attributes may be missing'
123+
)
124+
125+
return resource

0 commit comments

Comments
 (0)