diff --git a/.kokoro/common.cfg b/.kokoro/common.cfg index e0398ca2..bb469abb 100644 --- a/.kokoro/common.cfg +++ b/.kokoro/common.cfg @@ -11,3 +11,23 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-errorreporting/.kokoro/build.sh" } + + +############################################# +# this section merged from .kokoro/common_env_vars.cfg using owlbot.py + +env_vars: { + key: "PRODUCT_AREA_LABEL" + value: "observability" +} +env_vars: { + key: "PRODUCT_LABEL" + value: "error-reporting" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "java" +} + +################################################### + diff --git a/.kokoro/common_env_vars.cfg b/.kokoro/common_env_vars.cfg new file mode 100644 index 00000000..f523628d --- /dev/null +++ b/.kokoro/common_env_vars.cfg @@ -0,0 +1,19 @@ + +############################################# +# this section merged from .kokoro/common_env_vars.cfg using owlbot.py + +env_vars: { + key: "PRODUCT_AREA_LABEL" + value: "observability" +} +env_vars: { + key: "PRODUCT_LABEL" + value: "error-reporting" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "java" +} + +################################################### + diff --git a/.kokoro/continuous/common.cfg b/.kokoro/continuous/common.cfg index 00ab554d..dc381950 100644 --- a/.kokoro/continuous/common.cfg +++ b/.kokoro/continuous/common.cfg @@ -23,3 +23,23 @@ env_vars: { key: "JOB_TYPE" value: "test" } + + +############################################# +# this section merged from .kokoro/common_env_vars.cfg using owlbot.py + +env_vars: { + key: "PRODUCT_AREA_LABEL" + value: "observability" +} +env_vars: { + key: "PRODUCT_LABEL" + value: "error-reporting" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "java" +} + +################################################### + diff --git a/.kokoro/nightly/common.cfg b/.kokoro/nightly/common.cfg index 00ab554d..dc381950 100644 --- a/.kokoro/nightly/common.cfg +++ b/.kokoro/nightly/common.cfg @@ -23,3 +23,23 @@ env_vars: { key: "JOB_TYPE" value: "test" } + + +############################################# +# this section merged from .kokoro/common_env_vars.cfg using owlbot.py + +env_vars: { + key: "PRODUCT_AREA_LABEL" + value: "observability" +} +env_vars: { + key: "PRODUCT_LABEL" + value: "error-reporting" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "java" +} + +################################################### + diff --git a/.kokoro/presubmit/common.cfg b/.kokoro/presubmit/common.cfg index 276117b2..47544295 100644 --- a/.kokoro/presubmit/common.cfg +++ b/.kokoro/presubmit/common.cfg @@ -32,3 +32,23 @@ before_action { } } } + + +############################################# +# this section merged from .kokoro/common_env_vars.cfg using owlbot.py + +env_vars: { + key: "PRODUCT_AREA_LABEL" + value: "observability" +} +env_vars: { + key: "PRODUCT_LABEL" + value: "error-reporting" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "java" +} + +################################################### + diff --git a/.kokoro/release/common.cfg b/.kokoro/release/common.cfg index f5159234..a7242a91 100644 --- a/.kokoro/release/common.cfg +++ b/.kokoro/release/common.cfg @@ -47,3 +47,23 @@ before_action { } } } + + +############################################# +# this section merged from .kokoro/common_env_vars.cfg using owlbot.py + +env_vars: { + key: "PRODUCT_AREA_LABEL" + value: "observability" +} +env_vars: { + key: "PRODUCT_LABEL" + value: "error-reporting" +} +env_vars: { + key: "LANGUAGE_LABEL" + value: "java" +} + +################################################### + diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e7e61a9..4a664464 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.124.4](https://github.com/googleapis/java-errorreporting/compare/v0.124.3...v0.124.4) (2022-08-25) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-core to v2.8.10 ([#925](https://github.com/googleapis/java-errorreporting/issues/925)) ([ea452d1](https://github.com/googleapis/java-errorreporting/commit/ea452d1156c0bfd20fb30a25f48a31239058d5b4)) + ## [0.124.3](https://github.com/googleapis/java-errorreporting/compare/v0.124.2...v0.124.3) (2022-08-17) diff --git a/README.md b/README.md index 1ca95c19..aaff0e8d 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-errorreporting - 0.124.2-beta + 0.124.3-beta ``` @@ -78,13 +78,13 @@ implementation 'com.google.cloud:google-cloud-errorreporting' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-errorreporting:0.124.2-beta' +implementation 'com.google.cloud:google-cloud-errorreporting:0.124.3-beta' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-errorreporting" % "0.124.2-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-errorreporting" % "0.124.3-beta" ``` ## Authentication diff --git a/google-cloud-errorreporting-bom/pom.xml b/google-cloud-errorreporting-bom/pom.xml index 77bbad4e..c0345035 100644 --- a/google-cloud-errorreporting-bom/pom.xml +++ b/google-cloud-errorreporting-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-errorreporting-bom - 0.124.3-beta + 0.124.4-beta pom com.google.cloud @@ -52,17 +52,17 @@ com.google.cloud google-cloud-errorreporting - 0.124.3-beta + 0.124.4-beta com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.90.3 + 0.90.4 com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.90.3 + 0.90.4 diff --git a/google-cloud-errorreporting/pom.xml b/google-cloud-errorreporting/pom.xml index 3959b726..c90a9519 100644 --- a/google-cloud-errorreporting/pom.xml +++ b/google-cloud-errorreporting/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-errorreporting - 0.124.3-beta + 0.124.4-beta jar Google Cloud Error Reporting https://github.com/googleapis/java-errorreporting @@ -11,7 +11,7 @@ com.google.cloud google-cloud-errorreporting-parent - 0.124.3-beta + 0.124.4-beta google-cloud-errorreporting diff --git a/grpc-google-cloud-error-reporting-v1beta1/pom.xml b/grpc-google-cloud-error-reporting-v1beta1/pom.xml index b87955b9..3dfff3bf 100644 --- a/grpc-google-cloud-error-reporting-v1beta1/pom.xml +++ b/grpc-google-cloud-error-reporting-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.90.3 + 0.90.4 grpc-google-cloud-error-reporting-v1beta1 GRPC library for grpc-google-cloud-error-reporting-v1beta1 com.google.cloud google-cloud-errorreporting-parent - 0.124.3-beta + 0.124.4-beta diff --git a/owlbot.py b/owlbot.py index aef0e36c..85875cf8 100644 --- a/owlbot.py +++ b/owlbot.py @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import os import synthtool as s from synthtool.languages import java @@ -75,3 +76,25 @@ s.remove_staging_dirs() java.common_templates(excludes=['.github/auto-label.yaml']) + +# -------------------------------------------------------------------------- +# Modify test configs +# -------------------------------------------------------------------------- + +# add shared environment variables to test configs +s.move( + ".kokoro/common_env_vars.cfg", + ".kokoro/common.cfg", + merge=lambda src, dst, _, : f"{dst}\n{src}", +) +tracked_subdirs = ["continuous", "presubmit", "release", "nightly"] +for subdir in tracked_subdirs: + for path, subdirs, files in os.walk(f".kokoro/{subdir}"): + for name in files: + if name == "common.cfg": + file_path = os.path.join(path, name) + s.move( + ".kokoro/common_env_vars.cfg", + file_path, + merge=lambda src, dst, _, : f"{dst}\n{src}", + ) diff --git a/pom.xml b/pom.xml index c4d8fbf3..bfbfa421 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-errorreporting-parent pom - 0.124.3-beta + 0.124.4-beta Google Cloud Error Reporting Parent https://github.com/googleapis/java-errorreporting @@ -61,18 +61,18 @@ com.google.cloud google-cloud-errorreporting - 0.124.3-beta + 0.124.4-beta com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.90.3 + 0.90.4 com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.90.3 + 0.90.4 diff --git a/proto-google-cloud-error-reporting-v1beta1/pom.xml b/proto-google-cloud-error-reporting-v1beta1/pom.xml index 01f41f48..a7558e33 100644 --- a/proto-google-cloud-error-reporting-v1beta1/pom.xml +++ b/proto-google-cloud-error-reporting-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.90.3 + 0.90.4 proto-google-cloud-error-reporting-v1beta1 PROTO library for proto-google-cloud-error-reporting-v1beta1 com.google.cloud google-cloud-errorreporting-parent - 0.124.3-beta + 0.124.4-beta diff --git a/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/CommonProto.java b/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/CommonProto.java index 047a8aa3..53e26e71 100644 --- a/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/CommonProto.java +++ b/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/CommonProto.java @@ -68,44 +68,44 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "beta1/common.proto\022+google.devtools.clou" + "derrorreporting.v1beta1\032\031google/api/reso" + "urce.proto\032\037google/protobuf/timestamp.pr" - + "oto\032\034google/api/annotations.proto\"\262\002\n\nEr" - + "rorGroup\022\014\n\004name\030\001 \001(\t\022\020\n\010group_id\030\002 \001(\t" - + "\022S\n\017tracking_issues\030\003 \003(\0132:.google.devto" - + "ols.clouderrorreporting.v1beta1.Tracking" - + "Issue\022X\n\021resolution_status\030\005 \001(\0162=.googl" - + "e.devtools.clouderrorreporting.v1beta1.R" - + "esolutionStatus:U\352AR\n-clouderrorreportin" - + "g.googleapis.com/ErrorGroup\022!projects/{p" - + "roject}/groups/{group}\"\034\n\rTrackingIssue\022" - + "\013\n\003url\030\001 \001(\t\"\357\001\n\nErrorEvent\022.\n\nevent_tim" - + "e\030\001 \001(\0132\032.google.protobuf.Timestamp\022T\n\017s" - + "ervice_context\030\002 \001(\0132;.google.devtools.c" - + "louderrorreporting.v1beta1.ServiceContex" - + "t\022\017\n\007message\030\003 \001(\t\022J\n\007context\030\005 \001(\01329.go" + + "oto\"\262\002\n\nErrorGroup\022\014\n\004name\030\001 \001(\t\022\020\n\010grou" + + "p_id\030\002 \001(\t\022S\n\017tracking_issues\030\003 \003(\0132:.go" + "ogle.devtools.clouderrorreporting.v1beta" - + "1.ErrorContext\"I\n\016ServiceContext\022\017\n\007serv" - + "ice\030\002 \001(\t\022\017\n\007version\030\003 \001(\t\022\025\n\rresource_t" - + "ype\030\004 \001(\t\"\311\001\n\014ErrorContext\022U\n\014http_reque" - + "st\030\001 \001(\0132?.google.devtools.clouderrorrep" - + "orting.v1beta1.HttpRequestContext\022\014\n\004use" - + "r\030\002 \001(\t\022T\n\017report_location\030\003 \001(\0132;.googl" - + "e.devtools.clouderrorreporting.v1beta1.S" - + "ourceLocation\"\210\001\n\022HttpRequestContext\022\016\n\006" - + "method\030\001 \001(\t\022\013\n\003url\030\002 \001(\t\022\022\n\nuser_agent\030" - + "\003 \001(\t\022\020\n\010referrer\030\004 \001(\t\022\034\n\024response_stat" - + "us_code\030\005 \001(\005\022\021\n\tremote_ip\030\006 \001(\t\"O\n\016Sour" - + "ceLocation\022\021\n\tfile_path\030\001 \001(\t\022\023\n\013line_nu" - + "mber\030\002 \001(\005\022\025\n\rfunction_name\030\004 \001(\t*j\n\020Res" - + "olutionStatus\022!\n\035RESOLUTION_STATUS_UNSPE" - + "CIFIED\020\000\022\010\n\004OPEN\020\001\022\020\n\014ACKNOWLEDGED\020\002\022\014\n\010" - + "RESOLVED\020\003\022\t\n\005MUTED\020\004B\230\002\n/com.google.dev" - + "tools.clouderrorreporting.v1beta1B\013Commo" - + "nProtoP\001Z^google.golang.org/genproto/goo" - + "gleapis/devtools/clouderrorreporting/v1b" - + "eta1;clouderrorreporting\370\001\001\252\002#Google.Clo" - + "ud.ErrorReporting.V1Beta1\312\002#Google\\Cloud" - + "\\ErrorReporting\\V1beta1\352\002&Google::Cloud:" - + ":ErrorReporting::V1beta1b\006proto3" + + "1.TrackingIssue\022X\n\021resolution_status\030\005 \001" + + "(\0162=.google.devtools.clouderrorreporting" + + ".v1beta1.ResolutionStatus:U\352AR\n-clouderr" + + "orreporting.googleapis.com/ErrorGroup\022!p" + + "rojects/{project}/groups/{group}\"\034\n\rTrac" + + "kingIssue\022\013\n\003url\030\001 \001(\t\"\357\001\n\nErrorEvent\022.\n" + + "\nevent_time\030\001 \001(\0132\032.google.protobuf.Time" + + "stamp\022T\n\017service_context\030\002 \001(\0132;.google." + + "devtools.clouderrorreporting.v1beta1.Ser" + + "viceContext\022\017\n\007message\030\003 \001(\t\022J\n\007context\030" + + "\005 \001(\01329.google.devtools.clouderrorreport" + + "ing.v1beta1.ErrorContext\"I\n\016ServiceConte" + + "xt\022\017\n\007service\030\002 \001(\t\022\017\n\007version\030\003 \001(\t\022\025\n\r" + + "resource_type\030\004 \001(\t\"\311\001\n\014ErrorContext\022U\n\014" + + "http_request\030\001 \001(\0132?.google.devtools.clo" + + "uderrorreporting.v1beta1.HttpRequestCont" + + "ext\022\014\n\004user\030\002 \001(\t\022T\n\017report_location\030\003 \001" + + "(\0132;.google.devtools.clouderrorreporting" + + ".v1beta1.SourceLocation\"\210\001\n\022HttpRequestC" + + "ontext\022\016\n\006method\030\001 \001(\t\022\013\n\003url\030\002 \001(\t\022\022\n\nu" + + "ser_agent\030\003 \001(\t\022\020\n\010referrer\030\004 \001(\t\022\034\n\024res" + + "ponse_status_code\030\005 \001(\005\022\021\n\tremote_ip\030\006 \001" + + "(\t\"O\n\016SourceLocation\022\021\n\tfile_path\030\001 \001(\t\022" + + "\023\n\013line_number\030\002 \001(\005\022\025\n\rfunction_name\030\004 " + + "\001(\t*j\n\020ResolutionStatus\022!\n\035RESOLUTION_ST" + + "ATUS_UNSPECIFIED\020\000\022\010\n\004OPEN\020\001\022\020\n\014ACKNOWLE" + + "DGED\020\002\022\014\n\010RESOLVED\020\003\022\t\n\005MUTED\020\004B\230\002\n/com." + + "google.devtools.clouderrorreporting.v1be" + + "ta1B\013CommonProtoP\001Z^google.golang.org/ge" + + "nproto/googleapis/devtools/clouderrorrep" + + "orting/v1beta1;clouderrorreporting\370\001\001\252\002#" + + "Google.Cloud.ErrorReporting.V1Beta1\312\002#Go" + + "ogle\\Cloud\\ErrorReporting\\V1beta1\352\002&Goog" + + "le::Cloud::ErrorReporting::V1beta1b\006prot" + + "o3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -113,7 +113,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.Descriptors.FileDescriptor[] { com.google.api.ResourceProto.getDescriptor(), com.google.protobuf.TimestampProto.getDescriptor(), - com.google.api.AnnotationsProto.getDescriptor(), }); internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorGroup_descriptor = getDescriptor().getMessageTypes().get(0); @@ -178,7 +177,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { descriptor, registry); com.google.api.ResourceProto.getDescriptor(); com.google.protobuf.TimestampProto.getDescriptor(); - com.google.api.AnnotationsProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/proto-google-cloud-error-reporting-v1beta1/src/main/proto/google/devtools/clouderrorreporting/v1beta1/common.proto b/proto-google-cloud-error-reporting-v1beta1/src/main/proto/google/devtools/clouderrorreporting/v1beta1/common.proto index e9bb321e..8025368c 100644 --- a/proto-google-cloud-error-reporting-v1beta1/src/main/proto/google/devtools/clouderrorreporting/v1beta1/common.proto +++ b/proto-google-cloud-error-reporting-v1beta1/src/main/proto/google/devtools/clouderrorreporting/v1beta1/common.proto @@ -18,7 +18,6 @@ package google.devtools.clouderrorreporting.v1beta1; import "google/api/resource.proto"; import "google/protobuf/timestamp.proto"; -import "google/api/annotations.proto"; option cc_enable_arenas = true; option csharp_namespace = "Google.Cloud.ErrorReporting.V1Beta1"; diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index f6502bd3..4830989c 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,14 +29,14 @@ com.google.cloud google-cloud-errorreporting - 0.124.2-beta + 0.124.3-beta com.google.cloud google-cloud-core - 2.8.9 + 2.8.10 junit diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index fe06a4b2..e1878234 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,14 +28,14 @@ com.google.cloud google-cloud-errorreporting - 0.124.3-beta + 0.124.4-beta com.google.cloud google-cloud-core - 2.8.9 + 2.8.10 junit diff --git a/versions.txt b/versions.txt index 9a1311c8..1d17d86a 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-errorreporting:0.124.3-beta:0.124.3-beta -grpc-google-cloud-error-reporting-v1beta1:0.90.3:0.90.3 -proto-google-cloud-error-reporting-v1beta1:0.90.3:0.90.3 +google-cloud-errorreporting:0.124.4-beta:0.124.4-beta +grpc-google-cloud-error-reporting-v1beta1:0.90.4:0.90.4 +proto-google-cloud-error-reporting-v1beta1:0.90.4:0.90.4