Skip to content

Commit 466971e

Browse files
chenlujjjchenlujjj
committed
fix style
1 parent b859165 commit 466971e

22 files changed

+186
-92
lines changed

‎instrumentation/jsonrpc4j-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsonrpc4j/v1_6/JsonRpcClientBuilderInstrumentation.java

-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ public static void onExit(
9595
new SimpleJsonRpcRequest(methodName, argument),
9696
new SimpleJsonRpcResponse(result),
9797
throwable);
98-
System.out.println(extraHeaders);
9998
}
10099
}
101100
}

‎instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/HeadersSetter.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
27

38
import io.opentelemetry.context.propagation.TextMapSetter;

‎instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcClientAttributesExtractor.java

+16-12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
27

38
import io.opentelemetry.api.common.AttributesBuilder;
@@ -6,18 +11,19 @@
611
import javax.annotation.Nullable;
712

813
// Check https://opentelemetry.io/docs/specs/semconv/rpc/json-rpc/
9-
final class JsonRpcClientAttributesExtractor implements AttributesExtractor<SimpleJsonRpcRequest, SimpleJsonRpcResponse> {
14+
final class JsonRpcClientAttributesExtractor
15+
implements AttributesExtractor<SimpleJsonRpcRequest, SimpleJsonRpcResponse> {
1016

11-
// private final JsonRpcClientAttributesGetter getter;
12-
//
13-
//
14-
// JsonRpcClientAttributesExtractor(JsonRpcClientAttributesGetter getter) {
15-
// this.getter = getter;
16-
// }
17+
// private final JsonRpcClientAttributesGetter getter;
18+
//
19+
//
20+
// JsonRpcClientAttributesExtractor(JsonRpcClientAttributesGetter getter) {
21+
// this.getter = getter;
22+
// }
1723

1824
@Override
19-
public void onStart(AttributesBuilder attributes, Context parentContext,
20-
SimpleJsonRpcRequest jsonRpcRequest) {
25+
public void onStart(
26+
AttributesBuilder attributes, Context parentContext, SimpleJsonRpcRequest jsonRpcRequest) {
2127
attributes.put("rpc.jsonrpc.version", "2.0");
2228
}
2329

@@ -27,7 +33,5 @@ public void onEnd(
2733
Context context,
2834
SimpleJsonRpcRequest jsonRpcRequest,
2935
@Nullable SimpleJsonRpcResponse jsonRpcResponse,
30-
@Nullable Throwable error) {
31-
32-
}
36+
@Nullable Throwable error) {}
3337
}

‎instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcClientAttributesGetter.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
27

38
import io.opentelemetry.instrumentation.api.incubator.semconv.rpc.RpcAttributesGetter;
49

5-
// Check https://github.com/open-telemetry/semantic-conventions/blob/main/docs/rpc/rpc-metrics.md#attributes
10+
// Check
11+
// https://github.com/open-telemetry/semantic-conventions/blob/main/docs/rpc/rpc-metrics.md#attributes
612
// Check https://opentelemetry.io/docs/specs/semconv/rpc/json-rpc/
713
public enum JsonRpcClientAttributesGetter implements RpcAttributesGetter<SimpleJsonRpcRequest> {
814
INSTANCE;

‎instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcClientSpanNameExtractor.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
27

38
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;

‎instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcRequest.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
27

8+
import com.fasterxml.jackson.databind.JsonNode;
39
import java.lang.reflect.Method;
410
import java.util.List;
5-
import com.fasterxml.jackson.databind.JsonNode;
611

712
public final class JsonRpcRequest {
813

@@ -14,14 +19,11 @@ public final class JsonRpcRequest {
1419
this.arguments = arguments;
1520
}
1621

17-
1822
public Method getMethod() {
1923
return method;
2024
}
2125

2226
public List<JsonNode> getArguments() {
2327
return arguments;
2428
}
25-
26-
2729
}

‎instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcRequestGetter.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
27

38
import io.opentelemetry.context.propagation.TextMapGetter;
4-
import javax.annotation.Nullable;
59
import java.util.ArrayList;
10+
import javax.annotation.Nullable;
611

712
enum JsonRpcRequestGetter implements TextMapGetter<JsonRpcRequest> {
813
INSTANCE;

‎instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcResponse.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
27

8+
import com.fasterxml.jackson.databind.JsonNode;
39
import java.lang.reflect.Method;
410
import java.util.List;
5-
import com.fasterxml.jackson.databind.JsonNode;
611

712
public final class JsonRpcResponse {
813
private final Method method;

‎instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcServerAttributesExtractor.java

+21-11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
27

38
import com.googlecode.jsonrpc4j.AnnotationsErrorResolver;
@@ -11,24 +16,25 @@
1116
import javax.annotation.Nullable;
1217

1318
// Check https://opentelemetry.io/docs/specs/semconv/rpc/json-rpc/
14-
final class JsonRpcServerAttributesExtractor implements AttributesExtractor<JsonRpcRequest, JsonRpcResponse> {
19+
final class JsonRpcServerAttributesExtractor
20+
implements AttributesExtractor<JsonRpcRequest, JsonRpcResponse> {
1521

1622
private static final AttributeKey<Long> RPC_JSONRPC_ERROR_CODE =
1723
AttributeKey.longKey("rpc.jsonrpc.error_code");
1824

1925
private static final AttributeKey<String> RPC_JSONRPC_ERROR_MESSAGE =
2026
AttributeKey.stringKey("rpc.jsonrpc.error_message");
2127

22-
// private final JsonRpcServerAttributesGetter getter;
23-
//
24-
//
25-
// JsonRpcServerAttributesExtractor(JsonRpcServerAttributesGetter getter) {
26-
// this.getter = getter;
27-
// }
28+
// private final JsonRpcServerAttributesGetter getter;
29+
//
30+
//
31+
// JsonRpcServerAttributesExtractor(JsonRpcServerAttributesGetter getter) {
32+
// this.getter = getter;
33+
// }
2834

2935
@Override
30-
public void onStart(AttributesBuilder attributes, Context parentContext,
31-
JsonRpcRequest jsonRpcRequest) {
36+
public void onStart(
37+
AttributesBuilder attributes, Context parentContext, JsonRpcRequest jsonRpcRequest) {
3238
attributes.put("rpc.jsonrpc.version", "2.0");
3339
}
3440

@@ -41,8 +47,12 @@ public void onEnd(
4147
@Nullable Throwable error) {
4248
// use the DEFAULT_ERROR_RESOLVER to extract error code and message
4349
if (error != null) {
44-
ErrorResolver errorResolver = new MultipleErrorResolver(AnnotationsErrorResolver.INSTANCE, DefaultErrorResolver.INSTANCE);
45-
ErrorResolver.JsonError jsonError = errorResolver.resolveError(error, jsonRpcRequest.getMethod(), jsonRpcRequest.getArguments());
50+
ErrorResolver errorResolver =
51+
new MultipleErrorResolver(
52+
AnnotationsErrorResolver.INSTANCE, DefaultErrorResolver.INSTANCE);
53+
ErrorResolver.JsonError jsonError =
54+
errorResolver.resolveError(
55+
error, jsonRpcRequest.getMethod(), jsonRpcRequest.getArguments());
4656
attributes.put(RPC_JSONRPC_ERROR_CODE, jsonError.code);
4757
attributes.put(RPC_JSONRPC_ERROR_MESSAGE, jsonError.message);
4858
} else {

‎instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcServerAttributesGetter.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
27

38
import com.googlecode.jsonrpc4j.JsonRpcService;
49
import io.opentelemetry.instrumentation.api.incubator.semconv.rpc.RpcAttributesGetter;
510

6-
// Check https://github.com/open-telemetry/semantic-conventions/blob/main/docs/rpc/rpc-metrics.md#attributes
11+
// Check
12+
// https://github.com/open-telemetry/semantic-conventions/blob/main/docs/rpc/rpc-metrics.md#attributes
713
// Check https://opentelemetry.io/docs/specs/semconv/rpc/json-rpc/
814
public enum JsonRpcServerAttributesGetter implements RpcAttributesGetter<JsonRpcRequest> {
915
INSTANCE;

‎instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcServerSpanNameExtractor.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
27

38
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;

‎instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcServerSpanStatusExtractor.java

+13-7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
27

38
import com.fasterxml.jackson.core.JsonParseException;
@@ -7,16 +12,17 @@
712
import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor;
813
import javax.annotation.Nullable;
914

10-
public enum JsonRpcServerSpanStatusExtractor implements SpanStatusExtractor<JsonRpcRequest, JsonRpcResponse> {
11-
15+
public enum JsonRpcServerSpanStatusExtractor
16+
implements SpanStatusExtractor<JsonRpcRequest, JsonRpcResponse> {
1217
INSTANCE;
1318

14-
/**
15-
* Extracts the status from the response and sets it to the {@code spanStatusBuilder}.
16-
*/
19+
/** Extracts the status from the response and sets it to the {@code spanStatusBuilder}. */
1720
@Override
18-
public void extract(SpanStatusBuilder spanStatusBuilder, JsonRpcRequest jsonRpcRequest,
19-
@Nullable JsonRpcResponse jsonRpcResponse, @Nullable Throwable error) {
21+
public void extract(
22+
SpanStatusBuilder spanStatusBuilder,
23+
JsonRpcRequest jsonRpcRequest,
24+
@Nullable JsonRpcResponse jsonRpcResponse,
25+
@Nullable Throwable error) {
2026
if (error == null) {
2127
spanStatusBuilder.setStatus(StatusCode.OK);
2228
}

‎instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcTelemetry.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
25

6+
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
37

48
import com.googlecode.jsonrpc4j.InvocationListener;
59
import io.opentelemetry.api.OpenTelemetry;
@@ -28,7 +32,6 @@ public static JsonRpcTelemetryBuilder builder(OpenTelemetry openTelemetry) {
2832
this.propagators = propagators;
2933
}
3034

31-
3235
public InvocationListener newServerInvocationListener() {
3336
return new OpenTelemetryJsonRpcInvocationListener(serverInstrumenter);
3437
}

‎instrumentation/jsonrpc4j-1.6/library/src/main/java/io/opentelemetry/instrumentation/jsonrpc4j/v1_6/JsonRpcTelemetryBuilder.java

+18-11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.jsonrpc4j.v1_6;
27

38
import com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -20,7 +25,8 @@ public class JsonRpcTelemetryBuilder {
2025

2126
private final OpenTelemetry openTelemetry;
2227

23-
private final List<AttributesExtractor<? super SimpleJsonRpcRequest, ? super SimpleJsonRpcResponse>>
28+
private final List<
29+
AttributesExtractor<? super SimpleJsonRpcRequest, ? super SimpleJsonRpcResponse>>
2430
additionalClientExtractors = new ArrayList<>();
2531
private final List<AttributesExtractor<? super JsonRpcRequest, ? super JsonRpcResponse>>
2632
additionalServerExtractors = new ArrayList<>();
@@ -29,15 +35,15 @@ public class JsonRpcTelemetryBuilder {
2935
this.openTelemetry = openTelemetry;
3036
}
3137

32-
3338
/**
3439
* Adds an extra client-only {@link AttributesExtractor} to invoke to set attributes to
3540
* instrumented items. The {@link AttributesExtractor} will be executed after all default
3641
* extractors.
3742
*/
3843
@CanIgnoreReturnValue
3944
public JsonRpcTelemetryBuilder addClientAttributeExtractor(
40-
AttributesExtractor<? super SimpleJsonRpcRequest, ? super SimpleJsonRpcResponse> attributesExtractor) {
45+
AttributesExtractor<? super SimpleJsonRpcRequest, ? super SimpleJsonRpcResponse>
46+
attributesExtractor) {
4147
additionalClientExtractors.add(attributesExtractor);
4248
return this;
4349
}
@@ -55,17 +61,21 @@ public JsonRpcTelemetryBuilder addServerAttributeExtractor(
5561
}
5662

5763
public JsonRpcTelemetry build() {
58-
SpanNameExtractor<SimpleJsonRpcRequest> clientSpanNameExtractor = new JsonRpcClientSpanNameExtractor();
59-
SpanNameExtractor<JsonRpcRequest> serverSpanNameExtractor = new JsonRpcServerSpanNameExtractor();
64+
SpanNameExtractor<SimpleJsonRpcRequest> clientSpanNameExtractor =
65+
new JsonRpcClientSpanNameExtractor();
66+
SpanNameExtractor<JsonRpcRequest> serverSpanNameExtractor =
67+
new JsonRpcServerSpanNameExtractor();
6068

6169
InstrumenterBuilder<SimpleJsonRpcRequest, SimpleJsonRpcResponse> clientInstrumenterBuilder =
6270
Instrumenter.builder(openTelemetry, INSTRUMENTATION_NAME, clientSpanNameExtractor);
6371

6472
InstrumenterBuilder<JsonRpcRequest, JsonRpcResponse> serverInstrumenterBuilder =
6573
Instrumenter.builder(openTelemetry, INSTRUMENTATION_NAME, serverSpanNameExtractor);
6674

67-
JsonRpcServerAttributesGetter serverRpcAttributesGetter = JsonRpcServerAttributesGetter.INSTANCE;
68-
JsonRpcClientAttributesGetter clientRpcAttributesGetter = JsonRpcClientAttributesGetter.INSTANCE;
75+
JsonRpcServerAttributesGetter serverRpcAttributesGetter =
76+
JsonRpcServerAttributesGetter.INSTANCE;
77+
JsonRpcClientAttributesGetter clientRpcAttributesGetter =
78+
JsonRpcClientAttributesGetter.INSTANCE;
6979

7080
clientInstrumenterBuilder
7181
.addAttributesExtractor(RpcClientAttributesExtractor.create(clientRpcAttributesGetter))
@@ -83,9 +93,6 @@ public JsonRpcTelemetry build() {
8393
return new JsonRpcTelemetry(
8494
serverInstrumenterBuilder.buildServerInstrumenter(JsonRpcRequestGetter.INSTANCE),
8595
clientInstrumenterBuilder.buildInstrumenter(SpanKindExtractor.alwaysClient()),
86-
openTelemetry.getPropagators()
87-
);
88-
96+
openTelemetry.getPropagators());
8997
}
90-
9198
}

0 commit comments

Comments
 (0)