From ea6164d65dcaee06fc9f4d5fcb6a49eb771a6dbc Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 4 Oct 2022 22:54:12 +0000 Subject: [PATCH 1/5] chore(main): release 3.11.6-SNAPSHOT (#1122) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- google-cloud-logging-bom/pom.xml | 8 ++++---- google-cloud-logging/pom.xml | 4 ++-- grpc-google-cloud-logging-v2/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-logging-v2/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml index 31f1610d3..15e044fd6 100644 --- a/google-cloud-logging-bom/pom.xml +++ b/google-cloud-logging-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging-bom - 3.11.5 + 3.11.6-SNAPSHOT pom com.google.cloud @@ -53,17 +53,17 @@ com.google.cloud google-cloud-logging - 3.11.5 + 3.11.6-SNAPSHOT com.google.api.grpc grpc-google-cloud-logging-v2 - 0.100.5 + 0.100.6-SNAPSHOT com.google.api.grpc proto-google-cloud-logging-v2 - 0.100.5 + 0.100.6-SNAPSHOT diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index e84f65492..764c8127e 100644 --- a/google-cloud-logging/pom.xml +++ b/google-cloud-logging/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging - 3.11.5 + 3.11.6-SNAPSHOT jar Google Cloud Logging https://github.com/googleapis/java-logging @@ -11,7 +11,7 @@ com.google.cloud google-cloud-logging-parent - 3.11.5 + 3.11.6-SNAPSHOT google-cloud-logging diff --git a/grpc-google-cloud-logging-v2/pom.xml b/grpc-google-cloud-logging-v2/pom.xml index 9dea75518..2b7203637 100644 --- a/grpc-google-cloud-logging-v2/pom.xml +++ b/grpc-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.100.5 + 0.100.6-SNAPSHOT grpc-google-cloud-logging-v2 GRPC library for grpc-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.11.5 + 3.11.6-SNAPSHOT diff --git a/pom.xml b/pom.xml index 82391224d..dbd83d3f3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-logging-parent pom - 3.11.5 + 3.11.6-SNAPSHOT Google Cloud Logging Parent https://github.com/googleapis/java-logging @@ -61,17 +61,17 @@ com.google.api.grpc proto-google-cloud-logging-v2 - 0.100.5 + 0.100.6-SNAPSHOT com.google.api.grpc grpc-google-cloud-logging-v2 - 0.100.5 + 0.100.6-SNAPSHOT com.google.cloud google-cloud-logging - 3.11.5 + 3.11.6-SNAPSHOT diff --git a/proto-google-cloud-logging-v2/pom.xml b/proto-google-cloud-logging-v2/pom.xml index 0a5fc2912..b222e96d9 100644 --- a/proto-google-cloud-logging-v2/pom.xml +++ b/proto-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-logging-v2 - 0.100.5 + 0.100.6-SNAPSHOT proto-google-cloud-logging-v2 PROTO library for proto-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.11.5 + 3.11.6-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index b548c973e..e3eb7cdfc 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 3.11.5 + 3.11.6-SNAPSHOT diff --git a/versions.txt b/versions.txt index 68cf5d157..5e7386718 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-logging:3.11.5:3.11.5 -grpc-google-cloud-logging-v2:0.100.5:0.100.5 -proto-google-cloud-logging-v2:0.100.5:0.100.5 +google-cloud-logging:3.11.5:3.11.6-SNAPSHOT +grpc-google-cloud-logging-v2:0.100.5:0.100.6-SNAPSHOT +proto-google-cloud-logging-v2:0.100.5:0.100.6-SNAPSHOT From 8e29548d941b290aa57231e6b9b3e7787d0848d7 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 5 Oct 2022 19:46:06 +0200 Subject: [PATCH 2/5] chore(deps): update dependency com.google.cloud:google-cloud-logging to v3.11.5 (#1123) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:google-cloud-logging to v3.11.5 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- README.md | 6 +++--- samples/install-without-bom/pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 10fd585b6..0064e39db 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-logging - 3.11.4 + 3.11.5 ``` @@ -58,13 +58,13 @@ implementation 'com.google.cloud:google-cloud-logging' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-logging:3.11.4' +implementation 'com.google.cloud:google-cloud-logging:3.11.5' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.11.4" +libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.11.5" ``` ## Authentication diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 0ce8b15ec..a5774b375 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 3.11.4 + 3.11.5 From 330eb8870a7ac107fcb851b114a049c63d217b4f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 7 Oct 2022 19:31:33 +0200 Subject: [PATCH 3/5] chore(deps): update dependency com.google.cloud:libraries-bom to v26.1.3 (#1124) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:libraries-bom to v26.1.3 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- README.md | 4 ++-- samples/native-image-sample/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0064e39db..1d62cb36f 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.1.2 + 26.1.3 pom import @@ -51,7 +51,7 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.1.2') +implementation platform('com.google.cloud:libraries-bom:26.1.3') implementation 'com.google.cloud:google-cloud-logging' ``` diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 64861d6a2..fe65e204d 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -29,7 +29,7 @@ com.google.cloud libraries-bom - 26.1.2 + 26.1.3 pom import diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 33fe68ef9..5f19ce669 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -29,7 +29,7 @@ com.google.cloud libraries-bom - 26.1.2 + 26.1.3 pom import From 70fc6ee9c0fdc845a06e031ca82c50b8def2bb3b Mon Sep 17 00:00:00 2001 From: losalex <90795544+losalex@users.noreply.github.com> Date: Fri, 7 Oct 2022 21:41:43 +0300 Subject: [PATCH 4/5] fix: Logging SDK not applying quota limits for project set using quotaProjectId (#1125) --- .../java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java index ffd6b99d0..bac64965a 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java @@ -122,6 +122,7 @@ public GrpcLoggingRpc(final LoggingOptions options) throws IOException { .setDefaultCallContext(GrpcCallContext.of(managedChannel, CallOptions.DEFAULT)) .setBackgroundResources( Collections.singletonList(transportChannel)) + .setQuotaProjectId(options.getQuotaProjectId()) .build(); } catch (Exception ex) { throw new IOException(ex); @@ -144,6 +145,7 @@ public GrpcLoggingRpc(final LoggingOptions options) throws IOException { .build(); HeaderProvider headerProvider = options.getMergedHeaderProvider(internalHeaderProvider); settingsBuilder.setInternalHeaderProvider(headerProvider); + settingsBuilder.setQuotaProjectId(options.getQuotaProjectId()); clientContext = ClientContext.create(settingsBuilder.build()); } From c3f9a2f43beaec149939df2a5961e95e3db3f180 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 7 Oct 2022 13:03:43 -0700 Subject: [PATCH 5/5] chore(main): release 3.11.6 (#1126) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ google-cloud-logging-bom/pom.xml | 8 ++++---- google-cloud-logging/pom.xml | 4 ++-- grpc-google-cloud-logging-v2/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-logging-v2/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 6 +++--- 8 files changed, 25 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 041fc4906..508f08bec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [3.11.6](https://github.com/googleapis/java-logging/compare/v3.11.5...v3.11.6) (2022-10-07) + + +### Bug Fixes + +* Logging SDK not applying quota limits for project set using quotaProjectId ([#1125](https://github.com/googleapis/java-logging/issues/1125)) ([70fc6ee](https://github.com/googleapis/java-logging/commit/70fc6ee9c0fdc845a06e031ca82c50b8def2bb3b)) + ## [3.11.5](https://github.com/googleapis/java-logging/compare/v3.11.4...v3.11.5) (2022-10-03) diff --git a/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml index 15e044fd6..3fa952068 100644 --- a/google-cloud-logging-bom/pom.xml +++ b/google-cloud-logging-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging-bom - 3.11.6-SNAPSHOT + 3.11.6 pom com.google.cloud @@ -53,17 +53,17 @@ com.google.cloud google-cloud-logging - 3.11.6-SNAPSHOT + 3.11.6 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.100.6-SNAPSHOT + 0.100.6 com.google.api.grpc proto-google-cloud-logging-v2 - 0.100.6-SNAPSHOT + 0.100.6 diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index 764c8127e..0fb9aec50 100644 --- a/google-cloud-logging/pom.xml +++ b/google-cloud-logging/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging - 3.11.6-SNAPSHOT + 3.11.6 jar Google Cloud Logging https://github.com/googleapis/java-logging @@ -11,7 +11,7 @@ com.google.cloud google-cloud-logging-parent - 3.11.6-SNAPSHOT + 3.11.6 google-cloud-logging diff --git a/grpc-google-cloud-logging-v2/pom.xml b/grpc-google-cloud-logging-v2/pom.xml index 2b7203637..3b6128d44 100644 --- a/grpc-google-cloud-logging-v2/pom.xml +++ b/grpc-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.100.6-SNAPSHOT + 0.100.6 grpc-google-cloud-logging-v2 GRPC library for grpc-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.11.6-SNAPSHOT + 3.11.6 diff --git a/pom.xml b/pom.xml index dbd83d3f3..3f6a083c0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-logging-parent pom - 3.11.6-SNAPSHOT + 3.11.6 Google Cloud Logging Parent https://github.com/googleapis/java-logging @@ -61,17 +61,17 @@ com.google.api.grpc proto-google-cloud-logging-v2 - 0.100.6-SNAPSHOT + 0.100.6 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.100.6-SNAPSHOT + 0.100.6 com.google.cloud google-cloud-logging - 3.11.6-SNAPSHOT + 3.11.6 diff --git a/proto-google-cloud-logging-v2/pom.xml b/proto-google-cloud-logging-v2/pom.xml index b222e96d9..62d528c86 100644 --- a/proto-google-cloud-logging-v2/pom.xml +++ b/proto-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-logging-v2 - 0.100.6-SNAPSHOT + 0.100.6 proto-google-cloud-logging-v2 PROTO library for proto-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.11.6-SNAPSHOT + 3.11.6 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index e3eb7cdfc..77da35642 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 3.11.6-SNAPSHOT + 3.11.6 diff --git a/versions.txt b/versions.txt index 5e7386718..f01f4d033 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-logging:3.11.5:3.11.6-SNAPSHOT -grpc-google-cloud-logging-v2:0.100.5:0.100.6-SNAPSHOT -proto-google-cloud-logging-v2:0.100.5:0.100.6-SNAPSHOT +google-cloud-logging:3.11.6:3.11.6 +grpc-google-cloud-logging-v2:0.100.6:0.100.6 +proto-google-cloud-logging-v2:0.100.6:0.100.6