-
Notifications
You must be signed in to change notification settings - Fork 1.8k
feat(storage): add OpenTelemetry metrics gating and configuration #18407
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
shradhakatyal
wants to merge
5
commits into
googleapis:main
Choose a base branch
from
shradhakatyal:feat/gcs-otel-metrics-gating
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
cdb19a5
feat(storage): add OpenTelemetry metrics gating and configuration
6ced32b
fix(storage): resolve ruff formatting and mock credentials in metrics…
9747fba
fix(storage): skip metrics unit tests when opentelemetry.metrics is u…
fd3a654
fix(storage): pass base_setting to is_advanced_metrics_enabled
8867f72
feat(storage): enhance OpenTelemetry metrics gating and gRPC client p…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
140 changes: 140 additions & 0 deletions
140
packages/google-cloud-storage/google/cloud/storage/_opentelemetry_metrics.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| # Copyright 2026 Google LLC | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| """Manages OpenTelemetry metrics instruments and gating for GCS client.""" | ||
|
|
||
| import logging | ||
| import os | ||
| from typing import Any, Dict, Optional | ||
|
|
||
| from google.cloud.storage.version import __version__ | ||
|
|
||
| logger = logging.getLogger(__name__) | ||
|
|
||
| # --------------------------------------------------------------------------- | ||
| # 1. Hidden Development Gate | ||
| # --------------------------------------------------------------------------- | ||
| # Must remain False in production branches. | ||
| # Only enabled during active development and test runs. | ||
| _ENABLE_METRICS_DEV_GATE = False | ||
|
|
||
| # --------------------------------------------------------------------------- | ||
| # 2. Standardized Configuration and Environment Variable Names | ||
| # --------------------------------------------------------------------------- | ||
| ENABLE_OTEL_METRICS_ENV_VAR = "GCP_STORAGE_PYTHON_ENABLE_OTEL_METRICS" | ||
| ENABLE_DEBUG_METRICS_ENV_VAR = "GCP_STORAGE_PYTHON_ENABLE_DEBUG_METRICS" | ||
|
|
||
| _DEFAULT_ENABLE_METRICS = False | ||
| _DEFAULT_ENABLE_DEBUG_METRICS = False | ||
|
|
||
| # --------------------------------------------------------------------------- | ||
| # 3. Optional OpenTelemetry Dependency Check | ||
| # --------------------------------------------------------------------------- | ||
| try: | ||
| from opentelemetry import metrics | ||
|
|
||
| HAS_OPENTELEMETRY_METRICS = True | ||
| except ImportError: | ||
| HAS_OPENTELEMETRY_METRICS = False | ||
| logger.debug( | ||
| "OpenTelemetry metrics package (opentelemetry-api >= 1.12.0) is not " | ||
| "installed. GCS client metrics are disabled." | ||
| ) | ||
|
|
||
|
|
||
| def _parse_bool_env(name: str, default: bool = False) -> bool: | ||
| """Parses a boolean from an environment variable.""" | ||
| val = os.environ.get(name) | ||
| if val is None: | ||
| return default | ||
| return str(val).strip().lower() in {"1", "true", "yes", "on"} | ||
|
|
||
|
|
||
| def is_metrics_enabled(client_setting: Optional[bool] = None) -> bool: | ||
| """Evaluates whether standard GCS metrics should be recorded. | ||
|
|
||
| Args: | ||
| client_setting: Optional boolean configured on the client instance. | ||
| Takes precedence over the environment variable if specified. | ||
|
|
||
| Returns: | ||
| bool: True if metrics recording is enabled, False otherwise. | ||
| """ | ||
| if client_setting is not None and not isinstance(client_setting, bool): | ||
| raise TypeError("enable_metrics must be a boolean or None.") | ||
|
|
||
| if not HAS_OPENTELEMETRY_METRICS: | ||
| return False | ||
|
|
||
| if not _ENABLE_METRICS_DEV_GATE: | ||
| return False | ||
|
|
||
| if client_setting is not None: | ||
| return client_setting | ||
|
|
||
| return _parse_bool_env(ENABLE_OTEL_METRICS_ENV_VAR, _DEFAULT_ENABLE_METRICS) | ||
|
|
||
|
|
||
| def is_advanced_metrics_enabled( | ||
| client_setting: Optional[bool] = None, | ||
| base_setting: Optional[bool] = None, | ||
| ) -> bool: | ||
| """Evaluates whether high-frequency debug metrics should be recorded. | ||
|
|
||
| Args: | ||
| client_setting: Optional boolean configured on the client instance. | ||
| Takes precedence over the environment variable if specified. | ||
| base_setting: Optional boolean configured on the client instance for | ||
| base metrics. | ||
|
|
||
| Returns: | ||
| bool: True if advanced metrics recording is enabled, False otherwise. | ||
| """ | ||
| if client_setting is not None and not isinstance(client_setting, bool): | ||
| raise TypeError("enable_advanced_metrics must be a boolean or None.") | ||
|
|
||
| if not is_metrics_enabled(base_setting): | ||
| return False | ||
|
|
||
| if client_setting is not None: | ||
| return client_setting | ||
|
|
||
| return _parse_bool_env(ENABLE_DEBUG_METRICS_ENV_VAR, _DEFAULT_ENABLE_DEBUG_METRICS) | ||
|
|
||
|
|
||
| # --------------------------------------------------------------------------- | ||
| # 4. Standard Common Attributes & Meter Provider | ||
| # --------------------------------------------------------------------------- | ||
| _COMMON_ATTRIBUTES: Dict[str, Any] = { | ||
| "gcp.client.service": "storage", | ||
| "gcp.client.version": __version__, | ||
| "gcp.client.repo": "googleapis/google-cloud-python", | ||
| "gcp.client.artifact": "google-cloud-storage", | ||
| } | ||
|
|
||
|
|
||
| def get_common_attributes() -> Dict[str, Any]: | ||
| """Returns a copy of standard GCS client attributes for metrics.""" | ||
| return _COMMON_ATTRIBUTES.copy() | ||
|
|
||
|
|
||
| def get_meter(meter_provider: Optional[Any] = None) -> Optional[Any]: | ||
| """Returns the OpenTelemetry Meter for Google Cloud Storage.""" | ||
| if not HAS_OPENTELEMETRY_METRICS or not _ENABLE_METRICS_DEV_GATE: | ||
| return None | ||
| return metrics.get_meter( | ||
| "google.cloud.storage", | ||
| __version__, | ||
| meter_provider=meter_provider, | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.