kezhenxu94 commented on a change in pull request #5694:
URL: https://github.com/apache/skywalking/pull/5694#discussion_r511689803
##########
File path: .github/workflows/plugins-test.3.yaml
##########
@@ -55,6 +55,7 @@ jobs:
- quartz-scheduler-2.x-scenario
- xxl-job-2.x-scenario
- thrift-scenario
+ - mqtt-scenario
Review comment:
Can you please move this to `plugins-test.1.yaml`?
[Reference](https://github.com/apache/skywalking/blob/d113f58645f7f02508da75f648e829dbd83e7d82/docs/en/guides/Plugin-test.md#local-test-and-pull-request-to-the-upstream),
```shell
$ python3 skywalking/tools/select-group.py
/Volumes/data/developer/skywalking/.github/workflows/plugins-test.1.yaml 66
/Volumes/data/developer/skywalking/.github/workflows/plugins-test.2.yaml 81
/Volumes/data/developer/skywalking/.github/workflows/plugins-test.3.yaml 87
/Volumes/data/developer/skywalking/.github/workflows/plugins-test.0.yaml 122
```
##########
File path:
apm-sniffer/apm-sdk-plugin/mqtt-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mqtt/v3/define/MqttConsumerInstrumentation.java
##########
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.skywalking.apm.plugin.mqtt.v3.define;
+
+import net.bytebuddy.description.method.MethodDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
+import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
+
+import static net.bytebuddy.matcher.ElementMatchers.named;
+import static
org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch.byHierarchyMatch;
+
+public class MqttConsumerInstrumentation extends
ClassInstanceMethodsEnhancePluginDefine {
+
+ private static final String ENHANCE_CLASS =
"org.eclipse.paho.client.mqttv3.MqttCallback";
+ private static final String ON_SUCCESS_ENHANCE_METHOD = "messageArrived";
+ private static final String ON_SUCCESS_INTERCEPTOR =
"org.apache.skywalking.apm.plugin.mqtt.v3.MqttConsumerInterceptor";
+
+ @Override
+ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
+ return new ConstructorInterceptPoint[0];
+ }
+
+ @Override
+ public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints()
{
+ return new InstanceMethodsInterceptPoint[] {
+ new InstanceMethodsInterceptPoint() {
+ @Override
+ public ElementMatcher<MethodDescription> getMethodsMatcher() {
+ return named(ON_SUCCESS_ENHANCE_METHOD);
+ }
+
+ @Override
+ public String getMethodsInterceptor() {
+ return ON_SUCCESS_INTERCEPTOR;
+ }
+
+ @Override
+ public boolean isOverrideArgs() {
+ return false;
+ }
+ }
+ };
+ }
+
+ @Override
+ protected ClassMatch enhanceClass() {
+ return byHierarchyMatch(new String[] {ENHANCE_CLASS});
Review comment:
Redundant array creation for calling varargs method
##########
File path:
apm-sniffer/apm-sdk-plugin/mqtt-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mqtt/v3/MqttNetworkInterceptor.java
##########
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.skywalking.apm.plugin.mqtt.v3;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import org.apache.skywalking.apm.agent.core.context.ContextManager;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
+import org.apache.skywalking.apm.util.StringUtil;
+import org.eclipse.paho.client.mqttv3.internal.NetworkModule;
+
+public class MqttNetworkInterceptor implements
InstanceMethodsAroundInterceptor {
+
+ @Override
+ public void beforeMethod(EnhancedInstance enhancedInstance, Method method,
Object[] allArguments,
+ Class<?>[] classes, MethodInterceptResult
methodInterceptResult) throws Throwable {
+ NetworkModule[] networkModules = (NetworkModule[]) allArguments[0];
+ MqttEnhanceRequiredInfo requiredInfo = new MqttEnhanceRequiredInfo();
+ String[] serverURIs = Arrays.stream(networkModules)
+ .map(networkModule ->
networkModule.getServerURI())
+ .toArray(String[]::new);
+ requiredInfo.setBrokerServers(StringUtil.join(';', serverURIs));
+ requiredInfo.setStartTime(System.currentTimeMillis());
+ enhancedInstance.setSkyWalkingDynamicField(requiredInfo);
+
+ }
+
+ @Override
+ public Object afterMethod(EnhancedInstance enhancedInstance, Method
method, Object[] objects, Class<?>[] classes,
+ Object o) throws Throwable {
+ return o;
+ }
+
+ @Override
+ public void handleMethodException(EnhancedInstance enhancedInstance,
Method method, Object[] objects,
+ Class<?>[] classes, Throwable throwable)
{
+ ContextManager.activeSpan().errorOccurred().log(throwable);
Review comment:
Don't need `errorOccurred()` now, it's included in the `log` method
```suggestion
ContextManager.activeSpan().log(throwable);
```
##########
File path:
apm-sniffer/apm-sdk-plugin/mqtt-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mqtt/v3/MqttProducerInterceptor.java
##########
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.skywalking.apm.plugin.mqtt.v3;
+
+import java.lang.reflect.Method;
+import org.apache.skywalking.apm.agent.core.context.ContextCarrier;
+import org.apache.skywalking.apm.agent.core.context.ContextManager;
+import org.apache.skywalking.apm.agent.core.context.tag.Tags;
+import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
+import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
+import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
+import org.eclipse.paho.client.mqttv3.internal.wire.MqttPublish;
+
+public class MqttProducerInterceptor implements
InstanceMethodsAroundInterceptor {
+
+ public static final String OPERATE_NAME_PREFIX = "Mqtt/";
+
+ private static final String OPERATE_NAME = "/Producer/";
+
+ @Override
+ public void beforeMethod(EnhancedInstance enhancedInstance, Method method,
Object[] objects, Class<?>[] classes,
+ MethodInterceptResult methodInterceptResult)
throws Throwable {
+ String topic;
+ int qos;
+ if (objects[0] instanceof MqttPublish) {
+ MqttPublish mqttPublish = (MqttPublish) objects[0];
+ topic = mqttPublish.getTopicName();
+ qos = mqttPublish.getMessage().getQos();
+ } else {
+ return;
+ }
+ String operationName = OPERATE_NAME_PREFIX + topic + OPERATE_NAME +
qos;
+ MqttEnhanceRequiredInfo requiredInfo = (MqttEnhanceRequiredInfo)
enhancedInstance.getSkyWalkingDynamicField();
+ AbstractSpan activeSpan = ContextManager.createExitSpan(
+ operationName, new ContextCarrier(),
requiredInfo.getBrokerServers());
+ Tags.MQ_BROKER.set(activeSpan, requiredInfo.getBrokerServers());
+ Tags.MQ_TOPIC.set(activeSpan, topic);
+ activeSpan.setLayer(SpanLayer.MQ);
+ activeSpan.setComponent(ComponentsDefine.MQTT_PRODUCER);
+ }
+
+ @Override
+ public Object afterMethod(EnhancedInstance enhancedInstance, Method
method, Object[] objects, Class<?>[] classes,
+ Object o) throws Throwable {
+ if (ContextManager.isActive()) {
+ ContextManager.stopSpan();
+ }
+ return o;
+ }
+
+ @Override
+ public void handleMethodException(EnhancedInstance enhancedInstance,
Method method, Object[] objects,
+ Class<?>[] classes, Throwable throwable)
{
+ ContextManager.activeSpan().errorOccurred().log(throwable);
Review comment:
```suggestion
ContextManager.activeSpan().log(throwable);
```
##########
File path:
apm-sniffer/apm-sdk-plugin/mqtt-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mqtt/v3/MqttNetworkInterceptor.java
##########
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.skywalking.apm.plugin.mqtt.v3;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import org.apache.skywalking.apm.agent.core.context.ContextManager;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;
+import org.apache.skywalking.apm.util.StringUtil;
+import org.eclipse.paho.client.mqttv3.internal.NetworkModule;
+
+public class MqttNetworkInterceptor implements
InstanceMethodsAroundInterceptor {
+
+ @Override
+ public void beforeMethod(EnhancedInstance enhancedInstance, Method method,
Object[] allArguments,
+ Class<?>[] classes, MethodInterceptResult
methodInterceptResult) throws Throwable {
+ NetworkModule[] networkModules = (NetworkModule[]) allArguments[0];
+ MqttEnhanceRequiredInfo requiredInfo = new MqttEnhanceRequiredInfo();
+ String[] serverURIs = Arrays.stream(networkModules)
+ .map(networkModule ->
networkModule.getServerURI())
Review comment:
Lambda can be replaced with method reference
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
