diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 75183c673..8b479f3a4 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -17,6 +17,9 @@ name: Hermetic library generation upon generation config change through pull req
on:
pull_request:
+env:
+ HEAD_REF: ${{ github.head_ref }}
+
jobs:
library_generation:
# skip pull requests come from a forked repository
@@ -35,6 +38,6 @@ jobs:
[ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
bash .github/scripts/hermetic_library_generation.sh \
--target_branch ${{ github.base_ref }} \
- --current_branch ${{ github.head_ref }}
+ --current_branch $HEAD_REF
env:
GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index bc214ad0c..5b7b1b486 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -17,6 +17,6 @@ jobs:
# repository
.kokoro/build.sh
- name: Unmanaged dependency check
- uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.32.0
+ uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.33.0
with:
bom-path: google-cloud-logging-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 7d5ab3a25..7008a7215 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.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.32.0"
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.33.0"
}
env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 519c2e3ce..931f9bb00 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.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.32.0"
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.33.0"
}
env_vars: {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ed248472..9be2eac76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
# Changelog
+## [3.20.0](https://github.com/googleapis/java-logging/compare/v3.19.0...v3.20.0) (2024-08-02)
+
+
+### Features
+
+* Enable hermetic library generation ([#1620](https://github.com/googleapis/java-logging/issues/1620)) ([034b9c4](https://github.com/googleapis/java-logging/commit/034b9c42ac8ba12f20dbde9e90ae8e59ea4c5748))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#1664](https://github.com/googleapis/java-logging/issues/1664)) ([cb6de76](https://github.com/googleapis/java-logging/commit/cb6de767ba726a1178b4ebd0b481a4fc2454b910))
+
+
+### Documentation
+
+* Documentation update for OpenTelemetry and tracing ([#1657](https://github.com/googleapis/java-logging/issues/1657)) ([e3c6670](https://github.com/googleapis/java-logging/commit/e3c667094170ac7d404addc797facbe997ca51d3))
+
## [3.19.0](https://github.com/googleapis/java-logging/compare/v3.18.0...v3.19.0) (2024-06-26)
diff --git a/generation_config.yaml b/generation_config.yaml
index 222407c8f..b01689663 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,6 +1,6 @@
-gapic_generator_version: 2.42.0
-googleapis_commitish: 6f289d775912966eb0cf04bda91e5e355c998d30
-libraries_bom_version: 26.38.0
+gapic_generator_version: 2.43.0
+googleapis_commitish: c37b7f00ae5b9ce0d33ae28473d993cdaa5550cb
+libraries_bom_version: 26.43.0
libraries:
- api_shortname: logging
name_pretty: Cloud Logging
diff --git a/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml
index a7fa6fcba..96425c35b 100644
--- a/google-cloud-logging-bom/pom.xml
+++ b/google-cloud-logging-bom/pom.xml
@@ -3,12 +3,12 @@
4.0.0
com.google.cloud
google-cloud-logging-bom
- 3.19.0
+ 3.20.0
pom
com.google.cloud
google-cloud-shared-config
- 1.8.0
+ 1.9.1
Google Cloud logging BOM
@@ -53,17 +53,17 @@
com.google.cloud
google-cloud-logging
- 3.19.0
+ 3.20.0
com.google.api.grpc
grpc-google-cloud-logging-v2
- 0.108.0
+ 0.109.0
com.google.api.grpc
proto-google-cloud-logging-v2
- 0.108.0
+ 0.109.0
diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml
index a9cff71e6..702bcff41 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.19.0
+ 3.20.0
jar
Google Cloud Logging
https://github.com/googleapis/java-logging
@@ -11,7 +11,7 @@
com.google.cloud
google-cloud-logging-parent
- 3.19.0
+ 3.20.0
google-cloud-logging
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java
index 6b330b7a0..89f8af752 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java
@@ -40,7 +40,7 @@ public final class Instrumentation {
// See
// https://github.com/googleapis/release-please/blob/main/docs/customizing.md#updating-arbitrary-files
// {x-version-update-start:google-cloud-logging:current}
- public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.19.0";
+ public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.20.0";
// {x-version-update-end}
public static final String INSTRUMENTATION_LOG_NAME = "diagnostic-log";
public static final int MAX_DIAGNOSTIC_VALUE_LENGTH = 14;
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java
index 29323d068..bbe4525d8 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java
@@ -24,6 +24,7 @@
import com.google.api.core.ApiFunction;
import com.google.api.core.ApiFuture;
+import com.google.api.core.ObsoleteApi;
import com.google.api.gax.core.GaxProperties;
import com.google.api.gax.core.GoogleCredentialsProvider;
import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -690,6 +691,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
}
/** Returns the default service endpoint. */
+ @ObsoleteApi("Use getEndpoint() instead")
public static String getDefaultEndpoint() {
return "logging.googleapis.com:443";
}
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java
index f994abe37..d4f3c30bd 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java
@@ -23,6 +23,7 @@
import com.google.api.MonitoredResourceDescriptor;
import com.google.api.core.ApiFunction;
import com.google.api.core.ApiFuture;
+import com.google.api.core.ObsoleteApi;
import com.google.api.gax.batching.BatchingSettings;
import com.google.api.gax.batching.FlowControlSettings;
import com.google.api.gax.batching.FlowController;
@@ -449,6 +450,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
}
/** Returns the default service endpoint. */
+ @ObsoleteApi("Use getEndpoint() instead")
public static String getDefaultEndpoint() {
return "logging.googleapis.com:443";
}
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java
index f8df3e601..84eecd198 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java
@@ -20,6 +20,7 @@
import com.google.api.core.ApiFunction;
import com.google.api.core.ApiFuture;
+import com.google.api.core.ObsoleteApi;
import com.google.api.gax.core.GaxProperties;
import com.google.api.gax.core.GoogleCredentialsProvider;
import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -217,6 +218,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
}
/** Returns the default service endpoint. */
+ @ObsoleteApi("Use getEndpoint() instead")
public static String getDefaultEndpoint() {
return "logging.googleapis.com:443";
}
diff --git a/grpc-google-cloud-logging-v2/pom.xml b/grpc-google-cloud-logging-v2/pom.xml
index a2d583419..5761d1f5d 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.108.0
+ 0.109.0
grpc-google-cloud-logging-v2
GRPC library for grpc-google-cloud-logging-v2
com.google.cloud
google-cloud-logging-parent
- 3.19.0
+ 3.20.0
diff --git a/pom.xml b/pom.xml
index a5f5b8f2a..388879c26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-logging-parent
pom
- 3.19.0
+ 3.20.0
Google Cloud Logging Parent
https://github.com/googleapis/java-logging
@@ -14,7 +14,7 @@
com.google.cloud
sdk-platform-java-config
- 3.32.0
+ 3.33.0
@@ -80,17 +80,17 @@
com.google.api.grpc
proto-google-cloud-logging-v2
- 0.108.0
+ 0.109.0
com.google.api.grpc
grpc-google-cloud-logging-v2
- 0.108.0
+ 0.109.0
com.google.cloud
google-cloud-logging
- 3.19.0
+ 3.20.0
@@ -213,7 +213,7 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.5.0
+ 3.6.2
diff --git a/proto-google-cloud-logging-v2/pom.xml b/proto-google-cloud-logging-v2/pom.xml
index 9aa7442a1..fa621a9aa 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.108.0
+ 0.109.0
proto-google-cloud-logging-v2
PROTO library for proto-google-cloud-logging-v2
com.google.cloud
google-cloud-logging-parent
- 3.19.0
+ 3.20.0
diff --git a/renovate.json b/renovate.json
index 5f83e4b45..31da469c7 100644
--- a/renovate.json
+++ b/renovate.json
@@ -20,7 +20,7 @@
"customManagers": [
{
"customType": "regex",
- "fileMatch": [
+ "fileMatch": [
"^.kokoro/presubmit/graalvm-native.*.cfg$"
],
"matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?.*?)\""],
@@ -30,7 +30,7 @@
{
"customType": "regex",
"fileMatch": [
- "^.github/workflows/unmanaged_dependency_check.yaml$"
+ "^.github/workflows/unmanaged_dependency_check.yaml$"
],
"matchStrings": ["uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?.+?)\\n"],
"depNameTemplate": "com.google.cloud:sdk-platform-java-config",
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index d912e2d2d..d63215ae7 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -121,7 +121,7 @@
org.apache.maven.plugins
maven-surefire-plugin
- 3.2.5
+ 3.3.1
**/IT*
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 5a602e9af..9bc737cc8 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-logging
- 3.19.0
+ 3.20.0
diff --git a/versions.txt b/versions.txt
index a0c1b2209..5bc7fc4d6 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,6 +1,6 @@
# Format:
# module:released-version:current-version
-google-cloud-logging:3.19.0:3.19.0
-grpc-google-cloud-logging-v2:0.108.0:0.108.0
-proto-google-cloud-logging-v2:0.108.0:0.108.0
+google-cloud-logging:3.20.0:3.20.0
+grpc-google-cloud-logging-v2:0.109.0:0.109.0
+proto-google-cloud-logging-v2:0.109.0:0.109.0