Merge remote-tracking branch 'origin/main' into observability/tracing-attr/error.type

# Conflicts:
#	gax-java/gax/src/main/java/com/google/api/gax/rpc/ResourceNameExtractor.java
#	gax-java/gax/src/main/java/com/google/api/gax/tracing/ObservabilityAttributes.java
#	gax-java/gax/src/main/java/com/google/api/gax/tracing/OpenTelemetryTraceManager.java
#	gax-java/gax/src/main/java/com/google/api/gax/tracing/SpanTracer.java
#	gax-java/gax/src/test/java/com/google/api/gax/tracing/SpanTracerTest.java

Author: diegomarquezp

.cloudbuild/graalvm/cloudbuild-test-a.yaml

@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.57.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.58.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.17.0'
 options:
   machineType: 'E2_HIGHCPU_8'

.cloudbuild/graalvm/cloudbuild-test-b.yaml

@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.57.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.58.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.17.0'
 options:
   machineType: 'E2_HIGHCPU_8'

.cloudbuild/graalvm/cloudbuild-test-c.yaml

@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.57.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.58.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.17.0'
 options:
   machineType: 'E2_HIGHCPU_8'

.cloudbuild/graalvm/cloudbuild.yaml

@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.57.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.58.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.17.0'
 steps:
   # GraalVM A build

.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml

@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _GAPIC_GENERATOR_JAVA_VERSION: '2.67.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
+  _GAPIC_GENERATOR_JAVA_VERSION: '2.68.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
   _PRIVATE_IMAGE_NAME: "us-docker.pkg.dev/java-hermetic-build-prod/private-resources/java-library-generation"
   _PRIVATE_SHA_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:${COMMIT_SHA}"
   _PRIVATE_LATEST_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:latest"

.cloudbuild/library_generation/library_generation.Dockerfile

@@ -21,7 +21,7 @@ FROM docker.io/library/maven:3.9.9-eclipse-temurin-17-alpine@sha256:969014ee8852
 WORKDIR /sdk-platform-java
 COPY . .
 # {x-version-update-start:gapic-generator-java:current}
-ENV DOCKER_GAPIC_GENERATOR_VERSION="2.67.1-SNAPSHOT"
+ENV DOCKER_GAPIC_GENERATOR_VERSION="2.68.1-SNAPSHOT"
 # {x-version-update-end}
 
 # Download the java formatter

.cloudbuild/library_generation/library_generation_airlock.Dockerfile

@@ -21,7 +21,7 @@ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/maven@sha256:d3f0
 WORKDIR /sdk-platform-java
 COPY . .
 # {x-version-update-start:gapic-generator-java:current}
-ENV DOCKER_GAPIC_GENERATOR_VERSION="2.67.1-SNAPSHOT"
+ENV DOCKER_GAPIC_GENERATOR_VERSION="2.68.1-SNAPSHOT"
 # {x-version-update-end}
 
 # Download the java formatter

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "2.67.0"
+  ".": "2.68.0"
 }

CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## [2.68.0](https://github.com/googleapis/sdk-platform-java/compare/v2.67.0...v2.68.0) (2026-03-17)
+
+
+### Features
+
+* Add client request duration metric. ([#4132](https://github.com/googleapis/sdk-platform-java/issues/4132)) ([6a76397](https://github.com/googleapis/sdk-platform-java/commit/6a763979c2c5427f0a7ba23708fb7948520662d8))
+* Add more attributes to golden signals metrics. ([#4135](https://github.com/googleapis/sdk-platform-java/issues/4135)) ([59d0624](https://github.com/googleapis/sdk-platform-java/commit/59d0624ec5a85580a503f719897597161f529e3f))
+* **gax-httpjson:** add HttpJsonErrorParser utility ([#4137](https://github.com/googleapis/sdk-platform-java/issues/4137)) ([a1b7565](https://github.com/googleapis/sdk-platform-java/commit/a1b7565ef752259d79d3f1288b85120c6ac7452b))
+* **generator:** add extra allowed modules that will not be removed from the monorepo if they are present ([#4124](https://github.com/googleapis/sdk-platform-java/issues/4124)) ([774fe6e](https://github.com/googleapis/sdk-platform-java/commit/774fe6ede6bf25e150fb405dfe3bac9d85e21169))
+* **o11y:** introduce `gcp.client.repo` and `gcp.client.artifact` attributes ([#4120](https://github.com/googleapis/sdk-platform-java/issues/4120)) ([105f644](https://github.com/googleapis/sdk-platform-java/commit/105f644209cb78845a423d949cb7633a86d07868))
+* **o11y:** Introduce `rpc.system.name` and `rpc.method` in gRPC ([#4121](https://github.com/googleapis/sdk-platform-java/issues/4121)) ([7ab6d2e](https://github.com/googleapis/sdk-platform-java/commit/7ab6d2e5784f264558b7aca6f23e771361dbea3a))
+* **o11y:** introduce server.port attribute ([#4128](https://github.com/googleapis/sdk-platform-java/issues/4128)) ([56aa343](https://github.com/googleapis/sdk-platform-java/commit/56aa3438393e1992bb8f688291fb12030ec9bc0e))
+
+
+### Bug Fixes
+
+* add null checks for ApiTracerFactory in ClientContext ([#4122](https://github.com/googleapis/sdk-platform-java/issues/4122)) ([4b3dbe2](https://github.com/googleapis/sdk-platform-java/commit/4b3dbe29b32dd0fba6c7a5f4a08fafa2798eeca5))
+* Decrease log level for directpath warnings outside GCE ([#4139](https://github.com/googleapis/sdk-platform-java/issues/4139)) ([c9651e7](https://github.com/googleapis/sdk-platform-java/commit/c9651e7fa1501726798c0e38365e4b7c0acabc55))
+* **gax-grpc:** add pick_first fallback to direct path service config ([#4143](https://github.com/googleapis/sdk-platform-java/issues/4143)) ([b150fe9](https://github.com/googleapis/sdk-platform-java/commit/b150fe9ccfd5a97319388be4079699722aa033dc))
+* Populate method level attributes in metrics recording ([#4149](https://github.com/googleapis/sdk-platform-java/issues/4149)) ([7b7e6c9](https://github.com/googleapis/sdk-platform-java/commit/7b7e6c99251e1aecb1831084f5576aa9e8e48930))
+* suppress warnings in generated projects for non-idiomatic durations ([#4119](https://github.com/googleapis/sdk-platform-java/issues/4119)) ([4206e6e](https://github.com/googleapis/sdk-platform-java/commit/4206e6ed7546d6b8330dcb8dc29179e59677ccd3))
+* Use ServiceName + MethodName as the regex for Otel ([#2543](https://github.com/googleapis/sdk-platform-java/issues/2543)) ([b9ae73f](https://github.com/googleapis/sdk-platform-java/commit/b9ae73fba59ba32e9688d11c2b3db51fe0d68d8d))
+
+
+### Documentation
+
+* **hermetic_build:** fix config field name in readme ([#4130](https://github.com/googleapis/sdk-platform-java/issues/4130)) ([a0c8f67](https://github.com/googleapis/sdk-platform-java/commit/a0c8f67f5a425d9a365b8e451b18add2c5947a11))
+
 ## [2.67.0](https://github.com/googleapis/sdk-platform-java/compare/v2.66.1...v2.67.0) (2026-02-18)
 
 

GEMINI.md

@@ -65,8 +65,8 @@ mvn fmt:format
 
 The repository employs a multi-layered testing strategy to ensure the quality and correctness of the generated code:
 
-*   **Unit Tests:** Traditional unit tests for individual classes and methods.
-*   **Golden Unit Tests:** These tests generate code from test protos and compare the output to "golden" files, which are pre-approved versions of the generated code. These test cases exist inside the `gapic-generator-java` module.
+*   **Unit Tests:** Traditional unit tests for individual classes and methods. See [unit testing best practices](https://engdoc.corp.google.com/eng/doc/devguide/testing/unit/best-practices.md?cl=head&polyglot=java).
+*   **Golden Unit Tests:** These tests generate code from test protos and compare the output to "golden" files, which are pre-approved versions of the generated code. These test cases exist inside the `gapic-generator-java` module. See [GrpcServiceStubClassComposerTest](https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java) for an example of golden unit tests. The steps for golden unit tests include creating a test proto, loading the test proto, generating from the test proto, and comparing the result with a golden file.
 *   **Showcase Integration Tests:** These tests run the generated Showcase client against a local Showcase server to verify end-to-end functionality. This is the preferred way of testing integration tests.
 *   **Golden Integration Tests:** These tests generate full client libraries for real Google Cloud APIs and compare them to golden versions. This is an older test strategy and showcase testing is preferred.
 
@@ -144,6 +144,6 @@ Showcase integration tests are run against a local server that implements the Sh
   specification. The format is `<type>: <description>`. The type should be one of the following: fix, feat,
   build, chore, docs, test, or refactor.
 - **Issues:** All significant changes should start with a GitHub issue.
-- **Pull Requests:** All code changes must be submitted via a pull request and require review.
+- **Pull Requests:** All code changes must be submitted via a pull request and require review. Before creating a PR, always pull latest from main, merge main to local branch and resolve any conflicts.  
 - **Testing:** All new logic should be accompanied by tests.
 - For more details, see `CONTRIBUTING.md`.