diff --git a/.github/generated-files-bot.yml b/.github/generated-files-bot.yml index 20f3acc2..47c2ba13 100644 --- a/.github/generated-files-bot.yml +++ b/.github/generated-files-bot.yml @@ -5,3 +5,7 @@ externalManifests: - type: json file: '.github/readme/synth.metadata/synth.metadata' jsonpath: '$.generatedFiles[*]' +ignoreAuthors: +- 'renovate-bot' +- 'yoshi-automation' +- 'release-please[bot]' diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 01929fd2..0e707e93 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": "78862eddd036f4e079cb0655fa045d2afa3c5a3f" + "sha": "ca44287d7d752877cfd6d4daf1154a4903c0a691" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "996775eca5fd934edac3c2ae34b80ff0395b1717" + "sha": "618c3902546785b39ebac2ae1c970cba558691e7" } } ] diff --git a/.github/workflows/formatting.yaml b/.github/workflows/formatting.yaml deleted file mode 100644 index 6844407b..00000000 --- a/.github/workflows/formatting.yaml +++ /dev/null @@ -1,25 +0,0 @@ -on: - pull_request_target: - types: [opened, synchronize] - branches: - - master -name: format -jobs: - format-code: - runs-on: ubuntu-latest - env: - ACCESS_TOKEN: ${{ secrets.YOSHI_CODE_BOT_TOKEN }} - steps: - - uses: actions/checkout@v2 - with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} - - uses: actions/setup-java@v1 - with: - java-version: 11 - - run: "mvn com.coveo:fmt-maven-plugin:format" - - uses: googleapis/code-suggester@v1 - with: - command: review - pull_number: ${{ github.event.pull_request.number }} - git_dir: '.' diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg index 873d2f91..4839dfd7 100644 --- a/.kokoro/release/publish_javadoc.cfg +++ b/.kokoro/release/publish_javadoc.cfg @@ -27,3 +27,6 @@ before_action { } } } + +# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/ +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx" \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 09954eef..bb5358d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.2.11](https://www.github.com/googleapis/java-trace/compare/v1.2.10...v1.2.11) (2021-01-28) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.18.0 ([#392](https://www.github.com/googleapis/java-trace/issues/392)) ([ca08638](https://www.github.com/googleapis/java-trace/commit/ca08638700533bd8e95afcfdbb1a8ed2d16a6c8f)) + ### [1.2.10](https://www.github.com/googleapis/java-trace/compare/v1.2.9...v1.2.10) (2020-12-15) diff --git a/README.md b/README.md index 57445842..e59432f6 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 - 16.1.0 + 16.2.1 pom import @@ -38,18 +38,25 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-trace - 1.2.8 + 1.2.10 ``` -If you are using Gradle, add this to your dependencies +If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-trace:1.2.8' +implementation platform('com.google.cloud:libraries-bom:16.3.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.10' ``` + If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-trace" % "1.2.8" +libraryDependencies += "com.google.cloud" % "google-cloud-trace" % "1.2.10" ``` ## Authentication diff --git a/google-cloud-trace-bom/pom.xml b/google-cloud-trace-bom/pom.xml index 0898b2ff..64643a38 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.10 + 1.2.11 pom com.google.cloud @@ -63,32 +63,32 @@ com.google.api.grpc proto-google-cloud-trace-v1 - 1.2.10 + 1.2.11 com.google.api.grpc grpc-google-cloud-trace-v1 - 1.2.10 + 1.2.11 com.google.api.grpc grpc-google-cloud-trace-v2 - 1.2.10 + 1.2.11 com.google.api.grpc proto-google-cloud-trace-v2 - 1.2.10 + 1.2.11 com.google.api.grpc proto-google-cloud-trace-v2 - 1.2.10 + 1.2.11 com.google.cloud google-cloud-trace - 1.2.10 + 1.2.11 diff --git a/google-cloud-trace/pom.xml b/google-cloud-trace/pom.xml index 5bbd999b..b3abe52f 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.10 + 1.2.11 jar Google Cloud Trace https://github.com/googleapis/java-trace @@ -13,7 +13,7 @@ com.google.cloud google-cloud-trace-parent - 1.2.10 + 1.2.11 google-cloud-trace 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 18e563db..fa43462e 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 @@ -171,7 +171,10 @@ public void createSpanTest() throws Exception { .setDisplayName(TruncatableString.newBuilder().build()) .setStartTime(Timestamp.newBuilder().build()) .setEndTime(Timestamp.newBuilder().build()) + .setAttributes(Span.Attributes.newBuilder().build()) .setStackTrace(StackTrace.newBuilder().build()) + .setTimeEvents(Span.TimeEvents.newBuilder().build()) + .setLinks(Span.Links.newBuilder().build()) .setStatus(Status.newBuilder().build()) .setSameProcessAsParentSpan(BoolValue.newBuilder().build()) .setChildSpanCount(Int32Value.newBuilder().build()) @@ -186,7 +189,10 @@ public void createSpanTest() throws Exception { .setDisplayName(TruncatableString.newBuilder().build()) .setStartTime(Timestamp.newBuilder().build()) .setEndTime(Timestamp.newBuilder().build()) + .setAttributes(Span.Attributes.newBuilder().build()) .setStackTrace(StackTrace.newBuilder().build()) + .setTimeEvents(Span.TimeEvents.newBuilder().build()) + .setLinks(Span.Links.newBuilder().build()) .setStatus(Status.newBuilder().build()) .setSameProcessAsParentSpan(BoolValue.newBuilder().build()) .setChildSpanCount(Int32Value.newBuilder().build()) @@ -234,7 +240,10 @@ public void createSpanExceptionTest() throws Exception { .setDisplayName(TruncatableString.newBuilder().build()) .setStartTime(Timestamp.newBuilder().build()) .setEndTime(Timestamp.newBuilder().build()) + .setAttributes(Span.Attributes.newBuilder().build()) .setStackTrace(StackTrace.newBuilder().build()) + .setTimeEvents(Span.TimeEvents.newBuilder().build()) + .setLinks(Span.Links.newBuilder().build()) .setStatus(Status.newBuilder().build()) .setSameProcessAsParentSpan(BoolValue.newBuilder().build()) .setChildSpanCount(Int32Value.newBuilder().build()) diff --git a/grpc-google-cloud-trace-v1/pom.xml b/grpc-google-cloud-trace-v1/pom.xml index 6aadee15..1da15954 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.10 + 1.2.11 grpc-google-cloud-trace-v1 GRPC library for grpc-google-cloud-trace-v1 com.google.cloud google-cloud-trace-parent - 1.2.10 + 1.2.11 diff --git a/grpc-google-cloud-trace-v2/pom.xml b/grpc-google-cloud-trace-v2/pom.xml index d818d9ba..c5559530 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.10 + 1.2.11 grpc-google-cloud-trace-v2 GRPC library for grpc-google-cloud-trace-v2 com.google.cloud google-cloud-trace-parent - 1.2.10 + 1.2.11 diff --git a/pom.xml b/pom.xml index e6fab657..bc012cdc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-trace-parent pom - 1.2.10 + 1.2.11 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.10 + 1.2.11 com.google.api.grpc proto-google-cloud-trace-v2 - 1.2.10 + 1.2.11 com.google.api.grpc grpc-google-cloud-trace-v1 - 1.2.10 + 1.2.11 com.google.api.grpc grpc-google-cloud-trace-v2 - 1.2.10 + 1.2.11 com.google.cloud google-cloud-shared-dependencies - 0.17.0 + 0.18.0 pom import diff --git a/proto-google-cloud-trace-v1/pom.xml b/proto-google-cloud-trace-v1/pom.xml index 31879d34..46e87b89 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.10 + 1.2.11 proto-google-cloud-trace-v1 PROTO library for proto-google-cloud-trace-v1 com.google.cloud google-cloud-trace-parent - 1.2.10 + 1.2.11 diff --git a/proto-google-cloud-trace-v2/pom.xml b/proto-google-cloud-trace-v2/pom.xml index 8788d6b3..1e4123ea 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.10 + 1.2.11 proto-google-cloud-trace-v2 PROTO library for proto-google-cloud-trace-v2 com.google.cloud google-cloud-trace-parent - 1.2.10 + 1.2.11 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 0a4078f4..72209783 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.8 + 1.2.10 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 16f483c4..70e8d66c 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,19 +28,19 @@ com.google.cloud google-cloud-trace - 1.2.10 + 1.2.11 junit junit - 1.2.10 + 1.2.11 test com.google.truth truth - 1.2.10 + 1.2.11 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index bd23ace4..14b98c34 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 16.1.0 + 16.3.0 pom import diff --git a/synth.metadata b/synth.metadata index 1a967e0b..c28eba97 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,30 +4,30 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-trace.git", - "sha": "4af695516ec16d7c99bbd3229ee12cfafaa329ca" + "sha": "9142bd9b024ae2d340d95c5dfddf3ba17de0a5c9" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "857f70daef9f4c38f042fb3dfb7b8423ae18fd19", - "internalRef": "346372957" + "sha": "ad3bb00ed7750cd0625b3a36e0e2eff29f778e4a", + "internalRef": "350067652" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "857f70daef9f4c38f042fb3dfb7b8423ae18fd19", - "internalRef": "346372957" + "sha": "ad3bb00ed7750cd0625b3a36e0e2eff29f778e4a", + "internalRef": "350067652" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "5d11bd2888c38ce1fb6fa6bf25494a4219a73928" + "sha": "3816b080296d4d52975079fd26c110dd26ba25af" } } ], @@ -66,7 +66,6 @@ ".github/workflows/approve-readme.yaml", ".github/workflows/auto-release.yaml", ".github/workflows/ci.yaml", - ".github/workflows/formatting.yaml", ".github/workflows/samples.yaml", ".kokoro/build.bat", ".kokoro/build.sh", diff --git a/versions.txt b/versions.txt index ab7d032f..74464768 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-cloud-trace:1.2.10:1.2.10 -grpc-google-cloud-trace-v1:1.2.10:1.2.10 -grpc-google-cloud-trace-v2:1.2.10:1.2.10 -proto-google-cloud-trace-v1:1.2.10:1.2.10 -proto-google-cloud-trace-v2:1.2.10:1.2.10 +google-cloud-trace:1.2.11:1.2.11 +grpc-google-cloud-trace-v1:1.2.11:1.2.11 +grpc-google-cloud-trace-v2:1.2.11:1.2.11 +proto-google-cloud-trace-v1:1.2.11:1.2.11 +proto-google-cloud-trace-v2:1.2.11:1.2.11