Skip to content

Commit 644fe1c

Browse files
committed
fix(metrics): fix OpenTelemetry resource detector import path
1 parent 4263c69 commit 644fe1c

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

packages/google-cloud-spanner/google/cloud/spanner_v1/_helpers.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,18 @@
4848
try:
4949
from opentelemetry.propagate import inject
5050
from opentelemetry.propagators.textmap import Setter
51-
from opentelemetry.resourcedetector import gcp_resource_detector
5251
from opentelemetry.resourcedetector.gcp_resource_detector import (
5352
GoogleCloudResourceDetector,
5453
)
54+
from opentelemetry.resourcedetector.gcp_resource_detector import (
55+
_metadata as gcp_metadata,
56+
)
5557
from opentelemetry.semconv.resource import ResourceAttributes
5658

5759
# Overwrite the requests timeout for the detector.
5860
# This is necessary as the client will wait the full timeout if the
5961
# code is not run in a GCP environment, with the location endpoints available.
60-
gcp_resource_detector._TIMEOUT_SEC = 0.2
62+
gcp_metadata._TIMEOUT = 0.2
6163

6264
HAS_OPENTELEMETRY_INSTALLED = True
6365
except ImportError:

packages/google-cloud-spanner/tests/_helpers.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313

1414
try:
1515
from opentelemetry import trace
16+
from opentelemetry.resourcedetector.gcp_resource_detector import ( # noqa: F401
17+
GoogleCloudResourceDetector,
18+
)
1619
from opentelemetry.sdk.trace import TracerProvider
1720
from opentelemetry.sdk.trace.export import SimpleSpanProcessor
1821
from opentelemetry.sdk.trace.export.in_memory_span_exporter import (

0 commit comments

Comments
 (0)