Skip to content

Commit 5058329

Browse files
JoeWang1127JoeWang1127
committed
Merge branch 'main' into generate-libraries-main
2 parents d7ecb69 + 4b37ebc commit 5058329

File tree

23 files changed

+90
-48
lines changed

23 files changed

+90
-48
lines changed

‎.github/sync-repo-settings.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ branchProtectionRules:
1818
- 'Kokoro - Test: Java GraalVM Native Image'
1919
- 'Kokoro - Test: Java 17 GraalVM Native Image'
2020
- javadoc
21+
- library_generation
22+
- unmanaged_dependency_check
2123
- pattern: java7
2224
isAdminEnforced: true
2325
requiredApprovingReviewCount: 1

‎.github/workflows/hermetic_library_generation.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
fetch-depth: 0
3939
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
40-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.50.0
40+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.51.0
4141
if: env.SHOULD_RUN == 'true'
4242
with:
4343
base_ref: ${{ github.base_ref }}

‎.github/workflows/unmanaged_dependency_check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
# repository
1818
.kokoro/build.sh
1919
- name: Unmanaged dependency check
20-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.40.0
20+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.41.0
2121
with:
2222
bom-path: google-cloud-logging-bom/pom.xml

‎.kokoro/presubmit/graalvm-native-17.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.40.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.41.0"
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.40.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.41.0"
77
}
88

99
env_vars: {

‎CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
## [3.20.7](https://github.com/googleapis/java-logging/compare/v3.20.6...v3.20.7) (2024-11-18)
4+
5+
6+
### Bug Fixes
7+
8+
* **deps:** Update the Java code generator (gapic-generator-java) to 2.49.0 ([a1ec68d](https://github.com/googleapis/java-logging/commit/a1ec68d539e4d0720fb2cf72314deb4f485f3d4a))
9+
* **deps:** Update the Java code generator (gapic-generator-java) to 2.50.0 ([afcf63c](https://github.com/googleapis/java-logging/commit/afcf63cc063c4e0f5159c3ac5dbe2d372c335beb))
10+
* Fixed outdated link to X-Cloud-Trace-Context header description ([#1713](https://github.com/googleapis/java-logging/issues/1713)) ([d474313](https://github.com/googleapis/java-logging/commit/d4743138b9e5c9fd4e9c59b0793028f1e424e6e4))
11+
12+
13+
### Dependencies
14+
15+
* Update sdk platform java dependencies ([#1725](https://github.com/googleapis/java-logging/issues/1725)) ([531f8c5](https://github.com/googleapis/java-logging/commit/531f8c5089a260840eee7ff97d315307f074f5e6))
16+
317
## [3.20.6](https://github.com/googleapis/java-logging/compare/v3.20.5...v3.20.6) (2024-10-26)
418

519

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ implementation 'com.google.cloud:google-cloud-logging'
5858
If you are using Gradle without BOM, add this to your dependencies:
5959

6060
```Groovy
61-
implementation 'com.google.cloud:google-cloud-logging:3.20.6'
61+
implementation 'com.google.cloud:google-cloud-logging:3.20.7'
6262
```
6363

6464
If you are using SBT, add this to your dependencies:
6565

6666
```Scala
67-
libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.20.6"
67+
libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.20.7"
6868
```
6969

7070
## Authentication
@@ -463,7 +463,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
463463
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-logging/java11.html
464464
[stability-image]: https://img.shields.io/badge/stability-stable-green
465465
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-logging.svg
466-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging/3.20.6
466+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging/3.20.7
467467
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
468468
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
469469
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

‎google-cloud-logging-bom/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-logging-bom</artifactId>
6-
<version>3.20.7-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
6+
<version>3.20.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
1010
<artifactId>sdk-platform-java-config</artifactId>
11-
<version>3.40.0</version>
11+
<version>3.41.0</version>
1212
</parent>
1313

1414
<name>Google Cloud logging BOM</name>
@@ -53,17 +53,17 @@
5353
<dependency>
5454
<groupId>com.google.cloud</groupId>
5555
<artifactId>google-cloud-logging</artifactId>
56-
<version>3.20.7-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
56+
<version>3.20.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
5757
</dependency>
5858
<dependency>
5959
<groupId>com.google.api.grpc</groupId>
6060
<artifactId>grpc-google-cloud-logging-v2</artifactId>
61-
<version>0.109.7-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
61+
<version>0.109.8-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
6262
</dependency>
6363
<dependency>
6464
<groupId>com.google.api.grpc</groupId>
6565
<artifactId>proto-google-cloud-logging-v2</artifactId>
66-
<version>0.109.7-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
66+
<version>0.109.8-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
6767
</dependency>
6868
</dependencies>
6969
</dependencyManagement>

‎google-cloud-logging/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-logging</artifactId>
6-
<version>3.20.7-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
6+
<version>3.20.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
77
<packaging>jar</packaging>
88
<name>Google Cloud Logging</name>
99
<url>https://github.com/googleapis/java-logging</url>
1010
<description>Java idiomatic client for Cloud Logging</description>
1111
<parent>
1212
<groupId>com.google.cloud</groupId>
1313
<artifactId>google-cloud-logging-parent</artifactId>
14-
<version>3.20.7-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
14+
<version>3.20.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
1515
</parent>
1616
<properties>
1717
<site.installationModule>google-cloud-logging</site.installationModule>

‎google-cloud-logging/src/main/java/com/google/cloud/logging/HttpRequest.java‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,18 @@
1616

1717
package com.google.cloud.logging;
1818

19+
import static com.google.api.gax.util.TimeConversionUtils.toJavaTimeDuration;
20+
import static com.google.api.gax.util.TimeConversionUtils.toThreetenDuration;
21+
1922
import com.google.api.core.ApiFunction;
23+
import com.google.api.core.ObsoleteApi;
2024
import com.google.cloud.StringEnumType;
2125
import com.google.cloud.StringEnumValue;
2226
import com.google.common.base.MoreObjects;
2327
import com.google.errorprone.annotations.CanIgnoreReturnValue;
2428
import java.io.Serializable;
29+
import java.time.Duration;
2530
import java.util.Objects;
26-
import org.threeten.bp.Duration;
2731

2832
/**
2933
* Objects of this class represent information about the (optional) HTTP request associated with a
@@ -51,7 +55,7 @@ public final class HttpRequest implements Serializable {
5155
private final boolean cacheHit;
5256
private final boolean cacheValidatedWithOriginServer;
5357
private final Long cacheFillBytes;
54-
private final Duration latency;
58+
private final java.time.Duration latency;
5559

5660
/** The HTTP request method. */
5761
public static final class RequestMethod extends StringEnumValue {
@@ -112,7 +116,7 @@ public static final class Builder {
112116
private boolean cacheHit;
113117
private boolean cacheValidatedWithOriginServer;
114118
private Long cacheFillBytes;
115-
private Duration latency;
119+
private java.time.Duration latency;
116120

117121
Builder() {}
118122

@@ -258,12 +262,18 @@ public Builder setCacheFillBytes(long cacheFillBytes) {
258262
return this;
259263
}
260264

265+
/** This method is obsolete. Use {@link #setLatencyDuration(java.time.Duration)} instead. */
266+
@ObsoleteApi("Use setLatencyDuration(java.time.Duration) instead")
267+
public Builder setLatency(org.threeten.bp.Duration latency) {
268+
return setLatencyDuration(toJavaTimeDuration(latency));
269+
}
270+
261271
/**
262272
* Sets the latency on the server, from the time the request was received until the response was
263273
* sent.
264274
*/
265275
@CanIgnoreReturnValue
266-
public Builder setLatency(Duration latency) {
276+
public Builder setLatencyDuration(java.time.Duration latency) {
267277
this.latency = latency;
268278
return this;
269279
}
@@ -393,13 +403,19 @@ public Long getCacheFillBytes() {
393403
return cacheFillBytes;
394404
}
395405

406+
/** This method is obsolete. Use {@link #getLatencyDuration()} instead. */
407+
@ObsoleteApi("Use getLatencyDuration() instead")
408+
public org.threeten.bp.Duration getLatency() {
409+
return toThreetenDuration(getLatencyDuration());
410+
}
411+
396412
/**
397413
* Returns the processing latency on the server, from the time the request was received until the
398414
* response was sent.
399415
*
400416
* @return the latency, for null if not populated.
401417
*/
402-
public Duration getLatency() {
418+
public Duration getLatencyDuration() {
403419
return latency;
404420
}
405421

@@ -561,7 +577,7 @@ static HttpRequest fromPb(com.google.logging.type.HttpRequest requestPb) {
561577
}
562578
if (requestPb.hasLatency()) {
563579
// NOTE(pongad): Don't convert to nano; large durations overflow longs!
564-
builder.setLatency(
580+
builder.setLatencyDuration(
565581
Duration.ofSeconds(
566582
requestPb.getLatency().getSeconds(), requestPb.getLatency().getNanos()));
567583
}

0 commit comments

Comments
 (0)