From 334a2a4922122bd1b98157089f3e46b1331d5e54 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 02:15:52 +0000 Subject: [PATCH 01/41] chore(deps): update gradle/gradle-build-action action to v3 --- .github/workflows/build-master.yml | 4 ++-- .github/workflows/pull-request.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml index c553d2446..87f39bbde 100644 --- a/.github/workflows/build-master.yml +++ b/.github/workflows/build-master.yml @@ -30,13 +30,13 @@ jobs: run: openssl aes-256-cbc -K ${{ secrets.ENCRYPTED_KEY }} -iv ${{ secrets.ENCRYPTED_IV }} -in private.key.enc -out ./private.key -d && gpg --batch --import ./private.key || echo - name: Build with Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: --scan --stacktrace --warning-mode=all build - name: Deploy with Gradle if: ${{ matrix.java == '17' }} - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: --scan publish -x check -Psigning.gnupg.executable=gpg -Psigning.gnupg.keyName=${{ secrets.GPG_NAME }} -Psigning.gnupg.passphrase=${{ secrets.GPG_PASSWORD }} env: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 5ddb6ebed..96598d6df 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -24,12 +24,12 @@ jobs: check-latest: true - name: Build with Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: --scan --stacktrace --warning-mode=all build # Avoid publish errors when upgrading gradle version and dependencyManager plugin - name: Try publishToMavenLocal - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: publishToMavenLocal From f7ec0f1ab761ba2394f9a2bc906df7922cc16161 Mon Sep 17 00:00:00 2001 From: ST-DDT Date: Wed, 13 Mar 2024 09:12:32 +0100 Subject: [PATCH 02/41] Apply suggestions from code review --- .github/workflows/build-master.yml | 4 ++-- .github/workflows/pull-request.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml index 87f39bbde..fa1336cf4 100644 --- a/.github/workflows/build-master.yml +++ b/.github/workflows/build-master.yml @@ -30,13 +30,13 @@ jobs: run: openssl aes-256-cbc -K ${{ secrets.ENCRYPTED_KEY }} -iv ${{ secrets.ENCRYPTED_IV }} -in private.key.enc -out ./private.key -d && gpg --batch --import ./private.key || echo - name: Build with Gradle - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 with: arguments: --scan --stacktrace --warning-mode=all build - name: Deploy with Gradle if: ${{ matrix.java == '17' }} - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 with: arguments: --scan publish -x check -Psigning.gnupg.executable=gpg -Psigning.gnupg.keyName=${{ secrets.GPG_NAME }} -Psigning.gnupg.passphrase=${{ secrets.GPG_PASSWORD }} env: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 96598d6df..46b2bea0e 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -24,12 +24,12 @@ jobs: check-latest: true - name: Build with Gradle - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 with: arguments: --scan --stacktrace --warning-mode=all build # Avoid publish errors when upgrading gradle version and dependencyManager plugin - name: Try publishToMavenLocal - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 with: arguments: publishToMavenLocal From 2ae23499f3bef20f1de6b0a82ad20051ec20524f Mon Sep 17 00:00:00 2001 From: Clayton Walker Date: Thu, 8 Feb 2024 14:02:56 -0700 Subject: [PATCH 03/41] Upgrade grpc and remove unused method --- build.gradle | 2 +- .../channelfactory/AbstractChannelFactory.java | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 829834600..ba2d23d4c 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { projectVersion = '3.0.0.RELEASE' // https://github.com/grpc/grpc-java/releases - grpcVersion = '1.60.1' + grpcVersion = '1.61.1' // https://github.com/google/guava/releases guavaVersion = '33.0.0-jre' diff --git a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/channelfactory/AbstractChannelFactory.java b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/channelfactory/AbstractChannelFactory.java index 7db3c6903..e16f79770 100644 --- a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/channelfactory/AbstractChannelFactory.java +++ b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/channelfactory/AbstractChannelFactory.java @@ -181,7 +181,6 @@ protected void configure(final T builder, final String name) { configureKeepAlive(builder, name); configureSecurity(builder, name); configureLimits(builder, name); - configureCompression(builder, name); configureUserAgent(builder, name); for (final GrpcChannelConfigurer channelConfigurer : this.channelConfigurers) { channelConfigurer.accept(builder, name); @@ -251,19 +250,6 @@ protected void configureLimits(final T builder, final String name) { } } - /** - * Configures the compression options that should be used by the channel. - * - * @param builder The channel builder to configure. - * @param name The name of the client to configure. - */ - protected void configureCompression(final T builder, final String name) { - final GrpcChannelProperties properties = getPropertiesFor(name); - if (properties.isFullStreamDecompression()) { - builder.enableFullStreamDecompression(); - } - } - /** * Configures custom User-Agent for the channel. * From 4f7512668b9377fe8cf1ba07687b8a7787fc6b0b Mon Sep 17 00:00:00 2001 From: Clayton Walker Date: Thu, 8 Feb 2024 14:04:40 -0700 Subject: [PATCH 04/41] Remove flag in properties --- .../client/config/GrpcChannelProperties.java | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/config/GrpcChannelProperties.java b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/config/GrpcChannelProperties.java index dff796cc1..22994b5a5 100644 --- a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/config/GrpcChannelProperties.java +++ b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/config/GrpcChannelProperties.java @@ -372,35 +372,6 @@ public void setMaxInboundMetadataSize(DataSize maxInboundMetadataSize) { } // -------------------------------------------------- - private Boolean fullStreamDecompression; - private static final boolean DEFAULT_FULL_STREAM_DECOMPRESSION = false; - - /** - * Gets whether full-stream decompression of inbound streams should be enabled. - * - * @return True, if full-stream decompression of inbound streams should be enabled. False otherwise. - * - * @see #setFullStreamDecompression(Boolean) - */ - public boolean isFullStreamDecompression() { - return this.fullStreamDecompression == null ? DEFAULT_FULL_STREAM_DECOMPRESSION : this.fullStreamDecompression; - } - - /** - * Sets whether full-stream decompression of inbound streams should be enabled. This will cause the channel's - * outbound headers to advertise support for GZIP compressed streams, and gRPC servers which support the feature may - * respond with a GZIP compressed stream. - * - * @param fullStreamDecompression Whether full stream decompression should be enabled or null to use the fallback. - * - * @see ManagedChannelBuilder#enableFullStreamDecompression() - */ - public void setFullStreamDecompression(final Boolean fullStreamDecompression) { - this.fullStreamDecompression = fullStreamDecompression; - } - - // -------------------------------------------------- - private NegotiationType negotiationType; private static final NegotiationType DEFAULT_NEGOTIATION_TYPE = NegotiationType.TLS; @@ -530,9 +501,6 @@ public void copyDefaultsFrom(final GrpcChannelProperties config) { if (this.maxInboundMessageSize == null) { this.maxInboundMessageSize = config.maxInboundMessageSize; } - if (this.fullStreamDecompression == null) { - this.fullStreamDecompression = config.fullStreamDecompression; - } if (this.negotiationType == null) { this.negotiationType = config.negotiationType; } From a46299a8e1c5e40e02ae58e1515f540e36bb7323 Mon Sep 17 00:00:00 2001 From: Clayton Walker Date: Wed, 13 Mar 2024 19:13:51 -1000 Subject: [PATCH 05/41] Also remove option from spring configuration metadata --- .../META-INF/additional-spring-configuration-metadata.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/grpc-client-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/grpc-client-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json index c3f599700..44903c96e 100644 --- a/grpc-client-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/grpc-client-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -53,13 +53,6 @@ "description": "Whether keepAlive should be enabled.", "defaultValue": false }, - { - "name": "grpc.client.GLOBAL.full-stream-decompression", - "type": "java.lang.Boolean", - "sourceType": "net.devh.boot.grpc.client.config.GrpcChannelProperties", - "description": "Whether full-stream decompression of inbound streams should be enabled.", - "defaultValue": false - }, { "name": "grpc.client.GLOBAL.keep-alive-time", "type": "java.time.Duration", From 5107b54e95d1e6fa0b6f3152f773a2c82c6a0b54 Mon Sep 17 00:00:00 2001 From: Arnold Mashava Date: Wed, 27 Mar 2024 01:01:32 +0200 Subject: [PATCH 06/41] Update getting-started.md --- docs/en/server/getting-started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/server/getting-started.md b/docs/en/server/getting-started.md index 7632a4408..9c1791ef2 100644 --- a/docs/en/server/getting-started.md +++ b/docs/en/server/getting-started.md @@ -28,7 +28,7 @@ This section describes the steps necessary to convert your application into a gr Before we start adding the dependencies lets start with some of our recommendation for your project setup. -![project setup](/grpc-spring-boot-starter/assets/images/server-project-setup.svg) +![project setup](https://grpc-ecosystem.github.io/grpc-spring/assets/images/server-project-setup.svg) We recommend splitting your project into 2-3 separate modules. From c0644c1304d0dae8635496d4098a494e99c2b6f7 Mon Sep 17 00:00:00 2001 From: Arnold Mashava Date: Wed, 27 Mar 2024 01:02:39 +0200 Subject: [PATCH 07/41] Update getting-started.md --- docs/en/client/getting-started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/client/getting-started.md b/docs/en/client/getting-started.md index e0edd5a89..9cd30e3fc 100644 --- a/docs/en/client/getting-started.md +++ b/docs/en/client/getting-started.md @@ -26,7 +26,7 @@ This section deals with how to get Spring to connect to a grpc server and manage Before we start adding the dependencies lets start with some of our recommendation for your project setup. -![project setup](/grpc-spring-boot-starter/assets/images/client-project-setup.svg) +![project setup](https://grpc-ecosystem.github.io/grpc-spring/assets/images/client-project-setup.svg) We recommend splitting your project into 2-3 separate modules. From 83979ed87e2ff3071600ff7c0c35f2647453106a Mon Sep 17 00:00:00 2001 From: Arnold Mashava Date: Wed, 27 Mar 2024 01:20:18 +0200 Subject: [PATCH 08/41] Update getting-started.md for zh-CN Documentation Translation --- docs/zh-CN/server/getting-started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh-CN/server/getting-started.md b/docs/zh-CN/server/getting-started.md index 20bcb53ec..977ac69bb 100644 --- a/docs/zh-CN/server/getting-started.md +++ b/docs/zh-CN/server/getting-started.md @@ -28,7 +28,7 @@ 在我们开始添加依赖关系之前，让我们项目的一些设置建议开始。 -![项目创建](/grpc-spring-boot-starter/assets/images/server-project-setup.svg) +![项目创建](https://grpc-ecosystem.github.io/grpc-spring/assets/images/server-project-setup.svg) 我们建议将您的项目分为2至3个不同的模块。 From 0c06ee29880a2989dd294fefd126ccf404362cd6 Mon Sep 17 00:00:00 2001 From: Arnold Mashava Date: Wed, 27 Mar 2024 01:21:59 +0200 Subject: [PATCH 09/41] Update getting-started.md for zh-CN Documentation Translation --- docs/zh-CN/client/getting-started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh-CN/client/getting-started.md b/docs/zh-CN/client/getting-started.md index 4ecf2c6b3..abd3c1cfe 100644 --- a/docs/zh-CN/client/getting-started.md +++ b/docs/zh-CN/client/getting-started.md @@ -26,7 +26,7 @@ 在我们开始添加依赖关系之前，让我们项目的一些设置建议开始。 -![项目创建](/grpc-spring-boot-starter/assets/images/client-project-setup.svg) +![项目创建](https://grpc-ecosystem.github.io/grpc-spring/assets/images/client-project-setup.svg) 我们建议将您的项目分为2至3个不同的模块。 From 8dd72a29dcc374599abe93b261fc485f6afeab78 Mon Sep 17 00:00:00 2001 From: ST-DDT Date: Wed, 27 Mar 2024 11:18:14 +0100 Subject: [PATCH 10/41] Apply suggestions from code review --- docs/en/client/getting-started.md | 2 +- docs/en/server/getting-started.md | 2 +- docs/zh-CN/client/getting-started.md | 2 +- docs/zh-CN/server/getting-started.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en/client/getting-started.md b/docs/en/client/getting-started.md index 9cd30e3fc..7671c4845 100644 --- a/docs/en/client/getting-started.md +++ b/docs/en/client/getting-started.md @@ -26,7 +26,7 @@ This section deals with how to get Spring to connect to a grpc server and manage Before we start adding the dependencies lets start with some of our recommendation for your project setup. -![project setup](https://grpc-ecosystem.github.io/grpc-spring/assets/images/client-project-setup.svg) +![project setup](/grpc-spring/assets/images/client-project-setup.svg) We recommend splitting your project into 2-3 separate modules. diff --git a/docs/en/server/getting-started.md b/docs/en/server/getting-started.md index 9c1791ef2..a16644b03 100644 --- a/docs/en/server/getting-started.md +++ b/docs/en/server/getting-started.md @@ -28,7 +28,7 @@ This section describes the steps necessary to convert your application into a gr Before we start adding the dependencies lets start with some of our recommendation for your project setup. -![project setup](https://grpc-ecosystem.github.io/grpc-spring/assets/images/server-project-setup.svg) +![project setup](/grpc-spring/assets/images/server-project-setup.svg) We recommend splitting your project into 2-3 separate modules. diff --git a/docs/zh-CN/client/getting-started.md b/docs/zh-CN/client/getting-started.md index abd3c1cfe..d2aa94531 100644 --- a/docs/zh-CN/client/getting-started.md +++ b/docs/zh-CN/client/getting-started.md @@ -26,7 +26,7 @@ 在我们开始添加依赖关系之前，让我们项目的一些设置建议开始。 -![项目创建](https://grpc-ecosystem.github.io/grpc-spring/assets/images/client-project-setup.svg) +![项目创建](/grpc-spring/assets/images/client-project-setup.svg) 我们建议将您的项目分为2至3个不同的模块。 diff --git a/docs/zh-CN/server/getting-started.md b/docs/zh-CN/server/getting-started.md index 977ac69bb..48bfb0d6b 100644 --- a/docs/zh-CN/server/getting-started.md +++ b/docs/zh-CN/server/getting-started.md @@ -28,7 +28,7 @@ 在我们开始添加依赖关系之前，让我们项目的一些设置建议开始。 -![项目创建](https://grpc-ecosystem.github.io/grpc-spring/assets/images/server-project-setup.svg) +![项目创建](/grpc-spring/assets/images/server-project-setup.svg) 我们建议将您的项目分为2至3个不同的模块。 From 9d28f09d2380a41cef3c893c3211dee8a55000df Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Wed, 27 Mar 2024 22:05:49 +0000 Subject: [PATCH 11/41] Add instrumentation tags to grpc metrics --- .../metrics/MetricsClientStreamTracers.java | 7 ++++- .../MetricsClientStreamTracersTest.java | 10 ++++++ .../devh/boot/grpc/common/util/Versions.java | 31 +++++++++++++++++++ .../metrics/MetricsServerStreamTracers.java | 7 ++++- .../MetricsServerStreamTracersTest.java | 12 +++++++ 5 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java diff --git a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java index 6a39c697a..2708329a4 100644 --- a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java +++ b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java @@ -36,6 +36,8 @@ import io.grpc.Status.Code; import io.micrometer.core.instrument.Tags; +import net.devh.boot.grpc.common.util.Versions; + /** * Provides factories for {@link io.grpc.StreamTracer} that records metrics. * @@ -127,7 +129,10 @@ public void streamClosed(Status status) { void recordFinishedAttempt() { Tags attemptMetricTags = - Tags.of("grpc.method", fullMethodName, "grpc.status", statusCode.toString()); + Tags.of("grpc.method", fullMethodName, + "grpc.status", statusCode.toString(), + "instrumentation_source", "grpc-spring", + "instrumentation_version", Versions.PROJECT_VERSION); this.metricsClientMeters.getClientAttemptDuration() .withTags(attemptMetricTags) .record(attemptNanos, TimeUnit.NANOSECONDS); diff --git a/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java index 1ea2410f7..a525c526d 100644 --- a/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java +++ b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java @@ -36,7 +36,9 @@ import io.micrometer.core.instrument.distribution.CountAtBucket; import io.micrometer.core.instrument.distribution.HistogramSnapshot; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; + import net.devh.boot.grpc.client.metrics.MetricsClientStreamTracers.CallAttemptsTracerFactory; +import net.devh.boot.grpc.common.util.Versions; /** * Tests for {@link MetricsClientStreamTracers}. @@ -61,6 +63,10 @@ class MetricsClientStreamTracersTest { private static final String GRPC_METHOD_TAG_KEY = "grpc.method"; private static final String GRPC_STATUS_TAG_KEY = "grpc.status"; private static final String FULL_METHOD_NAME = "package1.service1/method1"; + private static final String INSTRUMENTATION_SOURCE_TAG_KEY = "instrumentation_source"; + private static final String INSTRUMENTATION_SOURCE_TAG_VALUE = "grpc-spring"; + private static final String INSTRUMENTATION_VERSION_TAG_KEY = "instrumentation_version"; + private static final String INSTRUMENTATION_VERSION_TAG_VALUE = Versions.PROJECT_VERSION; private static class StringInputStream extends InputStream { final String string; @@ -154,6 +160,8 @@ void clientBasicMetrics() { HistogramSnapshot attemptDurationSnapshot = meterRegistry.get(CLIENT_ATTEMPT_DURATION) .tags(expectedTags) + .tags(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, + INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .timer() .takeSnapshot(); HistogramSnapshot attemptDurationHistogram = HistogramSnapshot.empty(1L, 154L, 1.54E8); @@ -171,6 +179,8 @@ void clientBasicMetrics() { HistogramSnapshot sentAttemptMessageSizeSnapShot = meterRegistry.get(CLIENT_ATTEMPT_SENT_COMPRESSED_MESSAGE_SIZE) .tags(expectedTags) + .tags(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, + INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .summary() .takeSnapshot(); HistogramSnapshot expectedAttemptSentMessageSizeHistogram = HistogramSnapshot.empty(1L, 1127L, 1127L); diff --git a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java new file mode 100644 index 000000000..6f88db5e0 --- /dev/null +++ b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2016-2023 The gRPC-Spring Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.devh.boot.grpc.common.util; + +/** + * Class that contains version strings + */ +public final class Versions { + + /** + * A constant that defines, the current version of the library. + */ + public static final String PROJECT_VERSION = "v3.0.0.RELEASE"; + + private Versions() {} + +} diff --git a/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java b/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java index cdb1e4179..22e7922aa 100644 --- a/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java +++ b/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java @@ -31,6 +31,8 @@ import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tags; +import net.devh.boot.grpc.common.util.Versions; + /** * Provides factories for {@link io.grpc.StreamTracer} that records metrics. * @@ -122,7 +124,10 @@ public void streamClosed(Status status) { long callLatencyNanos = stopwatch.elapsed(TimeUnit.NANOSECONDS); Tags serverMetricTags = - Tags.of("grpc.method", this.fullMethodName, "grpc.status", status.getCode().toString()); + Tags.of("grpc.method", this.fullMethodName, + "grpc.status", status.getCode().toString(), + "instrumentation_source", "grpc-spring", + "instrumentation_version", Versions.PROJECT_VERSION); this.metricsServerMeters.getServerCallDuration() .withTags(serverMetricTags) .record(callLatencyNanos, TimeUnit.NANOSECONDS); diff --git a/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java b/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java index 2b8a4ceb9..5eca0689d 100644 --- a/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java +++ b/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java @@ -39,6 +39,8 @@ import io.micrometer.core.instrument.distribution.HistogramSnapshot; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; +import net.devh.boot.grpc.common.util.Versions; + /** * Tests for {@link MetricsServerStreamTracers}. */ @@ -54,6 +56,10 @@ class MetricsServerStreamTracersTest { private static final String FULL_METHOD_NAME = "package1.service1/method1"; private static final String GRPC_METHOD_TAG_KEY = "grpc.method"; private static final String GRPC_STATUS_TAG_KEY = "grpc.status"; + private static final String INSTRUMENTATION_SOURCE_TAG_KEY = "instrumentation_source"; + private static final String INSTRUMENTATION_SOURCE_TAG_VALUE = "grpc-spring"; + private static final String INSTRUMENTATION_VERSION_TAG_KEY = "instrumentation_version"; + private static final String INSTRUMENTATION_VERSION_TAG_VALUE = Versions.PROJECT_VERSION; private static class StringInputStream extends InputStream { @@ -170,6 +176,8 @@ void serverBasicMetrics() { HistogramSnapshot sentMessageSizeSnapShot = meterRegistry.get(SERVER_SENT_COMPRESSED_MESSAGE_SIZE) .tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME) .tag(GRPC_STATUS_TAG_KEY, Status.Code.CANCELLED.toString()) + .tag(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE) + .tag(INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .summary() .takeSnapshot(); HistogramSnapshot expectedSentMessageSizeHistogram = HistogramSnapshot.empty(1L, 1127L, 1127L); @@ -181,6 +189,8 @@ void serverBasicMetrics() { meterRegistry.get(SERVER_RECEIVED_COMPRESSED_MESSAGE_SIZE) .tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME) .tag(GRPC_STATUS_TAG_KEY, Status.Code.CANCELLED.toString()) + .tag(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE) + .tag(INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .summary() .takeSnapshot(); HistogramSnapshot expectedReceivedMessageSizeHistogram = HistogramSnapshot.empty(1L, 188L, 188L); @@ -197,6 +207,8 @@ void serverBasicMetrics() { HistogramSnapshot callDurationSnapshot = meterRegistry.get(SERVER_CALL_DURATION) .tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME) .tag(GRPC_STATUS_TAG_KEY, Status.Code.CANCELLED.toString()) + .tag(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE) + .tag(INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .timer() .takeSnapshot(); HistogramSnapshot expectedCallDurationHistogram = HistogramSnapshot.empty(1L, 40L, 40); From c85efa92cb611e48483c81cc5445fb869afccc90 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Wed, 27 Mar 2024 22:40:31 +0000 Subject: [PATCH 12/41] run spotlessApply --- .../grpc/client/metrics/MetricsClientStreamTracers.java | 1 - .../client/metrics/MetricsClientStreamTracersTest.java | 5 ++--- .../grpc/server/metrics/MetricsServerStreamTracers.java | 7 +++---- .../server/metrics/MetricsServerStreamTracersTest.java | 1 - 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java index 2708329a4..dc2cb4f9a 100644 --- a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java +++ b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java @@ -35,7 +35,6 @@ import io.grpc.Status; import io.grpc.Status.Code; import io.micrometer.core.instrument.Tags; - import net.devh.boot.grpc.common.util.Versions; /** diff --git a/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java index a525c526d..3de128d53 100644 --- a/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java +++ b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java @@ -36,7 +36,6 @@ import io.micrometer.core.instrument.distribution.CountAtBucket; import io.micrometer.core.instrument.distribution.HistogramSnapshot; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; - import net.devh.boot.grpc.client.metrics.MetricsClientStreamTracers.CallAttemptsTracerFactory; import net.devh.boot.grpc.common.util.Versions; @@ -161,7 +160,7 @@ void clientBasicMetrics() { HistogramSnapshot attemptDurationSnapshot = meterRegistry.get(CLIENT_ATTEMPT_DURATION) .tags(expectedTags) .tags(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, - INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) + INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .timer() .takeSnapshot(); HistogramSnapshot attemptDurationHistogram = HistogramSnapshot.empty(1L, 154L, 1.54E8); @@ -180,7 +179,7 @@ void clientBasicMetrics() { meterRegistry.get(CLIENT_ATTEMPT_SENT_COMPRESSED_MESSAGE_SIZE) .tags(expectedTags) .tags(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, - INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) + INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .summary() .takeSnapshot(); HistogramSnapshot expectedAttemptSentMessageSizeHistogram = HistogramSnapshot.empty(1L, 1127L, 1127L); diff --git a/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java b/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java index 22e7922aa..3a4627549 100644 --- a/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java +++ b/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java @@ -30,7 +30,6 @@ import io.grpc.Status; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tags; - import net.devh.boot.grpc.common.util.Versions; /** @@ -125,9 +124,9 @@ public void streamClosed(Status status) { Tags serverMetricTags = Tags.of("grpc.method", this.fullMethodName, - "grpc.status", status.getCode().toString(), - "instrumentation_source", "grpc-spring", - "instrumentation_version", Versions.PROJECT_VERSION); + "grpc.status", status.getCode().toString(), + "instrumentation_source", "grpc-spring", + "instrumentation_version", Versions.PROJECT_VERSION); this.metricsServerMeters.getServerCallDuration() .withTags(serverMetricTags) .record(callLatencyNanos, TimeUnit.NANOSECONDS); diff --git a/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java b/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java index 5eca0689d..bbc98afa3 100644 --- a/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java +++ b/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java @@ -38,7 +38,6 @@ import io.micrometer.core.instrument.distribution.CountAtBucket; import io.micrometer.core.instrument.distribution.HistogramSnapshot; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; - import net.devh.boot.grpc.common.util.Versions; /** From 9bdf04e9b1cac15856b2104245955f276715d3b7 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Wed, 27 Mar 2024 22:43:05 +0000 Subject: [PATCH 13/41] more consistent styling --- .../client/metrics/MetricsClientStreamTracersTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java index 3de128d53..76b4cc4ac 100644 --- a/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java +++ b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java @@ -159,8 +159,8 @@ void clientBasicMetrics() { HistogramSnapshot attemptDurationSnapshot = meterRegistry.get(CLIENT_ATTEMPT_DURATION) .tags(expectedTags) - .tags(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, - INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) + .tag(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE) + .tag(INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .timer() .takeSnapshot(); HistogramSnapshot attemptDurationHistogram = HistogramSnapshot.empty(1L, 154L, 1.54E8); @@ -178,8 +178,8 @@ void clientBasicMetrics() { HistogramSnapshot sentAttemptMessageSizeSnapShot = meterRegistry.get(CLIENT_ATTEMPT_SENT_COMPRESSED_MESSAGE_SIZE) .tags(expectedTags) - .tags(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, - INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) + .tag(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE) + .tag(INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .summary() .takeSnapshot(); HistogramSnapshot expectedAttemptSentMessageSizeHistogram = HistogramSnapshot.empty(1L, 1127L, 1127L); From 1a38b84a23348cc650109151e8a95be6abe34e03 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Wed, 27 Mar 2024 23:10:38 +0000 Subject: [PATCH 14/41] Replace version string from build process --- build.gradle | 10 ++++++++++ .../java/net/devh/boot/grpc/common/util/Versions.java | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7062a4ba8..ea4dc7485 100644 --- a/build.gradle +++ b/build.gradle @@ -224,6 +224,16 @@ allprojects { project -> } } + File versionsFile = file("${projectDir}/src/main/java/net/devh/boot/grpc/common/util/Versions.java") + task fixFile { + ant.replaceregexp( + file: versionsFile, + match: 'VERSIONS_STRING_PLACEHOLDER', + replace: "v${projectVersion}", + flags: 'g', + byline: true) + } + // Javadoc Task javadoc { dependsOn delombok diff --git a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java index 6f88db5e0..13837aae3 100644 --- a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java +++ b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java @@ -24,7 +24,7 @@ public final class Versions { /** * A constant that defines, the current version of the library. */ - public static final String PROJECT_VERSION = "v3.0.0.RELEASE"; + public static final String PROJECT_VERSION = "VERSIONS_STRING_PLACEHOLDER"; private Versions() {} From 0effd2ca2220f4214d8793af7fe0a8a0bf0e0684 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Wed, 27 Mar 2024 23:11:33 +0000 Subject: [PATCH 15/41] tabs no good --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index ea4dc7485..b7fe863f7 100644 --- a/build.gradle +++ b/build.gradle @@ -227,11 +227,11 @@ allprojects { project -> File versionsFile = file("${projectDir}/src/main/java/net/devh/boot/grpc/common/util/Versions.java") task fixFile { ant.replaceregexp( - file: versionsFile, - match: 'VERSIONS_STRING_PLACEHOLDER', - replace: "v${projectVersion}", - flags: 'g', - byline: true) + file: versionsFile, + match: 'VERSIONS_STRING_PLACEHOLDER', + replace: "v${projectVersion}", + flags: 'g', + byline: true) } // Javadoc Task From d06a424ddbc5627f7d53720918aacd851bef30c0 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Wed, 27 Mar 2024 23:18:13 +0000 Subject: [PATCH 16/41] minor tweaks --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index b7fe863f7..ab9715c6f 100644 --- a/build.gradle +++ b/build.gradle @@ -225,13 +225,14 @@ allprojects { project -> } File versionsFile = file("${projectDir}/src/main/java/net/devh/boot/grpc/common/util/Versions.java") - task fixFile { + task replaceVersion { ant.replaceregexp( file: versionsFile, match: 'VERSIONS_STRING_PLACEHOLDER', replace: "v${projectVersion}", flags: 'g', - byline: true) + byline: true, + ) } // Javadoc Task From b7cf5f6f168c57f8aff255d91da2d43e3b8a19b0 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Wed, 27 Mar 2024 23:58:45 +0000 Subject: [PATCH 17/41] generate the Versions.java file instead of doing a string replace --- build.gradle | 25 ++++++++------- .../devh/boot/grpc/common/util/Versions.java | 31 ------------------- 2 files changed, 14 insertions(+), 42 deletions(-) delete mode 100644 grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java diff --git a/build.gradle b/build.gradle index ab9715c6f..3bdf6b4af 100644 --- a/build.gradle +++ b/build.gradle @@ -72,6 +72,20 @@ ext { buildRevision = versioning.info.commit } +task createVersionFile { + new File("${projectDir}/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java").text = """ +package net.devh.boot.grpc.common.util; +public final class Versions { + public static final String PROJECT_VERSION = "v${projectVersion}"; + private Versions() {} +} + """ +} + +clean.doFirst { + delete "${projectDir}/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java" +} + allprojects { apply plugin: 'java' apply plugin: 'idea' @@ -224,17 +238,6 @@ allprojects { project -> } } - File versionsFile = file("${projectDir}/src/main/java/net/devh/boot/grpc/common/util/Versions.java") - task replaceVersion { - ant.replaceregexp( - file: versionsFile, - match: 'VERSIONS_STRING_PLACEHOLDER', - replace: "v${projectVersion}", - flags: 'g', - byline: true, - ) - } - // Javadoc Task javadoc { dependsOn delombok diff --git a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java deleted file mode 100644 index 13837aae3..000000000 --- a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016-2023 The gRPC-Spring Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.devh.boot.grpc.common.util; - -/** - * Class that contains version strings - */ -public final class Versions { - - /** - * A constant that defines, the current version of the library. - */ - public static final String PROJECT_VERSION = "VERSIONS_STRING_PLACEHOLDER"; - - private Versions() {} - -} From 9d6465fadfe644f86abd963e24bfec0c810b60f6 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 28 Mar 2024 01:12:35 +0000 Subject: [PATCH 18/41] Use a base template file, and in build time dynamically generate the correct Versions.java file --- build.gradle | 23 +++++++------- .../grpc/common/util/Versions.java.template | 31 +++++++++++++++++++ 2 files changed, 43 insertions(+), 11 deletions(-) create mode 100644 grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java.template diff --git a/build.gradle b/build.gradle index 3bdf6b4af..09c3f06b7 100644 --- a/build.gradle +++ b/build.gradle @@ -72,16 +72,6 @@ ext { buildRevision = versioning.info.commit } -task createVersionFile { - new File("${projectDir}/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java").text = """ -package net.devh.boot.grpc.common.util; -public final class Versions { - public static final String PROJECT_VERSION = "v${projectVersion}"; - private Versions() {} -} - """ -} - clean.doFirst { delete "${projectDir}/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java" } @@ -150,7 +140,18 @@ allprojects { } } - // Generate MANIFEST.MF + task createVersionsFile(type: Copy) { + from("src/main/java/net/devh/boot/grpc/common/util/Versions.java.template") { + rename "Versions.java.template", "Versions.java" + } + into "src/main/java/net/devh/boot/grpc/common/util" + filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [ + 'VERSIONS_STRING_PLACEHOLDER': "v${projectVersion}".toString(), + ]) + } + compileJava.dependsOn createVersionsFile + + // Generate.MF jar { manifest { attributes( diff --git a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java.template b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java.template new file mode 100644 index 000000000..13837aae3 --- /dev/null +++ b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java.template @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2016-2023 The gRPC-Spring Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.devh.boot.grpc.common.util; + +/** + * Class that contains version strings + */ +public final class Versions { + + /** + * A constant that defines, the current version of the library. + */ + public static final String PROJECT_VERSION = "VERSIONS_STRING_PLACEHOLDER"; + + private Versions() {} + +} From adb15435efdf6cb43aef7f0e239cd023a4a5e9ed Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 28 Mar 2024 01:13:48 +0000 Subject: [PATCH 19/41] restore unwanted change --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 09c3f06b7..6a40308ca 100644 --- a/build.gradle +++ b/build.gradle @@ -151,7 +151,7 @@ allprojects { } compileJava.dependsOn createVersionsFile - // Generate.MF + // Generate MANIFEST.MF jar { manifest { attributes( From baaff5915a4ff0fcbf0b89d46880674cc0799286 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 28 Mar 2024 01:23:41 +0000 Subject: [PATCH 20/41] use proper placeholder token style --- build.gradle | 6 +++--- .../net/devh/boot/grpc/common/util/Versions.java.template | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 6a40308ca..57603dd03 100644 --- a/build.gradle +++ b/build.gradle @@ -143,11 +143,11 @@ allprojects { task createVersionsFile(type: Copy) { from("src/main/java/net/devh/boot/grpc/common/util/Versions.java.template") { rename "Versions.java.template", "Versions.java" + filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [ + versionStringPlaceholder: "v${projectVersion}".toString(), + ]) } into "src/main/java/net/devh/boot/grpc/common/util" - filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [ - 'VERSIONS_STRING_PLACEHOLDER': "v${projectVersion}".toString(), - ]) } compileJava.dependsOn createVersionsFile diff --git a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java.template b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java.template index 13837aae3..bda61a920 100644 --- a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java.template +++ b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java.template @@ -24,7 +24,7 @@ public final class Versions { /** * A constant that defines, the current version of the library. */ - public static final String PROJECT_VERSION = "VERSIONS_STRING_PLACEHOLDER"; + public static final String PROJECT_VERSION = "@versionStringPlaceholder@"; private Versions() {} From 0d90e84a044d53fe763c5f29dc31615974bcc17f Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 28 Mar 2024 03:28:09 +0000 Subject: [PATCH 21/41] Add generated file to .gitignore, and fix gradle build error --- .gitignore | 5 ++++- build.gradle | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 99fbe20dc..82f994870 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,7 @@ bin/ ## VSCode .vscode/ -.devcontainer/ \ No newline at end of file +.devcontainer/ + +## build generated file +grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java diff --git a/build.gradle b/build.gradle index 57603dd03..137a7ac84 100644 --- a/build.gradle +++ b/build.gradle @@ -115,6 +115,7 @@ allprojects { removeUnusedImports() importOrderFile rootProject.file('extra/eclipse/eclipse.importorder') eclipse().configFile rootProject.file('extra/eclipse/eclipse-formatter.xml') + dependsOn createVersionsFile } format('misc') { target('**/*.gradle', '**/*.md', '**/*.yml') From c08f62dab8928c185fef7472bc2376e0e2667bd8 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 28 Mar 2024 03:32:41 +0000 Subject: [PATCH 22/41] fix gradle build error --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 137a7ac84..5c42bc99d 100644 --- a/build.gradle +++ b/build.gradle @@ -115,7 +115,6 @@ allprojects { removeUnusedImports() importOrderFile rootProject.file('extra/eclipse/eclipse.importorder') eclipse().configFile rootProject.file('extra/eclipse/eclipse-formatter.xml') - dependsOn createVersionsFile } format('misc') { target('**/*.gradle', '**/*.md', '**/*.yml') @@ -151,6 +150,7 @@ allprojects { into "src/main/java/net/devh/boot/grpc/common/util" } compileJava.dependsOn createVersionsFile + spotlessJava.dependsOn createVersionsFile // Generate MANIFEST.MF jar { From 89a6e3dddeefd5cb08059894abdeba478c9b27fc Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 28 Mar 2024 04:05:38 +0000 Subject: [PATCH 23/41] fix gradle build error --- build.gradle | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 5c42bc99d..1261e792c 100644 --- a/build.gradle +++ b/build.gradle @@ -72,8 +72,17 @@ ext { buildRevision = versioning.info.commit } +task createVersionsFile(type: Copy) { + from("grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java.template") { + rename "Versions.java.template", "Versions.java" + filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [ + versionStringPlaceholder: "v${projectVersion}".toString(), + ]) + } + into "grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util" +} clean.doFirst { - delete "${projectDir}/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java" + delete "grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java" } allprojects { @@ -140,15 +149,6 @@ allprojects { } } - task createVersionsFile(type: Copy) { - from("src/main/java/net/devh/boot/grpc/common/util/Versions.java.template") { - rename "Versions.java.template", "Versions.java" - filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [ - versionStringPlaceholder: "v${projectVersion}".toString(), - ]) - } - into "src/main/java/net/devh/boot/grpc/common/util" - } compileJava.dependsOn createVersionsFile spotlessJava.dependsOn createVersionsFile @@ -240,6 +240,10 @@ allprojects { project -> } } + delombok { + dependsOn createVersionsFile + } + // Javadoc Task javadoc { dependsOn delombok From 93ea147505f541bcb85ea6f0320d35c5319d6cdd Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 28 Mar 2024 04:09:52 +0000 Subject: [PATCH 24/41] fix gradle build error --- build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index 1261e792c..42eeec718 100644 --- a/build.gradle +++ b/build.gradle @@ -244,6 +244,10 @@ allprojects { project -> dependsOn createVersionsFile } + sourcesJar { + dependsOn createVersionsFile + } + // Javadoc Task javadoc { dependsOn delombok From 90cec2b31e222c505174b5976d4ef02860c9d407 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 28 Mar 2024 04:49:33 +0000 Subject: [PATCH 25/41] fix gradle build error --- build.gradle | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 42eeec718..4d92e2810 100644 --- a/build.gradle +++ b/build.gradle @@ -147,6 +147,7 @@ allprojects { include 'LICENSE' into 'META-INF' } + dependsOn createVersionsFile } compileJava.dependsOn createVersionsFile @@ -244,10 +245,6 @@ allprojects { project -> dependsOn createVersionsFile } - sourcesJar { - dependsOn createVersionsFile - } - // Javadoc Task javadoc { dependsOn delombok From e2de4d2e270e863e47b094fb91034eb7f72bca6a Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 28 Mar 2024 04:55:41 +0000 Subject: [PATCH 26/41] tabs are bad --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4d92e2810..8f2d43636 100644 --- a/build.gradle +++ b/build.gradle @@ -147,7 +147,7 @@ allprojects { include 'LICENSE' into 'META-INF' } - dependsOn createVersionsFile + dependsOn createVersionsFile } compileJava.dependsOn createVersionsFile From 6de2a52c2ac025f8960403cb44135d4f1785a20e Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 28 Mar 2024 20:49:56 +0000 Subject: [PATCH 27/41] Add tags test to all relevant tests --- .../metrics/MetricsClientStreamTracers.java | 13 ++++-- .../MetricsClientStreamTracersTest.java | 44 ++++++++++++++----- .../metrics/MetricsServerStreamTracers.java | 4 +- .../MetricsServerStreamTracersTest.java | 2 + 4 files changed, 49 insertions(+), 14 deletions(-) diff --git a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java index dc2cb4f9a..4fedf0c68 100644 --- a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java +++ b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java @@ -172,7 +172,9 @@ static final class CallAttemptsTracerFactory extends ClientStreamTracer.Factory // Record here in case newClientStreamTracer() would never be called. this.metricsClientMeters.getAttemptCounter() - .withTags(Tags.of("grpc.method", fullMethodName)) + .withTags(Tags.of("grpc.method", fullMethodName, + "instrumentation_source", "grpc-spring", + "instrumentation_version", Versions.PROJECT_VERSION)) .increment(); } @@ -192,7 +194,9 @@ public ClientStreamTracer newClientStreamTracer(StreamInfo info, Metadata metada // attempt, as first attempt cannot be a transparent retry. if (attemptsPerCall.get() > 0) { this.metricsClientMeters.getAttemptCounter() - .withTags((Tags.of("grpc.method", fullMethodName))) + .withTags((Tags.of("grpc.method", fullMethodName, + "instrumentation_source", "grpc-spring", + "instrumentation_version", Versions.PROJECT_VERSION))) .increment(); } if (!info.isTransparentRetry()) { @@ -252,7 +256,10 @@ void recordFinishedCall() { } callLatencyNanos = clientCallStopWatch.elapsed(TimeUnit.NANOSECONDS); Tags clientCallMetricTags = - Tags.of("grpc.method", this.fullMethodName, "grpc.status", status.getCode().toString()); + Tags.of("grpc.method", this.fullMethodName, + "grpc.status", status.getCode().toString(), + "instrumentation_source", "grpc-spring", + "instrumentation_version", Versions.PROJECT_VERSION); this.metricsClientMeters.getClientCallDuration() .withTags(clientCallMetricTags) .record(callLatencyNanos, TimeUnit.NANOSECONDS); diff --git a/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java index 76b4cc4ac..6ecb33633 100644 --- a/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java +++ b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java @@ -130,6 +130,8 @@ void clientBasicMetrics() { assertThat(meterRegistry.get(CLIENT_ATTEMPT_STARTED) .tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME) + .tag(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE) + .tag(INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .counter() .count()).isEqualTo(1); @@ -151,16 +153,19 @@ void clientBasicMetrics() { assertThat(meterRegistry.get(CLIENT_ATTEMPT_STARTED) .tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME) + .tag(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE) + .tag(INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .counter() .count()).isEqualTo(1); Tags expectedTags = - Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME, GRPC_STATUS_TAG_KEY, Status.Code.OK.toString()); + Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME, + GRPC_STATUS_TAG_KEY, Status.Code.OK.toString(), + INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, + INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE); HistogramSnapshot attemptDurationSnapshot = meterRegistry.get(CLIENT_ATTEMPT_DURATION) .tags(expectedTags) - .tag(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE) - .tag(INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .timer() .takeSnapshot(); HistogramSnapshot attemptDurationHistogram = HistogramSnapshot.empty(1L, 154L, 1.54E8); @@ -178,8 +183,6 @@ void clientBasicMetrics() { HistogramSnapshot sentAttemptMessageSizeSnapShot = meterRegistry.get(CLIENT_ATTEMPT_SENT_COMPRESSED_MESSAGE_SIZE) .tags(expectedTags) - .tag(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE) - .tag(INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .summary() .takeSnapshot(); HistogramSnapshot expectedAttemptSentMessageSizeHistogram = HistogramSnapshot.empty(1L, 1127L, 1127L); @@ -209,6 +212,8 @@ void recordAttemptMetrics() { assertThat(meterRegistry.get(CLIENT_ATTEMPT_STARTED) .tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME) + .tag(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE) + .tag(INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .counter() .count()).isEqualTo(1); @@ -222,10 +227,15 @@ void recordAttemptMetrics() { tracer.streamClosed(Status.UNAVAILABLE); Tags expectedUnailableStatusTags = - Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME, GRPC_STATUS_TAG_KEY, Status.Code.UNAVAILABLE.toString()); + Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME, + GRPC_STATUS_TAG_KEY, Status.Code.UNAVAILABLE.toString(), + INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, + INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE); assertThat(meterRegistry.get(CLIENT_ATTEMPT_STARTED) .tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME) + .tag(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE) + .tag(INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .counter() .count()).isEqualTo(1); assertThat(meterRegistry.get(CLIENT_ATTEMPT_DURATION) @@ -257,10 +267,15 @@ void recordAttemptMetrics() { tracer.streamClosed(Status.NOT_FOUND); Tags expectedNotFoundStatusTags = - Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME, GRPC_STATUS_TAG_KEY, Status.Code.NOT_FOUND.toString()); + Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME, + GRPC_STATUS_TAG_KEY, Status.Code.NOT_FOUND.toString(), + INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, + INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE); assertThat(meterRegistry.get(CLIENT_ATTEMPT_STARTED) .tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME) + .tag(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE) + .tag(INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .counter() .count()).isEqualTo(2); @@ -299,6 +314,8 @@ void recordAttemptMetrics() { assertThat(meterRegistry.get(CLIENT_ATTEMPT_STARTED) .tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME) + .tag(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE) + .tag(INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .counter() .count()).isEqualTo(3); @@ -351,10 +368,15 @@ void recordAttemptMetrics() { callAttemptsTracerFactory.callEnded(Status.OK); Tags expectedOKStatusTags = - Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME, GRPC_STATUS_TAG_KEY, Status.Code.OK.toString()); + Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME, + GRPC_STATUS_TAG_KEY, Status.Code.OK.toString(), + INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, + INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE); assertThat(meterRegistry.get(CLIENT_ATTEMPT_STARTED) .tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME) + .tag(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE) + .tag(INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .counter() .count()).isEqualTo(4); assertThat(meterRegistry.get(CLIENT_ATTEMPT_DURATION) @@ -397,8 +419,10 @@ void clientStreamNeverCreatedStillRecordMetrics() { callAttemptsTracerFactory.callEnded(status); Tags expectedDeadlineExceededStatusTags = - Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME, GRPC_STATUS_TAG_KEY, - Status.Code.DEADLINE_EXCEEDED.toString()); + Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME, + GRPC_STATUS_TAG_KEY, Status.Code.DEADLINE_EXCEEDED.toString(), + INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, + INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE); HistogramSnapshot attemptDurationSnapshot = meterRegistry.get(CLIENT_ATTEMPT_DURATION) .tags(expectedDeadlineExceededStatusTags) diff --git a/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java b/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java index 3a4627549..981bd38c6 100644 --- a/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java +++ b/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java @@ -101,7 +101,9 @@ private static final class ServerTracer extends ServerStreamTracer { @Override public void serverCallStarted(ServerCallInfo callInfo) { this.metricsServerMeters.getServerCallCounter() - .withTags(Tags.of("grpc.method", this.fullMethodName)) + .withTags(Tags.of("grpc.method", this.fullMethodName, + "instrumentation_source", "grpc-spring", + "instrumentation_version", Versions.PROJECT_VERSION)) .increment(); } diff --git a/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java b/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java index bbc98afa3..443c5c44d 100644 --- a/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java +++ b/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java @@ -155,6 +155,8 @@ void serverBasicMetrics() { assertThat(meterRegistry.get(SERVER_CALL_STARTED) .tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME) + .tag(INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE) + .tag(INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE) .counter() .count()).isEqualTo(1); From ac902270ac2d3cb8985709a405b2e7064908bc1b Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 28 Mar 2024 21:00:12 +0000 Subject: [PATCH 28/41] generalize file to Constants.java, put more constants into it --- build.gradle | 16 ++++++++-------- .../metrics/MetricsClientStreamTracers.java | 18 +++++++++--------- .../MetricsClientStreamTracersTest.java | 6 +++--- ...s.java.template => Constants.java.template} | 15 +++++++++++---- .../metrics/MetricsServerStreamTracers.java | 10 +++++----- .../MetricsServerStreamTracersTest.java | 6 +++--- 6 files changed, 39 insertions(+), 32 deletions(-) rename grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/{Versions.java.template => Constants.java.template} (69%) diff --git a/build.gradle b/build.gradle index 8f2d43636..b5341ee37 100644 --- a/build.gradle +++ b/build.gradle @@ -72,9 +72,9 @@ ext { buildRevision = versioning.info.commit } -task createVersionsFile(type: Copy) { - from("grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java.template") { - rename "Versions.java.template", "Versions.java" +task createConstantsFile(type: Copy) { + from("grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java.template") { + rename "Constants.java.template", "Constants.java" filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [ versionStringPlaceholder: "v${projectVersion}".toString(), ]) @@ -82,7 +82,7 @@ task createVersionsFile(type: Copy) { into "grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util" } clean.doFirst { - delete "grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java" + delete "grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java" } allprojects { @@ -147,11 +147,11 @@ allprojects { include 'LICENSE' into 'META-INF' } - dependsOn createVersionsFile + dependsOn createConstantsFile } - compileJava.dependsOn createVersionsFile - spotlessJava.dependsOn createVersionsFile + compileJava.dependsOn createConstantsFile + spotlessJava.dependsOn createConstantsFile // Generate MANIFEST.MF jar { @@ -242,7 +242,7 @@ allprojects { project -> } delombok { - dependsOn createVersionsFile + dependsOn createConstantsFile } // Javadoc Task diff --git a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java index 4fedf0c68..7afb45c12 100644 --- a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java +++ b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java @@ -35,7 +35,7 @@ import io.grpc.Status; import io.grpc.Status.Code; import io.micrometer.core.instrument.Tags; -import net.devh.boot.grpc.common.util.Versions; +import net.devh.boot.grpc.common.util.Constants; /** * Provides factories for {@link io.grpc.StreamTracer} that records metrics. @@ -130,8 +130,8 @@ void recordFinishedAttempt() { Tags attemptMetricTags = Tags.of("grpc.method", fullMethodName, "grpc.status", statusCode.toString(), - "instrumentation_source", "grpc-spring", - "instrumentation_version", Versions.PROJECT_VERSION); + "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, + "instrumentation_version", Constants.PROJECT_VERSION); this.metricsClientMeters.getClientAttemptDuration() .withTags(attemptMetricTags) .record(attemptNanos, TimeUnit.NANOSECONDS); @@ -173,8 +173,8 @@ static final class CallAttemptsTracerFactory extends ClientStreamTracer.Factory // Record here in case newClientStreamTracer() would never be called. this.metricsClientMeters.getAttemptCounter() .withTags(Tags.of("grpc.method", fullMethodName, - "instrumentation_source", "grpc-spring", - "instrumentation_version", Versions.PROJECT_VERSION)) + "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, + "instrumentation_version", Constants.PROJECT_VERSION)) .increment(); } @@ -195,8 +195,8 @@ public ClientStreamTracer newClientStreamTracer(StreamInfo info, Metadata metada if (attemptsPerCall.get() > 0) { this.metricsClientMeters.getAttemptCounter() .withTags((Tags.of("grpc.method", fullMethodName, - "instrumentation_source", "grpc-spring", - "instrumentation_version", Versions.PROJECT_VERSION))) + "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, + "instrumentation_version", Constants.PROJECT_VERSION))) .increment(); } if (!info.isTransparentRetry()) { @@ -258,8 +258,8 @@ void recordFinishedCall() { Tags clientCallMetricTags = Tags.of("grpc.method", this.fullMethodName, "grpc.status", status.getCode().toString(), - "instrumentation_source", "grpc-spring", - "instrumentation_version", Versions.PROJECT_VERSION); + "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, + "instrumentation_version", Constants.PROJECT_VERSION); this.metricsClientMeters.getClientCallDuration() .withTags(clientCallMetricTags) .record(callLatencyNanos, TimeUnit.NANOSECONDS); diff --git a/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java index 6ecb33633..94bf9957c 100644 --- a/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java +++ b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java @@ -37,7 +37,7 @@ import io.micrometer.core.instrument.distribution.HistogramSnapshot; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import net.devh.boot.grpc.client.metrics.MetricsClientStreamTracers.CallAttemptsTracerFactory; -import net.devh.boot.grpc.common.util.Versions; +import net.devh.boot.grpc.common.util.Constants; /** * Tests for {@link MetricsClientStreamTracers}. @@ -63,9 +63,9 @@ class MetricsClientStreamTracersTest { private static final String GRPC_STATUS_TAG_KEY = "grpc.status"; private static final String FULL_METHOD_NAME = "package1.service1/method1"; private static final String INSTRUMENTATION_SOURCE_TAG_KEY = "instrumentation_source"; - private static final String INSTRUMENTATION_SOURCE_TAG_VALUE = "grpc-spring"; + private static final String INSTRUMENTATION_SOURCE_TAG_VALUE = Constants.INSTRUMENTATION_SOURCE_TAG_VALUE; private static final String INSTRUMENTATION_VERSION_TAG_KEY = "instrumentation_version"; - private static final String INSTRUMENTATION_VERSION_TAG_VALUE = Versions.PROJECT_VERSION; + private static final String INSTRUMENTATION_VERSION_TAG_VALUE = Constants.PROJECT_VERSION; private static class StringInputStream extends InputStream { final String string; diff --git a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java.template b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java.template similarity index 69% rename from grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java.template rename to grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java.template index bda61a920..e948ce287 100644 --- a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java.template +++ b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java.template @@ -17,15 +17,22 @@ package net.devh.boot.grpc.common.util; /** - * Class that contains version strings + * Class that contains shared constants */ -public final class Versions { +public final class Constants { /** - * A constant that defines, the current version of the library. + * A constant that defines the current version of the library. */ public static final String PROJECT_VERSION = "@versionStringPlaceholder@"; - private Versions() {} + + /** + * A constant that defines the instrumentation_source metric tag value + */ + public static final String INSTRUMENTATION_SOURCE_TAG_VALUE = "grpc-spring"; + + + private Constants() {} } diff --git a/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java b/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java index 981bd38c6..bb24d7ec2 100644 --- a/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java +++ b/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java @@ -30,7 +30,7 @@ import io.grpc.Status; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tags; -import net.devh.boot.grpc.common.util.Versions; +import net.devh.boot.grpc.common.util.Constants; /** * Provides factories for {@link io.grpc.StreamTracer} that records metrics. @@ -102,8 +102,8 @@ private static final class ServerTracer extends ServerStreamTracer { public void serverCallStarted(ServerCallInfo callInfo) { this.metricsServerMeters.getServerCallCounter() .withTags(Tags.of("grpc.method", this.fullMethodName, - "instrumentation_source", "grpc-spring", - "instrumentation_version", Versions.PROJECT_VERSION)) + "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, + "instrumentation_version", Constants.PROJECT_VERSION)) .increment(); } @@ -127,8 +127,8 @@ public void streamClosed(Status status) { Tags serverMetricTags = Tags.of("grpc.method", this.fullMethodName, "grpc.status", status.getCode().toString(), - "instrumentation_source", "grpc-spring", - "instrumentation_version", Versions.PROJECT_VERSION); + "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, + "instrumentation_version", Constants.PROJECT_VERSION); this.metricsServerMeters.getServerCallDuration() .withTags(serverMetricTags) .record(callLatencyNanos, TimeUnit.NANOSECONDS); diff --git a/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java b/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java index 443c5c44d..5067b4036 100644 --- a/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java +++ b/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java @@ -38,7 +38,7 @@ import io.micrometer.core.instrument.distribution.CountAtBucket; import io.micrometer.core.instrument.distribution.HistogramSnapshot; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; -import net.devh.boot.grpc.common.util.Versions; +import net.devh.boot.grpc.common.util.Constants; /** * Tests for {@link MetricsServerStreamTracers}. @@ -56,9 +56,9 @@ class MetricsServerStreamTracersTest { private static final String GRPC_METHOD_TAG_KEY = "grpc.method"; private static final String GRPC_STATUS_TAG_KEY = "grpc.status"; private static final String INSTRUMENTATION_SOURCE_TAG_KEY = "instrumentation_source"; - private static final String INSTRUMENTATION_SOURCE_TAG_VALUE = "grpc-spring"; + private static final String INSTRUMENTATION_SOURCE_TAG_VALUE = Constants.INSTRUMENTATION_SOURCE_TAG_VALUE; private static final String INSTRUMENTATION_VERSION_TAG_KEY = "instrumentation_version"; - private static final String INSTRUMENTATION_VERSION_TAG_VALUE = Versions.PROJECT_VERSION; + private static final String INSTRUMENTATION_VERSION_TAG_VALUE = Constants.PROJECT_VERSION; private static class StringInputStream extends InputStream { From 34547e3d8e740172d45209b4cf98690a2bf32a99 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 28 Mar 2024 21:00:34 +0000 Subject: [PATCH 29/41] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 82f994870..18fd4204a 100644 --- a/.gitignore +++ b/.gitignore @@ -28,4 +28,4 @@ bin/ .devcontainer/ ## build generated file -grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Versions.java +grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java From 9af3326abc115293505e9eefa4a7b1f54690ec12 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 28 Mar 2024 21:05:38 +0000 Subject: [PATCH 30/41] Ran sportlessApply --- .../metrics/MetricsClientStreamTracers.java | 8 ++--- .../MetricsClientStreamTracersTest.java | 30 +++++++++---------- .../metrics/MetricsServerStreamTracers.java | 4 +-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java index 7afb45c12..2d6513260 100644 --- a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java +++ b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java @@ -173,8 +173,8 @@ static final class CallAttemptsTracerFactory extends ClientStreamTracer.Factory // Record here in case newClientStreamTracer() would never be called. this.metricsClientMeters.getAttemptCounter() .withTags(Tags.of("grpc.method", fullMethodName, - "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, - "instrumentation_version", Constants.PROJECT_VERSION)) + "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, + "instrumentation_version", Constants.PROJECT_VERSION)) .increment(); } @@ -195,8 +195,8 @@ public ClientStreamTracer newClientStreamTracer(StreamInfo info, Metadata metada if (attemptsPerCall.get() > 0) { this.metricsClientMeters.getAttemptCounter() .withTags((Tags.of("grpc.method", fullMethodName, - "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, - "instrumentation_version", Constants.PROJECT_VERSION))) + "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, + "instrumentation_version", Constants.PROJECT_VERSION))) .increment(); } if (!info.isTransparentRetry()) { diff --git a/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java index 94bf9957c..e9c2c16e8 100644 --- a/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java +++ b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java @@ -160,9 +160,9 @@ void clientBasicMetrics() { Tags expectedTags = Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME, - GRPC_STATUS_TAG_KEY, Status.Code.OK.toString(), - INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, - INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE); + GRPC_STATUS_TAG_KEY, Status.Code.OK.toString(), + INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, + INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE); HistogramSnapshot attemptDurationSnapshot = meterRegistry.get(CLIENT_ATTEMPT_DURATION) .tags(expectedTags) @@ -228,9 +228,9 @@ void recordAttemptMetrics() { Tags expectedUnailableStatusTags = Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME, - GRPC_STATUS_TAG_KEY, Status.Code.UNAVAILABLE.toString(), - INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, - INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE); + GRPC_STATUS_TAG_KEY, Status.Code.UNAVAILABLE.toString(), + INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, + INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE); assertThat(meterRegistry.get(CLIENT_ATTEMPT_STARTED) .tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME) @@ -268,9 +268,9 @@ void recordAttemptMetrics() { Tags expectedNotFoundStatusTags = Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME, - GRPC_STATUS_TAG_KEY, Status.Code.NOT_FOUND.toString(), - INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, - INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE); + GRPC_STATUS_TAG_KEY, Status.Code.NOT_FOUND.toString(), + INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, + INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE); assertThat(meterRegistry.get(CLIENT_ATTEMPT_STARTED) .tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME) @@ -369,9 +369,9 @@ void recordAttemptMetrics() { Tags expectedOKStatusTags = Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME, - GRPC_STATUS_TAG_KEY, Status.Code.OK.toString(), - INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, - INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE); + GRPC_STATUS_TAG_KEY, Status.Code.OK.toString(), + INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, + INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE); assertThat(meterRegistry.get(CLIENT_ATTEMPT_STARTED) .tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME) @@ -420,9 +420,9 @@ void clientStreamNeverCreatedStillRecordMetrics() { Tags expectedDeadlineExceededStatusTags = Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME, - GRPC_STATUS_TAG_KEY, Status.Code.DEADLINE_EXCEEDED.toString(), - INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, - INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE); + GRPC_STATUS_TAG_KEY, Status.Code.DEADLINE_EXCEEDED.toString(), + INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE, + INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE); HistogramSnapshot attemptDurationSnapshot = meterRegistry.get(CLIENT_ATTEMPT_DURATION) .tags(expectedDeadlineExceededStatusTags) diff --git a/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java b/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java index bb24d7ec2..d0ff68a4f 100644 --- a/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java +++ b/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java @@ -102,8 +102,8 @@ private static final class ServerTracer extends ServerStreamTracer { public void serverCallStarted(ServerCallInfo callInfo) { this.metricsServerMeters.getServerCallCounter() .withTags(Tags.of("grpc.method", this.fullMethodName, - "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, - "instrumentation_version", Constants.PROJECT_VERSION)) + "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, + "instrumentation_version", Constants.PROJECT_VERSION)) .increment(); } From 78ffee2da6dab4ac2d681410552817dac80291c5 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 28 Mar 2024 21:08:34 +0000 Subject: [PATCH 31/41] fix format --- .../java/net/devh/boot/grpc/common/util/Constants.java.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java.template b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java.template index e948ce287..de343e2b3 100644 --- a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java.template +++ b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java.template @@ -30,7 +30,7 @@ public final class Constants { /** * A constant that defines the instrumentation_source metric tag value */ - public static final String INSTRUMENTATION_SOURCE_TAG_VALUE = "grpc-spring"; + public static final String INSTRUMENTATION_SOURCE_TAG_VALUE = "grpc-spring"; private Constants() {} From d486cdb6b2d90d3eaa81c3f879fdcbb4a799548a Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Fri, 29 Mar 2024 17:58:11 +0000 Subject: [PATCH 32/41] Incorporate review feedback --- .../metrics/MetricsClientStreamTracers.java | 18 ++++++++++-------- .../MetricsClientStreamTracersTest.java | 4 ++-- .../grpc/common/util/Constants.java.template | 4 ++-- .../metrics/MetricsServerStreamTracers.java | 10 ++++++---- .../MetricsServerStreamTracersTest.java | 4 ++-- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java index 2d6513260..efc22f6c0 100644 --- a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java +++ b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java @@ -48,6 +48,8 @@ final class MetricsClientStreamTracers { private static final Supplier STOPWATCH_SUPPLIER = Stopwatch::createUnstarted; private final Supplier stopwatchSupplier; + private static final String INSTRUMENTATION_SOURCE_TAG_KEY = "instrumentation_source"; + private static final String INSTRUMENTATION_VERSION_TAG_KEY = "instrumentation_version"; MetricsClientStreamTracers() { this(STOPWATCH_SUPPLIER); @@ -130,8 +132,8 @@ void recordFinishedAttempt() { Tags attemptMetricTags = Tags.of("grpc.method", fullMethodName, "grpc.status", statusCode.toString(), - "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, - "instrumentation_version", Constants.PROJECT_VERSION); + INSTRUMENTATION_SOURCE_TAG_KEY, Constants.LIBRARY_NAME, + INSTRUMENTATION_VERSION_TAG_KEY, Constants.VERSION); this.metricsClientMeters.getClientAttemptDuration() .withTags(attemptMetricTags) .record(attemptNanos, TimeUnit.NANOSECONDS); @@ -173,8 +175,8 @@ static final class CallAttemptsTracerFactory extends ClientStreamTracer.Factory // Record here in case newClientStreamTracer() would never be called. this.metricsClientMeters.getAttemptCounter() .withTags(Tags.of("grpc.method", fullMethodName, - "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, - "instrumentation_version", Constants.PROJECT_VERSION)) + INSTRUMENTATION_SOURCE_TAG_KEY, Constants.LIBRARY_NAME, + INSTRUMENTATION_VERSION_TAG_KEY, Constants.VERSION)) .increment(); } @@ -195,8 +197,8 @@ public ClientStreamTracer newClientStreamTracer(StreamInfo info, Metadata metada if (attemptsPerCall.get() > 0) { this.metricsClientMeters.getAttemptCounter() .withTags((Tags.of("grpc.method", fullMethodName, - "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, - "instrumentation_version", Constants.PROJECT_VERSION))) + INSTRUMENTATION_SOURCE_TAG_KEY, Constants.LIBRARY_NAME, + INSTRUMENTATION_VERSION_TAG_KEY, Constants.VERSION))) .increment(); } if (!info.isTransparentRetry()) { @@ -258,8 +260,8 @@ void recordFinishedCall() { Tags clientCallMetricTags = Tags.of("grpc.method", this.fullMethodName, "grpc.status", status.getCode().toString(), - "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, - "instrumentation_version", Constants.PROJECT_VERSION); + INSTRUMENTATION_SOURCE_TAG_KEY, Constants.LIBRARY_NAME, + INSTRUMENTATION_VERSION_TAG_KEY, Constants.VERSION); this.metricsClientMeters.getClientCallDuration() .withTags(clientCallMetricTags) .record(callLatencyNanos, TimeUnit.NANOSECONDS); diff --git a/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java index e9c2c16e8..e21bd2098 100644 --- a/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java +++ b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java @@ -63,9 +63,9 @@ class MetricsClientStreamTracersTest { private static final String GRPC_STATUS_TAG_KEY = "grpc.status"; private static final String FULL_METHOD_NAME = "package1.service1/method1"; private static final String INSTRUMENTATION_SOURCE_TAG_KEY = "instrumentation_source"; - private static final String INSTRUMENTATION_SOURCE_TAG_VALUE = Constants.INSTRUMENTATION_SOURCE_TAG_VALUE; + private static final String INSTRUMENTATION_SOURCE_TAG_VALUE = Constants.LIBRARY_NAME; private static final String INSTRUMENTATION_VERSION_TAG_KEY = "instrumentation_version"; - private static final String INSTRUMENTATION_VERSION_TAG_VALUE = Constants.PROJECT_VERSION; + private static final String INSTRUMENTATION_VERSION_TAG_VALUE = Constants.VERSION; private static class StringInputStream extends InputStream { final String string; diff --git a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java.template b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java.template index de343e2b3..3beffcbc9 100644 --- a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java.template +++ b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java.template @@ -24,13 +24,13 @@ public final class Constants { /** * A constant that defines the current version of the library. */ - public static final String PROJECT_VERSION = "@versionStringPlaceholder@"; + public static final String VERSION = "@versionStringPlaceholder@"; /** * A constant that defines the instrumentation_source metric tag value */ - public static final String INSTRUMENTATION_SOURCE_TAG_VALUE = "grpc-spring"; + public static final String LIBRARY_NAME = "grpc-spring"; private Constants() {} diff --git a/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java b/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java index d0ff68a4f..f7eba5b9c 100644 --- a/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java +++ b/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java @@ -46,6 +46,8 @@ public final class MetricsServerStreamTracers { private static final Supplier STOPWATCH_SUPPLIER = Stopwatch::createUnstarted; private final Supplier stopwatchSupplier; + private static final String INSTRUMENTATION_SOURCE_TAG_KEY = "instrumentation_source"; + private static final String INSTRUMENTATION_VERSION_TAG_KEY = "instrumentation_version"; public MetricsServerStreamTracers() { this(STOPWATCH_SUPPLIER); @@ -102,8 +104,8 @@ private static final class ServerTracer extends ServerStreamTracer { public void serverCallStarted(ServerCallInfo callInfo) { this.metricsServerMeters.getServerCallCounter() .withTags(Tags.of("grpc.method", this.fullMethodName, - "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, - "instrumentation_version", Constants.PROJECT_VERSION)) + INSTRUMENTATION_SOURCE_TAG_KEY, Constants.LIBRARY_NAME, + INSTRUMENTATION_VERSION_TAG_KEY, Constants.VERSION)) .increment(); } @@ -127,8 +129,8 @@ public void streamClosed(Status status) { Tags serverMetricTags = Tags.of("grpc.method", this.fullMethodName, "grpc.status", status.getCode().toString(), - "instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE, - "instrumentation_version", Constants.PROJECT_VERSION); + INSTRUMENTATION_SOURCE_TAG_KEY, Constants.LIBRARY_NAME, + INSTRUMENTATION_VERSION_TAG_KEY, Constants.VERSION); this.metricsServerMeters.getServerCallDuration() .withTags(serverMetricTags) .record(callLatencyNanos, TimeUnit.NANOSECONDS); diff --git a/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java b/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java index 5067b4036..2b6d85bfc 100644 --- a/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java +++ b/grpc-server-spring-boot-starter/src/test/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracersTest.java @@ -56,9 +56,9 @@ class MetricsServerStreamTracersTest { private static final String GRPC_METHOD_TAG_KEY = "grpc.method"; private static final String GRPC_STATUS_TAG_KEY = "grpc.status"; private static final String INSTRUMENTATION_SOURCE_TAG_KEY = "instrumentation_source"; - private static final String INSTRUMENTATION_SOURCE_TAG_VALUE = Constants.INSTRUMENTATION_SOURCE_TAG_VALUE; + private static final String INSTRUMENTATION_SOURCE_TAG_VALUE = Constants.LIBRARY_NAME; private static final String INSTRUMENTATION_VERSION_TAG_KEY = "instrumentation_version"; - private static final String INSTRUMENTATION_VERSION_TAG_VALUE = Constants.PROJECT_VERSION; + private static final String INSTRUMENTATION_VERSION_TAG_VALUE = Constants.VERSION; private static class StringInputStream extends InputStream { From 34f3e410e8cfc4df7ce93f2c2452afedf4879469 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Fri, 29 Mar 2024 18:10:32 +0000 Subject: [PATCH 33/41] Remove the need to generate Constants.java, can grab the project version from the java class itself --- .gitignore | 3 --- build.gradle | 21 ------------------- ...Constants.java.template => Constants.java} | 2 +- 3 files changed, 1 insertion(+), 25 deletions(-) rename grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/{Constants.java.template => Constants.java} (91%) diff --git a/.gitignore b/.gitignore index 18fd4204a..96f9cf915 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,3 @@ bin/ ## VSCode .vscode/ .devcontainer/ - -## build generated file -grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java diff --git a/build.gradle b/build.gradle index b5341ee37..7062a4ba8 100644 --- a/build.gradle +++ b/build.gradle @@ -72,19 +72,6 @@ ext { buildRevision = versioning.info.commit } -task createConstantsFile(type: Copy) { - from("grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java.template") { - rename "Constants.java.template", "Constants.java" - filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [ - versionStringPlaceholder: "v${projectVersion}".toString(), - ]) - } - into "grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util" -} -clean.doFirst { - delete "grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java" -} - allprojects { apply plugin: 'java' apply plugin: 'idea' @@ -147,12 +134,8 @@ allprojects { include 'LICENSE' into 'META-INF' } - dependsOn createConstantsFile } - compileJava.dependsOn createConstantsFile - spotlessJava.dependsOn createConstantsFile - // Generate MANIFEST.MF jar { manifest { @@ -241,10 +224,6 @@ allprojects { project -> } } - delombok { - dependsOn createConstantsFile - } - // Javadoc Task javadoc { dependsOn delombok diff --git a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java.template b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java similarity index 91% rename from grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java.template rename to grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java index 3beffcbc9..558432600 100644 --- a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java.template +++ b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java @@ -24,7 +24,7 @@ public final class Constants { /** * A constant that defines the current version of the library. */ - public static final String VERSION = "@versionStringPlaceholder@"; + public static final String VERSION = Constants.class.getPackage().getImplementationVersion(); /** From 3bcb2ffb8dbaf47afb9975f03efc67c5ed5ee82e Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Fri, 29 Mar 2024 18:11:38 +0000 Subject: [PATCH 34/41] reset no change to .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 96f9cf915..99fbe20dc 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,4 @@ bin/ ## VSCode .vscode/ -.devcontainer/ +.devcontainer/ \ No newline at end of file From ed1b37750fd7871b384dc32af79b70a5303ac3ed Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Fri, 29 Mar 2024 18:13:12 +0000 Subject: [PATCH 35/41] fix comment --- .../src/main/java/net/devh/boot/grpc/common/util/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java index 558432600..dcb000b27 100644 --- a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java +++ b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java @@ -28,7 +28,7 @@ public final class Constants { /** - * A constant that defines the instrumentation_source metric tag value + * A constant that defines the library name that can be used as metric tags */ public static final String LIBRARY_NAME = "grpc-spring"; From 144599863fb645a1868cffeb670ddcc17a50c752 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Fri, 29 Mar 2024 18:17:14 +0000 Subject: [PATCH 36/41] missing the first v in the version string --- .../src/main/java/net/devh/boot/grpc/common/util/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java index dcb000b27..beabbceb7 100644 --- a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java +++ b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java @@ -24,7 +24,7 @@ public final class Constants { /** * A constant that defines the current version of the library. */ - public static final String VERSION = Constants.class.getPackage().getImplementationVersion(); + public static final String VERSION = "v"+Constants.class.getPackage().getImplementationVersion(); /** From 33580190dbfe781e64fa29ac1690f1e391a08a3d Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Fri, 29 Mar 2024 18:20:01 +0000 Subject: [PATCH 37/41] ran spotlessApply again --- .../src/main/java/net/devh/boot/grpc/common/util/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java index beabbceb7..ff20b23b2 100644 --- a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java +++ b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java @@ -24,7 +24,7 @@ public final class Constants { /** * A constant that defines the current version of the library. */ - public static final String VERSION = "v"+Constants.class.getPackage().getImplementationVersion(); + public static final String VERSION = "v" + Constants.class.getPackage().getImplementationVersion(); /** From 25165596e764e0d4392438401b7bab872186da98 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Fri, 29 Mar 2024 21:16:34 +0000 Subject: [PATCH 38/41] incorporate review feedback --- .../main/java/net/devh/boot/grpc/common/util/Constants.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java index ff20b23b2..d2fe16943 100644 --- a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java +++ b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/Constants.java @@ -17,7 +17,7 @@ package net.devh.boot.grpc.common.util; /** - * Class that contains shared constants + * Class that contains shared constants. */ public final class Constants { @@ -26,13 +26,11 @@ public final class Constants { */ public static final String VERSION = "v" + Constants.class.getPackage().getImplementationVersion(); - /** - * A constant that defines the library name that can be used as metric tags + * A constant that defines the library name that can be used as metric tags. */ public static final String LIBRARY_NAME = "grpc-spring"; - private Constants() {} } From dec5effccd30157e224ebff7168dbcc83133719e Mon Sep 17 00:00:00 2001 From: onyn Date: Fri, 2 Feb 2024 12:00:01 +0300 Subject: [PATCH 39/41] feat: apply grpc service config from consul (#1045) --- docs/en/client/configuration.md | 2 +- .../DiscoveryClientNameResolver.java | 56 +++++++++ .../DiscoveryClientNameResolverTest.java | 119 ++++++++++++++++++ .../client/nameresolver/TestableListener.java | 43 +++++++ .../devh/boot/grpc/common/util/GrpcUtils.java | 5 + 5 files changed, 224 insertions(+), 1 deletion(-) create mode 100644 grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/nameresolver/DiscoveryClientNameResolverTest.java create mode 100644 grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/nameresolver/TestableListener.java diff --git a/docs/en/client/configuration.md b/docs/en/client/configuration.md index 08271f943..00ad2babd 100644 --- a/docs/en/client/configuration.md +++ b/docs/en/client/configuration.md @@ -69,7 +69,7 @@ There are a number of supported schemes, that you can use to determine the targe - `discovery` (Prio 6): \ (Optional) Uses spring-cloud's `DiscoveryClient` to lookup appropriate targets. The connections will be refreshed automatically during `HeartbeatEvent`s. Uses the `gRPC_port` metadata to determine the port, otherwise uses the - service port. \ + service port. Uses the `gRPC_service_config` metadata to determine [service config](https://grpc.github.io/grpc/core/md_doc_service_config.html). \ Example: `discovery:///service-name` - `self` (Prio 0): \ The self address or scheme is a keyword that is available, if you also use `grpc-server-spring-boot-starter` and diff --git a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/nameresolver/DiscoveryClientNameResolver.java b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/nameresolver/DiscoveryClientNameResolver.java index b3e107eb7..d12f92c69 100644 --- a/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/nameresolver/DiscoveryClientNameResolver.java +++ b/grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/nameresolver/DiscoveryClientNameResolver.java @@ -22,6 +22,7 @@ import static net.devh.boot.grpc.client.nameresolver.DiscoveryClientResolverFactory.DISCOVERY_INSTANCE_ID_KEY; import static net.devh.boot.grpc.client.nameresolver.DiscoveryClientResolverFactory.DISCOVERY_SERVICE_NAME_KEY; import static net.devh.boot.grpc.common.util.GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT; +import static net.devh.boot.grpc.common.util.GrpcUtils.CLOUD_DISCOVERY_METADATA_SERVICE_CONFIG; import java.net.InetSocketAddress; import java.util.List; @@ -35,6 +36,8 @@ import org.springframework.util.CollectionUtils; import com.google.common.collect.Lists; +import com.google.gson.Gson; +import com.google.gson.JsonSyntaxException; import io.grpc.Attributes; import io.grpc.Attributes.Builder; @@ -58,6 +61,7 @@ public class DiscoveryClientNameResolver extends NameResolver { @Deprecated private static final String LEGACY_CLOUD_DISCOVERY_METADATA_PORT = "gRPC.port"; private static final List KEEP_PREVIOUS = null; + private static final Gson GSON = new Gson(); private final String name; private final DiscoveryClient client; @@ -65,6 +69,7 @@ public class DiscoveryClientNameResolver extends NameResolver { private final Consumer shutdownHook; private final SharedResourceHolder.Resource executorResource; private final boolean usingExecutorResource; + private final ServiceConfigParser serviceConfigParser; // The field must be accessed from syncContext, although the methods on an Listener2 can be called // from any thread. @@ -93,6 +98,7 @@ public DiscoveryClientNameResolver(final String name, final DiscoveryClient clie this.executor = args.getOffloadExecutor(); this.usingExecutorResource = this.executor == null; this.executorResource = executorResource; + this.serviceConfigParser = args.getServiceConfigParser(); } /** @@ -187,6 +193,55 @@ protected int getGrpcPort(final ServiceInstance instance) { } } + /** + * Extracts and parse gRPC service config from the given service instances. + * + * @param instances The list of instances to extract the service config from. + * @return Parsed gRPC service config or null. + */ + private ConfigOrError resolveServiceConfig(List instances) { + final String serviceConfig = getServiceConfig(instances); + if (serviceConfig == null) { + return null; + } + log.debug("Found service config for {}", getName()); + if (log.isTraceEnabled()) { + // This is to avoid blowing log into several lines if newlines present in service config string. + final String logStr = serviceConfig.replace("\r", "\\r").replace("\n", "\\n"); + log.trace("Service config for {}: {}", getName(), logStr); + } + try { + @SuppressWarnings("unchecked") + Map parsedServiceConfig = GSON.fromJson(serviceConfig, Map.class); + return serviceConfigParser.parseServiceConfig(parsedServiceConfig); + } catch (JsonSyntaxException e) { + return ConfigOrError.fromError( + Status.UNKNOWN + .withDescription("Failed to parse grpc service config") + .withCause(e)); + } + } + + /** + * Extracts the gRPC service config string from the given service instances. + * + * @param instances The list of instances to extract the service config from. + * @return The gRPC service config or null. + */ + protected String getServiceConfig(final List instances) { + for (final ServiceInstance inst : instances) { + final Map metadata = inst.getMetadata(); + if (metadata == null || metadata.isEmpty()) { + continue; + } + final String metaValue = metadata.get(CLOUD_DISCOVERY_METADATA_SERVICE_CONFIG); + if (metaValue != null && !metaValue.isEmpty()) { + return metaValue; + } + } + return null; + } + /** * Gets the attributes from the service instance for later use in a load balancer. Can be overwritten to convert * custom attributes. @@ -318,6 +373,7 @@ private List resolveInternal() { log.debug("Ready to update server list for {}", getName()); this.savedListener.onResult(ResolutionResult.newBuilder() .setAddresses(toTargets(newInstanceList)) + .setServiceConfig(resolveServiceConfig(newInstanceList)) .build()); log.info("Done updating server list for {}", getName()); return newInstanceList; diff --git a/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/nameresolver/DiscoveryClientNameResolverTest.java b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/nameresolver/DiscoveryClientNameResolverTest.java new file mode 100644 index 000000000..f91eda7ca --- /dev/null +++ b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/nameresolver/DiscoveryClientNameResolverTest.java @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2016-2023 The gRPC-Spring Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.devh.boot.grpc.client.nameresolver; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.net.InetSocketAddress; +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.Test; +import org.springframework.cloud.client.DefaultServiceInstance; +import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClient; +import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryProperties; + +import io.grpc.NameResolver; +import io.grpc.Status; +import io.grpc.SynchronizationContext; +import io.grpc.internal.AutoConfiguredLoadBalancerFactory; +import io.grpc.internal.GrpcUtil; +import io.grpc.internal.ScParser; +import net.devh.boot.grpc.common.util.GrpcUtils; + +/** + * Test for {@link DiscoveryClientNameResolver}. + */ +public class DiscoveryClientNameResolverTest { + + private final NameResolver.Args args = NameResolver.Args.newBuilder() + .setDefaultPort(1212) + .setProxyDetector(GrpcUtil.DEFAULT_PROXY_DETECTOR) + .setSynchronizationContext( + new SynchronizationContext((t, e) -> { + throw new AssertionError(e); + })) + .setServiceConfigParser(new ScParser(true, 10, 10, new AutoConfiguredLoadBalancerFactory("pick_first"))) + .setOffloadExecutor(Runnable::run) + .build(); + + @Test + void testValidServiceConfig() { + String validServiceConfig = """ + { + "loadBalancingConfig": [ + {"round_robin": {}} + ], + "methodConfig": [ + { + "name": [{}], + "retryPolicy": { + "maxAttempts": 5, + "initialBackoff": "0.05s", + "maxBackoff": "1s", + "backoffMultiplier": 2, + "retryableStatusCodes": [ + "UNAVAILABLE", + "ABORTED", + "DATA_LOSS", + "INTERNAL", + "DEADLINE_EXCEEDED" + ] + }, + "timeout": "5s" + } + ] + } + """; + TestableListener listener = resolveServiceAndVerify("test1", validServiceConfig); + NameResolver.ConfigOrError serviceConf = listener.getResult().getServiceConfig(); + assertThat(serviceConf).isNotNull(); + assertThat(serviceConf.getConfig()).isNotNull(); + assertThat(serviceConf.getError()).isNull(); + } + + @Test + void testBrokenServiceConfig() { + TestableListener listener = resolveServiceAndVerify("test2", "intentionally invalid service config"); + NameResolver.ConfigOrError serviceConf = listener.getResult().getServiceConfig(); + assertThat(serviceConf).isNotNull(); + assertThat(serviceConf.getConfig()).isNull(); + assertThat(serviceConf.getError()).extracting(Status::getCode).isEqualTo(Status.Code.UNKNOWN); + } + + private TestableListener resolveServiceAndVerify(String serviceName, String serviceConfig) { + SimpleDiscoveryProperties props = new SimpleDiscoveryProperties(); + DefaultServiceInstance service = new DefaultServiceInstance( + serviceName + "-1", serviceName, "127.0.0.1", 3322, false); + Map meta = service.getMetadata(); + meta.put(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT, "6688"); + meta.put(GrpcUtils.CLOUD_DISCOVERY_METADATA_SERVICE_CONFIG, serviceConfig); + props.setInstances(Map.of(serviceName, List.of(service))); + SimpleDiscoveryClient disco = new SimpleDiscoveryClient(props); + DiscoveryClientNameResolver dcnr = new DiscoveryClientNameResolver(serviceName, disco, args, null, null); + + TestableListener listener = new TestableListener(); + dcnr.start(listener); + + assertThat(listener.isErrorWasSet()).isFalse(); + assertThat(listener.isResultWasSet()).isTrue(); + InetSocketAddress addr = (InetSocketAddress) listener.getResult().getAddresses().get(0).getAddresses().get(0); + assertThat(addr.getPort()).isEqualTo(6688); + assertThat(addr.getHostString()).isEqualTo("127.0.0.1"); + return listener; + } +} diff --git a/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/nameresolver/TestableListener.java b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/nameresolver/TestableListener.java new file mode 100644 index 000000000..135d5ed52 --- /dev/null +++ b/grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/nameresolver/TestableListener.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2016-2023 The gRPC-Spring Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.devh.boot.grpc.client.nameresolver; + +import io.grpc.NameResolver; +import io.grpc.Status; +import lombok.Getter; + +@Getter +public class TestableListener extends NameResolver.Listener2 { + + private NameResolver.ResolutionResult result; + private Status error; + private boolean resultWasSet = false; + private boolean errorWasSet = false; + + @Override + public void onResult(NameResolver.ResolutionResult resolutionResult) { + this.result = resolutionResult; + resultWasSet = true; + } + + @Override + public void onError(Status error) { + this.error = error; + errorWasSet = true; + } + +} diff --git a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/GrpcUtils.java b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/GrpcUtils.java index f2583258e..1aafdd761 100644 --- a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/GrpcUtils.java +++ b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/GrpcUtils.java @@ -40,6 +40,11 @@ public final class GrpcUtils { */ public static final String CLOUD_DISCOVERY_METADATA_PORT = "gRPC_port"; + /** + * The cloud discovery metadata key used to identify service config. + */ + public static final String CLOUD_DISCOVERY_METADATA_SERVICE_CONFIG = "gRPC_service_config"; + /** * The constant for the grpc server port, -1 represents don't start an inter process server. */ From 6a5367e1e4bd84883defb2a3b3ae594d1aa2abc9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 07:01:38 +0000 Subject: [PATCH 40/41] chore(deps): update dependency gradle to v8.7 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 43462 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7062a4ba8..67241a587 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,7 @@ if (hasProperty('buildScan')) { wrapper { // Update using: // ./gradlew wrapper --gradle-version=8.4 --distribution-type=bin - gradleVersion = '8.6' + gradleVersion = '8.7' } def buildTimeAndDate = OffsetDateTime.now() diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd4917707c1f8861d8cb53dd15194d4248596..e6441136f3d4ba8a0da8d277868979cfbc8ad796 100644 GIT binary patch delta 34118 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 delta 34176 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 SGW6ptSs!X7{rG*o_g?|vpSEZK diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22ce5..b82aa23a4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 27b681fea89e5988f045038ece68b95d70da6109 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 07:11:42 +0000 Subject: [PATCH 41/41] fix(deps): update dependency io.grpc:grpc-bom to v1.63.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 78a9371bd..d643b4216 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { projectVersion = '3.0.0.RELEASE' // https://github.com/grpc/grpc-java/releases - grpcVersion = '1.61.1' + grpcVersion = '1.63.0' // https://github.com/google/guava/releases guavaVersion = '33.1.0-jre'