diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index d9995d71..b0843b7e 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-trace.git", - "sha": "fa0dcbc0161937ea119176824516846c8ae24007" + "sha": "2c1da59174e9ce7512aa0f076736245168569beb" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "0199c79b8324fba66476300824aa931788c47e2d" + "sha": "2e7bd5cc66a3f0b90ce1c150eb35c89eeb9872d6" } } ] diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 7c8816a7..9b4fd4d8 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -16,8 +16,8 @@ jobs: return; } - // only approve PRs like "chore(master): release " - if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) { + // only approve PRs like "chore: release " + if ( !context.payload.pull_request.title.startsWith("chore: release") ) { return; } diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg index 740b9c9f..c8af4326 100644 --- a/.kokoro/release/publish_javadoc.cfg +++ b/.kokoro/release/publish_javadoc.cfg @@ -7,12 +7,6 @@ env_vars: { value: "docs-staging" } -# cloud-rad staging -env_vars: { - key: "STAGING_BUCKET_V2" - value: "docs-staging-v2-staging" -} - env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-trace/.kokoro/release/publish_javadoc.sh" @@ -26,4 +20,4 @@ before_action { keyname: "docuploader_service_account" } } -} \ No newline at end of file +} diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index 000c5b49..fbfe9383 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -56,22 +56,3 @@ python3 -m docuploader create-metadata \ python3 -m docuploader upload . \ --credentials ${CREDENTIALS} \ --staging-bucket ${STAGING_BUCKET} - -popd - -# V2 due to problems w/ the released javadoc plugin doclava, Java 8 is required. Beware of accidental updates. - -mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/" - -pushd target/devsite/reference - -# create metadata -python3 -m docuploader create-metadata \ - --name ${NAME} \ - --version ${VERSION} \ - --language java - -# upload docs to staging bucket -python3 -m docuploader upload . \ - --credentials ${CREDENTIALS} \ - --staging-bucket ${STAGING_BUCKET_V2} diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 8de7c07b..6363e5ff 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -40,6 +40,9 @@ export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) # generate yml mvn clean site -B -q -P docFX +# copy README to docfx-yml dir and rename index.md +cp README.md target/docfx-yml/index.md + pushd target/docfx-yml # create metadata @@ -52,4 +55,4 @@ python3 -m docuploader create-metadata \ python3 -m docuploader upload . \ --credentials ${CREDENTIALS} \ --staging-bucket ${STAGING_BUCKET_V2} \ - --destination-prefix docfx- + --destination-prefix docfx diff --git a/CHANGELOG.md b/CHANGELOG.md index 35ab92fa..fd6a5852 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.3.0](https://www.github.com/googleapis/java-trace/compare/v1.2.13...v1.3.0) (2021-03-11) + + +### Features + +* **generator:** update protoc to v3.15.3 ([#438](https://www.github.com/googleapis/java-trace/issues/438)) ([ebd87e7](https://www.github.com/googleapis/java-trace/commit/ebd87e7be287da54fa038e602b39bb80f897fc39)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.20.1 ([#452](https://www.github.com/googleapis/java-trace/issues/452)) ([b1ab848](https://www.github.com/googleapis/java-trace/commit/b1ab8481dcf67e8184babfa1e59fb895e99a9aec)) + ### [1.2.13](https://www.github.com/googleapis/java-trace/compare/v1.2.12...v1.2.13) (2021-02-25) diff --git a/README.md b/README.md index 87356a0f..eec710c7 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 18.0.0 + 19.0.0 pom import @@ -38,25 +38,25 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-trace - 1.2.12 + 1.2.13 ``` If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:18.0.0') +implementation platform('com.google.cloud:libraries-bom:19.0.0') compile 'com.google.cloud:google-cloud-trace' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-trace:1.2.12' +compile 'com.google.cloud:google-cloud-trace:1.2.13' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-trace" % "1.2.12" +libraryDependencies += "com.google.cloud" % "google-cloud-trace" % "1.2.13" ``` ## Authentication diff --git a/google-cloud-trace-bom/pom.xml b/google-cloud-trace-bom/pom.xml index 420c4c70..84eee6cb 100644 --- a/google-cloud-trace-bom/pom.xml +++ b/google-cloud-trace-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-trace-bom - 1.2.13 + 1.3.0 pom com.google.cloud @@ -63,32 +63,32 @@ com.google.api.grpc proto-google-cloud-trace-v1 - 1.2.13 + 1.3.0 com.google.api.grpc grpc-google-cloud-trace-v1 - 1.2.13 + 1.3.0 com.google.api.grpc grpc-google-cloud-trace-v2 - 1.2.13 + 1.3.0 com.google.api.grpc proto-google-cloud-trace-v2 - 1.2.13 + 1.3.0 com.google.api.grpc proto-google-cloud-trace-v2 - 1.2.13 + 1.3.0 com.google.cloud google-cloud-trace - 1.2.13 + 1.3.0 diff --git a/google-cloud-trace/pom.xml b/google-cloud-trace/pom.xml index 2405cd83..0f87ede0 100644 --- a/google-cloud-trace/pom.xml +++ b/google-cloud-trace/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-trace - 1.2.13 + 1.3.0 jar Google Cloud Trace https://github.com/googleapis/java-trace @@ -13,7 +13,7 @@ com.google.cloud google-cloud-trace-parent - 1.2.13 + 1.3.0 google-cloud-trace diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceClient.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceClient.java index bb60a1e5..8d43b58c 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceClient.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceSettings.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceSettings.java index 1f5a94f8..8181abe9 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceSettings.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/package-info.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/package-info.java index e2011b48..36312407 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/package-info.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceCallableFactory.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceCallableFactory.java index b8593c64..25f71728 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceCallableFactory.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceCallableFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceStub.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceStub.java index 736b93f2..563da327 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceStub.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceStub.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStub.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStub.java index 43aa2845..d837dfce 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStub.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStub.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStubSettings.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStubSettings.java index 02d24d3b..b9e3dc2a 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStubSettings.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStubSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceClient.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceClient.java index 29a0c901..1baf1a70 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceClient.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceSettings.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceSettings.java index 7df61c55..63a8e240 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceSettings.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/package-info.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/package-info.java index 5a8f46b9..5956e6a6 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/package-info.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceCallableFactory.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceCallableFactory.java index b795c2f6..e52ab60c 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceCallableFactory.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceCallableFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceStub.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceStub.java index b12f4b7e..410fbe61 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceStub.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceStub.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStub.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStub.java index d34d7d36..87d3764c 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStub.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStub.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStubSettings.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStubSettings.java index 79d8ef2a..b64c4aab 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStubSettings.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStubSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceService.java b/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceService.java index bfb7cd37..646450c4 100644 --- a/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceService.java +++ b/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceServiceImpl.java b/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceServiceImpl.java index 6ec19cf7..7bc68f5b 100644 --- a/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceServiceImpl.java +++ b/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java b/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java index 9477c42e..bdc11375 100644 --- a/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java +++ b/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceService.java b/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceService.java index b1dbf104..caaed04c 100644 --- a/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceService.java +++ b/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceServiceImpl.java b/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceServiceImpl.java index a69eda42..cf60d263 100644 --- a/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceServiceImpl.java +++ b/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceClientTest.java b/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceClientTest.java index fa43462e..3e9a7f33 100644 --- a/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceClientTest.java +++ b/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceClientTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/grpc-google-cloud-trace-v1/pom.xml b/grpc-google-cloud-trace-v1/pom.xml index 0afc1a78..7309e1ea 100644 --- a/grpc-google-cloud-trace-v1/pom.xml +++ b/grpc-google-cloud-trace-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-trace-v1 - 1.2.13 + 1.3.0 grpc-google-cloud-trace-v1 GRPC library for grpc-google-cloud-trace-v1 com.google.cloud google-cloud-trace-parent - 1.2.13 + 1.3.0 diff --git a/grpc-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceServiceGrpc.java b/grpc-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceServiceGrpc.java index cea30718..2e523541 100644 --- a/grpc-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceServiceGrpc.java +++ b/grpc-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceServiceGrpc.java @@ -16,11 +16,6 @@ package com.google.devtools.cloudtrace.v1; import static io.grpc.MethodDescriptor.generateFullMethodName; -import static io.grpc.stub.ClientCalls.asyncUnaryCall; -import static io.grpc.stub.ClientCalls.blockingUnaryCall; -import static io.grpc.stub.ClientCalls.futureUnaryCall; -import static io.grpc.stub.ServerCalls.asyncUnaryCall; -import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; /** * @@ -241,7 +236,7 @@ public void listTraces( com.google.devtools.cloudtrace.v1.ListTracesRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getListTracesMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getListTracesMethod(), responseObserver); } /** @@ -254,7 +249,7 @@ public void listTraces( public void getTrace( com.google.devtools.cloudtrace.v1.GetTraceRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getGetTraceMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetTraceMethod(), responseObserver); } /** @@ -271,7 +266,8 @@ public void getTrace( public void patchTraces( com.google.devtools.cloudtrace.v1.PatchTracesRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getPatchTracesMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( + getPatchTracesMethod(), responseObserver); } @java.lang.Override @@ -279,20 +275,20 @@ public final io.grpc.ServerServiceDefinition bindService() { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getListTracesMethod(), - asyncUnaryCall( + io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< com.google.devtools.cloudtrace.v1.ListTracesRequest, com.google.devtools.cloudtrace.v1.ListTracesResponse>( this, METHODID_LIST_TRACES))) .addMethod( getGetTraceMethod(), - asyncUnaryCall( + io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< com.google.devtools.cloudtrace.v1.GetTraceRequest, com.google.devtools.cloudtrace.v1.Trace>(this, METHODID_GET_TRACE))) .addMethod( getPatchTracesMethod(), - asyncUnaryCall( + io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< com.google.devtools.cloudtrace.v1.PatchTracesRequest, com.google.protobuf.Empty>(this, METHODID_PATCH_TRACES))) @@ -333,7 +329,7 @@ public void listTraces( com.google.devtools.cloudtrace.v1.ListTracesRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnaryCall( + io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getListTracesMethod(), getCallOptions()), request, responseObserver); } @@ -347,7 +343,7 @@ public void listTraces( public void getTrace( com.google.devtools.cloudtrace.v1.GetTraceRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnaryCall( + io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getGetTraceMethod(), getCallOptions()), request, responseObserver); } @@ -365,7 +361,7 @@ public void getTrace( public void patchTraces( com.google.devtools.cloudtrace.v1.PatchTracesRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnaryCall( + io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getPatchTracesMethod(), getCallOptions()), request, responseObserver); @@ -404,7 +400,8 @@ protected TraceServiceBlockingStub build( */ public com.google.devtools.cloudtrace.v1.ListTracesResponse listTraces( com.google.devtools.cloudtrace.v1.ListTracesRequest request) { - return blockingUnaryCall(getChannel(), getListTracesMethod(), getCallOptions(), request); + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getListTracesMethod(), getCallOptions(), request); } /** @@ -416,7 +413,8 @@ public com.google.devtools.cloudtrace.v1.ListTracesResponse listTraces( */ public com.google.devtools.cloudtrace.v1.Trace getTrace( com.google.devtools.cloudtrace.v1.GetTraceRequest request) { - return blockingUnaryCall(getChannel(), getGetTraceMethod(), getCallOptions(), request); + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getGetTraceMethod(), getCallOptions(), request); } /** @@ -432,7 +430,8 @@ public com.google.devtools.cloudtrace.v1.Trace getTrace( */ public com.google.protobuf.Empty patchTraces( com.google.devtools.cloudtrace.v1.PatchTracesRequest request) { - return blockingUnaryCall(getChannel(), getPatchTracesMethod(), getCallOptions(), request); + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getPatchTracesMethod(), getCallOptions(), request); } } @@ -469,7 +468,7 @@ protected TraceServiceFutureStub build( public com.google.common.util.concurrent.ListenableFuture< com.google.devtools.cloudtrace.v1.ListTracesResponse> listTraces(com.google.devtools.cloudtrace.v1.ListTracesRequest request) { - return futureUnaryCall( + return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getListTracesMethod(), getCallOptions()), request); } @@ -483,7 +482,8 @@ protected TraceServiceFutureStub build( public com.google.common.util.concurrent.ListenableFuture< com.google.devtools.cloudtrace.v1.Trace> getTrace(com.google.devtools.cloudtrace.v1.GetTraceRequest request) { - return futureUnaryCall(getChannel().newCall(getGetTraceMethod(), getCallOptions()), request); + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getGetTraceMethod(), getCallOptions()), request); } /** @@ -499,7 +499,7 @@ protected TraceServiceFutureStub build( */ public com.google.common.util.concurrent.ListenableFuture patchTraces(com.google.devtools.cloudtrace.v1.PatchTracesRequest request) { - return futureUnaryCall( + return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getPatchTracesMethod(), getCallOptions()), request); } } diff --git a/grpc-google-cloud-trace-v2/pom.xml b/grpc-google-cloud-trace-v2/pom.xml index 4a697c6d..37ef1238 100644 --- a/grpc-google-cloud-trace-v2/pom.xml +++ b/grpc-google-cloud-trace-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-trace-v2 - 1.2.13 + 1.3.0 grpc-google-cloud-trace-v2 GRPC library for grpc-google-cloud-trace-v2 com.google.cloud google-cloud-trace-parent - 1.2.13 + 1.3.0 diff --git a/grpc-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TraceServiceGrpc.java b/grpc-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TraceServiceGrpc.java index d3cb43b4..b74aab26 100644 --- a/grpc-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TraceServiceGrpc.java +++ b/grpc-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TraceServiceGrpc.java @@ -16,11 +16,6 @@ package com.google.devtools.cloudtrace.v2; import static io.grpc.MethodDescriptor.generateFullMethodName; -import static io.grpc.stub.ClientCalls.asyncUnaryCall; -import static io.grpc.stub.ClientCalls.blockingUnaryCall; -import static io.grpc.stub.ClientCalls.futureUnaryCall; -import static io.grpc.stub.ServerCalls.asyncUnaryCall; -import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; /** * @@ -192,7 +187,8 @@ public abstract static class TraceServiceImplBase implements io.grpc.BindableSer public void batchWriteSpans( com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getBatchWriteSpansMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( + getBatchWriteSpansMethod(), responseObserver); } /** @@ -205,7 +201,7 @@ public void batchWriteSpans( public void createSpan( com.google.devtools.cloudtrace.v2.Span request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getCreateSpanMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getCreateSpanMethod(), responseObserver); } @java.lang.Override @@ -213,13 +209,13 @@ public final io.grpc.ServerServiceDefinition bindService() { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getBatchWriteSpansMethod(), - asyncUnaryCall( + io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest, com.google.protobuf.Empty>(this, METHODID_BATCH_WRITE_SPANS))) .addMethod( getCreateSpanMethod(), - asyncUnaryCall( + io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< com.google.devtools.cloudtrace.v2.Span, com.google.devtools.cloudtrace.v2.Span>(this, METHODID_CREATE_SPAN))) @@ -260,7 +256,7 @@ protected TraceServiceStub build(io.grpc.Channel channel, io.grpc.CallOptions ca public void batchWriteSpans( com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnaryCall( + io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getBatchWriteSpansMethod(), getCallOptions()), request, responseObserver); @@ -276,7 +272,7 @@ public void batchWriteSpans( public void createSpan( com.google.devtools.cloudtrace.v2.Span request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnaryCall( + io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getCreateSpanMethod(), getCallOptions()), request, responseObserver); } } @@ -314,7 +310,8 @@ protected TraceServiceBlockingStub build( */ public com.google.protobuf.Empty batchWriteSpans( com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest request) { - return blockingUnaryCall(getChannel(), getBatchWriteSpansMethod(), getCallOptions(), request); + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getBatchWriteSpansMethod(), getCallOptions(), request); } /** @@ -326,7 +323,8 @@ public com.google.protobuf.Empty batchWriteSpans( */ public com.google.devtools.cloudtrace.v2.Span createSpan( com.google.devtools.cloudtrace.v2.Span request) { - return blockingUnaryCall(getChannel(), getCreateSpanMethod(), getCallOptions(), request); + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getCreateSpanMethod(), getCallOptions(), request); } } @@ -363,7 +361,7 @@ protected TraceServiceFutureStub build( */ public com.google.common.util.concurrent.ListenableFuture batchWriteSpans(com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest request) { - return futureUnaryCall( + return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getBatchWriteSpansMethod(), getCallOptions()), request); } @@ -377,7 +375,7 @@ protected TraceServiceFutureStub build( public com.google.common.util.concurrent.ListenableFuture< com.google.devtools.cloudtrace.v2.Span> createSpan(com.google.devtools.cloudtrace.v2.Span request) { - return futureUnaryCall( + return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getCreateSpanMethod(), getCallOptions()), request); } } diff --git a/pom.xml b/pom.xml index 3e9e2f8d..dacc0706 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-trace-parent pom - 1.2.13 + 1.3.0 Google Cloud Trace Parent https://github.com/googleapis/java-core @@ -158,28 +158,28 @@ com.google.api.grpc proto-google-cloud-trace-v1 - 1.2.13 + 1.3.0 com.google.api.grpc proto-google-cloud-trace-v2 - 1.2.13 + 1.3.0 com.google.api.grpc grpc-google-cloud-trace-v1 - 1.2.13 + 1.3.0 com.google.api.grpc grpc-google-cloud-trace-v2 - 1.2.13 + 1.3.0 com.google.cloud google-cloud-shared-dependencies - 0.20.0 + 0.20.1 pom import diff --git a/proto-google-cloud-trace-v1/pom.xml b/proto-google-cloud-trace-v1/pom.xml index 150d398b..22043fa4 100644 --- a/proto-google-cloud-trace-v1/pom.xml +++ b/proto-google-cloud-trace-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-trace-v1 - 1.2.13 + 1.3.0 proto-google-cloud-trace-v1 PROTO library for proto-google-cloud-trace-v1 com.google.cloud google-cloud-trace-parent - 1.2.13 + 1.3.0 diff --git a/proto-google-cloud-trace-v2/pom.xml b/proto-google-cloud-trace-v2/pom.xml index 804558bd..ea1c3350 100644 --- a/proto-google-cloud-trace-v2/pom.xml +++ b/proto-google-cloud-trace-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-trace-v2 - 1.2.13 + 1.3.0 proto-google-cloud-trace-v2 PROTO library for proto-google-cloud-trace-v2 com.google.cloud google-cloud-trace-parent - 1.2.13 + 1.3.0 diff --git a/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValue.java b/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValue.java index 3e322bd1..5aa012f8 100644 --- a/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValue.java +++ b/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValue.java @@ -234,6 +234,21 @@ public com.google.devtools.cloudtrace.v2.TruncatableStringOrBuilder getStringVal } public static final int INT_VALUE_FIELD_NUMBER = 2; + /** + * + * + *
+   * A 64-bit signed integer.
+   * 
+ * + * int64 int_value = 2; + * + * @return Whether the intValue field is set. + */ + @java.lang.Override + public boolean hasIntValue() { + return valueCase_ == 2; + } /** * * @@ -254,6 +269,21 @@ public long getIntValue() { } public static final int BOOL_VALUE_FIELD_NUMBER = 3; + /** + * + * + *
+   * A Boolean value represented by `true` or `false`.
+   * 
+ * + * bool bool_value = 3; + * + * @return Whether the boolValue field is set. + */ + @java.lang.Override + public boolean hasBoolValue() { + return valueCase_ == 3; + } /** * * @@ -888,6 +918,20 @@ public com.google.devtools.cloudtrace.v2.TruncatableStringOrBuilder getStringVal return stringValueBuilder_; } + /** + * + * + *
+     * A 64-bit signed integer.
+     * 
+ * + * int64 int_value = 2; + * + * @return Whether the intValue field is set. + */ + public boolean hasIntValue() { + return valueCase_ == 2; + } /** * * @@ -943,6 +987,20 @@ public Builder clearIntValue() { return this; } + /** + * + * + *
+     * A Boolean value represented by `true` or `false`.
+     * 
+ * + * bool bool_value = 3; + * + * @return Whether the boolValue field is set. + */ + public boolean hasBoolValue() { + return valueCase_ == 3; + } /** * * diff --git a/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValueOrBuilder.java b/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValueOrBuilder.java index 1e7824ff..fb5450f8 100644 --- a/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValueOrBuilder.java +++ b/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValueOrBuilder.java @@ -58,6 +58,18 @@ public interface AttributeValueOrBuilder */ com.google.devtools.cloudtrace.v2.TruncatableStringOrBuilder getStringValueOrBuilder(); + /** + * + * + *
+   * A 64-bit signed integer.
+   * 
+ * + * int64 int_value = 2; + * + * @return Whether the intValue field is set. + */ + boolean hasIntValue(); /** * * @@ -71,6 +83,18 @@ public interface AttributeValueOrBuilder */ long getIntValue(); + /** + * + * + *
+   * A Boolean value represented by `true` or `false`.
+   * 
+ * + * bool bool_value = 3; + * + * @return Whether the boolValue field is set. + */ + boolean hasBoolValue(); /** * * diff --git a/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/ProjectName.java b/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/ProjectName.java index e3787e34..45513e3c 100644 --- a/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/ProjectName.java +++ b/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/ProjectName.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/SpanName.java b/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/SpanName.java index 884cfa1c..ca85086a 100644 --- a/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/SpanName.java +++ b/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/SpanName.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index ee667041..7b5be7b6 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-trace - 1.2.12 + 1.2.13 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 7e773cc6..611ef598 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -23,28 +23,28 @@ UTF-8
- + com.google.cloud google-cloud-trace - 1.2.13 + 1.3.0 + junit junit - 1.2.13 + 4.13.2 test com.google.truth truth - 1.2.13 + 1.1.2 test - diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 4dc2fa01..905b938d 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 18.0.0 + 19.0.0 pom import diff --git a/synth.metadata b/synth.metadata index 3c336913..917bfec3 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,30 +4,30 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-trace.git", - "sha": "15d0541dddb52d40dd5885000be5656a6ee24fba" + "sha": "b1ab8481dcf67e8184babfa1e59fb895e99a9aec" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "af8f71dae961ee036a0ac52a1965270149a6b2c9", - "internalRef": "358516065" + "sha": "0e915217fb5261c1e57bfaf0e16ee5c7feaaba89", + "internalRef": "361377784" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "af8f71dae961ee036a0ac52a1965270149a6b2c9", - "internalRef": "358516065" + "sha": "0e915217fb5261c1e57bfaf0e16ee5c7feaaba89", + "internalRef": "361377784" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2" + "sha": "0b064d767537e0675fc053e53fca473c5c701fb8" } } ], diff --git a/versions.txt b/versions.txt index e2132e97..f539fd1a 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-cloud-trace:1.2.13:1.2.13 -grpc-google-cloud-trace-v1:1.2.13:1.2.13 -grpc-google-cloud-trace-v2:1.2.13:1.2.13 -proto-google-cloud-trace-v1:1.2.13:1.2.13 -proto-google-cloud-trace-v2:1.2.13:1.2.13 +google-cloud-trace:1.3.0:1.3.0 +grpc-google-cloud-trace-v1:1.3.0:1.3.0 +grpc-google-cloud-trace-v2:1.3.0:1.3.0 +proto-google-cloud-trace-v1:1.3.0:1.3.0 +proto-google-cloud-trace-v2:1.3.0:1.3.0