Skip to content

Commit 9af3326

Browse files
Ran sportlessApply
1 parent 34547e3 commit 9af3326

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

grpc-client-spring-boot-starter/src/main/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracers.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ static final class CallAttemptsTracerFactory extends ClientStreamTracer.Factory
173173
// Record here in case newClientStreamTracer() would never be called.
174174
this.metricsClientMeters.getAttemptCounter()
175175
.withTags(Tags.of("grpc.method", fullMethodName,
176-
"instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE,
177-
"instrumentation_version", Constants.PROJECT_VERSION))
176+
"instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE,
177+
"instrumentation_version", Constants.PROJECT_VERSION))
178178
.increment();
179179
}
180180

@@ -195,8 +195,8 @@ public ClientStreamTracer newClientStreamTracer(StreamInfo info, Metadata metada
195195
if (attemptsPerCall.get() > 0) {
196196
this.metricsClientMeters.getAttemptCounter()
197197
.withTags((Tags.of("grpc.method", fullMethodName,
198-
"instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE,
199-
"instrumentation_version", Constants.PROJECT_VERSION)))
198+
"instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE,
199+
"instrumentation_version", Constants.PROJECT_VERSION)))
200200
.increment();
201201
}
202202
if (!info.isTransparentRetry()) {

grpc-client-spring-boot-starter/src/test/java/net/devh/boot/grpc/client/metrics/MetricsClientStreamTracersTest.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ void clientBasicMetrics() {
160160

161161
Tags expectedTags =
162162
Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME,
163-
GRPC_STATUS_TAG_KEY, Status.Code.OK.toString(),
164-
INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE,
165-
INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE);
163+
GRPC_STATUS_TAG_KEY, Status.Code.OK.toString(),
164+
INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE,
165+
INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE);
166166

167167
HistogramSnapshot attemptDurationSnapshot = meterRegistry.get(CLIENT_ATTEMPT_DURATION)
168168
.tags(expectedTags)
@@ -228,9 +228,9 @@ void recordAttemptMetrics() {
228228

229229
Tags expectedUnailableStatusTags =
230230
Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME,
231-
GRPC_STATUS_TAG_KEY, Status.Code.UNAVAILABLE.toString(),
232-
INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE,
233-
INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE);
231+
GRPC_STATUS_TAG_KEY, Status.Code.UNAVAILABLE.toString(),
232+
INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE,
233+
INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE);
234234

235235
assertThat(meterRegistry.get(CLIENT_ATTEMPT_STARTED)
236236
.tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME)
@@ -268,9 +268,9 @@ void recordAttemptMetrics() {
268268

269269
Tags expectedNotFoundStatusTags =
270270
Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME,
271-
GRPC_STATUS_TAG_KEY, Status.Code.NOT_FOUND.toString(),
272-
INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE,
273-
INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE);
271+
GRPC_STATUS_TAG_KEY, Status.Code.NOT_FOUND.toString(),
272+
INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE,
273+
INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE);
274274

275275
assertThat(meterRegistry.get(CLIENT_ATTEMPT_STARTED)
276276
.tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME)
@@ -369,9 +369,9 @@ void recordAttemptMetrics() {
369369

370370
Tags expectedOKStatusTags =
371371
Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME,
372-
GRPC_STATUS_TAG_KEY, Status.Code.OK.toString(),
373-
INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE,
374-
INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE);
372+
GRPC_STATUS_TAG_KEY, Status.Code.OK.toString(),
373+
INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE,
374+
INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE);
375375

376376
assertThat(meterRegistry.get(CLIENT_ATTEMPT_STARTED)
377377
.tag(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME)
@@ -420,9 +420,9 @@ void clientStreamNeverCreatedStillRecordMetrics() {
420420

421421
Tags expectedDeadlineExceededStatusTags =
422422
Tags.of(GRPC_METHOD_TAG_KEY, FULL_METHOD_NAME,
423-
GRPC_STATUS_TAG_KEY, Status.Code.DEADLINE_EXCEEDED.toString(),
424-
INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE,
425-
INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE);
423+
GRPC_STATUS_TAG_KEY, Status.Code.DEADLINE_EXCEEDED.toString(),
424+
INSTRUMENTATION_SOURCE_TAG_KEY, INSTRUMENTATION_SOURCE_TAG_VALUE,
425+
INSTRUMENTATION_VERSION_TAG_KEY, INSTRUMENTATION_VERSION_TAG_VALUE);
426426

427427
HistogramSnapshot attemptDurationSnapshot = meterRegistry.get(CLIENT_ATTEMPT_DURATION)
428428
.tags(expectedDeadlineExceededStatusTags)

grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/metrics/MetricsServerStreamTracers.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ private static final class ServerTracer extends ServerStreamTracer {
102102
public void serverCallStarted(ServerCallInfo<?, ?> callInfo) {
103103
this.metricsServerMeters.getServerCallCounter()
104104
.withTags(Tags.of("grpc.method", this.fullMethodName,
105-
"instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE,
106-
"instrumentation_version", Constants.PROJECT_VERSION))
105+
"instrumentation_source", Constants.INSTRUMENTATION_SOURCE_TAG_VALUE,
106+
"instrumentation_version", Constants.PROJECT_VERSION))
107107
.increment();
108108
}
109109

0 commit comments

Comments
 (0)