diff --git a/.cloudbuild/graalvm/cloudbuild-test-a.yaml b/.cloudbuild/graalvm/cloudbuild-test-a.yaml index 5e9b41cec7..030f2a6e00 100644 --- a/.cloudbuild/graalvm/cloudbuild-test-a.yaml +++ b/.cloudbuild/graalvm/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _SHARED_DEPENDENCIES_VERSION: '3.51.0' # {x-version-update:google-cloud-shared-dependencies:current} + _SHARED_DEPENDENCIES_VERSION: '3.52.0' # {x-version-update:google-cloud-shared-dependencies:current} _JAVA_SHARED_CONFIG_VERSION: '1.16.1' options: machineType: 'E2_HIGHCPU_8' diff --git a/.cloudbuild/graalvm/cloudbuild-test-b.yaml b/.cloudbuild/graalvm/cloudbuild-test-b.yaml index 797d876b61..911045b3ca 100644 --- a/.cloudbuild/graalvm/cloudbuild-test-b.yaml +++ b/.cloudbuild/graalvm/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _SHARED_DEPENDENCIES_VERSION: '3.51.0' # {x-version-update:google-cloud-shared-dependencies:current} + _SHARED_DEPENDENCIES_VERSION: '3.52.0' # {x-version-update:google-cloud-shared-dependencies:current} _JAVA_SHARED_CONFIG_VERSION: '1.16.1' options: machineType: 'E2_HIGHCPU_8' diff --git a/.cloudbuild/graalvm/cloudbuild-test-c.yaml b/.cloudbuild/graalvm/cloudbuild-test-c.yaml index 32c5bde711..e60c6ececa 100644 --- a/.cloudbuild/graalvm/cloudbuild-test-c.yaml +++ b/.cloudbuild/graalvm/cloudbuild-test-c.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _SHARED_DEPENDENCIES_VERSION: '3.51.0' # {x-version-update:google-cloud-shared-dependencies:current} + _SHARED_DEPENDENCIES_VERSION: '3.52.0' # {x-version-update:google-cloud-shared-dependencies:current} _JAVA_SHARED_CONFIG_VERSION: '1.16.1' options: machineType: 'E2_HIGHCPU_8' diff --git a/.cloudbuild/graalvm/cloudbuild.yaml b/.cloudbuild/graalvm/cloudbuild.yaml index e8a31c4656..ce48e5b047 100644 --- a/.cloudbuild/graalvm/cloudbuild.yaml +++ b/.cloudbuild/graalvm/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _SHARED_DEPENDENCIES_VERSION: '3.51.0' # {x-version-update:google-cloud-shared-dependencies:current} + _SHARED_DEPENDENCIES_VERSION: '3.52.0' # {x-version-update:google-cloud-shared-dependencies:current} _JAVA_SHARED_CONFIG_VERSION: '1.16.1' steps: # GraalVM A build diff --git a/.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml b/.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml index 425a040f0e..ed949d8cfd 100644 --- a/.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml +++ b/.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _GAPIC_GENERATOR_JAVA_VERSION: '2.61.0' # {x-version-update:gapic-generator-java:current} + _GAPIC_GENERATOR_JAVA_VERSION: '2.62.0' # {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" diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile index f6b5e94dd0..bcbc886704 100644 --- a/.cloudbuild/library_generation/library_generation.Dockerfile +++ b/.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.61.0" +ENV DOCKER_GAPIC_GENERATOR_VERSION="2.62.0" # {x-version-update-end} # Download the java formatter diff --git a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile index 49e832dd7f..d3efbc156c 100644 --- a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile +++ b/.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.61.0" +ENV DOCKER_GAPIC_GENERATOR_VERSION="2.62.0" # {x-version-update-end} # Download the java formatter diff --git a/.github/scripts/test_dependency_compatibility.sh b/.github/scripts/test_dependency_compatibility.sh new file mode 100755 index 0000000000..f2a5ae638e --- /dev/null +++ b/.github/scripts/test_dependency_compatibility.sh @@ -0,0 +1,99 @@ +#!/bin/bash + +# This script generates a maven command to test unit and integration tests for +# the repo. The outputted maven command will be in the rough following format +# `mvn verify ... -D{dependency.name}.version={dependency.version]`. The variables +# ${dependency.name} and ${dependency.version} are parsed from the input to the script. +# +# Default invocation ./.github/scripts/test_dependency_compatibility.sh will use the default +# upper-bounds dependency file at the root of the repo. +# There are two potential inputs to the script: +# 1. -f {file}: Custom file/path for the upper-bound dependencies to test +# 2. -l {deps_list}: Comma-separated list of dependencies to test (e.g. protobuf=4.31.0,guava=33.4.8-jre) +# Note: Do not include the `-D` prefix or `.version` suffix. Those values will be appended when generating +# the maven command. +# +# If both inputs are supplied, the deps_list input has precedence. For Github Actions workflow, +# the default workflow will run with the upper-bounds file. A `workflow_dispatch` option takes in +# an input for the deps_list to manually run a subset of dependencies. +# +# The default upper-bound dependencies file is `dependencies.txt` located in the root +# of sdk-platform-java. The upper-bound dependencies file will be in the format of: +# ${dependency.name}=${dependency.version} + +set -ex + +function print_help() { + echo "Unexpected input argument for this script." + echo "Use -f {file} for the directory of the upper-bound dependencies file." + echo "Use -l {deps_list} for a comma-separated list of dependencies to test (Format: dep1=1.0,dep2=2.0)" +} + +# Function to parse a dependency string and append it to the Maven command +function add_dependency_to_maven_command() { + local dep_pair=$1 + if [[ ! "${dep_pair}" =~ .*=.* ]]; then + echo "Malformed dependency string: ${dep_pair}. Expected format: dependency=version" + exit 1 + fi + local dependency=$(echo "${dep_pair}" | cut -d'=' -f1 | tr -d '[:space:]') + local version=$(echo "${dep_pair}" | cut -d'=' -f2 | sed 's/^[[:space:]]*//;s/[[:space:]]*$//') + MAVEN_COMMAND+=" -D${dependency}.version=${version}" +} + +# Default to the upper bounds file in the root of the repo +file='dependencies.txt' +dependency_list='' + +# The colon (:) after the letter means that there is an input associated with the flag +while getopts 'f:l:' flag; do + case "${flag}" in + f) file="${OPTARG}" ;; + l) dependency_list="${OPTARG}" ;; + *) print_help && exit 1 + esac +done + +# Error if both the file and deps_list inputs is empty +if [[ -z "${file}" && -z "${dependency_list}" ]]; then + print_help && exit 1 +fi + +MAVEN_COMMAND="mvn verify -Penable-integration-tests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip -Denforcer.skip " + +# Check if a list of dependencies was provided as an argument. If the list of dependency inputted +# is empty, then run with the upper-bound dependencies file +if [ -z "${dependency_list}" ]; then + UPPER_BOUND_DEPENDENCY_FILE=$file + + if [ ! -e "${UPPER_BOUND_DEPENDENCY_FILE}" ]; then + echo "The inputted upper-bound dependency file '${UPPER_BOUND_DEPENDENCY_FILE}' cannot be found" + exit 1 + fi + + # Read the file line by line + while IFS= read -r line; do + # Ignore any comments and blank lines + if [[ "${line}" =~ ^[[:space:]]*# ]] || [[ -z "${line}" ]]; then + continue + fi + add_dependency_to_maven_command "${line}" + done < "${UPPER_BOUND_DEPENDENCY_FILE}" +else # This else block means that a list of dependencies was inputted + # Set the Internal Field Separator (IFS) to a comma. + # This tells 'read' to split the string by commas into an array named DEPS. + # The 'read -ra' command reads the input into an array. + IFS=',' read -ra DEPS <<< "${dependency_list}" + + # Loop through each item in the DEPS array. + for DEP_PAIR in "${DEPS[@]}"; do + # Skip any empty items that might result from trailing commas. + if [ -z "${DEP_PAIR}" ]; then + continue + fi + add_dependency_to_maven_command "${DEP_PAIR}" + done +fi + +# Run the generated maven command to test with the dependency versions +$MAVEN_COMMAND diff --git a/.github/workflows/dependency_compatibility_test.yaml b/.github/workflows/dependency_compatibility_test.yaml new file mode 100644 index 0000000000..f13ce1e0cf --- /dev/null +++ b/.github/workflows/dependency_compatibility_test.yaml @@ -0,0 +1,75 @@ +name: Dependency Compatibility Test + +on: + pull_request: + branches: + - 'main' + workflow_dispatch: + inputs: + dependencies-list: + description: 'Comma-separated list of dependencies to test (Example format: protobuf=4.31.0,guava=33.4.8-jre). + Do not include the `-D` prefix or `.version` suffix. Those values will be appended when generating + the command. No input (default) will run the the upper-bound dependencies file.' + required: false + default: '' + +jobs: + dependency-compatibility-test: + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - name: Checkout sdk-platform-java + uses: actions/checkout@v4 + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + cache: maven + # The workflow_dispatch event is for team members who want to manually test certain dependencies + version combos + # The normal workflow is not from `workflow_dispatch` and will use the default upper-bounds dependencies file + - name: Determine Inputted Dependencies List + if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.dependencies-list != '' }} + run: echo "DEPENDENCIES_LIST=${{ github.event.inputs.dependencies-list }}" >> $GITHUB_ENV + + # Run in the root module which should test for everything except for showcase + - name: Perform Dependency Compatibility Testing + shell: bash + run: | + if [[ -n "${{ env.DEPENDENCIES_LIST }}" ]]; then + ./.github/scripts/test_dependency_compatibility.sh -l ${{ env.DEPENDENCIES_LIST }} + else + ./.github/scripts/test_dependency_compatibility.sh + fi + + # Install the modules for showcase (Shared-Deps is required to run showcase) + - name: Install sdk-platform-java's modules + # gapic-generator-java requires Java 8 and is irrelevant for this CI + run: mvn -q -B -ntp install --projects '!gapic-generator-java' -Dcheckstyle.skip -Dfmt.skip -DskipTests -Dclirr.skip -T 1C + + # Set up local showcase server to run the showcase ITs + - name: Parse showcase version + working-directory: java-showcase/gapic-showcase + run: echo "SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)" >> "$GITHUB_ENV" + - name: Install showcase server + run: | + sudo mkdir -p /usr/src/showcase + sudo chown -R ${USER} /usr/src/ + curl --location https://github.com/googleapis/gapic-showcase/releases/download/v${{env.SHOWCASE_VERSION}}/gapic-showcase-${{env.SHOWCASE_VERSION}}-linux-amd64.tar.gz --output /usr/src/showcase/showcase-${{env.SHOWCASE_VERSION}}-linux-amd64.tar.gz + cd /usr/src/showcase/ + tar -xf showcase-* + ./gapic-showcase run & + cd - + + # Run Showcase's Integration Tests + - name: Perform Dependency Compatibility Testing (Showcase only) + shell: bash + # Need to cd out of the directory to get the scripts as this step is run inside the java-showcase directory + run: | + if [[ -n "${{ env.DEPENDENCIES_LIST }}" ]]; then + ../.github/scripts/test_dependency_compatibility.sh -l ${{ env.DEPENDENCIES_LIST }} + else + ../.github/scripts/test_dependency_compatibility.sh -f ../dependencies.txt + fi + working-directory: java-showcase diff --git a/.github/workflows/gemini-cli.yml b/.github/workflows/gemini-cli.yml new file mode 100644 index 0000000000..a3cecf0f1f --- /dev/null +++ b/.github/workflows/gemini-cli.yml @@ -0,0 +1,270 @@ +name: '💬 Gemini CLI' + +on: + issue_comment: + types: [created] + +concurrency: + group: '${{ github.workflow }}-${{ github.event.issue.number }}' + cancel-in-progress: |- + ${{ github.event.sender.type == 'User' && ( github.event.issue.author_association == 'OWNER' || github.event.issue.author_association == 'MEMBER' || github.event.issue.author_association == 'COLLABORATOR') }} + +defaults: + run: + shell: 'bash' + +permissions: + contents: 'write' + id-token: 'write' + pull-requests: 'write' + issues: 'write' + +jobs: + gemini-cli: + # This condition is complex to ensure we only run when explicitly invoked. + if: |- + github.event_name == 'workflow_dispatch' || + ( + github.event_name == 'issues' && github.event.action == 'opened' && + contains(github.event.issue.body, '@gemini-cli') && + !contains(github.event.issue.body, '@gemini-cli /review') && + !contains(github.event.issue.body, '@gemini-cli /triage') && + contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.issue.author_association) + ) || + ( + github.event_name == 'issue_comment' && + contains(github.event.comment.body, '@gemini-cli') && + !contains(github.event.comment.body, '@gemini-cli /review') && + !contains(github.event.comment.body, '@gemini-cli /triage') && + contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association) + ) + timeout-minutes: 10 + runs-on: 'ubuntu-latest' + + steps: + - name: 'Get context from event' + id: 'get_context' + env: + EVENT_NAME: '${{ github.event_name }}' + EVENT_PAYLOAD: '${{ toJSON(github.event) }}' + run: |- + set -euo pipefail + + USER_REQUEST="" + ISSUE_NUMBER="" + IS_PR="false" + + if [[ "${EVENT_NAME}" == "issues" ]]; then + USER_REQUEST=$(echo "${EVENT_PAYLOAD}" | jq -r .issue.body) + ISSUE_NUMBER=$(echo "${EVENT_PAYLOAD}" | jq -r .issue.number) + elif [[ "${EVENT_NAME}" == "issue_comment" ]]; then + USER_REQUEST=$(echo "${EVENT_PAYLOAD}" | jq -r .comment.body) + ISSUE_NUMBER=$(echo "${EVENT_PAYLOAD}" | jq -r .issue.number) + if [[ $(echo "${EVENT_PAYLOAD}" | jq -r .issue.pull_request) != "null" ]]; then + IS_PR="true" + fi + fi + + # Clean up user request + USER_REQUEST=$(echo "${USER_REQUEST}" | sed 's/.*@gemini-cli//' | sed 's/^[[:space:]]*//;s/[[:space:]]*$//') + + { + echo "user_request=${USER_REQUEST}" + echo "issue_number=${ISSUE_NUMBER}" + echo "is_pr=${IS_PR}" + } >> "${GITHUB_OUTPUT}" + + - name: 'Set up git user for commits' + run: |- + git config --global user.name 'gemini-cli[bot]' + git config --global user.email 'gemini-cli[bot]@users.noreply.github.com' + + - name: 'Checkout PR branch' + if: |- + ${{ steps.get_context.outputs.is_pr == 'true' }} + uses: 'actions/checkout@v5' + with: + token: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}' + repository: '${{ github.repository }}' + ref: 'refs/pull/${{ steps.get_context.outputs.issue_number }}/head' + fetch-depth: 0 + + - name: 'Checkout main branch' + if: |- + ${{ steps.get_context.outputs.is_pr == 'false' }} + uses: 'actions/checkout@v5' + with: + token: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}' + repository: '${{ github.repository }}' + fetch-depth: 0 + + - name: 'Acknowledge request' + env: + GITHUB_ACTOR: '${{ github.actor }}' + GITHUB_TOKEN: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}' + ISSUE_NUMBER: '${{ steps.get_context.outputs.issue_number }}' + REPOSITORY: '${{ github.repository }}' + REQUEST_TYPE: '${{ steps.get_context.outputs.request_type }}' + run: |- + set -euo pipefail + MESSAGE="@${GITHUB_ACTOR} I've received your request and I'm working on it now! 🤖" + if [[ -n "${MESSAGE}" ]]; then + gh issue comment "${ISSUE_NUMBER}" \ + --body "${MESSAGE}" \ + --repo "${REPOSITORY}" + fi + + - name: 'Get description' + id: 'get_description' + env: + GITHUB_TOKEN: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}' + IS_PR: '${{ steps.get_context.outputs.is_pr }}' + ISSUE_NUMBER: '${{ steps.get_context.outputs.issue_number }}' + run: |- + set -euo pipefail + if [[ "${IS_PR}" == "true" ]]; then + DESCRIPTION=$(gh pr view "${ISSUE_NUMBER}" --json body --template '{{.body}}') + else + DESCRIPTION=$(gh issue view "${ISSUE_NUMBER}" --json body --template '{{.body}}') + fi + { + echo "description<> "${GITHUB_OUTPUT}" + + - name: 'Get comments' + id: 'get_comments' + env: + GITHUB_TOKEN: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}' + IS_PR: '${{ steps.get_context.outputs.is_pr }}' + ISSUE_NUMBER: '${{ steps.get_context.outputs.issue_number }}' + run: |- + set -euo pipefail + if [[ "${IS_PR}" == "true" ]]; then + COMMENTS=$(gh pr view "${ISSUE_NUMBER}" --json comments --template '{{range .comments}}{{.author.login}}: {{.body}}{{"\n"}}{{end}}') + else + COMMENTS=$(gh issue view "${ISSUE_NUMBER}" --json comments --template '{{range .comments}}{{.author.login}}: {{.body}}{{"\n"}}{{end}}') + fi + { + echo "comments<> "${GITHUB_OUTPUT}" + + - name: 'Run Gemini' + id: 'run_gemini' + uses: 'google-github-actions/run-gemini-cli@v0' + env: + GITHUB_TOKEN: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}' + REPOSITORY: '${{ github.repository }}' + USER_REQUEST: '${{ steps.get_context.outputs.user_request }}' + ISSUE_NUMBER: '${{ steps.get_context.outputs.issue_number }}' + IS_PR: '${{ steps.get_context.outputs.is_pr }}' + with: + gemini_api_key: '${{ secrets.GEMINI_API_KEY }}' + gcp_workload_identity_provider: '${{ vars.GCP_WIF_PROVIDER }}' + gcp_project_id: '${{ vars.GOOGLE_CLOUD_PROJECT }}' + gcp_location: '${{ vars.GOOGLE_CLOUD_LOCATION }}' + gcp_service_account: '${{ vars.SERVICE_ACCOUNT_EMAIL }}' + use_vertex_ai: '${{ vars.GOOGLE_GENAI_USE_VERTEXAI }}' + use_gemini_code_assist: '${{ vars.GOOGLE_GENAI_USE_GCA }}' + settings: |- + { + "maxSessionTurns": 50, + "telemetry": { + "enabled": false, + "target": "gcp" + } + } + prompt: |- + ## Role + + You are a helpful AI assistant invoked via a CLI interface in a GitHub workflow. You have access to tools to interact with the repository and respond to the user. + + ## Context + + - **Repository**: `${{ github.repository }}` + - **Triggering Event**: `${{ github.event_name }}` + - **Issue/PR Number**: `${{ steps.get_context.outputs.issue_number }}` + - **Is this a PR?**: `${{ steps.get_context.outputs.is_pr }}` + - **Issue/PR Description**: + `${{ steps.get_description.outputs.description }}` + - **Comments**: + `${{ steps.get_comments.outputs.comments }}` + + ## User Request + + The user has sent the following request: + `${{ steps.get_context.outputs.user_request }}` + + ## How to Respond to Issues, PR Comments, and Questions + + This workflow supports three main scenarios: + + 1. **Creating a Fix for an Issue** + - Carefully read the user request and the related issue or PR description. + - Use available tools to gather all relevant context (e.g., `gh issue view`, `gh pr view`, `gh pr diff`, `cat`, `head`, `tail`). + - Identify the root cause of the problem before proceeding. + - **Show and maintain a plan as a checklist**: + - At the very beginning, outline the steps needed to resolve the issue or address the request and post them as a checklist comment on the issue or PR (use GitHub markdown checkboxes: `- [ ] Task`). + - Example: + ``` + ### Plan + - [ ] Investigate the root cause + - [ ] Implement the fix in `file.py` + - [ ] Add/modify tests + - [ ] Update documentation + - [ ] Verify the fix and close the issue + ``` + - Use: `gh pr comment "${ISSUE_NUMBER}" --body ""` or `gh issue comment "${ISSUE_NUMBER}" --body ""` to post the initial plan. + - As you make progress, keep the checklist visible and up to date by editing the same comment (check off completed tasks with `- [x]`). + - To update the checklist: + 1. Find the comment ID for the checklist (use `gh pr comment list "${ISSUE_NUMBER}"` or `gh issue comment list "${ISSUE_NUMBER}"`). + 2. Edit the comment with the updated checklist: + - For PRs: `gh pr comment --edit --body ""` + - For Issues: `gh issue comment --edit --body ""` + 3. The checklist should only be maintained as a comment on the issue or PR. Do not track or update the checklist in code files. + - If the fix requires code changes, determine which files and lines are affected. If clarification is needed, note any questions for the user. + - Make the necessary code or documentation changes using the available tools (e.g., `write_file`). Ensure all changes follow project conventions and best practices. Reference all shell variables as `"${VAR}"` (with quotes and braces) to prevent errors. + - Run any relevant tests or checks to verify the fix works as intended. If possible, provide evidence (test output, screenshots, etc.) that the issue is resolved. + - **Branching and Committing**: + - **NEVER commit directly to the `main` branch.** + - If you are working on a **pull request** (`IS_PR` is `true`), the correct branch is already checked out. Simply commit and push to it. + - `git add .` + - `git commit -m "feat: "` + - `git push` + - If you are working on an **issue** (`IS_PR` is `false`), create a new branch for your changes. A good branch name would be `issue/${ISSUE_NUMBER}/`. + - `git checkout -b issue/${ISSUE_NUMBER}/my-fix` + - `git add .` + - `git commit -m "feat: "` + - `git push origin issue/${ISSUE_NUMBER}/my-fix` + - After pushing, you can create a pull request: `gh pr create --title "Fixes #${ISSUE_NUMBER}: " --body "This PR addresses issue #${ISSUE_NUMBER}."` + - Summarize what was changed and why in a markdown file: `write_file("response.md", "")` + - Post the response as a comment: + - For PRs: `gh pr comment "${ISSUE_NUMBER}" --body-file response.md` + - For Issues: `gh issue comment "${ISSUE_NUMBER}" --body-file response.md` + + 2. **Addressing Comments on a Pull Request** + - Read the specific comment and the context of the PR. + - Use tools like `gh pr view`, `gh pr diff`, and `cat` to understand the code and discussion. + - If the comment requests a change or clarification, follow the same process as for fixing an issue: create a checklist plan, implement, test, and commit any required changes, updating the checklist as you go. + - **Committing Changes**: The correct PR branch is already checked out. Simply add, commit, and push your changes. + - `git add .` + - `git commit -m "fix: address review comments"` + - `git push` + - If the comment is a question, answer it directly and clearly, referencing code or documentation as needed. + - Document your response in `response.md` and post it as a PR comment: `gh pr comment "${ISSUE_NUMBER}" --body-file response.md` + + 3. **Answering Any Question on an Issue** + - Read the question and the full issue context using `gh issue view` and related tools. + - Research or analyze the codebase as needed to provide an accurate answer. + - If the question requires code or documentation changes, follow the fix process above, including creating and updating a checklist plan and **creating a new branch for your changes as described in section 1.** + - Write a clear, concise answer in `response.md` and post it as an issue comment: `gh issue comment "${ISSUE_NUMBER}" --body-file response.md` + + ## Guidelines + + - **Be concise and actionable.** Focus on solving the user's problem efficiently. + - **Always commit and push your changes if you modify code or documentation.** + - **If you are unsure about the fix or answer, explain your reasoning and ask clarifying questions.** + - **Follow project conventions and best practices.** diff --git a/.github/workflows/gemini-issue-automated-triage.yml b/.github/workflows/gemini-issue-automated-triage.yml new file mode 100644 index 0000000000..b0b0beafc7 --- /dev/null +++ b/.github/workflows/gemini-issue-automated-triage.yml @@ -0,0 +1,123 @@ +name: '🏷️ Gemini Automated Issue Triage' + +on: + issues: + types: + - 'opened' + - 'reopened' + issue_comment: + types: + - 'created' + workflow_dispatch: + inputs: + issue_number: + description: 'issue number to triage' + required: true + type: 'number' + +concurrency: + group: '${{ github.workflow }}-${{ github.event.issue.number }}' + cancel-in-progress: true + +defaults: + run: + shell: 'bash' + +permissions: + contents: 'read' + id-token: 'write' + issues: 'write' + statuses: 'write' + +jobs: + triage-issue: + if: |- + github.event_name == 'issues' || + github.event_name == 'workflow_dispatch' || + ( + github.event_name == 'issue_comment' && + contains(github.event.comment.body, '@gemini-cli /triage') && + contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association) + ) + timeout-minutes: 5 + runs-on: 'ubuntu-latest' + + steps: + - name: 'Checkout repository' + uses: 'actions/checkout@v5' + + - name: 'Run Gemini Issue Triage' + uses: 'google-github-actions/run-gemini-cli@v0' + id: 'gemini_issue_triage' + env: + GITHUB_TOKEN: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}' + ISSUE_TITLE: '${{ github.event.issue.title }}' + ISSUE_BODY: '${{ github.event.issue.body }}' + ISSUE_NUMBER: '${{ github.event.issue.number }}' + REPOSITORY: '${{ github.repository }}' + with: + gemini_cli_version: '${{ vars.GEMINI_CLI_VERSION }}' + gcp_workload_identity_provider: '${{ vars.GCP_WIF_PROVIDER }}' + gcp_project_id: '${{ vars.GOOGLE_CLOUD_PROJECT }}' + gcp_location: '${{ vars.GOOGLE_CLOUD_LOCATION }}' + gcp_service_account: '${{ vars.SERVICE_ACCOUNT_EMAIL }}' + gemini_api_key: '${{ secrets.GEMINI_API_KEY }}' + use_vertex_ai: '${{ vars.GOOGLE_GENAI_USE_VERTEXAI }}' + use_gemini_code_assist: '${{ vars.GOOGLE_GENAI_USE_GCA }}' + settings: |- + { + "maxSessionTurns": 25, + "coreTools": [ + "run_shell_command(echo)", + "run_shell_command(gh label list)", + "run_shell_command(gh issue edit)" + ], + "telemetry": { + "enabled": true, + "target": "gcp" + } + } + prompt: |- + ## Role + + You are an issue triage assistant. Analyze the current GitHub issue + and apply the most appropriate existing labels. Use the available + tools to gather information; do not ask for information to be + provided. + + ## Steps + + 1. Run: `gh label list` to get all available labels. + 2. Review the issue title and body provided in the environment + variables: "${ISSUE_TITLE}" and "${ISSUE_BODY}". + 3. Classify issues by their type (bug, enhancement, documentation, + cleanup, etc) and their priority (p0, p1, p2, p3). Set the + labels according to the format `type: *` and `priority: *` patterns. + If the priority is determined to be more urgent than p2 (e.g. p0 or p1), mark the issue + as p2 and add a comment in the issue with the reason. The comment should ping + @blakeli0, @lqiu96, and @zhumin8 to notify them. + 4. Apply the selected labels to this issue using: + `gh issue edit "${ISSUE_NUMBER}" --add-label "label1,label2"` + + ## Guidelines + + - If there are already labels for `type: *` and `priority: *` set on the issue, do not modify the labels + - Only use labels that already exist in the repository + - Do not modify the original issue content + - Triage only the current issue + - Assign all applicable labels based on the issue content + - Reference all shell variables as "${VAR}" (with quotes and braces) + + - name: 'Post Issue Triage Failure Comment' + if: |- + ${{ failure() && steps.gemini_issue_triage.outcome == 'failure' }} + uses: 'actions/github-script@v7' + with: + github-token: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}' + script: |- + github.rest.issues.createComment({ + owner: '${{ github.repository }}'.split('/')[0], + repo: '${{ github.repository }}'.split('/')[1], + issue_number: '${{ github.event.issue.number }}', + body: 'There is a problem with the Gemini CLI issue triaging. Please check the [action logs](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) for details.' + }) diff --git a/.github/workflows/gemini-issue-scheduled-triage.yml b/.github/workflows/gemini-issue-scheduled-triage.yml new file mode 100644 index 0000000000..c16294eb13 --- /dev/null +++ b/.github/workflows/gemini-issue-scheduled-triage.yml @@ -0,0 +1,112 @@ +name: '📋 Gemini Scheduled Issue Triage' + +on: + schedule: + - cron: '0 0 * * *' # Runs every day + workflow_dispatch: + +concurrency: + group: '${{ github.workflow }}' + cancel-in-progress: true + +defaults: + run: + shell: 'bash' + +permissions: + contents: 'read' + id-token: 'write' + issues: 'write' + statuses: 'write' + +jobs: + triage-issues: + timeout-minutes: 5 + runs-on: 'ubuntu-latest' + + steps: + - name: 'Checkout repository' + uses: 'actions/checkout@v5' + + - name: 'Find untriaged issues' + id: 'find_issues' + env: + GITHUB_TOKEN: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}' + GITHUB_REPOSITORY: '${{ github.repository }}' + GITHUB_OUTPUT: '${{ github.output }}' + run: |- + set -euo pipefail + + echo '🔍 Finding issues without labels...' + NO_LABEL_ISSUES="$(gh issue list --repo "${GITHUB_REPOSITORY}" \ + --search 'is:open is:issue no:label' --json number,title,body)" + + echo '🔄 Merging and deduplicating issues...' + ISSUES="$(echo "${NO_LABEL_ISSUES}" "${NEED_TRIAGE_ISSUES}" | jq -c -s 'add | unique_by(.number)')" + + echo '📝 Setting output for GitHub Actions...' + echo "issues_to_triage=${ISSUES}" >> "${GITHUB_OUTPUT}" + + ISSUE_COUNT="$(echo "${ISSUES}" | jq 'length')" + echo "✅ Found ${ISSUE_COUNT} issues to triage! 🎯" + + - name: 'Run Gemini Issue Triage' + if: |- + ${{ steps.find_issues.outputs.issues_to_triage != '[]' }} + uses: 'google-github-actions/run-gemini-cli@v0' + id: 'gemini_issue_triage' + env: + GITHUB_TOKEN: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}' + ISSUES_TO_TRIAGE: '${{ steps.find_issues.outputs.issues_to_triage }}' + REPOSITORY: '${{ github.repository }}' + with: + gemini_cli_version: '${{ vars.GEMINI_CLI_VERSION }}' + gcp_workload_identity_provider: '${{ vars.GCP_WIF_PROVIDER }}' + gcp_project_id: '${{ vars.GOOGLE_CLOUD_PROJECT }}' + gcp_location: '${{ vars.GOOGLE_CLOUD_LOCATION }}' + gcp_service_account: '${{ vars.SERVICE_ACCOUNT_EMAIL }}' + gemini_api_key: '${{ secrets.GEMINI_API_KEY }}' + use_vertex_ai: '${{ vars.GOOGLE_GENAI_USE_VERTEXAI }}' + use_gemini_code_assist: '${{ vars.GOOGLE_GENAI_USE_GCA }}' + settings: |- + { + "maxSessionTurns": 25, + "coreTools": [ + "run_shell_command(echo)", + "run_shell_command(gh label list)", + "run_shell_command(gh issue edit)", + "run_shell_command(gh issue list)" + ], + "telemetry": { + "enabled": true, + "target": "gcp" + } + } + prompt: |- + ## Role + + You are an issue triage assistant. Analyze issues and apply + appropriate labels. Use the available tools to gather information; + do not ask for information to be provided. + + ## Steps + + 1. Run: `gh label list` + 2. Check environment variable: "${ISSUES_TO_TRIAGE}" (JSON array + of issues) + 3. Classify each issue by their type (bug, enhancement, documentation, + cleanup, etc) and their priority (p0, p1, p2, p3). Set the + labels according to the format `type: *` and `priority: *` patterns. + If the priority is determined to be more urgent than p2 (e.g. p0 or p1), mark the issue + as p2 and add a comment in the issue with the reason. The comment should ping + @blakeli0, @lqiu96, and @zhumin8 to notify them. + 4. Apply the selected labels to this issue using: + `gh issue edit "${ISSUE_NUMBER}" --add-label "label1,label2"` + + ## Guidelines + + - If there are already labels for `type: *` and `priority: *` set on the issue, do not modify the labels + - Only use existing repository labels + - Do not modify the original issue content + - Triage each issue independently + - Reference all shell variables as "${VAR}" (with quotes and braces) \ No newline at end of file diff --git a/.github/workflows/gemini-pr-review.yml b/.github/workflows/gemini-pr-review.yml new file mode 100644 index 0000000000..fe4d3c4455 --- /dev/null +++ b/.github/workflows/gemini-pr-review.yml @@ -0,0 +1,428 @@ +name: '🧐 Gemini Pull Request Review' + +on: + pull_request: + types: [opened, reopened] + issue_comment: + types: [created] + workflow_dispatch: + inputs: + pr_number: + description: 'PR number to review' + required: true + type: 'number' + +concurrency: + group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}' + cancel-in-progress: true + +defaults: + run: + shell: 'bash' + +permissions: + contents: 'read' + id-token: 'write' + issues: 'write' + pull-requests: 'write' + statuses: 'write' + +jobs: + review-pr: + if: |- + github.event_name == 'workflow_dispatch' || + ( + github.event_name == 'pull_request' && + contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.pull_request.author_association) + ) || + ( + github.event_name == 'issue_comment' && + github.event.issue.pull_request && + contains(github.event.comment.body, '@gemini-cli /review') && + contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association) + ) + timeout-minutes: 5 + runs-on: 'ubuntu-latest' + + steps: + - name: 'Checkout PR code' + uses: 'actions/checkout@v5' + + - name: 'Get PR details (pull_request & workflow_dispatch)' + id: 'get_pr' + if: |- + ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }} + env: + GITHUB_TOKEN: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}' + EVENT_NAME: '${{ github.event_name }}' + WORKFLOW_PR_NUMBER: '${{ github.event.inputs.pr_number }}' + PULL_REQUEST_NUMBER: '${{ github.event.pull_request.number }}' + run: |- + set -euo pipefail + + if [[ "${EVENT_NAME}" = "workflow_dispatch" ]]; then + PR_NUMBER="${WORKFLOW_PR_NUMBER}" + else + PR_NUMBER="${PULL_REQUEST_NUMBER}" + fi + + echo "pr_number=${PR_NUMBER}" >> "${GITHUB_OUTPUT}" + + # Get PR details + PR_DATA="$(gh pr view "${PR_NUMBER}" --json title,body,additions,deletions,changedFiles,baseRefName,headRefName)" + echo "pr_data=${PR_DATA}" >> "${GITHUB_OUTPUT}" + + # Get file changes + CHANGED_FILES="$(gh pr diff "${PR_NUMBER}" --name-only)" + { + echo "changed_files<> "${GITHUB_OUTPUT}" + + + - name: 'Get PR details (issue_comment)' + id: 'get_pr_comment' + if: |- + ${{ github.event_name == 'issue_comment' }} + env: + GITHUB_TOKEN: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}' + COMMENT_BODY: '${{ github.event.comment.body }}' + PR_NUMBER: '${{ github.event.issue.number }}' + run: |- + set -euo pipefail + + echo "pr_number=${PR_NUMBER}" >> "${GITHUB_OUTPUT}" + + # Extract additional instructions from comment + ADDITIONAL_INSTRUCTIONS="$( + echo "${COMMENT_BODY}" | sed 's/.*@gemini-cli \/review//' | xargs + )" + echo "additional_instructions=${ADDITIONAL_INSTRUCTIONS}" >> "${GITHUB_OUTPUT}" + + # Get PR details + PR_DATA="$(gh pr view "${PR_NUMBER}" --json title,body,additions,deletions,changedFiles,baseRefName,headRefName)" + echo "pr_data=${PR_DATA}" >> "${GITHUB_OUTPUT}" + + # Get file changes + CHANGED_FILES="$(gh pr diff "${PR_NUMBER}" --name-only)" + { + echo "changed_files<> "${GITHUB_OUTPUT}" + + - name: 'Run Gemini PR Review' + uses: 'google-github-actions/run-gemini-cli@v0' + id: 'gemini_pr_review' + env: + GITHUB_TOKEN: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}' + PR_NUMBER: '${{ steps.get_pr.outputs.pr_number || steps.get_pr_comment.outputs.pr_number }}' + PR_DATA: '${{ steps.get_pr.outputs.pr_data || steps.get_pr_comment.outputs.pr_data }}' + CHANGED_FILES: '${{ steps.get_pr.outputs.changed_files || steps.get_pr_comment.outputs.changed_files }}' + ADDITIONAL_INSTRUCTIONS: '${{ steps.get_pr.outputs.additional_instructions || steps.get_pr_comment.outputs.additional_instructions }}' + REPOSITORY: '${{ github.repository }}' + with: + gemini_cli_version: '${{ vars.GEMINI_CLI_VERSION }}' + gcp_workload_identity_provider: '${{ vars.GCP_WIF_PROVIDER }}' + gcp_project_id: '${{ vars.GOOGLE_CLOUD_PROJECT }}' + gcp_location: '${{ vars.GOOGLE_CLOUD_LOCATION }}' + gcp_service_account: '${{ vars.SERVICE_ACCOUNT_EMAIL }}' + gemini_api_key: '${{ secrets.GEMINI_API_KEY }}' + use_vertex_ai: '${{ vars.GOOGLE_GENAI_USE_VERTEXAI }}' + use_gemini_code_assist: '${{ vars.GOOGLE_GENAI_USE_GCA }}' + settings: |- + { + "maxSessionTurns": 20, + "mcpServers": { + "github": { + "command": "docker", + "args": [ + "run", + "-i", + "--rm", + "-e", + "GITHUB_PERSONAL_ACCESS_TOKEN", + "ghcr.io/github/github-mcp-server" + ], + "includeTools": [ + "create_pending_pull_request_review", + "add_comment_to_pending_review", + "submit_pending_pull_request_review" + ], + "env": { + "GITHUB_PERSONAL_ACCESS_TOKEN": "${GITHUB_TOKEN}" + } + } + }, + "coreTools": [ + "run_shell_command(echo)", + "run_shell_command(gh pr view)", + "run_shell_command(gh pr diff)", + "run_shell_command(cat)", + "run_shell_command(head)", + "run_shell_command(tail)", + "run_shell_command(grep)" + ], + "telemetry": { + "enabled": false, + "target": "gcp" + } + } + prompt: |- + ## Role + + You are an expert code reviewer. You have access to tools to gather + PR information and perform the review on GitHub. Use the available tools to + gather information; do not ask for information to be provided. + + ## Requirements + 1. All feedback must be left on GitHub. + 2. Any output that is not left in GitHub will not be seen. + + ## Steps + + Start by running these commands to gather the required data: + 1. Run: echo "${REPOSITORY}" to get the github repository in / format + 2. Run: echo "${PR_DATA}" to get PR details (JSON format) + 3. Run: echo "${CHANGED_FILES}" to get the list of changed files + 4. Run: echo "${PR_NUMBER}" to get the PR number + 5. Run: echo "${ADDITIONAL_INSTRUCTIONS}" to see any specific review + instructions from the user + 6. Run: gh pr diff "${PR_NUMBER}" to see the full diff and reference + Context section to understand it + 7. For any specific files, use: cat filename, head -50 filename, or + tail -50 filename + 8. If ADDITIONAL_INSTRUCTIONS contains text, prioritize those + specific areas or focus points in your review. Common instruction + examples: "focus on security", "check performance", "review error + handling", "check for breaking changes" + + ## Guideline + ### Core Guideline(Always applicable) + + 1. Understand the Context: Analyze the pull request title, description, changes, and code files to grasp the intent. + 2. Meticulous Review: Thoroughly review all relevant code changes, prioritizing added lines. Consider the specified + focus areas and any provided style guide. + 3. Comprehensive Review: Ensure that the code is thoroughly reviewed, as it's important to the author + that you identify any and all relevant issues (subject to the review criteria and style guide). + Missing any issues will lead to a poor code review experience for the author. + 4. Constructive Feedback: + * Provide clear explanations for each concern. + * Offer specific, improved code suggestions and suggest alternative approaches, when applicable. + Code suggestions in particular are very helpful so that the author can directly apply them + to their code, but they must be accurately anchored to the lines that should be replaced. + 5. Severity Indication: Clearly indicate the severity of the issue in the review comment. + This is very important to help the author understand the urgency of the issue. + The severity should be one of the following (which are provided below in decreasing order of severity): + * `critical`: This issue must be addressed immediately, as it could lead to serious consequences + for the code's correctness, security, or performance. + * `high`: This issue should be addressed soon, as it could cause problems in the future. + * `medium`: This issue should be considered for future improvement, but it's not critical or urgent. + * `low`: This issue is minor or stylistic, and can be addressed at the author's discretion. + 6. Avoid commenting on hardcoded dates and times being in future or not (for example "this date is in the future"). + * Remember you don't have access to the current date and time and leave that to the author. + 7. Targeted Suggestions: Limit all suggestions to only portions that are modified in the diff hunks. + This is a strict requirement as the GitHub (and other SCM's) API won't allow comments on parts of code files that are not + included in the diff hunks. + 8. Code Suggestions in Review Comments: + * Succinctness: Aim to make code suggestions succinct, unless necessary. Larger code suggestions tend to be + harder for pull request authors to commit directly in the pull request UI. + * Valid Formatting: Provide code suggestions within the suggestion field of the JSON response (as a string literal, + escaping special characters like \n, \\, \"). Do not include markdown code blocks in the suggestion field. + Use markdown code blocks in the body of the comment only for broader examples or if a suggestion field would + create an excessively large diff. Prefer the suggestion field for specific, targeted code changes. + * Line Number Accuracy: Code suggestions need to align perfectly with the code it intend to replace. + Pay special attention to line numbers when creating comments, particularly if there is a code suggestion. + Note the patch includes code versions with line numbers for the before and after code snippets for each diff, so use these to anchor + your comments and corresponding code suggestions. + * Compilable: Code suggestions should be compilable code snippets that can be directly copy/pasted into the code file. + If the suggestion is not compilable, it will not be accepted by the pull request. Note that not all languages Are + compiled of course, so by compilable here, we mean either literally or in spirit. + * Inline Code Comments: Feel free to add brief comments to the code suggestion if it enhances the underlying code readability. + Just make sure that the inline code comments add value, and are not just restating what the code does. Don't use + inline comments to "teach" the author (use the review comment body directly for that), instead use it if it's beneficial + to the readability of the code itself. + 10. Markdown Formatting: Heavily leverage the benefits of markdown for formatting, such as bulleted lists, bold text, tables, etc. + 11. Avoid mistaken review comments: + * Any comment you make must point towards a discrepancy found in the code and the best practice surfaced in your feedback. + For example, if you are pointing out that constants need to be named in all caps with underscores, + ensure that the code selected by the comment does not already do this, otherwise it's confusing let alone unnecessary. + 12. Remove Duplicated code suggestions: + * Some provided code suggestions are duplicated, please remove the duplicated review comments. + 13. Don't Approve The Pull Request + 14. Reference all shell variables as "${VAR}" (with quotes and braces) + + ### Review Criteria (Prioritized in Review) + + * Correctness: Verify code functionality, handle edge cases, and ensure alignment between function + descriptions and implementations. Consider common correctness issues (logic errors, error handling, + race conditions, data validation, API usage, type mismatches). + * Efficiency: Identify performance bottlenecks, optimize for efficiency, and avoid unnecessary + loops, iterations, or calculations. Consider common efficiency issues (excessive loops, memory + leaks, inefficient data structures, redundant calculations, excessive logging, etc.). + * Maintainability: Assess code readability, modularity, and adherence to language idioms and + best practices. Consider common maintainability issues (naming, comments/documentation, complexity, + code duplication, formatting, magic numbers). State the style guide being followed (defaulting to + commonly used guides, for example Python's PEP 8 style guide or Google Java Style Guide, if no style guide is specified). + * Security: Identify potential vulnerabilities (e.g., insecure storage, injection attacks, + insufficient access controls). + + ### Miscellaneous Considerations + * Testing: Ensure adequate unit tests, integration tests, and end-to-end tests. Evaluate + coverage, edge case handling, and overall test quality. + * Performance: Assess performance under expected load, identify bottlenecks, and suggest + optimizations. + * Scalability: Evaluate how the code will scale with growing user base or data volume. + * Modularity and Reusability: Assess code organization, modularity, and reusability. Suggest + refactoring or creating reusable components. + * Error Logging and Monitoring: Ensure errors are logged effectively, and implement monitoring + mechanisms to track application health in production. + + **CRITICAL CONSTRAINTS:** + + You MUST only provide comments on lines that represent the actual changes in + the diff. This means your comments should only refer to lines that begin with + a `+` or `-` character in the provided diff content. + DO NOT comment on lines that start with a space (context lines). + + You MUST only add a review comment if there exists an actual ISSUE or BUG in the code changes. + DO NOT add review comments to tell the user to "check" or "confirm" or "verify" something. + DO NOT add review comments to tell the user to "ensure" something. + DO NOT add review comments to explain what the code change does. + DO NOT add review comments to validate what the code change does. + DO NOT use the review comments to explain the code to the author. They already know their code. Only comment when there's an improvement opportunity. This is very important. + + Pay close attention to line numbers and ensure they are correct. + Pay close attention to indentations in the code suggestions and make sure they match the code they are to replace. + Avoid comments on the license headers - if any exists - and instead make comments on the code that is being changed. + + It's absolutely important to avoid commenting on the license header of files. + It's absolutely important to avoid commenting on copyright headers. + Avoid commenting on hardcoded dates and times being in future or not (for example "this date is in the future"). + Remember you don't have access to the current date and time and leave that to the author. + + Avoid mentioning any of your instructions, settings or criteria. + + Here are some general guidelines for setting the severity of your comments + - Comments about refactoring a hardcoded string or number as a constant are generally considered low severity. + - Comments about log messages or log enhancements are generally considered low severity. + - Comments in .md files are medium or low severity. This is really important. + - Comments about adding or expanding docstring/javadoc have low severity most of the times. + - Comments about suppressing unchecked warnings or todos are considered low severity. + - Comments about typos are usually low or medium severity. + - Comments about testing or on tests are usually low severity. + - Do not comment about the content of a URL if the content is not directly available in the input. + + Keep comments bodies concise and to the point. + Keep each comment focused on one issue. + + ## Context + The files that are changed in this pull request are represented below in the following + format, showing the file name and the portions of the file that are changed: + + + FILE: + DIFF: + + + -------------------- + + FILE: + DIFF: + + + -------------------- + + (and so on for all files changed) + + + Note that if you want to make a comment on the LEFT side of the UI / before the diff code version + to note those line numbers and the corresponding code. Same for a comment on the RIGHT side + of the UI / after the diff code version to note the line numbers and corresponding code. + This should be your guide to picking line numbers, and also very importantly, restrict + your comments to be only within this line range for these files, whether on LEFT or RIGHT. + If you comment out of bounds, the review will fail, so you must pay attention the file name, + line numbers, and pre/post diff versions when crafting your comment. + + Here are the patches that were implemented in the pull request, per the + formatting above: + + The get the files changed in this pull request, run: + "$(gh pr diff "${PR_NUMBER}" --patch)" to get the list of changed files PATCH + + ## Review + + Once you have the information and are ready to leave a review on GitHub, post the review to GitHub using the GitHub MCP tool by: + 1. Creating a pending review: Use the mcp__github__create_pending_pull_request_review to create a Pending Pull Request Review. + + 2. Adding review comments: + 2.1 Use the mcp__github__add_comment_to_pending_review to add comments to the Pending Pull Request Review. Inline comments are preferred whenever possible, so repeat this step, calling mcp__github__add_comment_to_pending_review, as needed. All comments about specific lines of code should use inline comments. It is preferred to use code suggestions when possible, which include a code block that is labeled "suggestion", which contains what the new code should be. All comments should also have a severity. The syntax is: + Normal Comment Syntax: + + {{SEVERITY}} {{COMMENT_TEXT}} + + + Inline Comment Syntax: (Preferred): + + {{SEVERITY}} {{COMMENT_TEXT}} + ```suggestion + {{CODE_SUGGESTION}} + ``` + + + Prepend a severity emoji to each comment: + - 🟢 for low severity + - 🟡 for medium severity + - 🟠 for high severity + - 🔴 for critical severity + - 🔵 if severity is unclear + + Including all of this, an example inline comment would be: + + 🟢 Use camelCase for function names + ```suggestion + myFooBarFunction + ``` + + + A critical severity example would be: + + 🔴 Remove storage key from GitHub + ```suggestion + ``` + + 3. Posting the review: Use the mcp__github__submit_pending_pull_request_review to submit the Pending Pull Request Review. + + 3.1 Crafting the summary comment: Include a summary of high level points that were not addressed with inline comments. Be concise. Do not repeat details mentioned inline. + + Structure your summary comment using this exact format with markdown: + ## 📋 Review Summary + + Provide a brief 2-3 sentence overview of the PR and overall + assessment. + + ## 🔍 General Feedback + - List general observations about code quality + - Mention overall patterns or architectural decisions + - Highlight positive aspects of the implementation + - Note any recurring themes across files + + ## Final Instructions + + Remember, you are running in a VM and no one reviewing your output. Your review must be posted to GitHub using the MCP tools to create a pending review, add comments to the pending review, and submit the pending review. + + + - name: 'Post PR review failure comment' + if: |- + ${{ failure() && steps.gemini_pr_review.outcome == 'failure' }} + uses: 'actions/github-script@v7' + with: + github-token: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}' + script: |- + github.rest.issues.createComment({ + owner: '${{ github.repository }}'.split('/')[0], + repo: '${{ github.repository }}'.split('/')[1], + issue_number: '${{ steps.get_pr.outputs.pr_number || steps.get_pr_comment.outputs.pr_number }}', + body: 'There is a problem with the Gemini CLI PR review. Please check the [action logs](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) for details.' + }) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 71f800fe01..3ae10ec6db 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "2.61.0" + ".": "2.62.0" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f7999fd14..67c5eba17d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.62.0](https://github.com/googleapis/sdk-platform-java/compare/v2.61.0...v2.62.0) (2025-08-19) + + +### Features + +* Set sampledToLocalTracing flag to true for all gRPC MethodDescriptors ([#3874](https://github.com/googleapis/sdk-platform-java/issues/3874)) ([592e899](https://github.com/googleapis/sdk-platform-java/commit/592e899c516288b0a60b69525ba12d6f29bc6200)) + ## [2.61.0](https://github.com/googleapis/sdk-platform-java/compare/v2.60.2...v2.61.0) (2025-08-04) diff --git a/GEMINI.md b/GEMINI.md new file mode 100644 index 0000000000..d1d1fdf495 --- /dev/null +++ b/GEMINI.md @@ -0,0 +1,149 @@ +# Gemini CLI Context for sdk-platform-java + +## 1. Overview + +This repository, `sdk-platform-java`, is a monorepo containing the foundational components for building Java client libraries for Google Cloud Platform services. It includes the GAPIC (Generated API Client) generator for Java, the GAX (Google API Extensions) runtime library, and other shared modules. + +## 2. Project Structure + +The repository is structured into several key modules: + +* **`gapic-generator-java`**: The core component for creating new client libraries. It is a Protobuf compiler plugin that generates Java client libraries from API definition files. The `DEVELOPMENT.md` file in this module provides detailed information on how to work with the generator. + +* **`gax-java`**: The Google API Extensions for Java (GAX) library. It provides runtime support for the generated client libraries, including features like pagination, request batching, and polling of long-running operations. It has the following submodules: + * `gax`: Transport-independent part of GAX for Java. + * `gax-grpc`: gRPC-specific logic for GAX. + * `gax-httpjson`: REST-specific logic for GAX. + +* **`api-common-java`**: Contains foundational types and utilities related to Google APIs. It includes the following packages: + * `core`: Core library containing API stability annotations and wrappers around Guava types. + * `pathtemplate`: Path Template library for manipulating strings that are formatted as Google API resource names. + * `resourcenames`: Resource Name library used by generated resource name types. + +* **`java-common-protos`**: Provides Protobuf-generated classes for common Google services that are used across multiple APIs. The code is in this module is auto-generated and should not be modified. + +* **`java-iam`**: Contains Protobuf-generated classes for Google's Identity and Access Management (IAM) service, used for managing policies. The code is in this module is auto-generated and should not be modified. + +* **`java-showcase`**: A demonstration client library for the "Showcase" API, which is a fake API used for integration testing of the GAPIC generator and GAX library. + +* **`java-shared-dependencies`**: Manages shared Maven dependencies for all Google Cloud Java client libraries. This ensures consistency and helps avoid dependency conflicts. + +## 3. Getting Started + +### 3.1. Prerequisites + +To build and work with this project, you will need to install: + +* Java 8+ +* Maven + +### 3.2. Building the Project + +The project uses Maven for its primary build system. To build all modules, run the following command from the root of the repository: + +```sh +mvn install +``` + +### 3.3. Code Formatting + +Code formatting is enforced using the `fmt-maven-plugin`. To check for formatting issues, run: + +```sh +mvn fmt:check +``` + +To format the code, run: + +```sh +mvn fmt:format +``` + +## 4. Testing + +### 4.1. Testing Strategy + +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. +* **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. + +Based on where the code changes are, we should add different tests, in general + +* If the changes are in `gax` or `api-common` only, you _must_ add traditional unit tests, you _may_ add showcase integration tests if you are modifying a public setting. +* If the changes are in `gapic-generator-java` only, showcase integration tests are most likely not needed + * If they are in the `composer` module, you _must_ add golden unit tests, you _may_ add traditional unit tests for better coverage and easier testing. + * If they are in the `parser` module, you _should_ add traditional unit tests with a test proto if possible, you _may_ add golden unit tests to easily see the changes. For example, [routing_rule_parser_testing](https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java/src/test/proto/routing_rule_parser_testing.proto) that is only used for testing [RoutingRuleParser](https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/RoutingRuleParser.java). + * If they are in `other modules(ast, model, writer etc.)`, you _must_ add traditional unit tests, you _may_ add golden unit tests to easily see the changes. +- If the changes are in both `gax` and `gapic-generator-java`, you _must_ add all test layers, including traditional unit tests, golden unit tests and showcase integration tests. + +### 4.2. Running Unit Tests + +Unit tests can be tested via this command: + +```sh +mvn test +``` + +### 4.3. Running Golden Integration Tests + +Golden integration tests are run using Bazel. To run all golden integration tests, use the following command from the root of the repository: + +```sh +bazelisk test //... +``` + +Specific integration tests can be run by specifying the target, for example: + +```sh +bazelisk test //test/integration:redis +``` + +### 4.4. Updating Golden Files + +If you make changes that affect the generated code, you will need to update the golden files. This can be done using the following command: + +```sh +bazelisk run //test/integration:update_asset && bazelisk run //test/integration:update_credentials && bazelisk run //test/integration:update_iam && bazelisk run //test/integration:update_kms && bazelisk run //test/integration:update_pubsub && bazelisk run //test/integration:update_logging && bazelisk run //test/integration:update_redis && bazelisk run //test/integration:update_storage && bazelisk run //test/integration:update_library && bazelisk run //test/integration:update_compute && bazelisk run //test/integration:update_bigtable && bazelisk run //test/integration:update_apigeeconnect +``` + +### 4.5. Running Showcase Integration Tests + +Showcase integration tests are run against a local server that implements the Showcase API. The `java-showcase/README.md` file provides detailed instructions on how to run these tests. The general steps are: + +1. **Install the Showcase server:** + + ```sh + go install github.com/googleapis/gapic-showcase/cmd/gapic-showcase@latest + ``` + +2. **Run the Showcase server:** + + ```sh + gapic-showcase run + ``` + +3. **Run the integration tests:** + + ```sh + cd java-showcase + mvn verify -P enable-integration-tests + ``` + +## 5. Dependency Management + +- Try not to bump any external dependency version unless there is a known CVE (security or vulnerability issue) or a critical bug fix. +- Try to avoid introducing new external dependencies. If a new dependency is required, please state the reason. +- Prefer to use features from the Java standard library, then try to use features from any existing dependencies (preferably from Google managed dependencies). + +## 6. Contribution Guidelines + +- **Commits:** Commit messages should follow the [Conventional Commits](https://www.conventionalcommits.org/) + specification. The format is `: `. 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. +- **Testing:** All new logic should be accompanied by tests. +- For more details, see `CONTRIBUTING.md`. diff --git a/WORKSPACE b/WORKSPACE index 1a75eac3c4..218d84943c 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -58,7 +58,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install") load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS") load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS") -_gapic_generator_java_version = "2.61.0" # {x-version-update:gapic-generator-java:current} +_gapic_generator_java_version = "2.62.0" # {x-version-update:gapic-generator-java:current} maven_install( artifacts = [ diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml index 899ada92c8..d43648498b 100644 --- a/api-common-java/pom.xml +++ b/api-common-java/pom.xml @@ -5,14 +5,14 @@ com.google.api api-common jar - 2.52.0 + 2.53.0 API Common Common utilities for Google APIs in Java com.google.api gapic-generator-java-pom-parent - 2.61.0 + 2.62.0 ../gapic-generator-java-pom-parent diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml index 5e50408b82..fe92558b20 100644 --- a/coverage-report/pom.xml +++ b/coverage-report/pom.xml @@ -31,22 +31,22 @@ com.google.api gax - 2.69.0 + 2.70.0 com.google.api gax-grpc - 2.69.0 + 2.70.0 com.google.api gax-httpjson - 2.69.0 + 2.70.0 com.google.api api-common - 2.52.0 + 2.53.0 diff --git a/dependencies.txt b/dependencies.txt new file mode 100644 index 0000000000..ed0c7e751e --- /dev/null +++ b/dependencies.txt @@ -0,0 +1,48 @@ +# This file contains a list of dependencies and their versions to be tested for compatibility. +# The format is key=value, where the key is the dependency name and the value is the version. +# "1P" refers to First-Party dependencies (owned by Google). +# "3P" refers to Third-Party dependencies. + +# Pom-Parent Dependencies +# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java-pom-parent/pom.xml +javax.annotation-api=1.3.2 +grpc=1.74.0 +google.auth=1.37.1 +google.http-client=1.47.1 +gson=2.13.1 +guava=33.4.8-jre +protobuf=4.31.1 +# Note: This opentelemetry version refers to the opentelemetry-bom +opentelemetry=1.52.0 +errorprone=2.41.0 +j2objc-annotations=3.1 +threetenbp=1.7.2 +slf4j=2.0.17 + +# 1P Shared-Deps +# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/java-shared-dependencies/first-party-dependencies/pom.xml +grpc-gcp=1.6.1 +google.oauth-client=1.39.0 +google.api-client=2.8.1 + +# 3P Shared-Deps +# These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/java-shared-dependencies/third-party-dependencies/pom.xml +threeten-extra=1.8.0 +opencensus=0.31.0 +findbugs=3.0.2 +jackson=2.19.2 +codec=1.19.0 +httpcomponents.httpcore=4.4.16 +httpcomponents.httpclient=4.5.14 +apache-httpclient-5=5.5 +apache-httpcore-5=5.3.4 +perfmark-api=0.27.0 +# Note: This is the google opentelemetry exporter and not the general opentelemetry project +google.cloud.opentelemetry=0.36.0 +flogger=0.9 +arrow=18.3.0 +dev.cel=0.10.1 +com.google.crypto.tink=1.18.0 +# The follow opentelemetry dependencies have a different version from the opentelemetry-bom +opentelemetry-semconv=1.34.0 +io.opentelemetry.contrib.opentelemetry-gcp-resources=1.48.0-alpha diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml index 6eb47fbab3..32f14621d7 100644 --- a/gapic-generator-java-bom/pom.xml +++ b/gapic-generator-java-bom/pom.xml @@ -4,7 +4,7 @@ com.google.api gapic-generator-java-bom pom - 2.61.0 + 2.62.0 GAPIC Generator Java BOM BOM for the libraries in gapic-generator-java repository. Users should not @@ -15,7 +15,7 @@ com.google.api gapic-generator-java-pom-parent - 2.61.0 + 2.62.0 ../gapic-generator-java-pom-parent @@ -75,81 +75,81 @@ com.google.api api-common - 2.52.0 + 2.53.0 com.google.api gax-bom - 2.69.0 + 2.70.0 pom import com.google.api gapic-generator-java - 2.61.0 + 2.62.0 com.google.api.grpc grpc-google-common-protos - 2.60.0 + 2.61.0 com.google.api.grpc proto-google-common-protos - 2.60.0 + 2.61.0 com.google.api.grpc proto-google-iam-v1 - 1.55.0 + 1.56.0 com.google.api.grpc proto-google-iam-v2 - 1.55.0 + 1.56.0 com.google.api.grpc proto-google-iam-v2beta - 1.55.0 + 1.56.0 com.google.api.grpc proto-google-iam-v3 - 1.55.0 + 1.56.0 com.google.api.grpc proto-google-iam-v3beta - 1.55.0 + 1.56.0 com.google.api.grpc grpc-google-iam-v1 - 1.55.0 + 1.56.0 com.google.api.grpc grpc-google-iam-v2 - 1.55.0 + 1.56.0 com.google.api.grpc grpc-google-iam-v2beta - 1.55.0 + 1.56.0 com.google.api.grpc grpc-google-iam-v3 - 1.55.0 + 1.56.0 com.google.api.grpc grpc-google-iam-v3beta - 1.55.0 + 1.56.0 diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index ecaed83989..b9e052f036 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.google.api gapic-generator-java-pom-parent - 2.61.0 + 2.62.0 pom GAPIC Generator Java POM Parent https://github.com/googleapis/sdk-platform-java diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index db74e2e996..0598671feb 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api gapic-generator-java - 2.61.0 + 2.62.0 GAPIC Generator Java GAPIC generator Java @@ -22,7 +22,7 @@ com.google.api gapic-generator-java-pom-parent - 2.61.0 + 2.62.0 ../gapic-generator-java-pom-parent @@ -31,7 +31,7 @@ com.google.api gapic-generator-java-bom - 2.61.0 + 2.62.0 pom import diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposer.java index 338ffbf9e7..455c507e0b 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposer.java @@ -22,6 +22,7 @@ import com.google.api.generator.engine.ast.Expr; import com.google.api.generator.engine.ast.ExprStatement; import com.google.api.generator.engine.ast.MethodInvocationExpr; +import com.google.api.generator.engine.ast.PrimitiveValue; import com.google.api.generator.engine.ast.ScopeNode; import com.google.api.generator.engine.ast.Statement; import com.google.api.generator.engine.ast.StringObjectValue; @@ -140,6 +141,16 @@ protected Statement createMethodDescriptorVariableDecl( .apply("setResponseMarshaller", protoUtilsMarshallerFn.apply(methodInvocationArg)) .apply(methodDescriptorMaker); + // The sampledToLocalTracing flag is set to true for all gRPC MethodDescriptors in GAPICs + // This flag enables captures for specific method names to help provide more detailed metrics + methodDescriptorMaker = + methodMakerFn + .apply( + "setSampledToLocalTracing", + ValueExpr.withValue( + PrimitiveValue.builder().setType(TypeNode.BOOLEAN).setValue("true").build())) + .apply(methodDescriptorMaker); + methodDescriptorMaker = MethodInvocationExpr.builder() .setMethodName("build") diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcAutoPopulateFieldStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcAutoPopulateFieldStub.golden index cfef350643..f3614d7226 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcAutoPopulateFieldStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcAutoPopulateFieldStub.golden @@ -42,6 +42,7 @@ public class GrpcAutoPopulateFieldTestingStub extends AutoPopulateFieldTestingSt ProtoUtils.marshaller(AutoPopulateFieldTestingEchoRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(AutoPopulateFieldTestingEchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor< @@ -57,6 +58,7 @@ public class GrpcAutoPopulateFieldTestingStub extends AutoPopulateFieldTestingSt ProtoUtils.marshaller(AutoPopulateFieldTestingExpandRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(AutoPopulateFieldTestingEchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor< @@ -72,6 +74,7 @@ public class GrpcAutoPopulateFieldTestingStub extends AutoPopulateFieldTestingSt ProtoUtils.marshaller(AutoPopulateFieldTestingEchoRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(AutoPopulateFieldTestingEchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor< @@ -87,6 +90,7 @@ public class GrpcAutoPopulateFieldTestingStub extends AutoPopulateFieldTestingSt ProtoUtils.marshaller(AutoPopulateFieldTestingEchoRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(AutoPopulateFieldTestingEchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable< diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcBigQueryJobServiceStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcBigQueryJobServiceStub.golden index c1c51ff44b..a6a08d1acb 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcBigQueryJobServiceStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcBigQueryJobServiceStub.golden @@ -35,6 +35,7 @@ public class GrpcJobServiceStub extends JobServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(JobProto.DeleteJobRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -45,6 +46,7 @@ public class GrpcJobServiceStub extends JobServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(JobProto.ListJobsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(JobProto.JobList.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable deleteJobCallable; diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcCallableNameTypeStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcCallableNameTypeStub.golden index b8f7271032..b3c396190a 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcCallableNameTypeStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcCallableNameTypeStub.golden @@ -33,6 +33,7 @@ public class GrpcCallableNameTypeServiceStub extends CallableNameTypeServiceStub .setRequestMarshaller( ProtoUtils.marshaller(GetApiOperationRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ApiOperation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -43,6 +44,7 @@ public class GrpcCallableNameTypeServiceStub extends CallableNameTypeServiceStub .setRequestMarshaller( ProtoUtils.marshaller(GetApiOperationRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ApiOperation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable getApiOperationCallable; diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcDeprecatedServiceStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcDeprecatedServiceStub.golden index b472790622..c225eb1a32 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcDeprecatedServiceStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcDeprecatedServiceStub.golden @@ -32,6 +32,7 @@ public class GrpcDeprecatedServiceStub extends DeprecatedServiceStub { .setFullMethodName("google.testdata.v1.DeprecatedService/FastFibonacci") .setRequestMarshaller(ProtoUtils.marshaller(FibonacciRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor slowFibonacciMethodDescriptor = @@ -40,6 +41,7 @@ public class GrpcDeprecatedServiceStub extends DeprecatedServiceStub { .setFullMethodName("google.testdata.v1.DeprecatedService/SlowFibonacci") .setRequestMarshaller(ProtoUtils.marshaller(FibonacciRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable fastFibonacciCallable; diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcEchoStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcEchoStub.golden index 7972dc929b..5068494115 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcEchoStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcEchoStub.golden @@ -49,6 +49,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.v1beta1.Echo/Echo") .setRequestMarshaller(ProtoUtils.marshaller(EchoRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor expandMethodDescriptor = @@ -57,6 +58,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.v1beta1.Echo/Expand") .setRequestMarshaller(ProtoUtils.marshaller(ExpandRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor collectMethodDescriptor = @@ -65,6 +67,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.v1beta1.Echo/Collect") .setRequestMarshaller(ProtoUtils.marshaller(EchoRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor chatMethodDescriptor = @@ -73,6 +76,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.v1beta1.Echo/Chat") .setRequestMarshaller(ProtoUtils.marshaller(EchoRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor chatAgainMethodDescriptor = @@ -81,6 +85,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.v1beta1.Echo/ChatAgain") .setRequestMarshaller(ProtoUtils.marshaller(EchoRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -91,6 +96,7 @@ public class GrpcEchoStub extends EchoStub { .setRequestMarshaller(ProtoUtils.marshaller(PagedExpandRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(PagedExpandResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -101,6 +107,7 @@ public class GrpcEchoStub extends EchoStub { .setRequestMarshaller(ProtoUtils.marshaller(PagedExpandRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(PagedExpandResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor waitMethodDescriptor = @@ -109,6 +116,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.v1beta1.Echo/Wait") .setRequestMarshaller(ProtoUtils.marshaller(WaitRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor blockMethodDescriptor = @@ -117,6 +125,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.v1beta1.Echo/Block") .setRequestMarshaller(ProtoUtils.marshaller(BlockRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(BlockResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor collideNameMethodDescriptor = @@ -125,6 +134,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.v1beta1.Echo/CollideName") .setRequestMarshaller(ProtoUtils.marshaller(EchoRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Object.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -136,6 +146,7 @@ public class GrpcEchoStub extends EchoStub { ProtoUtils.marshaller(PagedExpandLegacyRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(PagedExpandResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable echoCallable; diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcLoggingStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcLoggingStub.golden index 00931520dc..d05cd0ad46 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcLoggingStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcLoggingStub.golden @@ -46,6 +46,7 @@ public class GrpcLoggingServiceV2Stub extends LoggingServiceV2Stub { .setFullMethodName("google.logging.v2.LoggingServiceV2/DeleteLog") .setRequestMarshaller(ProtoUtils.marshaller(DeleteLogRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -57,6 +58,7 @@ public class GrpcLoggingServiceV2Stub extends LoggingServiceV2Stub { ProtoUtils.marshaller(WriteLogEntriesRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(WriteLogEntriesResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -68,6 +70,7 @@ public class GrpcLoggingServiceV2Stub extends LoggingServiceV2Stub { ProtoUtils.marshaller(ListLogEntriesRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListLogEntriesResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor< @@ -85,6 +88,7 @@ public class GrpcLoggingServiceV2Stub extends LoggingServiceV2Stub { .setResponseMarshaller( ProtoUtils.marshaller( ListMonitoredResourceDescriptorsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -94,6 +98,7 @@ public class GrpcLoggingServiceV2Stub extends LoggingServiceV2Stub { .setFullMethodName("google.logging.v2.LoggingServiceV2/ListLogs") .setRequestMarshaller(ProtoUtils.marshaller(ListLogsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ListLogsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -105,6 +110,7 @@ public class GrpcLoggingServiceV2Stub extends LoggingServiceV2Stub { ProtoUtils.marshaller(TailLogEntriesRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(TailLogEntriesResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable deleteLogCallable; diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcPublisherStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcPublisherStub.golden index ceef5178af..863dda39e1 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcPublisherStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcPublisherStub.golden @@ -48,6 +48,7 @@ public class GrpcPublisherStub extends PublisherStub { .setFullMethodName("google.pubsub.v1.Publisher/CreateTopic") .setRequestMarshaller(ProtoUtils.marshaller(Topic.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Topic.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor updateTopicMethodDescriptor = @@ -56,6 +57,7 @@ public class GrpcPublisherStub extends PublisherStub { .setFullMethodName("google.pubsub.v1.Publisher/UpdateTopic") .setRequestMarshaller(ProtoUtils.marshaller(UpdateTopicRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Topic.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor publishMethodDescriptor = @@ -64,6 +66,7 @@ public class GrpcPublisherStub extends PublisherStub { .setFullMethodName("google.pubsub.v1.Publisher/Publish") .setRequestMarshaller(ProtoUtils.marshaller(PublishRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(PublishResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getTopicMethodDescriptor = @@ -72,6 +75,7 @@ public class GrpcPublisherStub extends PublisherStub { .setFullMethodName("google.pubsub.v1.Publisher/GetTopic") .setRequestMarshaller(ProtoUtils.marshaller(GetTopicRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Topic.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -81,6 +85,7 @@ public class GrpcPublisherStub extends PublisherStub { .setFullMethodName("google.pubsub.v1.Publisher/ListTopics") .setRequestMarshaller(ProtoUtils.marshaller(ListTopicsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ListTopicsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor< @@ -94,6 +99,7 @@ public class GrpcPublisherStub extends PublisherStub { ProtoUtils.marshaller(ListTopicSubscriptionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListTopicSubscriptionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -105,6 +111,7 @@ public class GrpcPublisherStub extends PublisherStub { ProtoUtils.marshaller(ListTopicSnapshotsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListTopicSnapshotsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteTopicMethodDescriptor = @@ -113,6 +120,7 @@ public class GrpcPublisherStub extends PublisherStub { .setFullMethodName("google.pubsub.v1.Publisher/DeleteTopic") .setRequestMarshaller(ProtoUtils.marshaller(DeleteTopicRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -124,6 +132,7 @@ public class GrpcPublisherStub extends PublisherStub { ProtoUtils.marshaller(DetachSubscriptionRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(DetachSubscriptionResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable createTopicCallable; diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcRoutingHeadersStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcRoutingHeadersStub.golden index 2979cd27f3..26b66097b5 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcRoutingHeadersStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcRoutingHeadersStub.golden @@ -37,6 +37,7 @@ public class GrpcExplicitDynamicRoutingHeaderTestingStub "google.explicit.dynamic.routing.header.ExplicitDynamicRoutingHeaderTesting/Example1Test") .setRequestMarshaller(ProtoUtils.marshaller(Request.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor example2TestMethodDescriptor = @@ -46,6 +47,7 @@ public class GrpcExplicitDynamicRoutingHeaderTestingStub "google.explicit.dynamic.routing.header.ExplicitDynamicRoutingHeaderTesting/Example2Test") .setRequestMarshaller(ProtoUtils.marshaller(Request.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor example3TestMethodDescriptor = @@ -55,6 +57,7 @@ public class GrpcExplicitDynamicRoutingHeaderTestingStub "google.explicit.dynamic.routing.header.ExplicitDynamicRoutingHeaderTesting/Example3Test") .setRequestMarshaller(ProtoUtils.marshaller(Request.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor example3CTestMethodDescriptor = @@ -64,6 +67,7 @@ public class GrpcExplicitDynamicRoutingHeaderTestingStub "google.explicit.dynamic.routing.header.ExplicitDynamicRoutingHeaderTesting/Example3CTest") .setRequestMarshaller(ProtoUtils.marshaller(Request.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor example4TestMethodDescriptor = @@ -73,6 +77,7 @@ public class GrpcExplicitDynamicRoutingHeaderTestingStub "google.explicit.dynamic.routing.header.ExplicitDynamicRoutingHeaderTesting/Example4Test") .setRequestMarshaller(ProtoUtils.marshaller(Request.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor example5TestMethodDescriptor = @@ -82,6 +87,7 @@ public class GrpcExplicitDynamicRoutingHeaderTestingStub "google.explicit.dynamic.routing.header.ExplicitDynamicRoutingHeaderTesting/Example5Test") .setRequestMarshaller(ProtoUtils.marshaller(Request.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor example6TestMethodDescriptor = @@ -91,6 +97,7 @@ public class GrpcExplicitDynamicRoutingHeaderTestingStub "google.explicit.dynamic.routing.header.ExplicitDynamicRoutingHeaderTesting/Example6Test") .setRequestMarshaller(ProtoUtils.marshaller(Request.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor example7TestMethodDescriptor = @@ -100,6 +107,7 @@ public class GrpcExplicitDynamicRoutingHeaderTestingStub "google.explicit.dynamic.routing.header.ExplicitDynamicRoutingHeaderTesting/Example7Test") .setRequestMarshaller(ProtoUtils.marshaller(Request.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor example8TestMethodDescriptor = @@ -109,6 +117,7 @@ public class GrpcExplicitDynamicRoutingHeaderTestingStub "google.explicit.dynamic.routing.header.ExplicitDynamicRoutingHeaderTesting/Example8Test") .setRequestMarshaller(ProtoUtils.marshaller(Request.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor example9TestMethodDescriptor = @@ -118,6 +127,7 @@ public class GrpcExplicitDynamicRoutingHeaderTestingStub "google.explicit.dynamic.routing.header.ExplicitDynamicRoutingHeaderTesting/Example9Test") .setRequestMarshaller(ProtoUtils.marshaller(Request.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor backwardsCompatible1TestMethodDescriptor = @@ -127,6 +137,7 @@ public class GrpcExplicitDynamicRoutingHeaderTestingStub "google.explicit.dynamic.routing.header.ExplicitDynamicRoutingHeaderTesting/BackwardsCompatible1Test") .setRequestMarshaller(ProtoUtils.marshaller(Request.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor backwardsCompatible2TestMethodDescriptor = @@ -136,6 +147,7 @@ public class GrpcExplicitDynamicRoutingHeaderTestingStub "google.explicit.dynamic.routing.header.ExplicitDynamicRoutingHeaderTesting/BackwardsCompatible2Test") .setRequestMarshaller(ProtoUtils.marshaller(Request.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor backwardsCompatible3TestMethodDescriptor = @@ -145,6 +157,7 @@ public class GrpcExplicitDynamicRoutingHeaderTestingStub "google.explicit.dynamic.routing.header.ExplicitDynamicRoutingHeaderTesting/BackwardsCompatible3Test") .setRequestMarshaller(ProtoUtils.marshaller(Request.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -156,6 +169,7 @@ public class GrpcExplicitDynamicRoutingHeaderTestingStub .setRequestMarshaller( ProtoUtils.marshaller(RequestWithNestedField.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -166,6 +180,7 @@ public class GrpcExplicitDynamicRoutingHeaderTestingStub "google.explicit.dynamic.routing.header.ExplicitDynamicRoutingHeaderTesting/ImplicitRoutingHeaderWithEnumTest") .setRequestMarshaller(ProtoUtils.marshaller(EnumRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EnumResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable example1TestCallable; diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcTestingStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcTestingStub.golden index b3c92a772e..fefc927080 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcTestingStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcTestingStub.golden @@ -53,6 +53,7 @@ public class GrpcTestingStub extends TestingStub { .setRequestMarshaller( ProtoUtils.marshaller(CreateSessionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Session.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getSessionMethodDescriptor = @@ -61,6 +62,7 @@ public class GrpcTestingStub extends TestingStub { .setFullMethodName("google.showcase.v1beta1.Testing/GetSession") .setRequestMarshaller(ProtoUtils.marshaller(GetSessionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Session.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -71,6 +73,7 @@ public class GrpcTestingStub extends TestingStub { .setRequestMarshaller(ProtoUtils.marshaller(ListSessionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListSessionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteSessionMethodDescriptor = @@ -79,6 +82,7 @@ public class GrpcTestingStub extends TestingStub { .setFullMethodName("google.showcase.v1beta1.Testing/DeleteSession") .setRequestMarshaller(ProtoUtils.marshaller(DeleteSessionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -90,6 +94,7 @@ public class GrpcTestingStub extends TestingStub { ProtoUtils.marshaller(ReportSessionRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ReportSessionResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getTestMethodDescriptor = @@ -98,6 +103,7 @@ public class GrpcTestingStub extends TestingStub { .setFullMethodName("google.showcase.v1beta1.Testing/GetTest") .setRequestMarshaller(ProtoUtils.marshaller(GetTestRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Test.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -107,6 +113,7 @@ public class GrpcTestingStub extends TestingStub { .setFullMethodName("google.showcase.v1beta1.Testing/ListTests") .setRequestMarshaller(ProtoUtils.marshaller(ListTestsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ListTestsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteTestMethodDescriptor = @@ -115,6 +122,7 @@ public class GrpcTestingStub extends TestingStub { .setFullMethodName("google.showcase.v1beta1.Testing/DeleteTest") .setRequestMarshaller(ProtoUtils.marshaller(DeleteTestRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -124,6 +132,7 @@ public class GrpcTestingStub extends TestingStub { .setFullMethodName("google.showcase.v1beta1.Testing/VerifyTest") .setRequestMarshaller(ProtoUtils.marshaller(VerifyTestRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(VerifyTestResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable createSessionCallable; diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/GrpcEchoStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/GrpcEchoStub.golden index c52c8d3f07..180b0456dc 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/GrpcEchoStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/GrpcEchoStub.golden @@ -51,6 +51,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/Echo") .setRequestMarshaller(ProtoUtils.marshaller(EchoRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor expandMethodDescriptor = @@ -59,6 +60,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/Expand") .setRequestMarshaller(ProtoUtils.marshaller(ExpandRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -69,6 +71,7 @@ public class GrpcEchoStub extends EchoStub { .setRequestMarshaller(ProtoUtils.marshaller(PagedExpandRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(PagedExpandResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -79,6 +82,7 @@ public class GrpcEchoStub extends EchoStub { .setRequestMarshaller(ProtoUtils.marshaller(PagedExpandRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(PagedExpandResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor waitMethodDescriptor = @@ -87,6 +91,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/Wait") .setRequestMarshaller(ProtoUtils.marshaller(WaitRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor blockMethodDescriptor = @@ -95,6 +100,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/Block") .setRequestMarshaller(ProtoUtils.marshaller(BlockRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(BlockResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor collideNameMethodDescriptor = @@ -103,6 +109,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/CollideName") .setRequestMarshaller(ProtoUtils.marshaller(EchoRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Object.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor nestedBindingMethodDescriptor = @@ -111,6 +118,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/NestedBinding") .setRequestMarshaller(ProtoUtils.marshaller(EchoRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Object.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor chatMethodDescriptor = @@ -119,6 +127,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/Chat") .setRequestMarshaller(ProtoUtils.marshaller(EchoRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor noBindingMethodDescriptor = @@ -127,6 +136,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/NoBinding") .setRequestMarshaller(ProtoUtils.marshaller(EchoRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor updateCaseMethodDescriptor = @@ -135,6 +145,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.grpcrest.v1beta1.Echo/UpdateCase") .setRequestMarshaller(ProtoUtils.marshaller(UpdateCaseRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Case.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable echoCallable; diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/GrpcWickedStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/GrpcWickedStub.golden index a4accaa5ae..c421c2a8a6 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/GrpcWickedStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/GrpcWickedStub.golden @@ -33,6 +33,7 @@ public class GrpcWickedStub extends WickedStub { .setFullMethodName("google.showcase.v1beta1.Wicked/CraftEvilPlan") .setRequestMarshaller(ProtoUtils.marshaller(EvilRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EvilResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -42,6 +43,7 @@ public class GrpcWickedStub extends WickedStub { .setFullMethodName("google.showcase.v1beta1.Wicked/BrainstormEvilPlans") .setRequestMarshaller(ProtoUtils.marshaller(EvilRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EvilResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -51,6 +53,7 @@ public class GrpcWickedStub extends WickedStub { .setFullMethodName("google.showcase.v1beta1.Wicked/PersuadeEvilPlan") .setRequestMarshaller(ProtoUtils.marshaller(EvilRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EvilResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable craftEvilPlanCallable; diff --git a/gax-java/README.md b/gax-java/README.md index ed9787f4af..d2612ce947 100644 --- a/gax-java/README.md +++ b/gax-java/README.md @@ -34,27 +34,27 @@ If you are using Maven, add this to your pom.xml file com.google.api gax - 2.69.0 + 2.70.0 com.google.api gax-grpc - 2.69.0 + 2.70.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.api:gax:2.69.0', - 'com.google.api:gax-grpc:2.69.0' +compile 'com.google.api:gax:2.70.0', + 'com.google.api:gax-grpc:2.70.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.api" % "gax" % "2.69.0" -libraryDependencies += "com.google.api" % "gax-grpc" % "2.69.0" +libraryDependencies += "com.google.api" % "gax" % "2.70.0" +libraryDependencies += "com.google.api" % "gax-grpc" % "2.70.0" ``` [//]: # ({x-version-update-end}) diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 52acc0bb44..856d473a76 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -8,16 +8,16 @@ # Versions of oneself # {x-version-update-start:gax:current} -version.gax=2.69.0 +version.gax=2.70.0 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=2.69.0 +version.gax_grpc=2.70.0 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=2.69.0 +version.gax_bom=2.70.0 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_httpjson=2.69.0 +version.gax_httpjson=2.70.0 # {x-version-update-end} # Versions for dependencies which actual artifacts differ between Bazel and Gradle. diff --git a/gax-java/gax-bom/pom.xml b/gax-java/gax-bom/pom.xml index 9988977930..cbc36b235c 100644 --- a/gax-java/gax-bom/pom.xml +++ b/gax-java/gax-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api gax-bom - 2.69.0 + 2.70.0 pom GAX (Google Api eXtensions) for Java (BOM) Google Api eXtensions for Java (BOM) @@ -43,55 +43,55 @@ com.google.api gax - 2.69.0 + 2.70.0 com.google.api gax - 2.69.0 + 2.70.0 test-jar testlib com.google.api gax - 2.69.0 + 2.70.0 testlib com.google.api gax-grpc - 2.69.0 + 2.70.0 com.google.api gax-grpc - 2.69.0 + 2.70.0 test-jar testlib com.google.api gax-grpc - 2.69.0 + 2.70.0 testlib com.google.api gax-httpjson - 2.69.0 + 2.70.0 com.google.api gax-httpjson - 2.69.0 + 2.70.0 test-jar testlib com.google.api gax-httpjson - 2.69.0 + 2.70.0 testlib diff --git a/gax-java/gax-grpc/pom.xml b/gax-java/gax-grpc/pom.xml index 8aaac9a9d5..c1ffa89912 100644 --- a/gax-java/gax-grpc/pom.xml +++ b/gax-java/gax-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-grpc - 2.69.0 + 2.70.0 jar GAX (Google Api eXtensions) for Java (gRPC) Google Api eXtensions for Java (gRPC) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.69.0 + 2.70.0 diff --git a/gax-java/gax-httpjson/pom.xml b/gax-java/gax-httpjson/pom.xml index 0fdf35be2e..759adc41d4 100644 --- a/gax-java/gax-httpjson/pom.xml +++ b/gax-java/gax-httpjson/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-httpjson - 2.69.0 + 2.70.0 jar GAX (Google Api eXtensions) for Java (HTTP JSON) Google Api eXtensions for Java (HTTP JSON) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.69.0 + 2.70.0 diff --git a/gax-java/gax/pom.xml b/gax-java/gax/pom.xml index 319ba2ab2d..ee970ecef6 100644 --- a/gax-java/gax/pom.xml +++ b/gax-java/gax/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax - 2.69.0 + 2.70.0 jar GAX (Google Api eXtensions) for Java (Core) Google Api eXtensions for Java (Core) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.69.0 + 2.70.0 diff --git a/gax-java/pom.xml b/gax-java/pom.xml index 2da2cb2d17..8fb060621d 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -4,14 +4,14 @@ com.google.api gax-parent pom - 2.69.0 + 2.70.0 GAX (Google Api eXtensions) for Java (Parent) Google Api eXtensions for Java (Parent) com.google.api gapic-generator-java-pom-parent - 2.61.0 + 2.62.0 ../gapic-generator-java-pom-parent @@ -50,7 +50,7 @@ com.google.api api-common - 2.52.0 + 2.53.0 com.google.auth @@ -98,24 +98,24 @@ com.google.api gax - 2.69.0 + 2.70.0 com.google.api gax - 2.69.0 + 2.70.0 test-jar testlib com.google.api.grpc proto-google-common-protos - 2.60.0 + 2.61.0 com.google.api.grpc grpc-google-common-protos - 2.60.0 + 2.61.0 io.grpc diff --git a/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-a.cfg b/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-a.cfg index 783727ef01..5816d61073 100644 --- a/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-a.cfg +++ b/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-a.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.51.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.52.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-b.cfg b/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-b.cfg index 83c7afee07..7986fd6731 100644 --- a/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-b.cfg +++ b/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-b.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.51.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.52.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg b/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg index 3a9bbf8c3a..acecfce1bf 100644 --- a/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg +++ b/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.51.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.52.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/java-common-protos/grpc-google-common-protos/pom.xml b/java-common-protos/grpc-google-common-protos/pom.xml index 36e89251df..db6454572f 100644 --- a/java-common-protos/grpc-google-common-protos/pom.xml +++ b/java-common-protos/grpc-google-common-protos/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-common-protos - 2.60.0 + 2.61.0 grpc-google-common-protos GRPC library for grpc-google-common-protos com.google.api.grpc google-common-protos-parent - 2.60.0 + 2.61.0 diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index 57b8b59d7b..fef5ded0c1 100644 --- a/java-common-protos/pom.xml +++ b/java-common-protos/pom.xml @@ -4,7 +4,7 @@ com.google.api.grpc google-common-protos-parent pom - 2.60.0 + 2.61.0 Google Common Protos Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.61.0 + 2.62.0 ../gapic-generator-java-pom-parent @@ -51,7 +51,7 @@ com.google.cloud third-party-dependencies - 3.51.0 + 3.52.0 pom import @@ -65,7 +65,7 @@ com.google.api.grpc grpc-google-common-protos - 2.60.0 + 2.61.0 io.grpc @@ -77,7 +77,7 @@ com.google.api.grpc proto-google-common-protos - 2.60.0 + 2.61.0 com.google.guava diff --git a/java-common-protos/proto-google-common-protos/pom.xml b/java-common-protos/proto-google-common-protos/pom.xml index de29635a55..7d02a2b58e 100644 --- a/java-common-protos/proto-google-common-protos/pom.xml +++ b/java-common-protos/proto-google-common-protos/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-common-protos - 2.60.0 + 2.61.0 proto-google-common-protos PROTO library for proto-google-common-protos com.google.api.grpc google-common-protos-parent - 2.60.0 + 2.61.0 diff --git a/java-core/google-cloud-core-bom/pom.xml b/java-core/google-cloud-core-bom/pom.xml index bf4516e07e..df49b0cad3 100644 --- a/java-core/google-cloud-core-bom/pom.xml +++ b/java-core/google-cloud-core-bom/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.cloud google-cloud-core-bom - 2.59.0 + 2.60.0 pom com.google.api gapic-generator-java-pom-parent - 2.61.0 + 2.62.0 ../../gapic-generator-java-pom-parent @@ -23,17 +23,17 @@ com.google.cloud google-cloud-core - 2.59.0 + 2.60.0 com.google.cloud google-cloud-core-grpc - 2.59.0 + 2.60.0 com.google.cloud google-cloud-core-http - 2.59.0 + 2.60.0 diff --git a/java-core/google-cloud-core-grpc/pom.xml b/java-core/google-cloud-core-grpc/pom.xml index e78151e295..6594f68153 100644 --- a/java-core/google-cloud-core-grpc/pom.xml +++ b/java-core/google-cloud-core-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-grpc - 2.59.0 + 2.60.0 jar Google Cloud Core gRPC @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.59.0 + 2.60.0 google-cloud-core-grpc diff --git a/java-core/google-cloud-core-http/pom.xml b/java-core/google-cloud-core-http/pom.xml index c3dadf8820..0c0005f86c 100644 --- a/java-core/google-cloud-core-http/pom.xml +++ b/java-core/google-cloud-core-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-http - 2.59.0 + 2.60.0 jar Google Cloud Core HTTP @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.59.0 + 2.60.0 google-cloud-core-http diff --git a/java-core/google-cloud-core/pom.xml b/java-core/google-cloud-core/pom.xml index 0a41c7d271..8982ebf8ae 100644 --- a/java-core/google-cloud-core/pom.xml +++ b/java-core/google-cloud-core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core - 2.59.0 + 2.60.0 jar Google Cloud Core @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.59.0 + 2.60.0 google-cloud-core diff --git a/java-core/pom.xml b/java-core/pom.xml index c9547c9324..dcb8cbbc83 100644 --- a/java-core/pom.xml +++ b/java-core/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-core-parent pom - 2.59.0 + 2.60.0 Google Cloud Core Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.61.0 + 2.62.0 ../gapic-generator-java-pom-parent @@ -33,7 +33,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.51.0 + 3.52.0 pom import diff --git a/java-iam/grpc-google-iam-v1/pom.xml b/java-iam/grpc-google-iam-v1/pom.xml index 7b85b81eff..daba8b27f2 100644 --- a/java-iam/grpc-google-iam-v1/pom.xml +++ b/java-iam/grpc-google-iam-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v1 - 1.55.0 + 1.56.0 grpc-google-iam-v1 GRPC library for grpc-google-iam-v1 com.google.cloud google-iam-parent - 1.55.0 + 1.56.0 diff --git a/java-iam/grpc-google-iam-v2/pom.xml b/java-iam/grpc-google-iam-v2/pom.xml index fe7d32f76a..0b7a8101c4 100644 --- a/java-iam/grpc-google-iam-v2/pom.xml +++ b/java-iam/grpc-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2 - 1.55.0 + 1.56.0 grpc-google-iam-v2 GRPC library for proto-google-iam-v2 com.google.cloud google-iam-parent - 1.55.0 + 1.56.0 diff --git a/java-iam/grpc-google-iam-v2beta/pom.xml b/java-iam/grpc-google-iam-v2beta/pom.xml index b7857fc47e..478a6c2304 100644 --- a/java-iam/grpc-google-iam-v2beta/pom.xml +++ b/java-iam/grpc-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2beta - 1.55.0 + 1.56.0 grpc-google-iam-v2beta GRPC library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.55.0 + 1.56.0 diff --git a/java-iam/grpc-google-iam-v3/pom.xml b/java-iam/grpc-google-iam-v3/pom.xml index 6339efaf50..b1e2b1c3dc 100644 --- a/java-iam/grpc-google-iam-v3/pom.xml +++ b/java-iam/grpc-google-iam-v3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v3 - 1.55.0 + 1.56.0 grpc-google-iam-v3 GRPC library for proto-google-iam-v3 com.google.cloud google-iam-parent - 1.55.0 + 1.56.0 diff --git a/java-iam/grpc-google-iam-v3beta/pom.xml b/java-iam/grpc-google-iam-v3beta/pom.xml index 786211820c..3424be1d7e 100644 --- a/java-iam/grpc-google-iam-v3beta/pom.xml +++ b/java-iam/grpc-google-iam-v3beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v3beta - 1.55.0 + 1.56.0 grpc-google-iam-v3beta GRPC library for proto-google-iam-v3beta com.google.cloud google-iam-parent - 1.55.0 + 1.56.0 diff --git a/java-iam/pom.xml b/java-iam/pom.xml index f0e6339207..00575c0878 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-iam-parent pom - 1.55.0 + 1.56.0 Google IAM Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.61.0 + 2.62.0 ../gapic-generator-java-pom-parent @@ -50,19 +50,19 @@ com.google.cloud third-party-dependencies - 3.51.0 + 3.52.0 pom import com.google.api.grpc proto-google-iam-v3beta - 1.55.0 + 1.56.0 com.google.api.grpc grpc-google-iam-v3beta - 1.55.0 + 1.56.0 com.google.guava @@ -88,59 +88,59 @@ com.google.api gax-bom - 2.69.0 + 2.70.0 pom import com.google.api api-common - 2.52.0 + 2.53.0 com.google.api.grpc proto-google-iam-v2 - 1.55.0 + 1.56.0 com.google.api.grpc grpc-google-iam-v2 - 1.55.0 + 1.56.0 com.google.api.grpc proto-google-common-protos - 2.60.0 + 2.61.0 com.google.api.grpc proto-google-iam-v2beta - 1.55.0 + 1.56.0 com.google.api.grpc grpc-google-iam-v1 - 1.55.0 + 1.56.0 com.google.api.grpc grpc-google-iam-v2beta - 1.55.0 + 1.56.0 com.google.api.grpc proto-google-iam-v1 - 1.55.0 + 1.56.0 com.google.api.grpc proto-google-iam-v3 - 1.55.0 + 1.56.0 com.google.api.grpc grpc-google-iam-v3 - 1.55.0 + 1.56.0 javax.annotation diff --git a/java-iam/proto-google-iam-v1/pom.xml b/java-iam/proto-google-iam-v1/pom.xml index f182936b3b..a069503ba2 100644 --- a/java-iam/proto-google-iam-v1/pom.xml +++ b/java-iam/proto-google-iam-v1/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v1 - 1.55.0 + 1.56.0 proto-google-iam-v1 PROTO library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.55.0 + 1.56.0 diff --git a/java-iam/proto-google-iam-v2/pom.xml b/java-iam/proto-google-iam-v2/pom.xml index 1ab74eec4b..35f4c9e4e0 100644 --- a/java-iam/proto-google-iam-v2/pom.xml +++ b/java-iam/proto-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2 - 1.55.0 + 1.56.0 proto-google-iam-v2 Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.55.0 + 1.56.0 diff --git a/java-iam/proto-google-iam-v2beta/pom.xml b/java-iam/proto-google-iam-v2beta/pom.xml index 1391828de2..806d6abab1 100644 --- a/java-iam/proto-google-iam-v2beta/pom.xml +++ b/java-iam/proto-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2beta - 1.55.0 + 1.56.0 proto-google-iam-v2beta Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.55.0 + 1.56.0 diff --git a/java-iam/proto-google-iam-v3/pom.xml b/java-iam/proto-google-iam-v3/pom.xml index dbbe35d5e5..3111e68e51 100644 --- a/java-iam/proto-google-iam-v3/pom.xml +++ b/java-iam/proto-google-iam-v3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v3 - 1.55.0 + 1.56.0 proto-google-iam-v3 Proto library for proto-google-iam-v3 com.google.cloud google-iam-parent - 1.55.0 + 1.56.0 diff --git a/java-iam/proto-google-iam-v3beta/pom.xml b/java-iam/proto-google-iam-v3beta/pom.xml index 6a27ef63d9..7f6d28c69f 100644 --- a/java-iam/proto-google-iam-v3beta/pom.xml +++ b/java-iam/proto-google-iam-v3beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v3beta - 1.55.0 + 1.56.0 proto-google-iam-v3beta Proto library for proto-google-iam-v3beta com.google.cloud google-iam-parent - 1.55.0 + 1.56.0 diff --git a/java-shared-dependencies/README.md b/java-shared-dependencies/README.md index 4f230feed1..3bf73a8dd4 100644 --- a/java-shared-dependencies/README.md +++ b/java-shared-dependencies/README.md @@ -14,7 +14,7 @@ If you are using Maven, add this to the `dependencyManagement` section. com.google.cloud google-cloud-shared-dependencies - 3.51.0 + 3.52.0 pom import diff --git a/java-shared-dependencies/dependency-convergence-check/pom.xml b/java-shared-dependencies/dependency-convergence-check/pom.xml index 82692d0f25..57df4a6497 100644 --- a/java-shared-dependencies/dependency-convergence-check/pom.xml +++ b/java-shared-dependencies/dependency-convergence-check/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud shared-dependencies-dependency-convergence-test - 3.51.0 + 3.52.0 Dependency convergence test for certain artifacts in Google Cloud Shared Dependencies An dependency convergence test case for the shared dependencies BOM. A failure of this test case means diff --git a/java-shared-dependencies/first-party-dependencies/pom.xml b/java-shared-dependencies/first-party-dependencies/pom.xml index f00060da7f..575d44addf 100644 --- a/java-shared-dependencies/first-party-dependencies/pom.xml +++ b/java-shared-dependencies/first-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud first-party-dependencies pom - 3.51.0 + 3.52.0 Google Cloud First-party Shared Dependencies Shared first-party dependencies for Google Cloud Java libraries. @@ -33,7 +33,7 @@ com.google.api gapic-generator-java-bom - 2.61.0 + 2.62.0 pom import @@ -45,7 +45,7 @@ com.google.cloud google-cloud-core-bom - 2.59.0 + 2.60.0 pom import @@ -69,13 +69,13 @@ com.google.cloud google-cloud-core - 2.59.0 + 2.60.0 test-jar com.google.cloud google-cloud-core - 2.59.0 + 2.60.0 tests diff --git a/java-shared-dependencies/pom.xml b/java-shared-dependencies/pom.xml index 354b518626..3f75c050d6 100644 --- a/java-shared-dependencies/pom.xml +++ b/java-shared-dependencies/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-dependencies pom - 3.51.0 + 3.52.0 first-party-dependencies third-party-dependencies @@ -17,7 +17,7 @@ com.google.api gapic-generator-java-pom-parent - 2.61.0 + 2.62.0 ../gapic-generator-java-pom-parent @@ -31,14 +31,14 @@ com.google.cloud first-party-dependencies - 3.51.0 + 3.52.0 pom import com.google.cloud third-party-dependencies - 3.51.0 + 3.52.0 pom import diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index b690d521d9..7be8a0df60 100644 --- a/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/java-shared-dependencies/third-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud third-party-dependencies pom - 3.51.0 + 3.52.0 Google Cloud Third-party Shared Dependencies Shared third-party dependencies for Google Cloud Java libraries. @@ -15,7 +15,7 @@ com.google.api gapic-generator-java-pom-parent - 2.61.0 + 2.62.0 ../../gapic-generator-java-pom-parent diff --git a/java-shared-dependencies/upper-bound-check/pom.xml b/java-shared-dependencies/upper-bound-check/pom.xml index ab88b43a28..0af8ffe364 100644 --- a/java-shared-dependencies/upper-bound-check/pom.xml +++ b/java-shared-dependencies/upper-bound-check/pom.xml @@ -4,7 +4,7 @@ com.google.cloud shared-dependencies-upper-bound-test pom - 3.51.0 + 3.52.0 Upper bound test for Google Cloud Shared Dependencies An upper bound test case for the shared dependencies BOM. A failure of this test case means @@ -30,7 +30,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.51.0 + 3.52.0 pom import diff --git a/java-showcase/gapic-showcase/pom.xml b/java-showcase/gapic-showcase/pom.xml index 0d33fbfe34..845158467f 100644 --- a/java-showcase/gapic-showcase/pom.xml +++ b/java-showcase/gapic-showcase/pom.xml @@ -215,6 +215,12 @@ opentelemetry-sdk-testing test + + + io.grpc + grpc-opentelemetry + test + diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcComplianceStub.java b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcComplianceStub.java index 82b27f82f4..1b4ff86061 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcComplianceStub.java +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcComplianceStub.java @@ -62,6 +62,7 @@ public class GrpcComplianceStub extends ComplianceStub { .setFullMethodName("google.showcase.v1beta1.Compliance/RepeatDataBody") .setRequestMarshaller(ProtoUtils.marshaller(RepeatRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(RepeatResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -71,6 +72,7 @@ public class GrpcComplianceStub extends ComplianceStub { .setFullMethodName("google.showcase.v1beta1.Compliance/RepeatDataBodyInfo") .setRequestMarshaller(ProtoUtils.marshaller(RepeatRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(RepeatResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -80,6 +82,7 @@ public class GrpcComplianceStub extends ComplianceStub { .setFullMethodName("google.showcase.v1beta1.Compliance/RepeatDataQuery") .setRequestMarshaller(ProtoUtils.marshaller(RepeatRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(RepeatResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -89,6 +92,7 @@ public class GrpcComplianceStub extends ComplianceStub { .setFullMethodName("google.showcase.v1beta1.Compliance/RepeatDataSimplePath") .setRequestMarshaller(ProtoUtils.marshaller(RepeatRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(RepeatResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -98,6 +102,7 @@ public class GrpcComplianceStub extends ComplianceStub { .setFullMethodName("google.showcase.v1beta1.Compliance/RepeatDataPathResource") .setRequestMarshaller(ProtoUtils.marshaller(RepeatRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(RepeatResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -108,6 +113,7 @@ public class GrpcComplianceStub extends ComplianceStub { "google.showcase.v1beta1.Compliance/RepeatDataPathTrailingResource") .setRequestMarshaller(ProtoUtils.marshaller(RepeatRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(RepeatResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -117,6 +123,7 @@ public class GrpcComplianceStub extends ComplianceStub { .setFullMethodName("google.showcase.v1beta1.Compliance/RepeatDataBodyPut") .setRequestMarshaller(ProtoUtils.marshaller(RepeatRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(RepeatResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -126,6 +133,7 @@ public class GrpcComplianceStub extends ComplianceStub { .setFullMethodName("google.showcase.v1beta1.Compliance/RepeatDataBodyPatch") .setRequestMarshaller(ProtoUtils.marshaller(RepeatRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(RepeatResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getEnumMethodDescriptor = @@ -134,6 +142,7 @@ public class GrpcComplianceStub extends ComplianceStub { .setFullMethodName("google.showcase.v1beta1.Compliance/GetEnum") .setRequestMarshaller(ProtoUtils.marshaller(EnumRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EnumResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor verifyEnumMethodDescriptor = @@ -142,6 +151,7 @@ public class GrpcComplianceStub extends ComplianceStub { .setFullMethodName("google.showcase.v1beta1.Compliance/VerifyEnum") .setRequestMarshaller(ProtoUtils.marshaller(EnumResponse.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EnumResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -153,6 +163,7 @@ public class GrpcComplianceStub extends ComplianceStub { ProtoUtils.marshaller(ListLocationsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListLocationsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getLocationMethodDescriptor = @@ -161,6 +172,7 @@ public class GrpcComplianceStub extends ComplianceStub { .setFullMethodName("google.cloud.location.Locations/GetLocation") .setRequestMarshaller(ProtoUtils.marshaller(GetLocationRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Location.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor setIamPolicyMethodDescriptor = @@ -169,6 +181,7 @@ public class GrpcComplianceStub extends ComplianceStub { .setFullMethodName("google.iam.v1.IAMPolicy/SetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(SetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getIamPolicyMethodDescriptor = @@ -177,6 +190,7 @@ public class GrpcComplianceStub extends ComplianceStub { .setFullMethodName("google.iam.v1.IAMPolicy/GetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(GetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -188,6 +202,7 @@ public class GrpcComplianceStub extends ComplianceStub { ProtoUtils.marshaller(TestIamPermissionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(TestIamPermissionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable repeatDataBodyCallable; diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcEchoStub.java b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcEchoStub.java index 1bbe21e29f..4a2d9820af 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcEchoStub.java +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcEchoStub.java @@ -83,6 +83,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.v1beta1.Echo/Echo") .setRequestMarshaller(ProtoUtils.marshaller(EchoRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -94,6 +95,7 @@ public class GrpcEchoStub extends EchoStub { ProtoUtils.marshaller(EchoErrorDetailsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(EchoErrorDetailsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -105,6 +107,7 @@ public class GrpcEchoStub extends EchoStub { ProtoUtils.marshaller(FailEchoWithDetailsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(FailEchoWithDetailsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor expandMethodDescriptor = @@ -113,6 +116,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.v1beta1.Echo/Expand") .setRequestMarshaller(ProtoUtils.marshaller(ExpandRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor collectMethodDescriptor = @@ -121,6 +125,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.v1beta1.Echo/Collect") .setRequestMarshaller(ProtoUtils.marshaller(EchoRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor chatMethodDescriptor = @@ -129,6 +134,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.v1beta1.Echo/Chat") .setRequestMarshaller(ProtoUtils.marshaller(EchoRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EchoResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -139,6 +145,7 @@ public class GrpcEchoStub extends EchoStub { .setRequestMarshaller(ProtoUtils.marshaller(PagedExpandRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(PagedExpandResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -150,6 +157,7 @@ public class GrpcEchoStub extends EchoStub { ProtoUtils.marshaller(PagedExpandLegacyRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(PagedExpandResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -160,6 +168,7 @@ public class GrpcEchoStub extends EchoStub { .setRequestMarshaller(ProtoUtils.marshaller(PagedExpandRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(PagedExpandLegacyMappedResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor waitMethodDescriptor = @@ -168,6 +177,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.v1beta1.Echo/Wait") .setRequestMarshaller(ProtoUtils.marshaller(WaitRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor blockMethodDescriptor = @@ -176,6 +186,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.showcase.v1beta1.Echo/Block") .setRequestMarshaller(ProtoUtils.marshaller(BlockRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(BlockResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -187,6 +198,7 @@ public class GrpcEchoStub extends EchoStub { ProtoUtils.marshaller(ListLocationsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListLocationsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getLocationMethodDescriptor = @@ -195,6 +207,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.cloud.location.Locations/GetLocation") .setRequestMarshaller(ProtoUtils.marshaller(GetLocationRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Location.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor setIamPolicyMethodDescriptor = @@ -203,6 +216,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.iam.v1.IAMPolicy/SetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(SetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getIamPolicyMethodDescriptor = @@ -211,6 +225,7 @@ public class GrpcEchoStub extends EchoStub { .setFullMethodName("google.iam.v1.IAMPolicy/GetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(GetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -222,6 +237,7 @@ public class GrpcEchoStub extends EchoStub { ProtoUtils.marshaller(TestIamPermissionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(TestIamPermissionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable echoCallable; diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcIdentityStub.java b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcIdentityStub.java index 5e59ebe371..5260967a52 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcIdentityStub.java +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcIdentityStub.java @@ -66,6 +66,7 @@ public class GrpcIdentityStub extends IdentityStub { .setFullMethodName("google.showcase.v1beta1.Identity/CreateUser") .setRequestMarshaller(ProtoUtils.marshaller(CreateUserRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(User.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getUserMethodDescriptor = @@ -74,6 +75,7 @@ public class GrpcIdentityStub extends IdentityStub { .setFullMethodName("google.showcase.v1beta1.Identity/GetUser") .setRequestMarshaller(ProtoUtils.marshaller(GetUserRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(User.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor updateUserMethodDescriptor = @@ -82,6 +84,7 @@ public class GrpcIdentityStub extends IdentityStub { .setFullMethodName("google.showcase.v1beta1.Identity/UpdateUser") .setRequestMarshaller(ProtoUtils.marshaller(UpdateUserRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(User.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteUserMethodDescriptor = @@ -90,6 +93,7 @@ public class GrpcIdentityStub extends IdentityStub { .setFullMethodName("google.showcase.v1beta1.Identity/DeleteUser") .setRequestMarshaller(ProtoUtils.marshaller(DeleteUserRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -99,6 +103,7 @@ public class GrpcIdentityStub extends IdentityStub { .setFullMethodName("google.showcase.v1beta1.Identity/ListUsers") .setRequestMarshaller(ProtoUtils.marshaller(ListUsersRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ListUsersResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -110,6 +115,7 @@ public class GrpcIdentityStub extends IdentityStub { ProtoUtils.marshaller(ListLocationsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListLocationsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getLocationMethodDescriptor = @@ -118,6 +124,7 @@ public class GrpcIdentityStub extends IdentityStub { .setFullMethodName("google.cloud.location.Locations/GetLocation") .setRequestMarshaller(ProtoUtils.marshaller(GetLocationRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Location.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor setIamPolicyMethodDescriptor = @@ -126,6 +133,7 @@ public class GrpcIdentityStub extends IdentityStub { .setFullMethodName("google.iam.v1.IAMPolicy/SetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(SetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getIamPolicyMethodDescriptor = @@ -134,6 +142,7 @@ public class GrpcIdentityStub extends IdentityStub { .setFullMethodName("google.iam.v1.IAMPolicy/GetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(GetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -145,6 +154,7 @@ public class GrpcIdentityStub extends IdentityStub { ProtoUtils.marshaller(TestIamPermissionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(TestIamPermissionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable createUserCallable; diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcMessagingStub.java b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcMessagingStub.java index ad600b7bbf..2eb932b344 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcMessagingStub.java +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcMessagingStub.java @@ -86,6 +86,7 @@ public class GrpcMessagingStub extends MessagingStub { .setFullMethodName("google.showcase.v1beta1.Messaging/CreateRoom") .setRequestMarshaller(ProtoUtils.marshaller(CreateRoomRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Room.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getRoomMethodDescriptor = @@ -94,6 +95,7 @@ public class GrpcMessagingStub extends MessagingStub { .setFullMethodName("google.showcase.v1beta1.Messaging/GetRoom") .setRequestMarshaller(ProtoUtils.marshaller(GetRoomRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Room.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor updateRoomMethodDescriptor = @@ -102,6 +104,7 @@ public class GrpcMessagingStub extends MessagingStub { .setFullMethodName("google.showcase.v1beta1.Messaging/UpdateRoom") .setRequestMarshaller(ProtoUtils.marshaller(UpdateRoomRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Room.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteRoomMethodDescriptor = @@ -110,6 +113,7 @@ public class GrpcMessagingStub extends MessagingStub { .setFullMethodName("google.showcase.v1beta1.Messaging/DeleteRoom") .setRequestMarshaller(ProtoUtils.marshaller(DeleteRoomRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -119,6 +123,7 @@ public class GrpcMessagingStub extends MessagingStub { .setFullMethodName("google.showcase.v1beta1.Messaging/ListRooms") .setRequestMarshaller(ProtoUtils.marshaller(ListRoomsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ListRoomsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor createBlurbMethodDescriptor = @@ -127,6 +132,7 @@ public class GrpcMessagingStub extends MessagingStub { .setFullMethodName("google.showcase.v1beta1.Messaging/CreateBlurb") .setRequestMarshaller(ProtoUtils.marshaller(CreateBlurbRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Blurb.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getBlurbMethodDescriptor = @@ -135,6 +141,7 @@ public class GrpcMessagingStub extends MessagingStub { .setFullMethodName("google.showcase.v1beta1.Messaging/GetBlurb") .setRequestMarshaller(ProtoUtils.marshaller(GetBlurbRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Blurb.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor updateBlurbMethodDescriptor = @@ -143,6 +150,7 @@ public class GrpcMessagingStub extends MessagingStub { .setFullMethodName("google.showcase.v1beta1.Messaging/UpdateBlurb") .setRequestMarshaller(ProtoUtils.marshaller(UpdateBlurbRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Blurb.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteBlurbMethodDescriptor = @@ -151,6 +159,7 @@ public class GrpcMessagingStub extends MessagingStub { .setFullMethodName("google.showcase.v1beta1.Messaging/DeleteBlurb") .setRequestMarshaller(ProtoUtils.marshaller(DeleteBlurbRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -160,6 +169,7 @@ public class GrpcMessagingStub extends MessagingStub { .setFullMethodName("google.showcase.v1beta1.Messaging/ListBlurbs") .setRequestMarshaller(ProtoUtils.marshaller(ListBlurbsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ListBlurbsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -169,6 +179,7 @@ public class GrpcMessagingStub extends MessagingStub { .setFullMethodName("google.showcase.v1beta1.Messaging/SearchBlurbs") .setRequestMarshaller(ProtoUtils.marshaller(SearchBlurbsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -179,6 +190,7 @@ public class GrpcMessagingStub extends MessagingStub { .setRequestMarshaller(ProtoUtils.marshaller(StreamBlurbsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(StreamBlurbsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -188,6 +200,7 @@ public class GrpcMessagingStub extends MessagingStub { .setFullMethodName("google.showcase.v1beta1.Messaging/SendBlurbs") .setRequestMarshaller(ProtoUtils.marshaller(CreateBlurbRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(SendBlurbsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -198,6 +211,7 @@ public class GrpcMessagingStub extends MessagingStub { .setRequestMarshaller(ProtoUtils.marshaller(ConnectRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(StreamBlurbsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -209,6 +223,7 @@ public class GrpcMessagingStub extends MessagingStub { ProtoUtils.marshaller(ListLocationsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListLocationsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getLocationMethodDescriptor = @@ -217,6 +232,7 @@ public class GrpcMessagingStub extends MessagingStub { .setFullMethodName("google.cloud.location.Locations/GetLocation") .setRequestMarshaller(ProtoUtils.marshaller(GetLocationRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Location.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor setIamPolicyMethodDescriptor = @@ -225,6 +241,7 @@ public class GrpcMessagingStub extends MessagingStub { .setFullMethodName("google.iam.v1.IAMPolicy/SetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(SetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getIamPolicyMethodDescriptor = @@ -233,6 +250,7 @@ public class GrpcMessagingStub extends MessagingStub { .setFullMethodName("google.iam.v1.IAMPolicy/GetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(GetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -244,6 +262,7 @@ public class GrpcMessagingStub extends MessagingStub { ProtoUtils.marshaller(TestIamPermissionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(TestIamPermissionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable createRoomCallable; diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcSequenceServiceStub.java b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcSequenceServiceStub.java index c9c16d1bfe..90a06a2ea1 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcSequenceServiceStub.java +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcSequenceServiceStub.java @@ -72,6 +72,7 @@ public class GrpcSequenceServiceStub extends SequenceServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(CreateSequenceRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Sequence.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -82,6 +83,7 @@ public class GrpcSequenceServiceStub extends SequenceServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(CreateStreamingSequenceRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(StreamingSequence.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -92,6 +94,7 @@ public class GrpcSequenceServiceStub extends SequenceServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(GetSequenceReportRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(SequenceReport.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -104,6 +107,7 @@ public class GrpcSequenceServiceStub extends SequenceServiceStub { ProtoUtils.marshaller(GetStreamingSequenceReportRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(StreamingSequenceReport.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -114,6 +118,7 @@ public class GrpcSequenceServiceStub extends SequenceServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(AttemptSequenceRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor< @@ -127,6 +132,7 @@ public class GrpcSequenceServiceStub extends SequenceServiceStub { ProtoUtils.marshaller(AttemptStreamingSequenceRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(AttemptStreamingSequenceResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -138,6 +144,7 @@ public class GrpcSequenceServiceStub extends SequenceServiceStub { ProtoUtils.marshaller(ListLocationsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListLocationsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getLocationMethodDescriptor = @@ -146,6 +153,7 @@ public class GrpcSequenceServiceStub extends SequenceServiceStub { .setFullMethodName("google.cloud.location.Locations/GetLocation") .setRequestMarshaller(ProtoUtils.marshaller(GetLocationRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Location.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor setIamPolicyMethodDescriptor = @@ -154,6 +162,7 @@ public class GrpcSequenceServiceStub extends SequenceServiceStub { .setFullMethodName("google.iam.v1.IAMPolicy/SetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(SetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getIamPolicyMethodDescriptor = @@ -162,6 +171,7 @@ public class GrpcSequenceServiceStub extends SequenceServiceStub { .setFullMethodName("google.iam.v1.IAMPolicy/GetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(GetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -173,6 +183,7 @@ public class GrpcSequenceServiceStub extends SequenceServiceStub { ProtoUtils.marshaller(TestIamPermissionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(TestIamPermissionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable createSequenceCallable; diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcTestingStub.java b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcTestingStub.java index da7dd3d281..b485b9f36d 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcTestingStub.java +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/GrpcTestingStub.java @@ -75,6 +75,7 @@ public class GrpcTestingStub extends TestingStub { .setRequestMarshaller( ProtoUtils.marshaller(CreateSessionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Session.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getSessionMethodDescriptor = @@ -83,6 +84,7 @@ public class GrpcTestingStub extends TestingStub { .setFullMethodName("google.showcase.v1beta1.Testing/GetSession") .setRequestMarshaller(ProtoUtils.marshaller(GetSessionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Session.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -93,6 +95,7 @@ public class GrpcTestingStub extends TestingStub { .setRequestMarshaller(ProtoUtils.marshaller(ListSessionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListSessionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteSessionMethodDescriptor = @@ -101,6 +104,7 @@ public class GrpcTestingStub extends TestingStub { .setFullMethodName("google.showcase.v1beta1.Testing/DeleteSession") .setRequestMarshaller(ProtoUtils.marshaller(DeleteSessionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -112,6 +116,7 @@ public class GrpcTestingStub extends TestingStub { ProtoUtils.marshaller(ReportSessionRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ReportSessionResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -121,6 +126,7 @@ public class GrpcTestingStub extends TestingStub { .setFullMethodName("google.showcase.v1beta1.Testing/ListTests") .setRequestMarshaller(ProtoUtils.marshaller(ListTestsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ListTestsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteTestMethodDescriptor = @@ -129,6 +135,7 @@ public class GrpcTestingStub extends TestingStub { .setFullMethodName("google.showcase.v1beta1.Testing/DeleteTest") .setRequestMarshaller(ProtoUtils.marshaller(DeleteTestRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -138,6 +145,7 @@ public class GrpcTestingStub extends TestingStub { .setFullMethodName("google.showcase.v1beta1.Testing/VerifyTest") .setRequestMarshaller(ProtoUtils.marshaller(VerifyTestRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(VerifyTestResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -149,6 +157,7 @@ public class GrpcTestingStub extends TestingStub { ProtoUtils.marshaller(ListLocationsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListLocationsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getLocationMethodDescriptor = @@ -157,6 +166,7 @@ public class GrpcTestingStub extends TestingStub { .setFullMethodName("google.cloud.location.Locations/GetLocation") .setRequestMarshaller(ProtoUtils.marshaller(GetLocationRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Location.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor setIamPolicyMethodDescriptor = @@ -165,6 +175,7 @@ public class GrpcTestingStub extends TestingStub { .setFullMethodName("google.iam.v1.IAMPolicy/SetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(SetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getIamPolicyMethodDescriptor = @@ -173,6 +184,7 @@ public class GrpcTestingStub extends TestingStub { .setFullMethodName("google.iam.v1.IAMPolicy/GetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(GetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -184,6 +196,7 @@ public class GrpcTestingStub extends TestingStub { ProtoUtils.marshaller(TestIamPermissionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(TestIamPermissionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable createSessionCallable; diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITOtelMetrics.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITOtelMetrics.java index e0577b105e..06f46deee8 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITOtelMetrics.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITOtelMetrics.java @@ -30,9 +30,10 @@ package com.google.showcase.v1beta1.it; -import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.Assert.assertThrows; import com.google.api.client.http.javanet.NetHttpTransport; +import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider; @@ -59,6 +60,7 @@ import com.google.showcase.v1beta1.stub.EchoStub; import com.google.showcase.v1beta1.stub.EchoStubSettings; import io.grpc.ManagedChannelBuilder; +import io.grpc.opentelemetry.GrpcOpenTelemetry; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; @@ -76,9 +78,11 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; +import java.util.stream.Collectors; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -102,8 +106,13 @@ class ITOtelMetrics { private static final String OPERATION_COUNT = SERVICE_NAME + "/operation_count"; private static final String ATTEMPT_LATENCY = SERVICE_NAME + "/attempt_latency"; private static final String OPERATION_LATENCY = SERVICE_NAME + "/operation_latency"; - private static final int NUM_DEFAULT_METRICS = 4; - private static final int NUM_COLLECTION_FLUSH_ATTEMPTS = 10; + private static final Set GAX_METRICS = + ImmutableSet.of(ATTEMPT_COUNT, OPERATION_COUNT, ATTEMPT_LATENCY, OPERATION_LATENCY); + + // Gax provides four metrics by default. This number may change as new metrics are added. + private static final int NUM_GAX_OTEL_METRICS = 4; + private static final int NUM_DEFAULT_FLUSH_ATTEMPTS = 10; + private InMemoryMetricReader inMemoryMetricReader; private EchoClient grpcClient; private EchoClient httpClient; @@ -157,7 +166,8 @@ void setup() throws Exception { } @AfterEach - void cleanup() throws InterruptedException { + void cleanup() throws InterruptedException, IOException { + inMemoryMetricReader.close(); inMemoryMetricReader.shutdown(); grpcClient.close(); @@ -286,17 +296,25 @@ private List getMetricDataList() throws InterruptedException { */ private List getMetricDataList(InMemoryMetricReader metricReader) throws InterruptedException { - for (int i = 0; i < NUM_COLLECTION_FLUSH_ATTEMPTS; i++) { + for (int i = 0; i < NUM_DEFAULT_FLUSH_ATTEMPTS; i++) { Thread.sleep(1000L); List metricData = new ArrayList<>(metricReader.collectAllMetrics()); - if (metricData.size() == NUM_DEFAULT_METRICS) { + // Depending on the OpenTelemetry instance (i.e. OpenTelemetry, GrpcOpenTelemetry, etc.) + // there may be additional metrics recorded. Only check to ensure the Gax Metrics + // are recorded properly. Any additional metrics are fine to be passed. + if (metricData.size() >= NUM_GAX_OTEL_METRICS && areAllGaxMetricsRecorded(metricData)) { return metricData; } } - Assertions.fail("Unable to collect all the metrics required for the test"); + Assertions.fail("Unable to collect all the GAX metrics required for the test"); return new ArrayList<>(); } + private boolean areAllGaxMetricsRecorded(List metricData) { + return metricData.stream().filter(data -> GAX_METRICS.contains(data.getName())).count() + == NUM_GAX_OTEL_METRICS; + } + @Test void testGrpc_operationSucceeded_recordsMetrics() throws InterruptedException { int attemptCount = 1; @@ -830,7 +848,75 @@ void recordsCustomAttributes() throws InterruptedException, IOException { randomAttributeKey2, randomAttributeValue2); verifyDefaultMetricsAttributes(actualMetricDataList, expectedAttributes); + } - inMemoryMetricReader.close(); + // This test case uses GrpcOpenTelemetry from grpc-java and includes additional grpc-java specific + // metrics. This test case ensures that the `setSampledToLocalTracing` set to true will ensure + // that + // the gRPC full method name in the stub is recorded (not recorded as `other`). + @Test + void grpcOpenTelemetryImplementation_setSampledToLocalTracing_methodFullNameIsRecorded() + throws Exception { + SdkMeterProvider sdkMeterProvider = + SdkMeterProvider.builder().registerMetricReader(inMemoryMetricReader).build(); + + OpenTelemetry openTelemetry = + OpenTelemetrySdk.builder().setMeterProvider(sdkMeterProvider).build(); + + GrpcOpenTelemetry grpcOpenTelemetry = GrpcOpenTelemetry.newBuilder().sdk(openTelemetry).build(); + + // Java-Spanner configures the InstantiatingGrpcChannelProvider with gRPCOpenTelemetry + // This setup below is copied from their implementation + InstantiatingGrpcChannelProvider.Builder builder = + EchoSettings.defaultGrpcTransportProviderBuilder(); + ApiFunction channelConfigurator = + builder.getChannelConfigurator(); + builder.setChannelConfigurator( + b -> { + b.usePlaintext(); + grpcOpenTelemetry.configureChannelBuilder(b); + if (channelConfigurator != null) { + return channelConfigurator.apply(b); + } + return b; + }); + + OpenTelemetryMetricsRecorder otelMetricsRecorder = + new OpenTelemetryMetricsRecorder(openTelemetry, SERVICE_NAME); + + // Create a custom EchoClient that is different from what is created by default in setup() + EchoClient echoClient = + TestClientInitializer.createGrpcEchoClientOpentelemetry( + new MetricsTracerFactory(otelMetricsRecorder), builder.build()); + + EchoRequest echoRequest = + EchoRequest.newBuilder().setContent("test_grpc_request_succeeded").build(); + echoClient.echo(echoRequest); + + List metricDataList = getMetricDataList(); + + String gRPCMetricNamePrefix = "grpc."; + String gRPCMethodNameAttributeKey = "grpc.method"; + + List grpcMetricDataList = + metricDataList.stream() + .filter(x -> x.getName().startsWith(gRPCMetricNamePrefix)) + .collect(Collectors.toList()); + Truth.assertThat(grpcMetricDataList).isNotEmpty(); + for (MetricData grpcMetricData : grpcMetricDataList) { + List pointDataList = new ArrayList<>(grpcMetricData.getData().getPoints()); + + for (PointData pointData : pointDataList) { + String methodName = + pointData.getAttributes().get(AttributeKey.stringKey(gRPCMethodNameAttributeKey)); + + // All the attributes in the gRPC metrics should have the full method name + Truth.assertThat(methodName).doesNotMatch("other"); + Truth.assertThat(methodName).matches("^google.showcase.v1beta1.Echo/.*$"); + } + } + + echoClient.close(); + echoClient.awaitTermination(TestClientInitializer.AWAIT_TERMINATION_SECONDS, TimeUnit.SECONDS); } } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/util/TestClientInitializer.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/util/TestClientInitializer.java index 24f56eef61..a3db1a00e3 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/util/TestClientInitializer.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/util/TestClientInitializer.java @@ -23,6 +23,7 @@ import com.google.api.gax.longrunning.OperationTimedPollAlgorithm; import com.google.api.gax.retrying.RetrySettings; import com.google.api.gax.rpc.StatusCode; +import com.google.api.gax.rpc.TransportChannelProvider; import com.google.api.gax.rpc.UnaryCallSettings; import com.google.api.gax.tracing.ApiTracerFactory; import com.google.common.collect.ImmutableList; @@ -289,14 +290,20 @@ public static ComplianceClient createHttpJsonComplianceClient( public static EchoClient createGrpcEchoClientOpentelemetry(ApiTracerFactory metricsTracerFactory) throws Exception { + return createGrpcEchoClientOpentelemetry( + metricsTracerFactory, + EchoSettings.defaultGrpcTransportProviderBuilder() + .setChannelConfigurator(ManagedChannelBuilder::usePlaintext) + .build()); + } + public static EchoClient createGrpcEchoClientOpentelemetry( + ApiTracerFactory metricsTracerFactory, TransportChannelProvider transportChannelProvider) + throws Exception { EchoSettings grpcEchoSettings = EchoSettings.newBuilder() .setCredentialsProvider(NoCredentialsProvider.create()) - .setTransportChannelProvider( - EchoSettings.defaultGrpcTransportProviderBuilder() - .setChannelConfigurator(ManagedChannelBuilder::usePlaintext) - .build()) + .setTransportChannelProvider(transportChannelProvider) .setEndpoint(DEFAULT_GRPC_ENDPOINT) .build(); diff --git a/java-showcase/pom.xml b/java-showcase/pom.xml index d596dccdd1..5bcb07caa3 100644 --- a/java-showcase/pom.xml +++ b/java-showcase/pom.xml @@ -32,7 +32,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.51.0 + 3.52.0 pom import diff --git a/sdk-platform-java-config/pom.xml b/sdk-platform-java-config/pom.xml index bc8b183c8b..77fc9393cf 100644 --- a/sdk-platform-java-config/pom.xml +++ b/sdk-platform-java-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud sdk-platform-java-config pom - 3.51.0 + 3.52.0 SDK Platform For Java Configurations Shared build configuration for Google Cloud Java libraries. @@ -17,6 +17,6 @@ - 3.51.0 + 3.52.0 \ No newline at end of file diff --git a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/GrpcConnectionServiceStub.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/GrpcConnectionServiceStub.java index 5cd424c554..9aa014da38 100644 --- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/GrpcConnectionServiceStub.java +++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/GrpcConnectionServiceStub.java @@ -52,6 +52,7 @@ public class GrpcConnectionServiceStub extends ConnectionServiceStub { ProtoUtils.marshaller(ListConnectionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListConnectionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable diff --git a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/GrpcTetherStub.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/GrpcTetherStub.java index fad59f5a91..bdf24d80b8 100644 --- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/GrpcTetherStub.java +++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/GrpcTetherStub.java @@ -45,6 +45,7 @@ public class GrpcTetherStub extends TetherStub { .setFullMethodName("google.cloud.apigeeconnect.v1.Tether/Egress") .setRequestMarshaller(ProtoUtils.marshaller(EgressResponse.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EgressRequest.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final BidiStreamingCallable egressCallable; diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/GrpcAssetServiceStub.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/GrpcAssetServiceStub.java index 39ca6167fb..c468e79b15 100644 --- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/GrpcAssetServiceStub.java +++ b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/GrpcAssetServiceStub.java @@ -89,6 +89,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { .setFullMethodName("google.cloud.asset.v1.AssetService/ExportAssets") .setRequestMarshaller(ProtoUtils.marshaller(ExportAssetsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -98,6 +99,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { .setFullMethodName("google.cloud.asset.v1.AssetService/ListAssets") .setRequestMarshaller(ProtoUtils.marshaller(ListAssetsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ListAssetsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -109,6 +111,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { ProtoUtils.marshaller(BatchGetAssetsHistoryRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(BatchGetAssetsHistoryResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor createFeedMethodDescriptor = @@ -117,6 +120,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { .setFullMethodName("google.cloud.asset.v1.AssetService/CreateFeed") .setRequestMarshaller(ProtoUtils.marshaller(CreateFeedRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Feed.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getFeedMethodDescriptor = @@ -125,6 +129,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { .setFullMethodName("google.cloud.asset.v1.AssetService/GetFeed") .setRequestMarshaller(ProtoUtils.marshaller(GetFeedRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Feed.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -134,6 +139,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { .setFullMethodName("google.cloud.asset.v1.AssetService/ListFeeds") .setRequestMarshaller(ProtoUtils.marshaller(ListFeedsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ListFeedsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor updateFeedMethodDescriptor = @@ -142,6 +148,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { .setFullMethodName("google.cloud.asset.v1.AssetService/UpdateFeed") .setRequestMarshaller(ProtoUtils.marshaller(UpdateFeedRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Feed.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteFeedMethodDescriptor = @@ -150,6 +157,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { .setFullMethodName("google.cloud.asset.v1.AssetService/DeleteFeed") .setRequestMarshaller(ProtoUtils.marshaller(DeleteFeedRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -161,6 +169,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { ProtoUtils.marshaller(SearchAllResourcesRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(SearchAllResourcesResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -172,6 +181,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { ProtoUtils.marshaller(SearchAllIamPoliciesRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(SearchAllIamPoliciesResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -183,6 +193,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { ProtoUtils.marshaller(AnalyzeIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(AnalyzeIamPolicyResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -193,6 +204,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(AnalyzeIamPolicyLongrunningRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -203,6 +215,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { .setRequestMarshaller(ProtoUtils.marshaller(AnalyzeMoveRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(AnalyzeMoveResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -213,6 +226,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { .setRequestMarshaller(ProtoUtils.marshaller(QueryAssetsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(QueryAssetsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -223,6 +237,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(CreateSavedQueryRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(SavedQuery.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -233,6 +248,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(GetSavedQueryRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(SavedQuery.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -244,6 +260,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { ProtoUtils.marshaller(ListSavedQueriesRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListSavedQueriesResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -254,6 +271,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(UpdateSavedQueryRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(SavedQuery.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -264,6 +282,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(DeleteSavedQueryRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor< @@ -278,6 +297,7 @@ public class GrpcAssetServiceStub extends AssetServiceStub { ProtoUtils.marshaller(BatchGetEffectiveIamPoliciesRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(BatchGetEffectiveIamPoliciesResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable exportAssetsCallable; diff --git a/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java b/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java index 307a7e2da0..f3c10b3489 100644 --- a/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java +++ b/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java @@ -62,6 +62,7 @@ public class GrpcBigtableStub extends BigtableStub { .setFullMethodName("google.bigtable.v2.Bigtable/ReadRows") .setRequestMarshaller(ProtoUtils.marshaller(ReadRowsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ReadRowsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -73,6 +74,7 @@ public class GrpcBigtableStub extends BigtableStub { ProtoUtils.marshaller(SampleRowKeysRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(SampleRowKeysResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -82,6 +84,7 @@ public class GrpcBigtableStub extends BigtableStub { .setFullMethodName("google.bigtable.v2.Bigtable/MutateRow") .setRequestMarshaller(ProtoUtils.marshaller(MutateRowRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(MutateRowResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -91,6 +94,7 @@ public class GrpcBigtableStub extends BigtableStub { .setFullMethodName("google.bigtable.v2.Bigtable/MutateRows") .setRequestMarshaller(ProtoUtils.marshaller(MutateRowsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(MutateRowsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -102,6 +106,7 @@ public class GrpcBigtableStub extends BigtableStub { ProtoUtils.marshaller(CheckAndMutateRowRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(CheckAndMutateRowResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -112,6 +117,7 @@ public class GrpcBigtableStub extends BigtableStub { .setRequestMarshaller(ProtoUtils.marshaller(PingAndWarmRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(PingAndWarmResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -123,6 +129,7 @@ public class GrpcBigtableStub extends BigtableStub { ProtoUtils.marshaller(ReadModifyWriteRowRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ReadModifyWriteRowResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final ServerStreamingCallable readRowsCallable; diff --git a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/GrpcIamCredentialsStub.java b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/GrpcIamCredentialsStub.java index 237e5a6d03..f3597caf8c 100644 --- a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/GrpcIamCredentialsStub.java +++ b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/GrpcIamCredentialsStub.java @@ -56,6 +56,7 @@ public class GrpcIamCredentialsStub extends IamCredentialsStub { ProtoUtils.marshaller(GenerateAccessTokenRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(GenerateAccessTokenResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -67,6 +68,7 @@ public class GrpcIamCredentialsStub extends IamCredentialsStub { ProtoUtils.marshaller(GenerateIdTokenRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(GenerateIdTokenResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -76,6 +78,7 @@ public class GrpcIamCredentialsStub extends IamCredentialsStub { .setFullMethodName("google.iam.credentials.v1.IAMCredentials/SignBlob") .setRequestMarshaller(ProtoUtils.marshaller(SignBlobRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(SignBlobResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor signJwtMethodDescriptor = @@ -84,6 +87,7 @@ public class GrpcIamCredentialsStub extends IamCredentialsStub { .setFullMethodName("google.iam.credentials.v1.IAMCredentials/SignJwt") .setRequestMarshaller(ProtoUtils.marshaller(SignJwtRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(SignJwtResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable diff --git a/test/integration/goldens/iam/src/com/google/iam/v1/stub/GrpcIAMPolicyStub.java b/test/integration/goldens/iam/src/com/google/iam/v1/stub/GrpcIAMPolicyStub.java index 7ad79d35f4..f7412f0e1c 100644 --- a/test/integration/goldens/iam/src/com/google/iam/v1/stub/GrpcIAMPolicyStub.java +++ b/test/integration/goldens/iam/src/com/google/iam/v1/stub/GrpcIAMPolicyStub.java @@ -50,6 +50,7 @@ public class GrpcIAMPolicyStub extends IAMPolicyStub { .setFullMethodName("google.iam.v1.IAMPolicy/SetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(SetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getIamPolicyMethodDescriptor = @@ -58,6 +59,7 @@ public class GrpcIAMPolicyStub extends IAMPolicyStub { .setFullMethodName("google.iam.v1.IAMPolicy/GetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(GetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -69,6 +71,7 @@ public class GrpcIAMPolicyStub extends IAMPolicyStub { ProtoUtils.marshaller(TestIamPermissionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(TestIamPermissionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable setIamPolicyCallable; diff --git a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/stub/GrpcKeyManagementServiceStub.java b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/stub/GrpcKeyManagementServiceStub.java index 0f13ece39c..070b5f924d 100644 --- a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/stub/GrpcKeyManagementServiceStub.java +++ b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/stub/GrpcKeyManagementServiceStub.java @@ -97,6 +97,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setRequestMarshaller(ProtoUtils.marshaller(ListKeyRingsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListKeyRingsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -108,6 +109,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { ProtoUtils.marshaller(ListCryptoKeysRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListCryptoKeysResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -119,6 +121,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { ProtoUtils.marshaller(ListCryptoKeyVersionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListCryptoKeyVersionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -130,6 +133,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { ProtoUtils.marshaller(ListImportJobsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListImportJobsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getKeyRingMethodDescriptor = @@ -138,6 +142,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setFullMethodName("google.cloud.kms.v1.KeyManagementService/GetKeyRing") .setRequestMarshaller(ProtoUtils.marshaller(GetKeyRingRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(KeyRing.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -147,6 +152,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setFullMethodName("google.cloud.kms.v1.KeyManagementService/GetCryptoKey") .setRequestMarshaller(ProtoUtils.marshaller(GetCryptoKeyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(CryptoKey.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -157,6 +163,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(GetCryptoKeyVersionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(CryptoKeyVersion.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -166,6 +173,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setFullMethodName("google.cloud.kms.v1.KeyManagementService/GetPublicKey") .setRequestMarshaller(ProtoUtils.marshaller(GetPublicKeyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(PublicKey.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -175,6 +183,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setFullMethodName("google.cloud.kms.v1.KeyManagementService/GetImportJob") .setRequestMarshaller(ProtoUtils.marshaller(GetImportJobRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ImportJob.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -185,6 +194,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(CreateKeyRingRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(KeyRing.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -195,6 +205,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(CreateCryptoKeyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(CryptoKey.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -205,6 +216,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(CreateCryptoKeyVersionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(CryptoKeyVersion.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -215,6 +227,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(ImportCryptoKeyVersionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(CryptoKeyVersion.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -225,6 +238,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(CreateImportJobRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ImportJob.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -235,6 +249,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(UpdateCryptoKeyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(CryptoKey.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -245,6 +260,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(UpdateCryptoKeyVersionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(CryptoKeyVersion.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor encryptMethodDescriptor = @@ -253,6 +269,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setFullMethodName("google.cloud.kms.v1.KeyManagementService/Encrypt") .setRequestMarshaller(ProtoUtils.marshaller(EncryptRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(EncryptResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor decryptMethodDescriptor = @@ -261,6 +278,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setFullMethodName("google.cloud.kms.v1.KeyManagementService/Decrypt") .setRequestMarshaller(ProtoUtils.marshaller(DecryptRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(DecryptResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -272,6 +290,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { ProtoUtils.marshaller(AsymmetricSignRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(AsymmetricSignResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -283,6 +302,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { ProtoUtils.marshaller(AsymmetricDecryptRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(AsymmetricDecryptResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -294,6 +314,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(UpdateCryptoKeyPrimaryVersionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(CryptoKey.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -304,6 +325,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(DestroyCryptoKeyVersionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(CryptoKeyVersion.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -314,6 +336,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(RestoreCryptoKeyVersionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(CryptoKeyVersion.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getIamPolicyMethodDescriptor = @@ -322,6 +345,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setFullMethodName("google.cloud.kms.v1.KeyManagementService/GetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(GetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -333,6 +357,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { ProtoUtils.marshaller(ListLocationsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListLocationsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getLocationMethodDescriptor = @@ -341,6 +366,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { .setFullMethodName("google.cloud.location.Locations/GetLocation") .setRequestMarshaller(ProtoUtils.marshaller(GetLocationRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Location.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -352,6 +378,7 @@ public class GrpcKeyManagementServiceStub extends KeyManagementServiceStub { ProtoUtils.marshaller(TestIamPermissionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(TestIamPermissionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable listKeyRingsCallable; diff --git a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/GrpcLibraryServiceStub.java b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/GrpcLibraryServiceStub.java index e0bfff934a..6ba61fccd5 100644 --- a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/GrpcLibraryServiceStub.java +++ b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/GrpcLibraryServiceStub.java @@ -64,6 +64,7 @@ public class GrpcLibraryServiceStub extends LibraryServiceStub { .setFullMethodName("google.example.library.v1.LibraryService/CreateShelf") .setRequestMarshaller(ProtoUtils.marshaller(CreateShelfRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Shelf.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getShelfMethodDescriptor = @@ -72,6 +73,7 @@ public class GrpcLibraryServiceStub extends LibraryServiceStub { .setFullMethodName("google.example.library.v1.LibraryService/GetShelf") .setRequestMarshaller(ProtoUtils.marshaller(GetShelfRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Shelf.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -82,6 +84,7 @@ public class GrpcLibraryServiceStub extends LibraryServiceStub { .setRequestMarshaller(ProtoUtils.marshaller(ListShelvesRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListShelvesResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteShelfMethodDescriptor = @@ -90,6 +93,7 @@ public class GrpcLibraryServiceStub extends LibraryServiceStub { .setFullMethodName("google.example.library.v1.LibraryService/DeleteShelf") .setRequestMarshaller(ProtoUtils.marshaller(DeleteShelfRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor mergeShelvesMethodDescriptor = @@ -98,6 +102,7 @@ public class GrpcLibraryServiceStub extends LibraryServiceStub { .setFullMethodName("google.example.library.v1.LibraryService/MergeShelves") .setRequestMarshaller(ProtoUtils.marshaller(MergeShelvesRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Shelf.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor createBookMethodDescriptor = @@ -106,6 +111,7 @@ public class GrpcLibraryServiceStub extends LibraryServiceStub { .setFullMethodName("google.example.library.v1.LibraryService/CreateBook") .setRequestMarshaller(ProtoUtils.marshaller(CreateBookRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Book.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getBookMethodDescriptor = @@ -114,6 +120,7 @@ public class GrpcLibraryServiceStub extends LibraryServiceStub { .setFullMethodName("google.example.library.v1.LibraryService/GetBook") .setRequestMarshaller(ProtoUtils.marshaller(GetBookRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Book.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -123,6 +130,7 @@ public class GrpcLibraryServiceStub extends LibraryServiceStub { .setFullMethodName("google.example.library.v1.LibraryService/ListBooks") .setRequestMarshaller(ProtoUtils.marshaller(ListBooksRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ListBooksResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteBookMethodDescriptor = @@ -131,6 +139,7 @@ public class GrpcLibraryServiceStub extends LibraryServiceStub { .setFullMethodName("google.example.library.v1.LibraryService/DeleteBook") .setRequestMarshaller(ProtoUtils.marshaller(DeleteBookRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor updateBookMethodDescriptor = @@ -139,6 +148,7 @@ public class GrpcLibraryServiceStub extends LibraryServiceStub { .setFullMethodName("google.example.library.v1.LibraryService/UpdateBook") .setRequestMarshaller(ProtoUtils.marshaller(UpdateBookRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Book.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor moveBookMethodDescriptor = @@ -147,6 +157,7 @@ public class GrpcLibraryServiceStub extends LibraryServiceStub { .setFullMethodName("google.example.library.v1.LibraryService/MoveBook") .setRequestMarshaller(ProtoUtils.marshaller(MoveBookRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Book.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable createShelfCallable; diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2Stub.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2Stub.java index a30117ecb2..c27b22218f 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2Stub.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2Stub.java @@ -93,6 +93,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setRequestMarshaller(ProtoUtils.marshaller(ListBucketsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListBucketsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getBucketMethodDescriptor = @@ -101,6 +102,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setFullMethodName("google.logging.v2.ConfigServiceV2/GetBucket") .setRequestMarshaller(ProtoUtils.marshaller(GetBucketRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(LogBucket.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -110,6 +112,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setFullMethodName("google.logging.v2.ConfigServiceV2/CreateBucket") .setRequestMarshaller(ProtoUtils.marshaller(CreateBucketRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(LogBucket.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -119,6 +122,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setFullMethodName("google.logging.v2.ConfigServiceV2/UpdateBucket") .setRequestMarshaller(ProtoUtils.marshaller(UpdateBucketRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(LogBucket.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteBucketMethodDescriptor = @@ -127,6 +131,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setFullMethodName("google.logging.v2.ConfigServiceV2/DeleteBucket") .setRequestMarshaller(ProtoUtils.marshaller(DeleteBucketRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -137,6 +142,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setRequestMarshaller( ProtoUtils.marshaller(UndeleteBucketRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -146,6 +152,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setFullMethodName("google.logging.v2.ConfigServiceV2/ListViews") .setRequestMarshaller(ProtoUtils.marshaller(ListViewsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ListViewsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getViewMethodDescriptor = @@ -154,6 +161,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setFullMethodName("google.logging.v2.ConfigServiceV2/GetView") .setRequestMarshaller(ProtoUtils.marshaller(GetViewRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(LogView.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor createViewMethodDescriptor = @@ -162,6 +170,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setFullMethodName("google.logging.v2.ConfigServiceV2/CreateView") .setRequestMarshaller(ProtoUtils.marshaller(CreateViewRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(LogView.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor updateViewMethodDescriptor = @@ -170,6 +179,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setFullMethodName("google.logging.v2.ConfigServiceV2/UpdateView") .setRequestMarshaller(ProtoUtils.marshaller(UpdateViewRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(LogView.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteViewMethodDescriptor = @@ -178,6 +188,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setFullMethodName("google.logging.v2.ConfigServiceV2/DeleteView") .setRequestMarshaller(ProtoUtils.marshaller(DeleteViewRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -187,6 +198,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setFullMethodName("google.logging.v2.ConfigServiceV2/ListSinks") .setRequestMarshaller(ProtoUtils.marshaller(ListSinksRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ListSinksResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getSinkMethodDescriptor = @@ -195,6 +207,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setFullMethodName("google.logging.v2.ConfigServiceV2/GetSink") .setRequestMarshaller(ProtoUtils.marshaller(GetSinkRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(LogSink.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor createSinkMethodDescriptor = @@ -203,6 +216,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setFullMethodName("google.logging.v2.ConfigServiceV2/CreateSink") .setRequestMarshaller(ProtoUtils.marshaller(CreateSinkRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(LogSink.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor updateSinkMethodDescriptor = @@ -211,6 +225,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setFullMethodName("google.logging.v2.ConfigServiceV2/UpdateSink") .setRequestMarshaller(ProtoUtils.marshaller(UpdateSinkRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(LogSink.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteSinkMethodDescriptor = @@ -219,6 +234,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setFullMethodName("google.logging.v2.ConfigServiceV2/DeleteSink") .setRequestMarshaller(ProtoUtils.marshaller(DeleteSinkRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -230,6 +246,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { ProtoUtils.marshaller(ListExclusionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListExclusionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -239,6 +256,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setFullMethodName("google.logging.v2.ConfigServiceV2/GetExclusion") .setRequestMarshaller(ProtoUtils.marshaller(GetExclusionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(LogExclusion.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -249,6 +267,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setRequestMarshaller( ProtoUtils.marshaller(CreateExclusionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(LogExclusion.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -259,6 +278,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setRequestMarshaller( ProtoUtils.marshaller(UpdateExclusionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(LogExclusion.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -269,6 +289,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setRequestMarshaller( ProtoUtils.marshaller(DeleteExclusionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -279,6 +300,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setRequestMarshaller( ProtoUtils.marshaller(GetCmekSettingsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(CmekSettings.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -289,6 +311,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setRequestMarshaller( ProtoUtils.marshaller(UpdateCmekSettingsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(CmekSettings.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getSettingsMethodDescriptor = @@ -297,6 +320,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setFullMethodName("google.logging.v2.ConfigServiceV2/GetSettings") .setRequestMarshaller(ProtoUtils.marshaller(GetSettingsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Settings.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -307,6 +331,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setRequestMarshaller( ProtoUtils.marshaller(UpdateSettingsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Settings.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -317,6 +342,7 @@ public class GrpcConfigServiceV2Stub extends ConfigServiceV2Stub { .setRequestMarshaller( ProtoUtils.marshaller(CopyLogEntriesRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable listBucketsCallable; diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2Stub.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2Stub.java index 91dde7f065..2d0753dede 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2Stub.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2Stub.java @@ -62,6 +62,7 @@ public class GrpcLoggingServiceV2Stub extends LoggingServiceV2Stub { .setFullMethodName("google.logging.v2.LoggingServiceV2/DeleteLog") .setRequestMarshaller(ProtoUtils.marshaller(DeleteLogRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -73,6 +74,7 @@ public class GrpcLoggingServiceV2Stub extends LoggingServiceV2Stub { ProtoUtils.marshaller(WriteLogEntriesRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(WriteLogEntriesResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -84,6 +86,7 @@ public class GrpcLoggingServiceV2Stub extends LoggingServiceV2Stub { ProtoUtils.marshaller(ListLogEntriesRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListLogEntriesResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor< @@ -101,6 +104,7 @@ public class GrpcLoggingServiceV2Stub extends LoggingServiceV2Stub { .setResponseMarshaller( ProtoUtils.marshaller( ListMonitoredResourceDescriptorsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -110,6 +114,7 @@ public class GrpcLoggingServiceV2Stub extends LoggingServiceV2Stub { .setFullMethodName("google.logging.v2.LoggingServiceV2/ListLogs") .setRequestMarshaller(ProtoUtils.marshaller(ListLogsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ListLogsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -121,6 +126,7 @@ public class GrpcLoggingServiceV2Stub extends LoggingServiceV2Stub { ProtoUtils.marshaller(TailLogEntriesRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(TailLogEntriesResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable deleteLogCallable; diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2Stub.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2Stub.java index ec36cc21c3..cedfd8829a 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2Stub.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2Stub.java @@ -58,6 +58,7 @@ public class GrpcMetricsServiceV2Stub extends MetricsServiceV2Stub { ProtoUtils.marshaller(ListLogMetricsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListLogMetricsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -67,6 +68,7 @@ public class GrpcMetricsServiceV2Stub extends MetricsServiceV2Stub { .setFullMethodName("google.logging.v2.MetricsServiceV2/GetLogMetric") .setRequestMarshaller(ProtoUtils.marshaller(GetLogMetricRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(LogMetric.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -77,6 +79,7 @@ public class GrpcMetricsServiceV2Stub extends MetricsServiceV2Stub { .setRequestMarshaller( ProtoUtils.marshaller(CreateLogMetricRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(LogMetric.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -87,6 +90,7 @@ public class GrpcMetricsServiceV2Stub extends MetricsServiceV2Stub { .setRequestMarshaller( ProtoUtils.marshaller(UpdateLogMetricRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(LogMetric.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -97,6 +101,7 @@ public class GrpcMetricsServiceV2Stub extends MetricsServiceV2Stub { .setRequestMarshaller( ProtoUtils.marshaller(DeleteLogMetricRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable listLogMetricsCallable; diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/GrpcPublisherStub.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/GrpcPublisherStub.java index d9e6ed4803..541f363803 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/GrpcPublisherStub.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/GrpcPublisherStub.java @@ -69,6 +69,7 @@ public class GrpcPublisherStub extends PublisherStub { .setFullMethodName("google.pubsub.v1.Publisher/CreateTopic") .setRequestMarshaller(ProtoUtils.marshaller(Topic.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Topic.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor updateTopicMethodDescriptor = @@ -77,6 +78,7 @@ public class GrpcPublisherStub extends PublisherStub { .setFullMethodName("google.pubsub.v1.Publisher/UpdateTopic") .setRequestMarshaller(ProtoUtils.marshaller(UpdateTopicRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Topic.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor publishMethodDescriptor = @@ -85,6 +87,7 @@ public class GrpcPublisherStub extends PublisherStub { .setFullMethodName("google.pubsub.v1.Publisher/Publish") .setRequestMarshaller(ProtoUtils.marshaller(PublishRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(PublishResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getTopicMethodDescriptor = @@ -93,6 +96,7 @@ public class GrpcPublisherStub extends PublisherStub { .setFullMethodName("google.pubsub.v1.Publisher/GetTopic") .setRequestMarshaller(ProtoUtils.marshaller(GetTopicRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Topic.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -102,6 +106,7 @@ public class GrpcPublisherStub extends PublisherStub { .setFullMethodName("google.pubsub.v1.Publisher/ListTopics") .setRequestMarshaller(ProtoUtils.marshaller(ListTopicsRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ListTopicsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor< @@ -115,6 +120,7 @@ public class GrpcPublisherStub extends PublisherStub { ProtoUtils.marshaller(ListTopicSubscriptionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListTopicSubscriptionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -126,6 +132,7 @@ public class GrpcPublisherStub extends PublisherStub { ProtoUtils.marshaller(ListTopicSnapshotsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListTopicSnapshotsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteTopicMethodDescriptor = @@ -134,6 +141,7 @@ public class GrpcPublisherStub extends PublisherStub { .setFullMethodName("google.pubsub.v1.Publisher/DeleteTopic") .setRequestMarshaller(ProtoUtils.marshaller(DeleteTopicRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -145,6 +153,7 @@ public class GrpcPublisherStub extends PublisherStub { ProtoUtils.marshaller(DetachSubscriptionRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(DetachSubscriptionResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor setIamPolicyMethodDescriptor = @@ -153,6 +162,7 @@ public class GrpcPublisherStub extends PublisherStub { .setFullMethodName("google.iam.v1.IAMPolicy/SetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(SetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getIamPolicyMethodDescriptor = @@ -161,6 +171,7 @@ public class GrpcPublisherStub extends PublisherStub { .setFullMethodName("google.iam.v1.IAMPolicy/GetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(GetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -172,6 +183,7 @@ public class GrpcPublisherStub extends PublisherStub { ProtoUtils.marshaller(TestIamPermissionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(TestIamPermissionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable createTopicCallable; diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/GrpcSchemaServiceStub.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/GrpcSchemaServiceStub.java index 9c8e570aa7..ef439881a6 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/GrpcSchemaServiceStub.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/GrpcSchemaServiceStub.java @@ -69,6 +69,7 @@ public class GrpcSchemaServiceStub extends SchemaServiceStub { .setFullMethodName("google.pubsub.v1.SchemaService/CreateSchema") .setRequestMarshaller(ProtoUtils.marshaller(CreateSchemaRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Schema.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getSchemaMethodDescriptor = @@ -77,6 +78,7 @@ public class GrpcSchemaServiceStub extends SchemaServiceStub { .setFullMethodName("google.pubsub.v1.SchemaService/GetSchema") .setRequestMarshaller(ProtoUtils.marshaller(GetSchemaRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Schema.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -87,6 +89,7 @@ public class GrpcSchemaServiceStub extends SchemaServiceStub { .setRequestMarshaller(ProtoUtils.marshaller(ListSchemasRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListSchemasResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -98,6 +101,7 @@ public class GrpcSchemaServiceStub extends SchemaServiceStub { ProtoUtils.marshaller(ListSchemaRevisionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListSchemaRevisionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor commitSchemaMethodDescriptor = @@ -106,6 +110,7 @@ public class GrpcSchemaServiceStub extends SchemaServiceStub { .setFullMethodName("google.pubsub.v1.SchemaService/CommitSchema") .setRequestMarshaller(ProtoUtils.marshaller(CommitSchemaRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Schema.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -116,6 +121,7 @@ public class GrpcSchemaServiceStub extends SchemaServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(RollbackSchemaRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Schema.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -126,6 +132,7 @@ public class GrpcSchemaServiceStub extends SchemaServiceStub { .setRequestMarshaller( ProtoUtils.marshaller(DeleteSchemaRevisionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Schema.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteSchemaMethodDescriptor = @@ -134,6 +141,7 @@ public class GrpcSchemaServiceStub extends SchemaServiceStub { .setFullMethodName("google.pubsub.v1.SchemaService/DeleteSchema") .setRequestMarshaller(ProtoUtils.marshaller(DeleteSchemaRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -145,6 +153,7 @@ public class GrpcSchemaServiceStub extends SchemaServiceStub { ProtoUtils.marshaller(ValidateSchemaRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ValidateSchemaResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -156,6 +165,7 @@ public class GrpcSchemaServiceStub extends SchemaServiceStub { ProtoUtils.marshaller(ValidateMessageRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ValidateMessageResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor setIamPolicyMethodDescriptor = @@ -164,6 +174,7 @@ public class GrpcSchemaServiceStub extends SchemaServiceStub { .setFullMethodName("google.iam.v1.IAMPolicy/SetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(SetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getIamPolicyMethodDescriptor = @@ -172,6 +183,7 @@ public class GrpcSchemaServiceStub extends SchemaServiceStub { .setFullMethodName("google.iam.v1.IAMPolicy/GetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(GetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -183,6 +195,7 @@ public class GrpcSchemaServiceStub extends SchemaServiceStub { ProtoUtils.marshaller(TestIamPermissionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(TestIamPermissionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable createSchemaCallable; diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/GrpcSubscriberStub.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/GrpcSubscriberStub.java index b7456a0647..2c95d75bea 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/GrpcSubscriberStub.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/GrpcSubscriberStub.java @@ -78,6 +78,7 @@ public class GrpcSubscriberStub extends SubscriberStub { .setFullMethodName("google.pubsub.v1.Subscriber/CreateSubscription") .setRequestMarshaller(ProtoUtils.marshaller(Subscription.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Subscription.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -88,6 +89,7 @@ public class GrpcSubscriberStub extends SubscriberStub { .setRequestMarshaller( ProtoUtils.marshaller(GetSubscriptionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Subscription.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -98,6 +100,7 @@ public class GrpcSubscriberStub extends SubscriberStub { .setRequestMarshaller( ProtoUtils.marshaller(UpdateSubscriptionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Subscription.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -109,6 +112,7 @@ public class GrpcSubscriberStub extends SubscriberStub { ProtoUtils.marshaller(ListSubscriptionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListSubscriptionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -119,6 +123,7 @@ public class GrpcSubscriberStub extends SubscriberStub { .setRequestMarshaller( ProtoUtils.marshaller(DeleteSubscriptionRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -129,6 +134,7 @@ public class GrpcSubscriberStub extends SubscriberStub { .setRequestMarshaller( ProtoUtils.marshaller(ModifyAckDeadlineRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor acknowledgeMethodDescriptor = @@ -137,6 +143,7 @@ public class GrpcSubscriberStub extends SubscriberStub { .setFullMethodName("google.pubsub.v1.Subscriber/Acknowledge") .setRequestMarshaller(ProtoUtils.marshaller(AcknowledgeRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor pullMethodDescriptor = @@ -145,6 +152,7 @@ public class GrpcSubscriberStub extends SubscriberStub { .setFullMethodName("google.pubsub.v1.Subscriber/Pull") .setRequestMarshaller(ProtoUtils.marshaller(PullRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(PullResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -156,6 +164,7 @@ public class GrpcSubscriberStub extends SubscriberStub { ProtoUtils.marshaller(StreamingPullRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(StreamingPullResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -166,6 +175,7 @@ public class GrpcSubscriberStub extends SubscriberStub { .setRequestMarshaller( ProtoUtils.marshaller(ModifyPushConfigRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getSnapshotMethodDescriptor = @@ -174,6 +184,7 @@ public class GrpcSubscriberStub extends SubscriberStub { .setFullMethodName("google.pubsub.v1.Subscriber/GetSnapshot") .setRequestMarshaller(ProtoUtils.marshaller(GetSnapshotRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Snapshot.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -185,6 +196,7 @@ public class GrpcSubscriberStub extends SubscriberStub { ProtoUtils.marshaller(ListSnapshotsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListSnapshotsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -195,6 +207,7 @@ public class GrpcSubscriberStub extends SubscriberStub { .setRequestMarshaller( ProtoUtils.marshaller(CreateSnapshotRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Snapshot.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -205,6 +218,7 @@ public class GrpcSubscriberStub extends SubscriberStub { .setRequestMarshaller( ProtoUtils.marshaller(UpdateSnapshotRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Snapshot.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -215,6 +229,7 @@ public class GrpcSubscriberStub extends SubscriberStub { .setRequestMarshaller( ProtoUtils.marshaller(DeleteSnapshotRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor seekMethodDescriptor = @@ -223,6 +238,7 @@ public class GrpcSubscriberStub extends SubscriberStub { .setFullMethodName("google.pubsub.v1.Subscriber/Seek") .setRequestMarshaller(ProtoUtils.marshaller(SeekRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(SeekResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor setIamPolicyMethodDescriptor = @@ -231,6 +247,7 @@ public class GrpcSubscriberStub extends SubscriberStub { .setFullMethodName("google.iam.v1.IAMPolicy/SetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(SetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getIamPolicyMethodDescriptor = @@ -239,6 +256,7 @@ public class GrpcSubscriberStub extends SubscriberStub { .setFullMethodName("google.iam.v1.IAMPolicy/GetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(GetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -250,6 +268,7 @@ public class GrpcSubscriberStub extends SubscriberStub { ProtoUtils.marshaller(TestIamPermissionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(TestIamPermissionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable createSubscriptionCallable; diff --git a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java index 4e919f3a8d..9ba062d76a 100644 --- a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java +++ b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java @@ -70,6 +70,7 @@ public class GrpcCloudRedisStub extends CloudRedisStub { ProtoUtils.marshaller(ListInstancesRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListInstancesResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getInstanceMethodDescriptor = @@ -78,6 +79,7 @@ public class GrpcCloudRedisStub extends CloudRedisStub { .setFullMethodName("google.cloud.redis.v1beta1.CloudRedis/GetInstance") .setRequestMarshaller(ProtoUtils.marshaller(GetInstanceRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Instance.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -88,6 +90,7 @@ public class GrpcCloudRedisStub extends CloudRedisStub { .setRequestMarshaller( ProtoUtils.marshaller(GetInstanceAuthStringRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(InstanceAuthString.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -98,6 +101,7 @@ public class GrpcCloudRedisStub extends CloudRedisStub { .setRequestMarshaller( ProtoUtils.marshaller(CreateInstanceRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -108,6 +112,7 @@ public class GrpcCloudRedisStub extends CloudRedisStub { .setRequestMarshaller( ProtoUtils.marshaller(UpdateInstanceRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -118,6 +123,7 @@ public class GrpcCloudRedisStub extends CloudRedisStub { .setRequestMarshaller( ProtoUtils.marshaller(UpgradeInstanceRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -128,6 +134,7 @@ public class GrpcCloudRedisStub extends CloudRedisStub { .setRequestMarshaller( ProtoUtils.marshaller(ImportInstanceRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -138,6 +145,7 @@ public class GrpcCloudRedisStub extends CloudRedisStub { .setRequestMarshaller( ProtoUtils.marshaller(ExportInstanceRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -148,6 +156,7 @@ public class GrpcCloudRedisStub extends CloudRedisStub { .setRequestMarshaller( ProtoUtils.marshaller(FailoverInstanceRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -158,6 +167,7 @@ public class GrpcCloudRedisStub extends CloudRedisStub { .setRequestMarshaller( ProtoUtils.marshaller(DeleteInstanceRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -168,6 +178,7 @@ public class GrpcCloudRedisStub extends CloudRedisStub { .setRequestMarshaller( ProtoUtils.marshaller(RescheduleMaintenanceRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable listInstancesCallable; diff --git a/test/integration/goldens/storage/src/com/google/storage/v2/stub/GrpcStorageStub.java b/test/integration/goldens/storage/src/com/google/storage/v2/stub/GrpcStorageStub.java index 570725fd5d..024a801375 100644 --- a/test/integration/goldens/storage/src/com/google/storage/v2/stub/GrpcStorageStub.java +++ b/test/integration/goldens/storage/src/com/google/storage/v2/stub/GrpcStorageStub.java @@ -102,6 +102,7 @@ public class GrpcStorageStub extends StorageStub { .setFullMethodName("google.storage.v2.Storage/DeleteBucket") .setRequestMarshaller(ProtoUtils.marshaller(DeleteBucketRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getBucketMethodDescriptor = @@ -110,6 +111,7 @@ public class GrpcStorageStub extends StorageStub { .setFullMethodName("google.storage.v2.Storage/GetBucket") .setRequestMarshaller(ProtoUtils.marshaller(GetBucketRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Bucket.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor createBucketMethodDescriptor = @@ -118,6 +120,7 @@ public class GrpcStorageStub extends StorageStub { .setFullMethodName("google.storage.v2.Storage/CreateBucket") .setRequestMarshaller(ProtoUtils.marshaller(CreateBucketRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Bucket.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -128,6 +131,7 @@ public class GrpcStorageStub extends StorageStub { .setRequestMarshaller(ProtoUtils.marshaller(ListBucketsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListBucketsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -138,6 +142,7 @@ public class GrpcStorageStub extends StorageStub { .setRequestMarshaller( ProtoUtils.marshaller(LockBucketRetentionPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Bucket.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getIamPolicyMethodDescriptor = @@ -146,6 +151,7 @@ public class GrpcStorageStub extends StorageStub { .setFullMethodName("google.storage.v2.Storage/GetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(GetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor setIamPolicyMethodDescriptor = @@ -154,6 +160,7 @@ public class GrpcStorageStub extends StorageStub { .setFullMethodName("google.storage.v2.Storage/SetIamPolicy") .setRequestMarshaller(ProtoUtils.marshaller(SetIamPolicyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -165,6 +172,7 @@ public class GrpcStorageStub extends StorageStub { ProtoUtils.marshaller(TestIamPermissionsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(TestIamPermissionsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor updateBucketMethodDescriptor = @@ -173,6 +181,7 @@ public class GrpcStorageStub extends StorageStub { .setFullMethodName("google.storage.v2.Storage/UpdateBucket") .setRequestMarshaller(ProtoUtils.marshaller(UpdateBucketRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Bucket.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -183,6 +192,7 @@ public class GrpcStorageStub extends StorageStub { .setRequestMarshaller( ProtoUtils.marshaller(DeleteNotificationRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -193,6 +203,7 @@ public class GrpcStorageStub extends StorageStub { .setRequestMarshaller( ProtoUtils.marshaller(GetNotificationRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Notification.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -203,6 +214,7 @@ public class GrpcStorageStub extends StorageStub { .setRequestMarshaller( ProtoUtils.marshaller(CreateNotificationRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Notification.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -214,6 +226,7 @@ public class GrpcStorageStub extends StorageStub { ProtoUtils.marshaller(ListNotificationsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListNotificationsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -224,6 +237,7 @@ public class GrpcStorageStub extends StorageStub { .setRequestMarshaller( ProtoUtils.marshaller(ComposeObjectRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Object.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteObjectMethodDescriptor = @@ -232,6 +246,7 @@ public class GrpcStorageStub extends StorageStub { .setFullMethodName("google.storage.v2.Storage/DeleteObject") .setRequestMarshaller(ProtoUtils.marshaller(DeleteObjectRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -243,6 +258,7 @@ public class GrpcStorageStub extends StorageStub { ProtoUtils.marshaller(CancelResumableWriteRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(CancelResumableWriteResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor getObjectMethodDescriptor = @@ -251,6 +267,7 @@ public class GrpcStorageStub extends StorageStub { .setFullMethodName("google.storage.v2.Storage/GetObject") .setRequestMarshaller(ProtoUtils.marshaller(GetObjectRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Object.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -260,6 +277,7 @@ public class GrpcStorageStub extends StorageStub { .setFullMethodName("google.storage.v2.Storage/ReadObject") .setRequestMarshaller(ProtoUtils.marshaller(ReadObjectRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ReadObjectResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor updateObjectMethodDescriptor = @@ -268,6 +286,7 @@ public class GrpcStorageStub extends StorageStub { .setFullMethodName("google.storage.v2.Storage/UpdateObject") .setRequestMarshaller(ProtoUtils.marshaller(UpdateObjectRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Object.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -278,6 +297,7 @@ public class GrpcStorageStub extends StorageStub { .setRequestMarshaller(ProtoUtils.marshaller(WriteObjectRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(WriteObjectResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -288,6 +308,7 @@ public class GrpcStorageStub extends StorageStub { .setRequestMarshaller(ProtoUtils.marshaller(ListObjectsRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListObjectsResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -298,6 +319,7 @@ public class GrpcStorageStub extends StorageStub { .setRequestMarshaller( ProtoUtils.marshaller(RewriteObjectRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(RewriteResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -309,6 +331,7 @@ public class GrpcStorageStub extends StorageStub { ProtoUtils.marshaller(StartResumableWriteRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(StartResumableWriteResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -320,6 +343,7 @@ public class GrpcStorageStub extends StorageStub { ProtoUtils.marshaller(QueryWriteStatusRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(QueryWriteStatusResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -330,6 +354,7 @@ public class GrpcStorageStub extends StorageStub { .setRequestMarshaller( ProtoUtils.marshaller(GetServiceAccountRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(ServiceAccount.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -341,6 +366,7 @@ public class GrpcStorageStub extends StorageStub { ProtoUtils.marshaller(CreateHmacKeyRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(CreateHmacKeyResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor deleteHmacKeyMethodDescriptor = @@ -349,6 +375,7 @@ public class GrpcStorageStub extends StorageStub { .setFullMethodName("google.storage.v2.Storage/DeleteHmacKey") .setRequestMarshaller(ProtoUtils.marshaller(DeleteHmacKeyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -358,6 +385,7 @@ public class GrpcStorageStub extends StorageStub { .setFullMethodName("google.storage.v2.Storage/GetHmacKey") .setRequestMarshaller(ProtoUtils.marshaller(GetHmacKeyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(HmacKeyMetadata.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -368,6 +396,7 @@ public class GrpcStorageStub extends StorageStub { .setRequestMarshaller(ProtoUtils.marshaller(ListHmacKeysRequest.getDefaultInstance())) .setResponseMarshaller( ProtoUtils.marshaller(ListHmacKeysResponse.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private static final MethodDescriptor @@ -378,6 +407,7 @@ public class GrpcStorageStub extends StorageStub { .setRequestMarshaller( ProtoUtils.marshaller(UpdateHmacKeyRequest.getDefaultInstance())) .setResponseMarshaller(ProtoUtils.marshaller(HmacKeyMetadata.getDefaultInstance())) + .setSampledToLocalTracing(true) .build(); private final UnaryCallable deleteBucketCallable; diff --git a/versions.txt b/versions.txt index 60bb09730a..51a166072a 100644 --- a/versions.txt +++ b/versions.txt @@ -1,26 +1,26 @@ # Format: # module:released-version:current-version -gapic-generator-java:2.61.0:2.61.0 -api-common:2.52.0:2.52.0 -gax:2.69.0:2.69.0 -gax-grpc:2.69.0:2.69.0 -gax-httpjson:0.154.0:0.154.0 -proto-google-common-protos:2.60.0:2.60.0 -grpc-google-common-protos:2.60.0:2.60.0 -proto-google-iam-v1:1.55.0:1.55.0 -grpc-google-iam-v1:1.55.0:1.55.0 -proto-google-iam-v2beta:1.55.0:1.55.0 -grpc-google-iam-v2beta:1.55.0:1.55.0 -google-iam-policy:1.55.0:1.55.0 -proto-google-iam-v2:1.55.0:1.55.0 -grpc-google-iam-v2:1.55.0:1.55.0 -google-cloud-core:2.59.0:2.59.0 -google-cloud-shared-dependencies:3.51.0:3.51.0 -gapic-showcase:0.7.0:0.7.0 -proto-gapic-showcase-v1beta1:0.7.0:0.7.0 -grpc-gapic-showcase-v1beta1:0.7.0:0.7.0 -proto-google-iam-v3:1.55.0:1.55.0 -grpc-google-iam-v3:1.55.0:1.55.0 -proto-google-iam-v3beta:1.55.0:1.55.0 -grpc-google-iam-v3beta:1.55.0:1.55.0 +gapic-generator-java:2.62.0:2.62.0 +api-common:2.53.0:2.53.0 +gax:2.70.0:2.70.0 +gax-grpc:2.70.0:2.70.0 +gax-httpjson:0.155.0:0.155.0 +proto-google-common-protos:2.61.0:2.61.0 +grpc-google-common-protos:2.61.0:2.61.0 +proto-google-iam-v1:1.56.0:1.56.0 +grpc-google-iam-v1:1.56.0:1.56.0 +proto-google-iam-v2beta:1.56.0:1.56.0 +grpc-google-iam-v2beta:1.56.0:1.56.0 +google-iam-policy:1.56.0:1.56.0 +proto-google-iam-v2:1.56.0:1.56.0 +grpc-google-iam-v2:1.56.0:1.56.0 +google-cloud-core:2.60.0:2.60.0 +google-cloud-shared-dependencies:3.52.0:3.52.0 +gapic-showcase:0.8.0:0.8.0 +proto-gapic-showcase-v1beta1:0.8.0:0.8.0 +grpc-gapic-showcase-v1beta1:0.8.0:0.8.0 +proto-google-iam-v3:1.56.0:1.56.0 +grpc-google-iam-v3:1.56.0:1.56.0 +proto-google-iam-v3beta:1.56.0:1.56.0 +grpc-google-iam-v3beta:1.56.0:1.56.0