[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #3803: Add elasticsearch 6.x plugin & elasticsearch 6.x test scenario
kezhenxu94 commented on a change in pull request #3803: Add elasticsearch 6.x
plugin & elasticsearch 6.x test scenario
URL: https://github.com/apache/skywalking/pull/3803#discussion_r33571
##
File path:
apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RemotePeerCache.java
##
@@ -0,0 +1,46 @@
+/*
+ * 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.elasticsearch.v6;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author aderm
+ */
+public class RemotePeerCache {
+
+private List remotePeerList = Collections.synchronizedList(new
ArrayList());
Review comment:
> Yes, I was thinking about future expansion of the function.
add it when you really need it, unused codes simply confuse others, and
increase maintenance effort
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #3803: Add elasticsearch 6.x plugin & elasticsearch 6.x test scenario
kezhenxu94 commented on a change in pull request #3803: Add elasticsearch 6.x
plugin & elasticsearch 6.x test scenario
URL: https://github.com/apache/skywalking/pull/3803#discussion_r33571
##
File path:
apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RemotePeerCache.java
##
@@ -0,0 +1,46 @@
+/*
+ * 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.elasticsearch.v6;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author aderm
+ */
+public class RemotePeerCache {
+
+private List remotePeerList = Collections.synchronizedList(new
ArrayList());
Review comment:
> Yes, I was thinking about future expansion of the function.
add it when you really need it, unused codes simply confuse others
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #3803: Add elasticsearch 6.x plugin & elasticsearch 6.x test scenario
kezhenxu94 commented on a change in pull request #3803: Add elasticsearch 6.x
plugin & elasticsearch 6.x test scenario
URL: https://github.com/apache/skywalking/pull/3803#discussion_r33259
##
File path:
apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientCreateMethodsInterceptor.java
##
@@ -0,0 +1,79 @@
+/*
+ * 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.elasticsearch.v6.interceptor;
+
+import static
org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL;
+
+import java.lang.reflect.Method;
+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.logging.api.ILog;
+import org.apache.skywalking.apm.agent.core.logging.api.LogManager;
+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.apache.skywalking.apm.plugin.elasticsearch.v6.ESTypeEnum;
+import org.apache.skywalking.apm.plugin.elasticsearch.v6.RestClientEnhanceInfo;
+import org.elasticsearch.client.indices.CreateIndexRequest;
+
+/**
+ * @author aderm
+ */
+public class IndicesClientCreateMethodsInterceptor implements
InstanceMethodsAroundInterceptor {
+
+private static final ILog logger =
LogManager.getLogger(IndicesClientCreateMethodsInterceptor.class);
+
+@Override
+public void beforeMethod(EnhancedInstance objInst, Method method, Object[]
allArguments,
+Class[] argumentsTypes, MethodInterceptResult result) throws
Throwable {
+CreateIndexRequest createIndexRequest =
(CreateIndexRequest)(allArguments[0]);
+
+RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo)
(objInst
+.getSkyWalkingDynamicField());
+if (restClientEnhanceInfo != null) {
+AbstractSpan span = ContextManager
+.createExitSpan(Constants.CREATE_OPERATOR_NAME,
+restClientEnhanceInfo.getPeers());
+span.setComponent(ComponentsDefine.REST_HIGH_LEVEL_CLIENT);
+
+Tags.DB_TYPE.set(span, ESTypeEnum.CREATE.getType());
+Tags.DB_INSTANCE.set(span, createIndexRequest.index());
+if (TRACE_DSL) {
+Tags.DB_STATEMENT
+.set(span, createIndexRequest.mappings().utf8ToString());
+}
+SpanLayer.asDB(span);
+}
+}
+
+@Override
+public Object afterMethod(EnhancedInstance objInst, Method method,
Object[] allArguments,
+Class[] argumentsTypes, Object ret) throws Throwable {
+ContextManager.stopSpan();
+return ret;
+}
Review comment:
> Yes, they are not the same. The front is mainly related to index
operations.
>
> > if this condition is a must, then you may need it in afterMethod
>
> Not understanding the meaning
I was asking why some of them have condition `if (restClientEnhanceInfo !=
null) {` and other don't, if the condition is really needed, you'll need the
same condition in `afterMethod`
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #3803: Add elasticsearch 6.x plugin & elasticsearch 6.x test scenario
kezhenxu94 commented on a change in pull request #3803: Add elasticsearch 6.x
plugin & elasticsearch 6.x test scenario
URL: https://github.com/apache/skywalking/pull/3803#discussion_r344433994
##
File path:
apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientCreateMethodsInterceptor.java
##
@@ -0,0 +1,79 @@
+/*
+ * 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.elasticsearch.v6.interceptor;
+
+import static
org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL;
+
+import java.lang.reflect.Method;
+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.logging.api.ILog;
+import org.apache.skywalking.apm.agent.core.logging.api.LogManager;
+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.apache.skywalking.apm.plugin.elasticsearch.v6.ESTypeEnum;
+import org.apache.skywalking.apm.plugin.elasticsearch.v6.RestClientEnhanceInfo;
+import org.elasticsearch.client.indices.CreateIndexRequest;
+
+/**
+ * @author aderm
+ */
+public class IndicesClientCreateMethodsInterceptor implements
InstanceMethodsAroundInterceptor {
+
+private static final ILog logger =
LogManager.getLogger(IndicesClientCreateMethodsInterceptor.class);
+
+@Override
+public void beforeMethod(EnhancedInstance objInst, Method method, Object[]
allArguments,
+Class[] argumentsTypes, MethodInterceptResult result) throws
Throwable {
+CreateIndexRequest createIndexRequest =
(CreateIndexRequest)(allArguments[0]);
+
+RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo)
(objInst
+.getSkyWalkingDynamicField());
+if (restClientEnhanceInfo != null) {
+AbstractSpan span = ContextManager
+.createExitSpan(Constants.CREATE_OPERATOR_NAME,
+restClientEnhanceInfo.getPeers());
+span.setComponent(ComponentsDefine.REST_HIGH_LEVEL_CLIENT);
+
+Tags.DB_TYPE.set(span, ESTypeEnum.CREATE.getType());
+Tags.DB_INSTANCE.set(span, createIndexRequest.index());
+if (TRACE_DSL) {
+Tags.DB_STATEMENT
+.set(span, createIndexRequest.mappings().utf8ToString());
+}
+SpanLayer.asDB(span);
+}
+}
+
+@Override
+public Object afterMethod(EnhancedInstance objInst, Method method,
Object[] allArguments,
+Class[] argumentsTypes, Object ret) throws Throwable {
+ContextManager.stopSpan();
+return ret;
+}
Review comment:
I notice some of the interceptors have this
condition(`IndicesClientCreateMethodsInterceptor`,
`IndicesClientDeleteMethodsInterceptor`), and the others don't
(`RestHighLevelClientGetMethodsInterceptor`,
`RestHighLevelClientIndexMethodsInterceptor`), are there differencies? if this
condition is a must, then you may need it in `afterMethod`
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #3803: Add elasticsearch 6.x plugin & elasticsearch 6.x test scenario
kezhenxu94 commented on a change in pull request #3803: Add elasticsearch 6.x
plugin & elasticsearch 6.x test scenario
URL: https://github.com/apache/skywalking/pull/3803#discussion_r344433583
##
File path:
apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientCreateMethodsInterceptor.java
##
@@ -0,0 +1,79 @@
+/*
+ * 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.elasticsearch.v6.interceptor;
+
+import static
org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL;
+
+import java.lang.reflect.Method;
+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.logging.api.ILog;
+import org.apache.skywalking.apm.agent.core.logging.api.LogManager;
+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.apache.skywalking.apm.plugin.elasticsearch.v6.ESTypeEnum;
+import org.apache.skywalking.apm.plugin.elasticsearch.v6.RestClientEnhanceInfo;
+import org.elasticsearch.client.indices.CreateIndexRequest;
+
+/**
+ * @author aderm
+ */
+public class IndicesClientCreateMethodsInterceptor implements
InstanceMethodsAroundInterceptor {
+
+private static final ILog logger =
LogManager.getLogger(IndicesClientCreateMethodsInterceptor.class);
Review comment:
unused
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #3803: Add elasticsearch 6.x plugin & elasticsearch 6.x test scenario
kezhenxu94 commented on a change in pull request #3803: Add elasticsearch 6.x
plugin & elasticsearch 6.x test scenario
URL: https://github.com/apache/skywalking/pull/3803#discussion_r344433273
##
File path:
apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RemotePeerCache.java
##
@@ -0,0 +1,46 @@
+/*
+ * 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.elasticsearch.v6;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author aderm
+ */
+public class RemotePeerCache {
+
+private List remotePeerList = Collections.synchronizedList(new
ArrayList());
+private String remotePeers = "";
+
+public void addRemotePeer(String host, int port) {
+String hostPort = host + ":" + String.valueOf(port);
Review comment:
```suggestion
String hostPort = host + ":" + port;
```
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #3803: Add elasticsearch 6.x plugin & elasticsearch 6.x test scenario
kezhenxu94 commented on a change in pull request #3803: Add elasticsearch 6.x
plugin & elasticsearch 6.x test scenario
URL: https://github.com/apache/skywalking/pull/3803#discussion_r344433264
##
File path:
apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RemotePeerCache.java
##
@@ -0,0 +1,46 @@
+/*
+ * 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.elasticsearch.v6;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author aderm
+ */
+public class RemotePeerCache {
+
+private List remotePeerList = Collections.synchronizedList(new
ArrayList());
Review comment:
Is this field used? I didn't see anywhere it is used
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:
us...@infra.apache.org
With regards,
Apache Git Services
