Merge branch 'main' into owl-bot-copy

Author: parthea

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "3.11.4"
+    ".": "3.12.1"
 }

CHANGELOG.md

@@ -4,6 +4,35 @@
 
 [1]: https://pypi.org/project/google-cloud-logging/#history
 
+## [3.12.1](https://github.com/googleapis/python-logging/compare/v3.12.0...v3.12.1) (2025-04-21)
+
+
+### Bug Fixes
+
+* Make logging handler close conditional to having the transport opened ([#990](https://github.com/googleapis/python-logging/issues/990)) ([66c6b91](https://github.com/googleapis/python-logging/commit/66c6b91725eb479a0af138a2be13f3c25f369d7e))
+
+## [3.12.0](https://github.com/googleapis/python-logging/compare/v3.11.4...v3.12.0) (2025-04-10)
+
+
+### Features
+
+* Add REST Interceptors which support reading metadata ([681bcc5](https://github.com/googleapis/python-logging/commit/681bcc5c1f983bb5a43e1d5ebcdb14e5e3f25a77))
+* Add support for opt-in debug logging ([681bcc5](https://github.com/googleapis/python-logging/commit/681bcc5c1f983bb5a43e1d5ebcdb14e5e3f25a77))
+* Added flushes/close functionality to logging handlers ([#917](https://github.com/googleapis/python-logging/issues/917)) ([d179304](https://github.com/googleapis/python-logging/commit/d179304b344277e349456f72cd90c56f28011286))
+
+
+### Bug Fixes
+
+* Allow protobuf 6.x ([#977](https://github.com/googleapis/python-logging/issues/977)) ([6757890](https://github.com/googleapis/python-logging/commit/675789001344fdae68ee20ec14e14c11c83a0433))
+* **deps:** Require google-cloud-audit-log >= 0.3.1 ([#979](https://github.com/googleapis/python-logging/issues/979)) ([1cc00ec](https://github.com/googleapis/python-logging/commit/1cc00ecf646a7a36eb32afd2e5df3d9aa7f564b1))
+* Fix typing issue with gRPC metadata when key ends in -bin ([681bcc5](https://github.com/googleapis/python-logging/commit/681bcc5c1f983bb5a43e1d5ebcdb14e5e3f25a77))
+
+
+### Documentation
+
+* Added documentation on log_level and excluded_loggers params in setup_logging ([#971](https://github.com/googleapis/python-logging/issues/971)) ([70d9d25](https://github.com/googleapis/python-logging/commit/70d9d25bf8c3c85a3c5523ecc7fbdbf72f08c583))
+* Update README to break infinite redirect loop ([#972](https://github.com/googleapis/python-logging/issues/972)) ([52cd907](https://github.com/googleapis/python-logging/commit/52cd907bb313df2766ec11e3d24c7e10cda31ca7))
+
 ## [3.11.4](https://github.com/googleapis/python-logging/compare/v3.11.3...v3.11.4) (2025-01-22)
 
 

google/cloud/logging/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.11.4"  # {x-release-please-version}
+__version__ = "3.12.1"  # {x-release-please-version}

google/cloud/logging_v2/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.11.4"  # {x-release-please-version}
+__version__ = "3.12.1"  # {x-release-please-version}

google/cloud/logging_v2/handlers/handlers.py

@@ -245,9 +245,10 @@ def flush(self):
 
     def close(self):
         """Closes the log handler and cleans up all Transport objects used."""
-        self.transport.close()
-        self.transport = None
-        self._transport_open = False
+        if self._transport_open:
+            self.transport.close()
+            self.transport = None
+            self._transport_open = False
 
 
 def _format_and_parse_message(record, formatter_handler):

samples/generated_samples/snippet_metadata_google.logging.v2.json

@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-logging",
-    "version": "0.1.0"
+    "version": "3.12.1"
   },
   "snippets": [
     {

tests/unit/handlers/test_handlers.py

@@ -901,6 +901,10 @@ def test_close(self):
         self.assertFalse(handler._transport_open)
         self.assertTrue(old_transport.close_called)
 
+        # second call to close shouldn't throw an exception
+        handler.close()
+        self.assertFalse(handler._transport_open)
+
 
 class TestFormatAndParseMessage(unittest.TestCase):
     def test_none(self):