Skip to content

Commit 016e9d6

Browse files
wl2027wl2027
committed
refactor(nacos-client): Improve code formatting and muzzle validation
- Improved code formatting - Enhanced muzzle validation - Managed dependency versions
1 parent 72e3a8e commit 016e9d6

File tree

19 files changed

+338
-265
lines changed

19 files changed

+338
-265
lines changed

‎instrumentation/nacos-client-2.0.3/javaagent/build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@ muzzle {
77
group.set("com.alibaba.nacos")
88
module.set("nacos-client")
99
versions.set("[2.0.3,)")
10+
skip("0.5.0","1.1.2", "1.1.4", "1.4.7", "2.0.1","2.0.2")
1011
assertInverse.set(true)
1112
}
1213
}
1314

1415
dependencies {
15-
implementation("com.alibaba.nacos:nacos-client:2.0.3")
16+
val nacosClientVersion = "2.0.3"
17+
implementation("com.alibaba.nacos:nacos-client:$nacosClientVersion")
1618
testImplementation("javax.annotation:javax.annotation-api:1.3.2")
1719
}
1820

19-
2021
tasks.withType<Test>().configureEach {
2122
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
2223
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")

‎instrumentation/nacos-client-2.0.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nacos/client/v2_0_3/NacosClientConstants.java‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.nacos.client.v2_0_3;
27

38
import io.opentelemetry.api.common.AttributeKey;
49

510
public class NacosClientConstants {
6-
private NacosClientConstants() {
7-
}
11+
private NacosClientConstants() {}
812

913
public static final String NACOS_PREFIX = "Nacos/";
1014

@@ -28,20 +32,20 @@ private NacosClientConstants() {
2832

2933
public static final String NOTIFY_CONFIG_CHANGE = "notifyConfigChange";
3034

31-
public static final AttributeKey<String> NACOS_NAME_SPACE_ATTR = AttributeKey.stringKey(
32-
"nacos.namespace");
35+
public static final AttributeKey<String> NACOS_NAME_SPACE_ATTR =
36+
AttributeKey.stringKey("nacos.namespace");
3337

34-
public static final AttributeKey<String> NACOS_GROUP_NAME_ATTR = AttributeKey.stringKey("nacos.group.name");
38+
public static final AttributeKey<String> NACOS_GROUP_NAME_ATTR =
39+
AttributeKey.stringKey("nacos.group.name");
3540

36-
public static final AttributeKey<String> NACOS_SERVICE_NAME_ATTR = AttributeKey.stringKey(
37-
"nacos.service.name");
41+
public static final AttributeKey<String> NACOS_SERVICE_NAME_ATTR =
42+
AttributeKey.stringKey("nacos.service.name");
3843

39-
public static final AttributeKey<String> NACOS_DATA_ID_ATTR = AttributeKey.stringKey(
40-
"nacos.data.id");
44+
public static final AttributeKey<String> NACOS_DATA_ID_ATTR =
45+
AttributeKey.stringKey("nacos.data.id");
4146

4247
public static final AttributeKey<String> NACOS_GROUP_ATTR = AttributeKey.stringKey("nacos.group");
4348

44-
public static final AttributeKey<String> NACOS_TENANT_ATTR = AttributeKey.stringKey(
45-
"nacos.tenant");
46-
49+
public static final AttributeKey<String> NACOS_TENANT_ATTR =
50+
AttributeKey.stringKey("nacos.tenant");
4751
}

‎instrumentation/nacos-client-2.0.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nacos/client/v2_0_3/NacosClientHelper.java‎

Lines changed: 140 additions & 117 deletions
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.javaagent.instrumentation.nacos.client.v2_0_3;
27

38
import com.alibaba.nacos.api.config.remote.request.ConfigChangeNotifyRequest;
@@ -15,142 +20,160 @@
1520
import javax.annotation.Nonnull;
1621

1722
public class NacosClientHelper {
18-
private static final NacosClientRequestOperator UNKNOWN_OPERATOR = new NacosClientRequestOperator(
19-
request -> request.getClass().getSimpleName(), null);
20-
private static final Map<Class<? extends Request>, NacosClientRequestOperator> KNOWN_OPERATOR_MAP = new HashMap<>();
23+
private static final NacosClientRequestOperator UNKNOWN_OPERATOR =
24+
new NacosClientRequestOperator(request -> request.getClass().getSimpleName(), null);
25+
private static final Map<Class<? extends Request>, NacosClientRequestOperator>
26+
KNOWN_OPERATOR_MAP = new HashMap<>();
2127

2228
private NacosClientHelper() {}
2329

2430
static {
25-
KNOWN_OPERATOR_MAP.put(InstanceRequest.class, new NacosClientRequestOperator(
26-
request -> ((InstanceRequest) request).getType(),
27-
(attributesBuilder, request) -> {
28-
InstanceRequest instanceRequest = (InstanceRequest) request;
29-
attributesBuilder.put(NacosClientConstants.NACOS_NAME_SPACE_ATTR,
30-
instanceRequest.getNamespace());
31-
attributesBuilder.put(NacosClientConstants.NACOS_GROUP_NAME_ATTR,
32-
instanceRequest.getGroupName());
33-
attributesBuilder.put(NacosClientConstants.NACOS_SERVICE_NAME_ATTR,
34-
instanceRequest.getServiceName());
35-
})
36-
);
31+
KNOWN_OPERATOR_MAP.put(
32+
InstanceRequest.class,
33+
new NacosClientRequestOperator(
34+
request -> ((InstanceRequest) request).getType(),
35+
(attributesBuilder, request) -> {
36+
InstanceRequest instanceRequest = (InstanceRequest) request;
37+
attributesBuilder.put(
38+
NacosClientConstants.NACOS_NAME_SPACE_ATTR, instanceRequest.getNamespace());
39+
attributesBuilder.put(
40+
NacosClientConstants.NACOS_GROUP_NAME_ATTR, instanceRequest.getGroupName());
41+
attributesBuilder.put(
42+
NacosClientConstants.NACOS_SERVICE_NAME_ATTR, instanceRequest.getServiceName());
43+
}));
3744

38-
KNOWN_OPERATOR_MAP.put(ServiceQueryRequest.class, new NacosClientRequestOperator(
39-
request -> NacosClientConstants.QUERY_SERVICE,
40-
(attributesBuilder, request) -> {
41-
ServiceQueryRequest serviceQueryRequest = (ServiceQueryRequest) request;
42-
attributesBuilder.put(NacosClientConstants.NACOS_NAME_SPACE_ATTR,
43-
serviceQueryRequest.getNamespace());
44-
attributesBuilder.put(NacosClientConstants.NACOS_GROUP_NAME_ATTR,
45-
serviceQueryRequest.getGroupName());
46-
attributesBuilder.put(NacosClientConstants.NACOS_SERVICE_NAME_ATTR,
47-
serviceQueryRequest.getServiceName());
48-
})
49-
);
45+
KNOWN_OPERATOR_MAP.put(
46+
ServiceQueryRequest.class,
47+
new NacosClientRequestOperator(
48+
request -> NacosClientConstants.QUERY_SERVICE,
49+
(attributesBuilder, request) -> {
50+
ServiceQueryRequest serviceQueryRequest = (ServiceQueryRequest) request;
51+
attributesBuilder.put(
52+
NacosClientConstants.NACOS_NAME_SPACE_ATTR, serviceQueryRequest.getNamespace());
53+
attributesBuilder.put(
54+
NacosClientConstants.NACOS_GROUP_NAME_ATTR, serviceQueryRequest.getGroupName());
55+
attributesBuilder.put(
56+
NacosClientConstants.NACOS_SERVICE_NAME_ATTR,
57+
serviceQueryRequest.getServiceName());
58+
}));
5059

51-
KNOWN_OPERATOR_MAP.put(SubscribeServiceRequest.class, new NacosClientRequestOperator(
52-
request -> ((SubscribeServiceRequest) request).isSubscribe()
53-
? NacosClientConstants.SUBSCRIBE_SERVICE
54-
: NacosClientConstants.UNSUBSCRIBE_SERVICE,
55-
(attributesBuilder, request) -> {
56-
SubscribeServiceRequest subscribeServiceRequest = (SubscribeServiceRequest) request;
57-
attributesBuilder.put(NacosClientConstants.NACOS_NAME_SPACE_ATTR,
58-
subscribeServiceRequest.getNamespace());
59-
attributesBuilder.put(NacosClientConstants.NACOS_GROUP_NAME_ATTR,
60-
subscribeServiceRequest.getGroupName());
61-
attributesBuilder.put(NacosClientConstants.NACOS_SERVICE_NAME_ATTR,
62-
subscribeServiceRequest.getServiceName());
63-
})
64-
);
60+
KNOWN_OPERATOR_MAP.put(
61+
SubscribeServiceRequest.class,
62+
new NacosClientRequestOperator(
63+
request ->
64+
((SubscribeServiceRequest) request).isSubscribe()
65+
? NacosClientConstants.SUBSCRIBE_SERVICE
66+
: NacosClientConstants.UNSUBSCRIBE_SERVICE,
67+
(attributesBuilder, request) -> {
68+
SubscribeServiceRequest subscribeServiceRequest = (SubscribeServiceRequest) request;
69+
attributesBuilder.put(
70+
NacosClientConstants.NACOS_NAME_SPACE_ATTR,
71+
subscribeServiceRequest.getNamespace());
72+
attributesBuilder.put(
73+
NacosClientConstants.NACOS_GROUP_NAME_ATTR,
74+
subscribeServiceRequest.getGroupName());
75+
attributesBuilder.put(
76+
NacosClientConstants.NACOS_SERVICE_NAME_ATTR,
77+
subscribeServiceRequest.getServiceName());
78+
}));
6579

66-
KNOWN_OPERATOR_MAP.put(ServiceListRequest.class, new NacosClientRequestOperator(
67-
request -> NacosClientConstants.GET_SERVICE_LIST,
68-
(attributesBuilder, request) -> {
69-
ServiceListRequest serviceListRequest = (ServiceListRequest) request;
70-
attributesBuilder.put(NacosClientConstants.NACOS_NAME_SPACE_ATTR,
71-
serviceListRequest.getNamespace());
72-
attributesBuilder.put(NacosClientConstants.NACOS_GROUP_NAME_ATTR,
73-
serviceListRequest.getGroupName());
74-
attributesBuilder.put(NacosClientConstants.NACOS_SERVICE_NAME_ATTR,
75-
serviceListRequest.getServiceName());
76-
})
77-
);
80+
KNOWN_OPERATOR_MAP.put(
81+
ServiceListRequest.class,
82+
new NacosClientRequestOperator(
83+
request -> NacosClientConstants.GET_SERVICE_LIST,
84+
(attributesBuilder, request) -> {
85+
ServiceListRequest serviceListRequest = (ServiceListRequest) request;
86+
attributesBuilder.put(
87+
NacosClientConstants.NACOS_NAME_SPACE_ATTR, serviceListRequest.getNamespace());
88+
attributesBuilder.put(
89+
NacosClientConstants.NACOS_GROUP_NAME_ATTR, serviceListRequest.getGroupName());
90+
attributesBuilder.put(
91+
NacosClientConstants.NACOS_SERVICE_NAME_ATTR,
92+
serviceListRequest.getServiceName());
93+
}));
7894

79-
KNOWN_OPERATOR_MAP.put(ConfigQueryRequest.class, new NacosClientRequestOperator(
80-
request -> NacosClientConstants.QUERY_CONFIG,
81-
(attributesBuilder, request) -> {
82-
ConfigQueryRequest configQueryRequest = (ConfigQueryRequest) request;
83-
attributesBuilder.put(NacosClientConstants.NACOS_DATA_ID_ATTR,
84-
configQueryRequest.getDataId());
85-
attributesBuilder.put(NacosClientConstants.NACOS_GROUP_ATTR,
86-
configQueryRequest.getGroup());
87-
attributesBuilder.put(NacosClientConstants.NACOS_TENANT_ATTR,
88-
configQueryRequest.getTenant());
89-
})
90-
);
95+
KNOWN_OPERATOR_MAP.put(
96+
ConfigQueryRequest.class,
97+
new NacosClientRequestOperator(
98+
request -> NacosClientConstants.QUERY_CONFIG,
99+
(attributesBuilder, request) -> {
100+
ConfigQueryRequest configQueryRequest = (ConfigQueryRequest) request;
101+
attributesBuilder.put(
102+
NacosClientConstants.NACOS_DATA_ID_ATTR, configQueryRequest.getDataId());
103+
attributesBuilder.put(
104+
NacosClientConstants.NACOS_GROUP_ATTR, configQueryRequest.getGroup());
105+
attributesBuilder.put(
106+
NacosClientConstants.NACOS_TENANT_ATTR, configQueryRequest.getTenant());
107+
}));
91108

92-
KNOWN_OPERATOR_MAP.put(ConfigPublishRequest.class, new NacosClientRequestOperator(
93-
request -> NacosClientConstants.PUBLISH_CONFIG,
94-
(attributesBuilder, request) -> {
95-
ConfigPublishRequest configPublishRequest = (ConfigPublishRequest) request;
96-
attributesBuilder.put(NacosClientConstants.NACOS_DATA_ID_ATTR,
97-
configPublishRequest.getDataId());
98-
attributesBuilder.put(NacosClientConstants.NACOS_GROUP_ATTR,
99-
configPublishRequest.getGroup());
100-
attributesBuilder.put(NacosClientConstants.NACOS_TENANT_ATTR,
101-
configPublishRequest.getTenant());
102-
})
103-
);
109+
KNOWN_OPERATOR_MAP.put(
110+
ConfigPublishRequest.class,
111+
new NacosClientRequestOperator(
112+
request -> NacosClientConstants.PUBLISH_CONFIG,
113+
(attributesBuilder, request) -> {
114+
ConfigPublishRequest configPublishRequest = (ConfigPublishRequest) request;
115+
attributesBuilder.put(
116+
NacosClientConstants.NACOS_DATA_ID_ATTR, configPublishRequest.getDataId());
117+
attributesBuilder.put(
118+
NacosClientConstants.NACOS_GROUP_ATTR, configPublishRequest.getGroup());
119+
attributesBuilder.put(
120+
NacosClientConstants.NACOS_TENANT_ATTR, configPublishRequest.getTenant());
121+
}));
104122

105-
KNOWN_OPERATOR_MAP.put(ConfigRemoveRequest.class, new NacosClientRequestOperator(
106-
request -> NacosClientConstants.REMOVE_CONFIG,
107-
(attributesBuilder, request) -> {
108-
ConfigRemoveRequest configRemoveRequest = (ConfigRemoveRequest) request;
109-
attributesBuilder.put(NacosClientConstants.NACOS_DATA_ID_ATTR,
110-
configRemoveRequest.getDataId());
111-
attributesBuilder.put(NacosClientConstants.NACOS_GROUP_ATTR,
112-
configRemoveRequest.getGroup());
113-
attributesBuilder.put(NacosClientConstants.NACOS_TENANT_ATTR,
114-
configRemoveRequest.getTenant());
115-
})
116-
);
123+
KNOWN_OPERATOR_MAP.put(
124+
ConfigRemoveRequest.class,
125+
new NacosClientRequestOperator(
126+
request -> NacosClientConstants.REMOVE_CONFIG,
127+
(attributesBuilder, request) -> {
128+
ConfigRemoveRequest configRemoveRequest = (ConfigRemoveRequest) request;
129+
attributesBuilder.put(
130+
NacosClientConstants.NACOS_DATA_ID_ATTR, configRemoveRequest.getDataId());
131+
attributesBuilder.put(
132+
NacosClientConstants.NACOS_GROUP_ATTR, configRemoveRequest.getGroup());
133+
attributesBuilder.put(
134+
NacosClientConstants.NACOS_TENANT_ATTR, configRemoveRequest.getTenant());
135+
}));
117136

118-
KNOWN_OPERATOR_MAP.put(NotifySubscriberRequest.class, new NacosClientRequestOperator(
119-
request -> NacosClientConstants.NOTIFY_SUBSCRIBE_CHANGE,
120-
(attributesBuilder, request) -> {
121-
NotifySubscriberRequest notifySubscriberRequest = (NotifySubscriberRequest) request;
122-
attributesBuilder.put(NacosClientConstants.NACOS_NAME_SPACE_ATTR,
123-
notifySubscriberRequest.getNamespace());
124-
attributesBuilder.put(NacosClientConstants.NACOS_GROUP_NAME_ATTR,
125-
notifySubscriberRequest.getGroupName());
126-
attributesBuilder.put(NacosClientConstants.NACOS_SERVICE_NAME_ATTR,
127-
notifySubscriberRequest.getServiceName());
128-
})
129-
);
137+
KNOWN_OPERATOR_MAP.put(
138+
NotifySubscriberRequest.class,
139+
new NacosClientRequestOperator(
140+
request -> NacosClientConstants.NOTIFY_SUBSCRIBE_CHANGE,
141+
(attributesBuilder, request) -> {
142+
NotifySubscriberRequest notifySubscriberRequest = (NotifySubscriberRequest) request;
143+
attributesBuilder.put(
144+
NacosClientConstants.NACOS_NAME_SPACE_ATTR,
145+
notifySubscriberRequest.getNamespace());
146+
attributesBuilder.put(
147+
NacosClientConstants.NACOS_GROUP_NAME_ATTR,
148+
notifySubscriberRequest.getGroupName());
149+
attributesBuilder.put(
150+
NacosClientConstants.NACOS_SERVICE_NAME_ATTR,
151+
notifySubscriberRequest.getServiceName());
152+
}));
130153

131-
KNOWN_OPERATOR_MAP.put(ConfigChangeNotifyRequest.class, new NacosClientRequestOperator(
132-
request -> NacosClientConstants.NOTIFY_CONFIG_CHANGE,
133-
(attributesBuilder, request) -> {
134-
ConfigChangeNotifyRequest configChangeNotifyRequest = (ConfigChangeNotifyRequest) request;
135-
attributesBuilder.put(NacosClientConstants.NACOS_DATA_ID_ATTR,
136-
configChangeNotifyRequest.getDataId());
137-
attributesBuilder.put(NacosClientConstants.NACOS_GROUP_ATTR,
138-
configChangeNotifyRequest.getGroup());
139-
attributesBuilder.put(NacosClientConstants.NACOS_TENANT_ATTR,
140-
configChangeNotifyRequest.getTenant());
141-
})
142-
);
154+
KNOWN_OPERATOR_MAP.put(
155+
ConfigChangeNotifyRequest.class,
156+
new NacosClientRequestOperator(
157+
request -> NacosClientConstants.NOTIFY_CONFIG_CHANGE,
158+
(attributesBuilder, request) -> {
159+
ConfigChangeNotifyRequest configChangeNotifyRequest =
160+
(ConfigChangeNotifyRequest) request;
161+
attributesBuilder.put(
162+
NacosClientConstants.NACOS_DATA_ID_ATTR, configChangeNotifyRequest.getDataId());
163+
attributesBuilder.put(
164+
NacosClientConstants.NACOS_GROUP_ATTR, configChangeNotifyRequest.getGroup());
165+
attributesBuilder.put(
166+
NacosClientConstants.NACOS_TENANT_ATTR, configChangeNotifyRequest.getTenant());
167+
}));
143168
}
144169

145170
@Nonnull
146171
public static NacosClientRequestOperator getOperator(@Nonnull Request request) {
147-
NacosClientRequestOperator nacosClientRequestOperator = KNOWN_OPERATOR_MAP.get(
148-
request.getClass());
172+
NacosClientRequestOperator nacosClientRequestOperator =
173+
KNOWN_OPERATOR_MAP.get(request.getClass());
149174
if (nacosClientRequestOperator != null) {
150175
return nacosClientRequestOperator;
151176
}
152177
return UNKNOWN_OPERATOR;
153178
}
154-
155-
156179
}

‎instrumentation/nacos-client-2.0.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nacos/client/v2_0_3/NacosClientInstrumentationModule.java‎

Lines changed: 8 additions & 6 deletions
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.javaagent.instrumentation.nacos.client.v2_0_3;
27

38
import com.google.auto.service.AutoService;
@@ -10,17 +15,14 @@
1015
import java.util.List;
1116

1217
@AutoService(InstrumentationModule.class)
13-
public class NacosClientInstrumentationModule extends InstrumentationModule implements
14-
ExperimentalInstrumentationModule {
18+
public class NacosClientInstrumentationModule extends InstrumentationModule
19+
implements ExperimentalInstrumentationModule {
1520
public NacosClientInstrumentationModule() {
1621
super("nacos-client", "nacos-client-2.0.3");
1722
}
1823

1924
@Override
2025
public List<TypeInstrumentation> typeInstrumentations() {
21-
return Arrays.asList(
22-
new GrpcConnectionInstrumentation(),
23-
new RpcClientInstrumentation()
24-
);
26+
return Arrays.asList(new GrpcConnectionInstrumentation(), new RpcClientInstrumentation());
2527
}
2628
}

0 commit comments

Comments
 (0)