Merge branch 'main' into sanche-add-314-support

googleapis · daniel-sanche · Dec 15, 2025 · Oct 10, 2025 · Oct 10, 2025 · Oct 10, 2025
commit 3e16ec9dd2ccc10d92bee89e964ecd87fb7866eb
diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml
diff --git a/.github/auto-approve.yml b/.github/auto-approve.yml
diff --git a/.github/release-please.yml b/.github/release-please.yml
diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml
diff --git a/.librarian/generator-input/.repo-metadata.json b/.librarian/generator-input/.repo-metadata.json
@@ -0,0 +1,17 @@
+{
+    "name": "logging",
+    "name_pretty": "Cloud Logging",
+    "product_documentation": "https://cloud.google.com/logging/docs",
+    "client_documentation": "https://cloud.google.com/python/docs/reference/logging/latest",
+    "issue_tracker": "https://issuetracker.google.com/savedsearches/559764",
+    "release_level": "stable",
+    "language": "python",
+    "library_type": "GAPIC_COMBO",
+    "repo": "googleapis/python-logging",
+    "distribution_name": "google-cloud-logging",
+    "api_id": "logging.googleapis.com",
+    "codeowner_team": "@googleapis/api-logging @googleapis/api-logging-partners",
+    "default_version": "v2",
+    "api_shortname": "logging",
+    "api_description": "allows you to store, search, analyze, monitor, and alert on log data and events from Google Cloud and Amazon Web Services. Using the BindPlane service, you can also collect this data from over 150 common application components, on-premises systems, and hybrid cloud systems. BindPlane is included with your Google Cloud project at no additional cost."
+}
diff --git a/owlbot.py → .librarian/generator-input/librarian.py b/owlbot.py → .librarian/generator-input/librarian.py
@@ -65,16 +65,17 @@ def place_before(path, text, *before_text, escape=None):
     )
 
     s.move([library], excludes=[
-            "**/gapic_version.py",
             "setup.py",
             "testing/constraints*.txt",
             "README.rst",
             "google/cloud/logging/__init__.py",  # generated types are hidden from users
             "google/cloud/logging_v2/__init__.py",
+            "docs/conf.py",
             "docs/index.rst",
             "docs/logging_v2",  # Don't include gapic library docs. Users should use the hand-written layer instead
             "docs/multiprocessing.rst",
             "scripts/fixup_logging_v2_keywords.py",  # don't include script since it only works for generated layer
+            "noxfile.py",
         ],
     )
 
@@ -104,21 +105,13 @@ def place_before(path, text, *before_text, escape=None):
 s.move(templated_files, 
     excludes=[
         "docs/index.rst",
-        ".github/release-please.yml",
+        ".github/**",
+        ".kokoro/**",
         ".coveragerc",
         "docs/multiprocessing.rst",
-        ".github/workflows", # exclude gh actions as credentials are needed for tests
-        ".github/auto-label.yaml",
         "README.rst", # This repo has a customized README
     ],
 )
-s.replace("noxfile.py",
-"""prerel_deps = \[
-        "protobuf",""",
-"""prerel_deps = [
-        "google-cloud-audit-log",
-        "protobuf",""",
-)
 
 # adjust .trampolinerc for environment tests
 s.replace(".trampolinerc", "required_envvars[^\)]*\)", "required_envvars+=()")
@@ -249,21 +242,3 @@ def place_before(path, text, *before_text, escape=None):
         s.replace(sample_files, text, replacement)
 
 s.shell.run(["nox", "-s", "blacken"], hide_output=False)
-s.shell.run(["nox", "-s", "blacken"], cwd="samples/snippets", hide_output=False)
-
-# --------------------------------------------------------------------------
-# Modify test configs
-# --------------------------------------------------------------------------
-
-# add shared environment variables to test configs
-tracked_subdirs = ["continuous", "presubmit", "samples"]
-for subdir in tracked_subdirs:
-    for path, subdirs, files in os.walk(f".kokoro/{subdir}"):
-        for name in files:
-            if name == "common.cfg":
-                file_path = os.path.join(path, name)
-                s.move(
-                    ".kokoro/common_env_vars.cfg",
-                    file_path,
-                    merge=lambda src, dst, _,: f"{dst}\n{src}",
-                )