Skip to content

Commit 589ccbe

Browse files
authored
Merge branch 'main' into bigtable-admin-client
2 parents b22a0ea + 58e50fc commit 589ccbe

4,594 files changed

Lines changed: 1209960 additions & 84298 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@
33
# For syntax help see:
44
# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
55

6-
* @googleapis/cloud-sdk-java-team
6+
* @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
77

88
# java-vertexai has maintainers
9-
/java-vertexai/ @googleapis/vertexai-team @googleapis/cloud-sdk-java-team
10-
/java-bigquerystorage/ @googleapis/bigquery-team @googleapis/cloud-sdk-java-team
11-
/java-bigquery/ @googleapis/bigquery-team @googleapis/cloud-sdk-java-team
12-
/java-bigquery-jdbc/ @googleapis/bigquery-developer-tools-team @googleapis/bigquery-team @googleapis/cloud-sdk-java-team
13-
/grpc-gcp-java/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
14-
/java-spanner/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
15-
/java-spanner-jdbc/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
16-
/google-auth-library-java/ @googleapis/cloud-sdk-auth-team @googleapis/cloud-sdk-java-team @googleapis/aion-team
17-
/java-storage/ @googleapis/gcs-team @googleapis/cloud-sdk-java-team
18-
/java-storage-nio/ @googleapis/gcs-team @googleapis/cloud-sdk-java-team
19-
/java-pubsub/ @googleapis/pubsub-team @googleapis/cloud-sdk-java-team
20-
/java-bigtable/ @googleapis/bigtable-team @googleapis/cloud-sdk-java-team
21-
/java-firestore/ @googleapis/firestore-team @googleapis/cloud-sdk-java-team
9+
/java-vertexai/ @googleapis/vertexai-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
10+
/java-bigquerystorage/ @googleapis/bigquery-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
11+
/java-bigquery/ @googleapis/bigquery-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
12+
/java-bigquery-jdbc/ @googleapis/bigquery-developer-tools-team @googleapis/bigquery-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
13+
/grpc-gcp-java/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
14+
/java-spanner/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
15+
/java-spanner-jdbc/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
16+
/google-auth-library-java/ @googleapis/cloud-sdk-auth-team @googleapis/cloud-sdk-java-team @googleapis/aion-team @googleapis/cloud-sdk-librarian-team
17+
/java-storage/ @googleapis/gcs-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
18+
/java-storage-nio/ @googleapis/gcs-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
19+
/java-pubsub/ @googleapis/pubsub-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
20+
/java-bigtable/ @googleapis/bigtable-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
21+
/java-firestore/ @googleapis/firestore-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
22+
/librarian.yaml @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 95 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,119 @@ about: Create a report to help us improve
66

77
Thanks for stopping by to let us know something could be better!
88

9-
**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
9+
**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. We try to review GitHub issues on a regular basis, however we cannot guarantee an SLO.
1010

11-
Please run down the following list and make sure you've tried the usual "quick fixes":
11+
Before creating this issue, please run down the following list and make sure you've tried the usual "quick fixes":
1212

1313
- Search the issues already opened: https://github.com/googleapis/google-cloud-java/issues
1414
- Check for answers on StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform
15+
- Refer to the [Google Cloud Java Getting Started guides](https://docs.cloud.google.com/java/getting-started) for common usage patterns and troubleshooting.
16+
- Verify you are using the latest versions of the Java SDK. If not, is it possible to upgrade? We recommend using the [Libraries-Bom](https://cloud.google.com/java/docs/bom) to manage dependency versions.
1517

16-
If you are still having issues, please include as much information as possible:
18+
To help expedite the resolution of the issue, please fill out as much information as possible. If unable to provide information, please note down why the information is unable to be provided.
1719

18-
#### Environment details
20+
## Issue Details
1921

20-
1. Specify the API at the beginning of the title. For example, "[vision]: ...").
21-
General, Core, and Other are also allowed as types
22-
2. OS type and version:
23-
3. Java version:
24-
4. Version(s):
22+
Required: Provide a detailed description of the issue. Any additional information helps with figuring out the issue.
2523

26-
#### Steps to reproduce
24+
### Example
25+
I am seeing {ISSUE} when running X, Y... after doing Z. This behavior started after the X library upgrade a few weeks ago ...
2726

28-
1. ?
29-
2. ?
27+
## Environment
3028

31-
#### Code example
29+
Required: Provide details about your environment. If relevant, please also provide details about your GCP environment. The environment details MUST be filled out.
3230

33-
```java
34-
// example
31+
Provide the relevant details about your environment:
32+
33+
- OS Type and Version:
34+
- Java Version and JDK Vendor:
35+
- (If using GraalVM) GraalVM Version:
36+
37+
(Optional) If deployed on GCP, provide the relevant details about your GCP deployment environment:
38+
39+
- Project ID:
40+
- Cloud Services:
41+
- Deployment Environment (Compute, GKE, Run, etc):
42+
43+
## Dependencies
44+
45+
Required: Provide a list of the dependencies that are being used. If unable to provide the list, please list the relevant libraries shown below. One of the two sections below MUST be filled out.
46+
47+
1. List your application’s dependency versions. Please provide the output of `mvn dependency:tree`, `gradle dependencies`, or your build system.
48+
49+
### Example `mvn dependency:tree` output
3550
```
51+
maven-dependency-plugin:tree
52+
53+
- com.google.cloud:{X}:{Y}
54+
55+
- com.google.auth:{X}:{Y}
56+
57+
...
58+
```
59+
60+
2. Provide the versions of the relevant libraries:
61+
- Libraries-Bom ([com.google.cloud:libraries-bom](https://central.sonatype.com/artifact/com.google.cloud/libraries-bom)):
62+
- (If not using Libraries-Bom) Client Libraries:
63+
- Gax (gax / gax-grpc / gax-httpjson):
64+
- Auth (google-auth-library-oauth2-http / google-auth-library-credentials):
65+
- Any other relevant Java SDK dependencies:
66+
- Google-Http-Java-Client ([com.google.http-client:google-http-client](https://central.sonatype.com/artifact/com.google.http-client/google-http-client)):
67+
68+
## Reproducer
69+
70+
Required: Provide a reproducer and the steps needed to reproduce this issue locally. If unable to provide a reproducer, please provide code snippets to help reproduce the issue. One of the two sections below MUST be filled out.
3671

37-
#### Stack trace
72+
1. A reproducer is the quickest method to resolve this issue. It could be a test case or a sample application. It is easier for us to troubleshoot the problem and to verify the solution.
73+
74+
Steps to reproduce:
75+
76+
### Example
77+
1. Enable Speech API
78+
2. Upload a .mp4 file to GCS
79+
3. ...
80+
4. See {ERROR}
81+
82+
If unable to provide a reproducer, please provide a reason: ...
83+
84+
2. Provide as many code snippets as possible:
85+
86+
### Example
87+
```java
88+
try (InstancesClient instancesClient = InstancesClient.create()) {
89+
...
90+
}
3891
```
39-
Any relevant stacktrace here.
92+
93+
## Logs and Stack Trace
94+
95+
Required: Provide logs that showcase the error. This will help show the flow of the application and help narrow down the cause. Additionally, provide a stack trace of the error if possible.
96+
97+
The Java SDK has a troubleshooting [guide](https://github.com/googleapis/google-cloud-java/blob/main/TROUBLESHOOTING.md) for enabling logs. This contains information regarding client-server communication, request and response details, and logging in dependency libraries. If using this guide, please obfuscate any private information (bearer tokens, request and response params, etc).
98+
99+
Additionally, please provide a stack trace of the error seen:
100+
101+
### Example
40102
```
103+
TransportContext.java:347|Fatal (CERTIFICATE_UNKNOWN): PKIX path building failed: sun.security.provider.certpath.SunCertPathBuilderException: unable to find valid certification path to requested target (
104+
105+
"throwable" : {
41106
42-
#### External references such as API reference guides
107+
sun.security.validator.ValidatorException: PKIX path building failed: sun.security.provider.certpath.SunCertPathBuilderException: unable to find valid certification path to requested target
43108
44-
- ?
109+
at sun.security.validator.PKIXValidator.doBuild(PKIXValidator.java:456)
110+
111+
at sun.security.validator.PKIXValidator.engineValidate(PKIXValidator.java:323)
112+
113+
...
114+
```
45115

46-
#### Any additional information below
116+
## Behavior
47117

118+
Optional: Any additional information about the behavior of the error is helpful to debug.
48119

49-
Following these steps guarantees the quickest resolution possible.
120+
Behavioral Questions:
50121

51-
Thanks!
122+
- When did the issue begin? Is this behavior related to any dependency version upgrade?
123+
- Is this behavior flaky? Or is this consistently seen in production?
124+
- Is this behavior related to the volume of data?

.github/workflows/ci.yaml

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,22 @@ jobs:
2929
outputs:
3030
src: ${{ steps.filter.outputs.src }}
3131
ci: ${{ steps.filter.outputs.ci }}
32+
# runnable is true if there are changes outside the .github/workflows directory OR if ci.yaml itself (or kokoro scripts) is modified.
33+
runnable: ${{ fromJSON(steps.filter.outputs.all_count) > fromJSON(steps.filter.outputs.workflows_count) || fromJSON(steps.filter.outputs.ci_count) > 0 }}
3234
steps:
33-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v6
36+
# Use this action, rather than a file filter so that we can make this
37+
# mandatory.
38+
# See https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#example-including-branches
39+
# for more details.
3440
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
3541
id: filter
3642
with:
3743
filters: |
44+
all:
45+
- '**'
46+
workflows:
47+
- '.github/workflows/**'
3848
src:
3949
- '!(google-auth-library-java|grpc-gcp-java|java-bigquery|java-bigquery-jdbc|java-bigquerystorage|java-bigtable|java-datastore|java-firestore|java-logging|java-logging-logback|java-pubsub|java-spanner|java-storage)/**/*.java'
4050
- '!(google-auth-library-java|grpc-gcp-java|java-bigquery|java-bigquery-jdbc|java-bigquerystorage|java-bigtable|java-datastore|java-firestore|java-logging|java-logging-logback|java-pubsub|java-spanner|java-storage)/**/pom.xml'
@@ -53,20 +63,25 @@ jobs:
5363
steps:
5464
- name: Get current week within the year
5565
id: date
66+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
5667
run: echo "::set-output name=week_of_year::$(date +'%W' --utc)"
5768
- uses: actions/checkout@v4
69+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
5870
- uses: actions/setup-java@v4
71+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
5972
with:
6073
distribution: temurin
6174
java-version: ${{matrix.java}}
6275
- run: java -version
76+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
6377
- uses: actions/cache@v4
6478
id: mvn-cache
79+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
6580
with:
6681
path: ~/.m2/repository
6782
key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }}
6883
- run: .kokoro/build.sh
69-
if: ${{ needs.bulk-filter.outputs.src == 'true' || needs.bulk-filter.outputs.ci == 'true' }}
84+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' && (needs.bulk-filter.outputs.src == 'true' || needs.bulk-filter.outputs.ci == 'true') }}
7085
env:
7186
JOB_TYPE: test
7287
JOB_NAME: units-${{matrix.java}}
@@ -77,42 +92,50 @@ jobs:
7792
steps:
7893
- name: Get current week within the year
7994
id: date
95+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
8096
run: echo "::set-output name=week_of_year::$(date +'%W' --utc)"
8197
- uses: actions/checkout@v4
98+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
8299
- uses: actions/setup-java@v4
100+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
83101
with:
84102
java-version: 8
85103
distribution: temurin
86104
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
87105
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
88106
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
107+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
89108
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
90109
shell: bash
91110
- uses: actions/setup-java@v4
111+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
92112
with:
93113
java-version: 11
94114
distribution: temurin
95115
cache: maven
96116
- uses: actions/cache@v4
97117
id: mvn-cache
118+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
98119
with:
99120
path: ~/.m2/repository
100121
key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }}
101122
- run: .kokoro/build.sh
102-
if: ${{ needs.bulk-filter.outputs.src == 'true' || needs.bulk-filter.outputs.ci == 'true' }}
123+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' && (needs.bulk-filter.outputs.src == 'true' || needs.bulk-filter.outputs.ci == 'true') }}
103124
shell: bash
104125
env:
105126
JOB_TYPE: test
106127
JOB_NAME: units-8-runtime-${{matrix.java}}
107128
# detect which libraries have changed
108129
changes:
130+
needs: bulk-filter
131+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
109132
runs-on: ubuntu-latest
110133
permissions:
111134
pull-requests: read
112135
outputs:
113136
packages: ${{ steps.filter.outputs.changes }}
114137
steps:
115-
- uses: actions/checkout@v4
138+
- uses: actions/checkout@v6
116139
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
117140
id: filter
118141
with:
@@ -302,7 +325,7 @@ jobs:
302325
env:
303326
BUILD_SUBDIR: ${{matrix.package}}
304327
required:
305-
needs: [ changes, split-units, split-clirr, split-dependencies ]
328+
needs: [ bulk-filter, changes, split-units, split-clirr, split-dependencies ]
306329
name: conditional-required-check
307330
if: ${{ always() }} # Always run even if any "needs" jobs fail
308331
runs-on: ubuntu-22.04
@@ -313,6 +336,8 @@ jobs:
313336
- name: Success otherwise
314337
run: echo "Success!"
315338
windows:
339+
needs: bulk-filter
340+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
316341
runs-on: windows-latest
317342
steps:
318343
- name: Support longpaths
@@ -329,6 +354,8 @@ jobs:
329354
JOB_TYPE: test
330355
JOB_NAME: windows-units
331356
lint:
357+
needs: bulk-filter
358+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
332359
runs-on: ubuntu-latest
333360
steps:
334361
- uses: actions/checkout@v4
@@ -345,6 +372,8 @@ jobs:
345372
HEAD_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
346373
BASE_SHA: ${{ github.event.pull_request.base.sha || github.event.before }}
347374
enforcer:
375+
needs: bulk-filter
376+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
348377
runs-on: ubuntu-latest
349378
steps:
350379
- name: Get current week within the year
@@ -364,6 +393,8 @@ jobs:
364393
- run: java -version
365394
- run: mvn -B -ntp enforcer:enforce@enforce -T 1C
366395
gapic-libraries-bom:
396+
needs: bulk-filter
397+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
367398
runs-on: ubuntu-latest
368399
steps:
369400
- uses: actions/checkout@v4
@@ -381,6 +412,8 @@ jobs:
381412
with:
382413
bom-path: gapic-libraries-bom/pom.xml
383414
generation-config-check:
415+
needs: bulk-filter
416+
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
384417
runs-on: ubuntu-latest
385418
steps:
386419
- uses: actions/checkout@v4

.github/workflows/generated_files_sync.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
pull_request:
1818
name: generation diff
1919
env:
20-
library_generation_image_tag: 2.73.0-SNAPSHOT # {x-version-update:gapic-generator-java:current}
20+
library_generation_image_tag: 2.73.0 # {x-version-update:gapic-generator-java:current}
2121
jobs:
2222
root-pom:
2323
# root pom.xml does not have diff from generated one

.github/workflows/hermetic_library_generation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }}
2222
GITHUB_REPOSITORY: ${{ github.repository }}
2323
# {x-version-update-start:gapic-generator-java:current}
24-
GENERATOR_VERSION: 2.73.0-SNAPSHOT
24+
GENERATOR_VERSION: 2.73.0
2525
# {x-version-update-end}
2626
jobs:
2727
library_generation:

0 commit comments

Comments
 (0)