-
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
2
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
2 commits
Select commit
Hold shift + click to select a range
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
122 changes: 122 additions & 0 deletions
122
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,122 @@ | ||
| # 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 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 not HAS_OPENTELEMETRY_METRICS: | ||
| return False | ||
|
|
||
| if not _ENABLE_METRICS_DEV_GATE: | ||
| return False | ||
|
|
||
| if client_setting is not None: | ||
| return bool(client_setting) | ||
|
|
||
| return _parse_bool_env(ENABLE_OTEL_METRICS_ENV_VAR, _DEFAULT_ENABLE_METRICS) | ||
|
|
||
|
|
||
| def is_advanced_metrics_enabled(client_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. | ||
|
|
||
| Returns: | ||
| bool: True if advanced metrics recording is enabled, False otherwise. | ||
| """ | ||
| if not is_metrics_enabled(client_setting): | ||
| return False | ||
|
|
||
| if client_setting is not None: | ||
| return bool(client_setting) | ||
|
|
||
| return _parse_bool_env(ENABLE_DEBUG_METRICS_ENV_VAR, _DEFAULT_ENABLE_DEBUG_METRICS) | ||
|
|
||
|
|
||
| # --------------------------------------------------------------------------- | ||
| # 4. Standard Common Attributes & Meter Provider | ||
| # --------------------------------------------------------------------------- | ||
| def get_common_attributes() -> Dict[str, Any]: | ||
| """Returns standard GCS client attributes for metrics.""" | ||
| return { | ||
| "gcp.client.service": "storage", | ||
| "gcp.client.version": __version__, | ||
| "gcp.client.repo": "googleapis/google-cloud-python", | ||
| "gcp.client.artifact": "google-cloud-storage", | ||
| } | ||
|
|
||
|
|
||
| def get_meter(): | ||
| """Returns the OpenTelemetry Meter for Google Cloud Storage.""" | ||
| if not HAS_OPENTELEMETRY_METRICS: | ||
| return None | ||
| return metrics.get_meter("google.cloud.storage", __version__) |
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
144 changes: 144 additions & 0 deletions
144
packages/google-cloud-storage/tests/unit/test__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,144 @@ | ||
| # 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. | ||
|
|
||
| import pytest | ||
|
|
||
| from google.cloud.storage import _opentelemetry_metrics | ||
| from google.cloud.storage.version import __version__ | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| "env_val,default,expected", | ||
| [ | ||
| ("1", False, True), | ||
| ("true", False, True), | ||
| ("True", False, True), | ||
| ("yes", False, True), | ||
| ("on", False, True), | ||
| ("0", True, False), | ||
| ("false", True, False), | ||
| ("no", True, False), | ||
| ("off", True, False), | ||
| ("invalid", False, False), | ||
| ], | ||
| ) | ||
| def test_parse_bool_env(monkeypatch, env_val, default, expected): | ||
| monkeypatch.setenv("TEST_BOOL_ENV", env_val) | ||
| assert _opentelemetry_metrics._parse_bool_env("TEST_BOOL_ENV", default) == expected | ||
|
|
||
|
|
||
| def test_parse_bool_env_default(monkeypatch): | ||
| monkeypatch.delenv("TEST_BOOL_ENV_MISSING", raising=False) | ||
| assert _opentelemetry_metrics._parse_bool_env("TEST_BOOL_ENV_MISSING", True) is True | ||
| assert ( | ||
| _opentelemetry_metrics._parse_bool_env("TEST_BOOL_ENV_MISSING", False) is False | ||
| ) | ||
|
|
||
|
|
||
| def test_dev_gate_locked_disables_metrics(monkeypatch): | ||
| """When _ENABLE_METRICS_DEV_GATE is False, metrics must remain disabled.""" | ||
| monkeypatch.setattr(_opentelemetry_metrics, "_ENABLE_METRICS_DEV_GATE", False) | ||
| monkeypatch.setenv("GCP_STORAGE_PYTHON_ENABLE_OTEL_METRICS", "true") | ||
|
|
||
| assert _opentelemetry_metrics.is_metrics_enabled() is False | ||
| assert _opentelemetry_metrics.is_metrics_enabled(client_setting=True) is False | ||
|
|
||
|
|
||
| def test_dev_gate_unlocked_respects_env_var(monkeypatch): | ||
| """When dev gate is open, environment variable enables metrics.""" | ||
| monkeypatch.setattr(_opentelemetry_metrics, "_ENABLE_METRICS_DEV_GATE", True) | ||
|
|
||
| monkeypatch.setenv("GCP_STORAGE_PYTHON_ENABLE_OTEL_METRICS", "true") | ||
| assert _opentelemetry_metrics.is_metrics_enabled() is True | ||
|
|
||
| monkeypatch.setenv("GCP_STORAGE_PYTHON_ENABLE_OTEL_METRICS", "false") | ||
| assert _opentelemetry_metrics.is_metrics_enabled() is False | ||
|
|
||
|
|
||
| def test_metrics_default_is_disabled_when_env_unset(monkeypatch): | ||
| """When env var is unset, default value is False.""" | ||
| monkeypatch.setattr(_opentelemetry_metrics, "_ENABLE_METRICS_DEV_GATE", True) | ||
| monkeypatch.delenv("GCP_STORAGE_PYTHON_ENABLE_OTEL_METRICS", raising=False) | ||
|
|
||
| assert _opentelemetry_metrics.is_metrics_enabled() is False | ||
|
|
||
|
|
||
| def test_client_setting_overrides_env_var(monkeypatch): | ||
| """Client constructor parameter must take precedence over env var.""" | ||
| monkeypatch.setattr(_opentelemetry_metrics, "_ENABLE_METRICS_DEV_GATE", True) | ||
|
|
||
| # Client disables while env var is True | ||
| monkeypatch.setenv("GCP_STORAGE_PYTHON_ENABLE_OTEL_METRICS", "true") | ||
| assert _opentelemetry_metrics.is_metrics_enabled(client_setting=False) is False | ||
|
|
||
| # Client enables while env var is False | ||
| monkeypatch.setenv("GCP_STORAGE_PYTHON_ENABLE_OTEL_METRICS", "false") | ||
| assert _opentelemetry_metrics.is_metrics_enabled(client_setting=True) is True | ||
|
|
||
|
|
||
| def test_advanced_metrics_requires_base_metrics(monkeypatch): | ||
| """Advanced metrics cannot be active if base metrics are disabled.""" | ||
| monkeypatch.setattr(_opentelemetry_metrics, "_ENABLE_METRICS_DEV_GATE", True) | ||
| monkeypatch.setenv("GCP_STORAGE_PYTHON_ENABLE_OTEL_METRICS", "false") | ||
| monkeypatch.setenv("GCP_STORAGE_PYTHON_ENABLE_DEBUG_METRICS", "true") | ||
|
|
||
| assert _opentelemetry_metrics.is_advanced_metrics_enabled() is False | ||
|
|
||
|
|
||
| def test_advanced_metrics_enabled(monkeypatch): | ||
| """Advanced metrics is enabled when both base and debug flags are True.""" | ||
| monkeypatch.setattr(_opentelemetry_metrics, "_ENABLE_METRICS_DEV_GATE", True) | ||
| monkeypatch.setenv("GCP_STORAGE_PYTHON_ENABLE_OTEL_METRICS", "true") | ||
| monkeypatch.setenv("GCP_STORAGE_PYTHON_ENABLE_DEBUG_METRICS", "true") | ||
|
|
||
| assert _opentelemetry_metrics.is_advanced_metrics_enabled() is True | ||
|
|
||
|
|
||
| def test_advanced_metrics_client_setting_overrides_env_var(monkeypatch): | ||
| """Client setting overrides advanced metrics env var.""" | ||
| monkeypatch.setattr(_opentelemetry_metrics, "_ENABLE_METRICS_DEV_GATE", True) | ||
| monkeypatch.setenv("GCP_STORAGE_PYTHON_ENABLE_OTEL_METRICS", "true") | ||
| monkeypatch.setenv("GCP_STORAGE_PYTHON_ENABLE_DEBUG_METRICS", "false") | ||
|
|
||
| assert ( | ||
| _opentelemetry_metrics.is_advanced_metrics_enabled(client_setting=True) is True | ||
| ) | ||
|
|
||
|
|
||
| def test_otel_missing_disables_metrics(monkeypatch): | ||
| """If opentelemetry-api is not installed, metrics must gracefully disable.""" | ||
| monkeypatch.setattr(_opentelemetry_metrics, "HAS_OPENTELEMETRY_METRICS", False) | ||
| monkeypatch.setattr(_opentelemetry_metrics, "_ENABLE_METRICS_DEV_GATE", True) | ||
| monkeypatch.setenv("GCP_STORAGE_PYTHON_ENABLE_OTEL_METRICS", "true") | ||
|
|
||
| assert _opentelemetry_metrics.is_metrics_enabled() is False | ||
| assert _opentelemetry_metrics.get_meter() is None | ||
|
|
||
|
|
||
| def test_get_common_attributes(): | ||
| """Verify common attributes conform to GCS OTel specification.""" | ||
| attrs = _opentelemetry_metrics.get_common_attributes() | ||
| assert attrs["gcp.client.service"] == "storage" | ||
| assert attrs["gcp.client.version"] == __version__ | ||
| assert attrs["gcp.client.repo"] == "googleapis/google-cloud-python" | ||
| assert attrs["gcp.client.artifact"] == "google-cloud-storage" | ||
|
|
||
|
|
||
| def test_get_meter(): | ||
| """Verify get_meter returns a meter or None.""" | ||
| meter = _opentelemetry_metrics.get_meter() | ||
| if _opentelemetry_metrics.HAS_OPENTELEMETRY_METRICS: | ||
| assert meter is not None | ||
| else: | ||
| assert meter is None |
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 |
|---|---|---|
|
|
@@ -259,6 +259,63 @@ def test_ctor_w_universe_domain_and_matched_credentials(self): | |
| self.assertEqual(client.api_endpoint, expected_api_endpoint) | ||
| self.assertEqual(client.universe_domain, universe_domain) | ||
|
|
||
| def test_ctor_w_enable_metrics(self): | ||
| PROJECT = "PROJECT" | ||
| credentials = _make_credentials() | ||
| client = self._make_one( | ||
| project=PROJECT, credentials=credentials, enable_metrics=True | ||
| ) | ||
| self.assertTrue(client._enable_metrics) | ||
|
|
||
| def test_ctor_w_enable_advanced_metrics(self): | ||
| PROJECT = "PROJECT" | ||
| credentials = _make_credentials() | ||
| client = self._make_one( | ||
| project=PROJECT, credentials=credentials, enable_advanced_metrics=True | ||
| ) | ||
| self.assertTrue(client._enable_advanced_metrics) | ||
|
|
||
| def test_client_metrics_enabled_property(self): | ||
| from google.cloud.storage import _opentelemetry_metrics | ||
|
|
||
| PROJECT = "PROJECT" | ||
| credentials = _make_credentials() | ||
| client = self._make_one( | ||
| project=PROJECT, credentials=credentials, enable_metrics=True | ||
| ) | ||
|
|
||
| with mock.patch.object( | ||
| _opentelemetry_metrics, "_ENABLE_METRICS_DEV_GATE", True | ||
| ): | ||
| self.assertTrue(client.metrics_enabled) | ||
|
|
||
| with mock.patch.object( | ||
| _opentelemetry_metrics, "_ENABLE_METRICS_DEV_GATE", False | ||
| ): | ||
| self.assertFalse(client.metrics_enabled) | ||
|
|
||
| def test_client_advanced_metrics_enabled_property(self): | ||
| from google.cloud.storage import _opentelemetry_metrics | ||
|
|
||
| PROJECT = "PROJECT" | ||
| credentials = _make_credentials() | ||
| client = self._make_one( | ||
| project=PROJECT, | ||
| credentials=credentials, | ||
| enable_metrics=True, | ||
| enable_advanced_metrics=True, | ||
| ) | ||
|
|
||
| with mock.patch.object( | ||
| _opentelemetry_metrics, "_ENABLE_METRICS_DEV_GATE", True | ||
| ): | ||
| self.assertTrue(client.advanced_metrics_enabled) | ||
|
|
||
| with mock.patch.object( | ||
| _opentelemetry_metrics, "_ENABLE_METRICS_DEV_GATE", False | ||
| ): | ||
| self.assertFalse(client.advanced_metrics_enabled) | ||
|
Comment on lines
+297
to
+317
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add a test case to verify that advanced metrics are correctly disabled when base metrics are disabled, even if def test_client_advanced_metrics_enabled_property(self):
from google.cloud.storage import _opentelemetry_metrics
PROJECT = "PROJECT"
client = self._make_one(
project=PROJECT, enable_metrics=True, enable_advanced_metrics=True
)
with mock.patch.object(
_opentelemetry_metrics, "_ENABLE_METRICS_DEV_GATE", True
):
self.assertTrue(client.advanced_metrics_enabled)
with mock.patch.object(
_opentelemetry_metrics, "_ENABLE_METRICS_DEV_GATE", False
):
self.assertFalse(client.advanced_metrics_enabled)
# Verify that advanced metrics are disabled if base metrics are disabled
client_disabled_base = self._make_one(
project=PROJECT, enable_metrics=False, enable_advanced_metrics=True
)
with mock.patch.object(
_opentelemetry_metrics, "_ENABLE_METRICS_DEV_GATE", True
):
self.assertFalse(client_disabled_base.advanced_metrics_enabled) |
||
|
|
||
| def test_ctor_w_universe_domain_and_mismatched_credentials(self): | ||
| PROJECT = "PROJECT" | ||
| universe_domain = "example.com" | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update the call to
is_advanced_metrics_enabledto pass both the advanced metrics setting and the base metrics setting, ensuring correct evaluation when base metrics are disabled.