Skip to content

Commit 4902310

Browse files
ldetmerldetmer
authored
Merge branch 'main' into protobuf-4.30.1-RC1
2 parents 6979a8b + ce8b356 commit 4902310

File tree

13 files changed

+105
-63
lines changed

13 files changed

+105
-63
lines changed

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
- uses: actions/setup-java@v4
105105
with:
106106
distribution: temurin
107-
java-version: 11
107+
java-version: 17
108108
- run: java -version
109109
- run: .kokoro/build.sh
110110
env:

‎.github/workflows/unmanaged_dependency_check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
shell: bash
1515
run: .kokoro/build.sh
1616
- name: Unmanaged dependency check
17-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.46.2
17+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.48.0
1818
with:
1919
bom-path: pom.xml

‎.kokoro/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ test)
5252
RETURN_CODE=$?
5353
;;
5454
lint)
55-
mvn com.coveo:fmt-maven-plugin:check -B -ntp
55+
mvn com.spotify.fmt:fmt-maven-plugin:check -B -ntp
5656
RETURN_CODE=$?
5757
;;
5858
javadoc)

‎.kokoro/presubmit/graalvm-native-a.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.46.2"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.48.0"
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native-b.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.46.2"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.48.0"
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native-c.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_c:3.46.2"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.48.0"
77
}
88

99
env_vars: {

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
# Changelog
22

33

4+
## [0.132.7-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.132.6-alpha...v0.132.7-alpha) (2025-05-06)
5+
6+
7+
### Dependencies
8+
9+
* Update dependency com.google.cloud:google-cloud-logging to v3.22.3 ([#1470](https://github.com/googleapis/java-logging-logback/issues/1470)) ([423cb11](https://github.com/googleapis/java-logging-logback/commit/423cb1133b130ba0ca3c420b873e369bc132abaa))
10+
* Update dependency com.google.cloud:sdk-platform-java-config to v3.46.3 ([#1467](https://github.com/googleapis/java-logging-logback/issues/1467)) ([386f258](https://github.com/googleapis/java-logging-logback/commit/386f2588cf8757a050acd348b8dc3cbdd32d8673))
11+
* Update dependency com.google.cloud:sdk-platform-java-config to v3.47.0 ([#1469](https://github.com/googleapis/java-logging-logback/issues/1469)) ([aa03bc1](https://github.com/googleapis/java-logging-logback/commit/aa03bc1b32976d33bdebf31c65615139b40dba39))
12+
413
## [0.132.6-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.132.5-alpha...v0.132.6-alpha) (2025-04-26)
514

615

‎README.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,36 @@ public class TestLogger {
159159
}
160160
```
161161

162+
### Controlling the batching settings
163+
When using asynchronous logging, the Logging API is called asynchronously. This allows the appender
164+
to combine multiple `write()` calls into a single, more efficient request to the Logging API. The
165+
`logbackBatchingSettings` in the `logback.xml` file configures the batching behavior:
166+
167+
```
168+
<logbackBatchingSettings>
169+
<elementCountThreshold>100</elementCountThreshold> <!-- Send a writeLogEntries request once the number of log entries in a batch is over 100 -->
170+
<requestByteThreshold>1000</requestByteThreshold> <!-- Send a writeLogEntries request once the total size of log entries in a batch is over 1000 bytes -->
171+
<delayThreshold>500</delayThreshold> <!-- Send a writeLogEntries request once the 500 ms duration has passed since the first log entry created the batch -->
172+
<maxOutstandingElementCount>10000</maxOutstandingElementCount>
173+
<maxOutstandingRequestBytes>100000</maxOutstandingRequestBytes>
174+
<limitExceededBehavior>Ignore</limitExceededBehavior>
175+
</logbackBatchingSettings>
176+
```
177+
Here are some explanations for [BatchingSettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.batching.BatchingSettings):
178+
* `elementCountThreshold`: Triggers a `writeLogEntries` request when the number of batched log entries exceeds this threshold.
179+
* `requestByteThreshold`: Triggers a `writeLogEntries` request when the total size of batched log entries (in bytes) exceeds this threshold.
180+
* `delayThreshold`: Triggers a `writeLogEntries` request when the threshold in milliseconds has passed since the first log entry created the batch.
181+
182+
Batching also supports [FlowControl](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.batching.FlowControlSettings), which can be used to
183+
prevent the batching implementation from accumulating messages without limit, resulting eventually in an OutOfMemory exception. These settings in the configuration controls
184+
flow control behavior:
185+
186+
* `maxOutstandingElementCount`: When the total number of outstanding log events exceeds this threshold, flow control will be initiated.
187+
* `maxOutstandingRequestBytes`: When the total size of outstanding `writeLogEntries` requests exceeds this threshold, flow control will be initiated.
188+
* `limitExceededBehavior`: This value defines what action the appender should take when the configured limits (like `maxOutstandingRequestBytes` or `maxOutstandingElementCount`) are exceeded.
189+
190+
For more information about batching configurations, see [BatchingSettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.batching.BatchingSettings).
191+
162192
### Populate log entries with metadata
163193

164194
The library provides multiple ways to enrich log entries with additional information.

‎pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<artifactId>google-cloud-logging-logback</artifactId>
8-
<version>0.132.6-alpha</version><!-- {x-version-update:google-cloud-logging-logback:current} -->
8+
<version>0.132.8-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging-logback:current} -->
99
<packaging>jar</packaging>
1010
<name>Google Cloud Logging Logback Appender</name>
1111
<url>https://github.com/googleapis/java-logging-logback</url>
@@ -15,17 +15,17 @@
1515

1616
<properties>
1717
<logback.version>1.2.13</logback.version>
18-
<easymock.version>5.5.0</easymock.version>
18+
<easymock.version>5.6.0</easymock.version>
1919
<truth.version>1.4.4</truth.version>
20-
<logging.version>3.22.2</logging.version>
20+
<logging.version>3.22.3</logging.version>
2121
<slf4j.version>1.7.36</slf4j.version>
2222
<google.api-common.version>1.10.1</google.api-common.version>
2323
</properties>
2424

2525
<parent>
2626
<groupId>com.google.cloud</groupId>
2727
<artifactId>sdk-platform-java-config</artifactId>
28-
<version>3.46.2</version>
28+
<version>3.48.0</version>
2929
</parent>
3030

3131
<developers>

‎renovate.json

Lines changed: 48 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
":updateNotScheduled",
88
":automergeDisabled",
99
":ignoreModulesAndTests",
10-
":maintainLockFilesDisabled",
11-
":autodetectPinVersions"
10+
":maintainLockFilesDisabled"
1211
],
1312
"ignorePaths": [
1413
".kokoro/requirements.txt",
@@ -23,7 +22,9 @@
2322
"fileMatch": [
2423
"^.kokoro/presubmit/graalvm-native.*.cfg$"
2524
],
26-
"matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?<currentValue>.*?)\""],
25+
"matchStrings": [
26+
"value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?<currentValue>.*?)\""
27+
],
2728
"depNameTemplate": "com.google.cloud:sdk-platform-java-config",
2829
"datasourceTemplate": "maven"
2930
},
@@ -32,71 +33,73 @@
3233
"fileMatch": [
3334
"^.github/workflows/unmanaged_dependency_check.yaml$"
3435
],
35-
"matchStrings": ["uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?<currentValue>.+?)\\n"],
36+
"matchStrings": [
37+
"uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?<currentValue>.+?)\\n"
38+
],
3639
"depNameTemplate": "com.google.cloud:sdk-platform-java-config",
3740
"datasourceTemplate": "maven"
3841
}
3942
],
4043
"packageRules": [
4144
{
42-
"packagePatterns": [
43-
"^com.google.guava:"
44-
],
45-
"versionScheme": "docker"
45+
"versioning": "docker",
46+
"matchPackageNames": [
47+
"/^com.google.guava:/"
48+
]
4649
},
4750
{
48-
"packagePatterns": [
49-
"*"
50-
],
5151
"semanticCommitType": "deps",
52-
"semanticCommitScope": null
52+
"semanticCommitScope": null,
53+
"matchPackageNames": [
54+
"*"
55+
]
5356
},
5457
{
55-
"packagePatterns": [
56-
"^org.apache.maven",
57-
"^org.jacoco:",
58-
"^org.codehaus.mojo:",
59-
"^org.sonatype.plugins:",
60-
"^com.coveo:",
61-
"^com.google.cloud:google-cloud-shared-config"
62-
],
6358
"semanticCommitType": "build",
64-
"semanticCommitScope": "deps"
59+
"semanticCommitScope": "deps",
60+
"matchPackageNames": [
61+
"/^org.apache.maven/",
62+
"/^org.jacoco:/",
63+
"/^org.codehaus.mojo:/",
64+
"/^org.sonatype.plugins:/",
65+
"/^com.coveo:/",
66+
"/^com.google.cloud:google-cloud-shared-config/"
67+
]
6568
},
6669
{
67-
"packagePatterns": [
68-
"^com.google.cloud:google-cloud-logging-logback",
69-
"^com.google.cloud:libraries-bom",
70-
"^com.google.cloud.samples:shared-configuration"
71-
],
7270
"semanticCommitType": "chore",
73-
"semanticCommitScope": "deps"
71+
"semanticCommitScope": "deps",
72+
"matchPackageNames": [
73+
"/^com.google.cloud:google-cloud-logging-logback/",
74+
"/^com.google.cloud:libraries-bom/",
75+
"/^com.google.cloud.samples:shared-configuration/"
76+
]
7477
},
7578
{
76-
"packagePatterns": [
77-
"^junit:junit",
78-
"^com.google.truth:truth",
79-
"^org.mockito:mockito-core",
80-
"^org.objenesis:objenesis",
81-
"^com.google.cloud:google-cloud-conformance-tests",
82-
"^org.graalvm.buildtools:junit-platform-native"
83-
],
8479
"semanticCommitType": "test",
85-
"semanticCommitScope": "deps"
80+
"semanticCommitScope": "deps",
81+
"matchPackageNames": [
82+
"/^junit:junit/",
83+
"/^com.google.truth:truth/",
84+
"/^org.mockito:mockito-core/",
85+
"/^org.objenesis:objenesis/",
86+
"/^com.google.cloud:google-cloud-conformance-tests/",
87+
"/^org.graalvm.buildtools:junit-platform-native/"
88+
]
8689
},
8790
{
88-
"packagePatterns": [
89-
"^com.google.cloud:google-cloud-"
90-
],
91-
"ignoreUnstable": false
91+
"ignoreUnstable": false,
92+
"matchPackageNames": [
93+
"/^com.google.cloud:google-cloud-/"
94+
]
9295
},
9396
{
94-
"packagePatterns": [
95-
"^com.fasterxml.jackson.core"
96-
],
97-
"groupName": "jackson dependencies"
97+
"groupName": "jackson dependencies",
98+
"matchPackageNames": [
99+
"/^com.fasterxml.jackson.core/"
100+
]
98101
}
99102
],
100-
"semanticCommits": true,
103+
"semanticCommits": "enabled",
101104
"dependencyDashboard": true
102105
}

0 commit comments

Comments
 (0)