fix(metrics): fix OpenTelemetry resource detector import path

Author: sinhasubham

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

@@ -48,16 +48,14 @@
 try:
     from opentelemetry.propagate import inject
     from opentelemetry.propagators.textmap import Setter
-    from opentelemetry.resourcedetector import gcp_resource_detector
-    from opentelemetry.resourcedetector.gcp_resource_detector import (
-        GoogleCloudResourceDetector,
-    )
+    from opentelemetry.resource.detector.gcp import GoogleCloudResourceDetector
+    from opentelemetry.resource.detector.gcp import _metadata as gcp_metadata
     from opentelemetry.semconv.resource import ResourceAttributes
 
     # Overwrite the requests timeout for the detector.
     # This is necessary as the client will wait the full timeout if the
     # code is not run in a GCP environment, with the location endpoints available.
-    gcp_resource_detector._TIMEOUT_SEC = 0.2
+    gcp_metadata._TIMEOUT = 0.2
 
     HAS_OPENTELEMETRY_INSTALLED = True
 except ImportError:

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

@@ -20,6 +20,9 @@
     )
     from opentelemetry.sdk.trace.sampling import TraceIdRatioBased
     from opentelemetry.trace.status import StatusCode
+    from opentelemetry.resource.detector.gcp import (  # noqa: F401
+        GoogleCloudResourceDetector,
+    )
 
     trace.set_tracer_provider(TracerProvider(sampler=TraceIdRatioBased(1.0)))