[GitHub] wu-sheng commented on issue #2083: Support redisson plugin
wu-sheng commented on issue #2083: Support redisson plugin URL: https://github.com/apache/incubator-skywalking/pull/2083#issuecomment-453459619 @zhaoyuguang @WithLin any of you could work on lettuce redis client? This is an automated message from the Apache Git Service. To respond to the message, please log on 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] wu-sheng commented on issue #2104: Support spring-rabbit plugin for 1.x and 2.x
wu-sheng commented on issue #2104: Support spring-rabbit plugin for 1.x and 2.x URL: https://github.com/apache/incubator-skywalking/pull/2104#issuecomment-453459374 Any update? This is an automated message from the Apache Git Service. To respond to the message, please log on 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] zhaoyuguang opened a new pull request #2147: Bugfix: logger information has not enough arguments
zhaoyuguang opened a new pull request #2147: Bugfix: logger information has not enough arguments URL: https://github.com/apache/incubator-skywalking/pull/2147 Please answer these questions before submitting pull request - Why submit this pull request? - [x] Bug fix - [ ] New feature provided - [ ] Improve performance ___ ### Bug fix - logger information has not enough arguments such as  This is an automated message from the Apache Git Service. To respond to the message, please log on 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] zhaoyuguang commented on issue #2083: Support redisson plugin
zhaoyuguang commented on issue #2083: Support redisson plugin URL: https://github.com/apache/incubator-skywalking/pull/2083#issuecomment-453487349 I researched lettuce, lettuce was widely popular after the 5.x version, I will try to write a letuce plugin based on the most popular version 5.1.3.RELEASE. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] zhaoyuguang edited a comment on issue #2083: Support redisson plugin
zhaoyuguang edited a comment on issue #2083: Support redisson plugin URL: https://github.com/apache/incubator-skywalking/pull/2083#issuecomment-453487349 I researched lettuce, the lettuce architecture is similar to redisson, lettuce was widely popular after the 5.x version, I will try to write a letuce plugin based on the most popular version 5.1.3.RELEASE. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] zhaoyuguang edited a comment on issue #2083: Support redisson plugin
zhaoyuguang edited a comment on issue #2083: Support redisson plugin URL: https://github.com/apache/incubator-skywalking/pull/2083#issuecomment-453487349 I researched lettuce, the lettuce architecture is similar to redisson, lettuce was widely popular after the 5.x version, I will try to write a letuce plugin based on the most popular version 5.1.3.RELEASE.   This is an automated message from the Apache Git Service. To respond to the message, please log on 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
[incubator-skywalking] branch inventory-extend updated: Fix code bugs
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch inventory-extend
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/inventory-extend by this push:
new 95229cd Fix code bugs
95229cd is described below
commit 95229cd3f8bfbb632117a3ecc85d3d50b095fefa
Author: Wu Sheng
AuthorDate: Fri Jan 11 19:57:50 2019 +0800
Fix code bugs
---
.../oap/server/core/register/ServiceInventory.java | 2 +-
.../provider/parser/standardization/SpanIdExchanger.java| 13 +++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
index 0f11d4e..676ba52 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
@@ -55,7 +55,7 @@ public class ServiceInventory extends RegisterSource {
@Setter(AccessLevel.PRIVATE) @Getter(AccessLevel.PRIVATE)
@Column(columnName = NODE_TYPE) private int nodeType;
@Setter @Getter @Column(columnName = MAPPING_SERVICE_ID) private int
mappingServiceId;
@Setter @Getter @Column(columnName = MAPPING_LAST_UPDATE_TIME) private
long mappingLastUpdateTime;
-@Getter(AccessLevel.PRIVATE) @Column(columnName =
MAPPING_LAST_UPDATE_TIME) private String prop;
+@Getter(AccessLevel.PRIVATE) @Column(columnName = PROPERTIES) private
String prop;
@Getter private JsonObject properties;
public NodeType getServiceNodeType() {
diff --git
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SpanIdExchanger.java
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SpanIdExchanger.java
index 049aadf..f9bcf9c 100644
---
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SpanIdExchanger.java
+++
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SpanIdExchanger.java
@@ -22,12 +22,13 @@ import com.google.common.base.Strings;
import com.google.gson.JsonObject;
import java.util.List;
import org.apache.skywalking.apm.network.common.KeyStringValuePair;
+import org.apache.skywalking.apm.network.language.agent.SpanLayer;
import org.apache.skywalking.oap.server.core.*;
+import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache;
import
org.apache.skywalking.oap.server.core.config.IComponentLibraryCatalogService;
import org.apache.skywalking.oap.server.core.register.*;
import org.apache.skywalking.oap.server.core.register.service.*;
-import org.apache.skywalking.oap.server.core.source.*;
-import
org.apache.skywalking.oap.server.core.storage.cache.IServiceInventoryCacheDAO;
+import org.apache.skywalking.oap.server.core.source.DetectPoint;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import
org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.SpanDecorator;
import org.slf4j.*;
@@ -40,7 +41,7 @@ public class SpanIdExchanger implements
IdExchanger {
private static final Logger logger =
LoggerFactory.getLogger(SpanIdExchanger.class);
private static SpanIdExchanger EXCHANGER;
-private final IServiceInventoryCacheDAO serviceInventoryCacheDAO;
+private final ServiceInventoryCache serviceInventoryCacheDAO;
private final IServiceInventoryRegister serviceInventoryRegister;
private final IEndpointInventoryRegister endpointInventoryRegister;
private final INetworkAddressInventoryRegister
networkAddressInventoryRegister;
@@ -54,7 +55,7 @@ public class SpanIdExchanger implements
IdExchanger {
}
private SpanIdExchanger(ModuleManager moduleManager) {
-this.serviceInventoryCacheDAO =
moduleManager.find(CoreModule.NAME).provider().getService(IServiceInventoryCacheDAO.class);
+this.serviceInventoryCacheDAO =
moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class);
this.serviceInventoryRegister =
moduleManager.find(CoreModule.NAME).provider().getService(IServiceInventoryRegister.class);
this.endpointInventoryRegister =
moduleManager.find(CoreModule.NAME).provider().getService(IEndpointInventoryRegister.class);
this.networkAddressInventoryRegister =
moduleManager.find(CoreModule.NAME).provider().getService(INetworkAddressInventoryRegi
[GitHub] wu-sheng commented on issue #2083: Support redisson plugin
wu-sheng commented on issue #2083: Support redisson plugin URL: https://github.com/apache/incubator-skywalking/pull/2083#issuecomment-453495653 I think 5.x or 5.1x is good enough. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] wu-sheng closed pull request #2147: Bugfix: logger information has not enough arguments
wu-sheng closed pull request #2147: Bugfix: logger information has not enough
arguments
URL: https://github.com/apache/incubator-skywalking/pull/2147
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java
index d490b6c18b..f573f4f3e8 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java
@@ -79,7 +79,7 @@ private EndpointInventoryCache getCacheService() {
InventoryProcess.INSTANCE.in(endpointInventory);
} else {
-logger.warn("Endpoint {} heartbeat, but not found in storage.");
+logger.warn("Endpoint {} heartbeat, but not found in storage.",
endpointId);
}
}
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/NetworkAddressInventoryRegister.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/NetworkAddressInventoryRegister.java
index 0cff697d0a..18d05b200a 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/NetworkAddressInventoryRegister.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/NetworkAddressInventoryRegister.java
@@ -111,7 +111,7 @@ private IServiceInstanceInventoryRegister
getServiceInstanceInventoryRegister()
InventoryProcess.INSTANCE.in(networkAddress);
} else {
-logger.warn("Network getAddress {} heartbeat, but not found in
storage.");
+logger.warn("Network getAddress {} heartbeat, but not found in
storage.", addressId);
}
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInventoryRegister.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInventoryRegister.java
index d5a94df191..04b60dba76 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInventoryRegister.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInventoryRegister.java
@@ -96,7 +96,7 @@ private ServiceInventoryCache getServiceInventoryCache() {
InventoryProcess.INSTANCE.in(serviceInventory);
} else {
-logger.warn("Service {} heartbeat, but not found in storage.");
+logger.warn("Service {} heartbeat, but not found in storage.",
serviceId);
}
}
@@ -109,7 +109,7 @@ private ServiceInventoryCache getServiceInventoryCache() {
InventoryProcess.INSTANCE.in(serviceInventory);
} else {
-logger.warn("Service {} mapping update, but not found in
storage.");
+logger.warn("Service {} mapping update, but not found in
storage.", serviceId);
}
}
}
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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
[incubator-skywalking] branch master updated: Bugfix: logger information has not enough arguments (#2147)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 20aa7f9 Bugfix: logger information has not enough arguments (#2147)
20aa7f9 is described below
commit 20aa7f9ba15bb01ee66f56334bff52746da3d143
Author: 于玉桔 <769213...@qq.com>
AuthorDate: Fri Jan 11 20:00:23 2019 +0800
Bugfix: logger information has not enough arguments (#2147)
---
.../oap/server/core/register/service/EndpointInventoryRegister.java | 2 +-
.../server/core/register/service/NetworkAddressInventoryRegister.java | 2 +-
.../oap/server/core/register/service/ServiceInventoryRegister.java| 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java
index d490b6c..f573f4f 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java
@@ -79,7 +79,7 @@ public class EndpointInventoryRegister implements
IEndpointInventoryRegister {
InventoryProcess.INSTANCE.in(endpointInventory);
} else {
-logger.warn("Endpoint {} heartbeat, but not found in storage.");
+logger.warn("Endpoint {} heartbeat, but not found in storage.",
endpointId);
}
}
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/NetworkAddressInventoryRegister.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/NetworkAddressInventoryRegister.java
index 0cff697..18d05b2 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/NetworkAddressInventoryRegister.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/NetworkAddressInventoryRegister.java
@@ -111,7 +111,7 @@ public class NetworkAddressInventoryRegister implements
INetworkAddressInventory
InventoryProcess.INSTANCE.in(networkAddress);
} else {
-logger.warn("Network getAddress {} heartbeat, but not found in
storage.");
+logger.warn("Network getAddress {} heartbeat, but not found in
storage.", addressId);
}
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInventoryRegister.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInventoryRegister.java
index d5a94df..04b60db 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInventoryRegister.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInventoryRegister.java
@@ -96,7 +96,7 @@ public class ServiceInventoryRegister implements
IServiceInventoryRegister {
InventoryProcess.INSTANCE.in(serviceInventory);
} else {
-logger.warn("Service {} heartbeat, but not found in storage.");
+logger.warn("Service {} heartbeat, but not found in storage.",
serviceId);
}
}
@@ -109,7 +109,7 @@ public class ServiceInventoryRegister implements
IServiceInventoryRegister {
InventoryProcess.INSTANCE.in(serviceInventory);
} else {
-logger.warn("Service {} mapping update, but not found in
storage.");
+logger.warn("Service {} mapping update, but not found in
storage.", serviceId);
}
}
}
[GitHub] zhaoyuguang commented on issue #2083: Support redisson plugin
zhaoyuguang commented on issue #2083: Support redisson plugin URL: https://github.com/apache/incubator-skywalking/pull/2083#issuecomment-453500119 Yeah~ let me try.. This is an automated message from the Apache Git Service. To respond to the message, please log on 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
[incubator-skywalking] branch inventory-extend updated: Provide develop doc for inventory extension.
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch inventory-extend in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git The following commit(s) were added to refs/heads/inventory-extend by this push: new abfede8 Provide develop doc for inventory extension. abfede8 is described below commit abfede8a51952767921b275d76300eccc243b115 Author: Wu Sheng AuthorDate: Fri Jan 11 20:30:42 2019 +0800 Provide develop doc for inventory extension. --- docs/en/guides/README.md | 2 ++ docs/en/guides/inventory-extension.md | 31 +++ 2 files changed, 33 insertions(+) diff --git a/docs/en/guides/README.md b/docs/en/guides/README.md index 26f0033..af3c192 100644 --- a/docs/en/guides/README.md +++ b/docs/en/guides/README.md @@ -37,6 +37,8 @@ and private plugin developer should read this. - [Storage extension development guide](storage-extention.md). Help potential contributors to build a new storage implementor besides the official. - [Customize analysis by oal script](write-oal.md). Guide you to use oal script to make your own metric available. +- [Backend Inventory entity extension](inventory-extension.md). If you want to extend SkyWalking inventory entities, and +want to push upstream back to our Apache OSS repo, please read these principles. ### UI developer Our UI is constituted by static pages and web container. diff --git a/docs/en/guides/inventory-extension.md b/docs/en/guides/inventory-extension.md new file mode 100644 index 000..cee70eb --- /dev/null +++ b/docs/en/guides/inventory-extension.md @@ -0,0 +1,31 @@ +# Backend Inventory Entity Extension +SkyWalking includes four inventory entities. +- Service Inventory +- Service Instance Inventory +- Endpoint Inventory +- Network Address Inventory + +All metric, topology, trace and alarm are related to these entity IDs. + +For understanding the **Service**, **Service Instance** and **Endpoint** concepts, +please read [Project Overview](../concepts-and-designs/overview.md#why-use-skywalking). + +For **Network Address Inventory**, it represents all network address, in IP:port, hostname, domain name +formats, which are detected by language agents or other probes. + +## Extension +Right now, only **Service Inventory** extension is already supported in backend core. +Service provides field `properties` in Json format, which is usually used for specific service +rather than normal business services, such as Database, Cache, MQ, etc. + +For keeping code consistent and friendly in query and visualization, the Json properties +need to follow the rules. + +### Database +1. NodeType == **Database(1)** +1. Json properties include following keys. + - `database`. Database name, such as MySQL, PostgreSQL + - `db.type`. Database type, such as sql db, redis db. + - `db.instance`. Database instance name. + +
[GitHub] wu-sheng opened a new pull request #2148: Support service inventory extension fields in json format
wu-sheng opened a new pull request #2148: Support service inventory extension fields in json format URL: https://github.com/apache/incubator-skywalking/pull/2148 For service inventory extension, I add an extension point in service inventory entity. It is in JSON format, but it could only be set once right now for performance consideration. Also, I provide the default database service properties initialization codes. @liuhaoyang which you may want to extend. I just put the basic fields, which I think make sense. And all contributions around inventory extension should following the consistent rules. So I also provide a document in development guide. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] wu-sheng commented on issue #2148: Support service inventory extension fields in json format
wu-sheng commented on issue #2148: Support service inventory extension fields in json format URL: https://github.com/apache/incubator-skywalking/pull/2148#issuecomment-453503585 # Backend Inventory Entity Extension SkyWalking includes four inventory entities. - Service Inventory - Service Instance Inventory - Endpoint Inventory - Network Address Inventory All metric, topology, trace and alarm are related to these entity IDs. For understanding the **Service**, **Service Instance** and **Endpoint** concepts, please read [Project Overview](../concepts-and-designs/overview.md#why-use-skywalking). For **Network Address Inventory**, it represents all network address, in IP:port, hostname, domain name formats, which are detected by language agents or other probes. ## Extension Right now, only **Service Inventory** extension is already supported in backend core. Service provides field `properties` in Json format, which is usually used for specific service rather than normal business services, such as Database, Cache, MQ, etc. For keeping code consistent and friendly in query and visualization, the Json properties need to follow the rules. ### Database 1. NodeType == **Database(1)** 1. Json properties include following keys. - `database`. Database name, such as MySQL, PostgreSQL - `db.type`. Database type, such as sql db, redis db. - `db.instance`. Database instance name. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] wu-sheng commented on issue #2148: Support service inventory extension fields in json format
wu-sheng commented on issue #2148: Support service inventory extension fields in json format URL: https://github.com/apache/incubator-skywalking/pull/2148#issuecomment-453503703 FYI @peng-yongsheng @hanahmily @JaredTan95 I think you may be interested about this. This is an automated message from the Apache Git Service. To respond to the message, please log on 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
[incubator-skywalking] branch inventory-extend updated (abfede8 -> 3d7c4b8)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch inventory-extend in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git. from abfede8 Provide develop doc for inventory extension. add 20aa7f9 Bugfix: logger information has not enough arguments (#2147) add 3d7c4b8 Merge branch 'master' into inventory-extend No new revisions were added by this update. Summary of changes: .../oap/server/core/register/service/EndpointInventoryRegister.java | 2 +- .../server/core/register/service/NetworkAddressInventoryRegister.java | 2 +- .../oap/server/core/register/service/ServiceInventoryRegister.java| 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
[GitHub] wu-sheng edited a comment on issue #2148: Support service inventory extension fields in json format
wu-sheng edited a comment on issue #2148: Support service inventory extension fields in json format URL: https://github.com/apache/incubator-skywalking/pull/2148#issuecomment-453503703 FYI @peng-yongsheng @hanahmily @JaredTan95 I think you may be interested about this. Feel free to review this pull request. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] coveralls edited a comment on issue #2083: Support redisson plugin
coveralls edited a comment on issue #2083: Support redisson plugin URL: https://github.com/apache/incubator-skywalking/pull/2083#issuecomment-450781853 [](https://coveralls.io/builds/21023745) Coverage decreased (-0.02%) to 14.261% when pulling **fb4a16417d4cab2d4ff43fa8553354b70c69677d on zhaoyuguang:local_plugin_redisson** into **20aa7f9ba15bb01ee66f56334bff52746da3d143 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] ascrutae commented on a change in pull request #2083: Support redisson plugin
ascrutae commented on a change in pull request #2083: Support redisson plugin
URL:
https://github.com/apache/incubator-skywalking/pull/2083#discussion_r247108182
##
File path:
apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisClientConstructorInterceptor.java
##
@@ -0,0 +1,33 @@
+/*
+ * 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.redisson.v3;
+
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
+
+/**
+ * @author zhaoyuguang
+ */
+public class RedisClientConstructorInterceptor implements
InstanceConstructorInterceptor {
Review comment:
It seems that there is no logic in this interceptor. Is this interceptor
necessary, if not, delete it.
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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] coveralls commented on issue #2148: Support service inventory extension fields in json format
coveralls commented on issue #2148: Support service inventory extension fields in json format URL: https://github.com/apache/incubator-skywalking/pull/2148#issuecomment-453512380 [](https://coveralls.io/builds/21024035) Coverage decreased (-0.02%) to 14.262% when pulling **3d7c4b8e011575f3d5731a047555a6635bf81add on inventory-extend** into **20aa7f9ba15bb01ee66f56334bff52746da3d143 on master**. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] ascrutae commented on issue #2083: Support redisson plugin
ascrutae commented on issue #2083: Support redisson plugin URL: https://github.com/apache/incubator-skywalking/pull/2083#issuecomment-453512334 Is this plugin only interceptor part that Redssion as easy java redis client, and other part is not support? if so, I suggest that you should make sense in the doc. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] wu-sheng closed pull request #2148: Support service inventory extension fields in json format
wu-sheng closed pull request #2148: Support service inventory extension fields in json format URL: https://github.com/apache/incubator-skywalking/pull/2148 This is an automated message from the Apache Git Service. To respond to the message, please log on 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
[incubator-skywalking] branch master updated: Support service inventory extension fields in json format (#2148)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 9cc5e76 Support service inventory extension fields in json format
(#2148)
9cc5e76 is described below
commit 9cc5e76d97230c4cb19acff43606091741e7a0f8
Author: 吴晟 Wu Sheng
AuthorDate: Fri Jan 11 21:24:51 2019 +0800
Support service inventory extension fields in json format (#2148)
* Add properties for service inventory
* Fix code bugs
* Provide develop doc for inventory extension.
---
docs/en/guides/README.md | 2 +
docs/en/guides/inventory-extension.md | 31 +++
.../core/register/NetworkAddressInventory.java | 11
.../oap/server/core/register/ServiceInventory.java | 29 +++
.../service/INetworkAddressInventoryRegister.java | 3 +-
.../service/IServiceInventoryRegister.java | 7 ++-
.../service/NetworkAddressInventoryRegister.java | 9 ++--
.../register/service/ServiceInventoryRegister.java | 22 ++--
.../mesh/ServiceMeshMetricDataDecorator.java | 4 +-
.../v5/grpc/ApplicationRegisterHandler.java| 2 +-
.../grpc/NetworkAddressRegisterServiceHandler.java | 2 +-
.../v5/rest/ApplicationRegisterServletHandler.java | 2 +-
.../rest/NetworkAddressRegisterServletHandler.java | 2 +-
.../handler/v6/grpc/RegisterServiceHandler.java| 6 +--
.../provider/parser/decorator/SpanDecorator.java | 26 --
.../standardization/ReferenceIdExchanger.java | 2 +-
.../parser/standardization/SpanIdExchanger.java| 60 +++---
.../receiver/zipkin/handler/SpanProcessor.java | 2 +-
.../receiver/zipkin/transform/SegmentBuilder.java | 2 +-
.../transform/SpringSleuthSegmentBuilderTest.java | 10 ++--
20 files changed, 201 insertions(+), 33 deletions(-)
diff --git a/docs/en/guides/README.md b/docs/en/guides/README.md
index 26f0033..af3c192 100644
--- a/docs/en/guides/README.md
+++ b/docs/en/guides/README.md
@@ -37,6 +37,8 @@ and private plugin developer should read this.
- [Storage extension development guide](storage-extention.md). Help potential
contributors to build a new
storage implementor besides the official.
- [Customize analysis by oal script](write-oal.md). Guide you to use oal
script to make your own metric available.
+- [Backend Inventory entity extension](inventory-extension.md). If you want to
extend SkyWalking inventory entities, and
+want to push upstream back to our Apache OSS repo, please read these
principles.
### UI developer
Our UI is constituted by static pages and web container.
diff --git a/docs/en/guides/inventory-extension.md
b/docs/en/guides/inventory-extension.md
new file mode 100644
index 000..cee70eb
--- /dev/null
+++ b/docs/en/guides/inventory-extension.md
@@ -0,0 +1,31 @@
+# Backend Inventory Entity Extension
+SkyWalking includes four inventory entities.
+- Service Inventory
+- Service Instance Inventory
+- Endpoint Inventory
+- Network Address Inventory
+
+All metric, topology, trace and alarm are related to these entity IDs.
+
+For understanding the **Service**, **Service Instance** and **Endpoint**
concepts,
+please read [Project
Overview](../concepts-and-designs/overview.md#why-use-skywalking).
+
+For **Network Address Inventory**, it represents all network address, in
IP:port, hostname, domain name
+formats, which are detected by language agents or other probes.
+
+## Extension
+Right now, only **Service Inventory** extension is already supported in
backend core.
+Service provides field `properties` in Json format, which is usually used for
specific service
+rather than normal business services, such as Database, Cache, MQ, etc.
+
+For keeping code consistent and friendly in query and visualization, the Json
properties
+need to follow the rules.
+
+### Database
+1. NodeType == **Database(1)**
+1. Json properties include following keys.
+ - `database`. Database name, such as MySQL, PostgreSQL
+ - `db.type`. Database type, such as sql db, redis db.
+ - `db.instance`. Database instance name.
+
+
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java
index 0647a2c..3fc26cd 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java
@@ -82,6 +82,17 @@ public class NetworkAddressInventory extends RegisterSource {
return true;
}
+public NetworkAddressInventory getClone() {
+NetworkAddressInventory inventory = new NetworkAddressInventory();
+
[incubator-skywalking] branch inventory-extend deleted (was 3d7c4b8)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch inventory-extend in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git. was 3d7c4b8 Merge branch 'master' into inventory-extend The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[GitHub] wu-sheng commented on issue #2083: Support redisson plugin
wu-sheng commented on issue #2083: Support redisson plugin URL: https://github.com/apache/incubator-skywalking/pull/2083#issuecomment-453516722 > Is this plugin only interceptor part that Redssion as easy java redis client, and other part is not support? Could you be more clear? @ascrutae Do you mean there is other API not instrumented for Redisson? This is an automated message from the Apache Git Service. To respond to the message, please log on 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] zhaoyuguang commented on a change in pull request #2083: Support redisson plugin
zhaoyuguang commented on a change in pull request #2083: Support redisson plugin
URL:
https://github.com/apache/incubator-skywalking/pull/2083#discussion_r247116395
##
File path:
apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisClientConstructorInterceptor.java
##
@@ -0,0 +1,33 @@
+/*
+ * 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.redisson.v3;
+
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
+
+/**
+ * @author zhaoyuguang
+ */
+public class RedisClientConstructorInterceptor implements
InstanceConstructorInterceptor {
Review comment:
RedisClient is the link between RedisConnection and ConnectionManager. to
enhance RedisClient for bring peer(the cluster configuration information) in
ConnectionManager to RedisConnection.
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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] zhaoyuguang commented on issue #2083: Support redisson plugin
zhaoyuguang commented on issue #2083: Support redisson plugin URL: https://github.com/apache/incubator-skywalking/pull/2083#issuecomment-453518382 > Is this plugin only interceptor part that Redssion as easy java redis client, and other part is not support? if so, I suggest that you should make sense in the doc. Only intercepted redisson's operation on redis. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] wu-sheng commented on a change in pull request #2083: Support redisson plugin
wu-sheng commented on a change in pull request #2083: Support redisson plugin
URL:
https://github.com/apache/incubator-skywalking/pull/2083#discussion_r247117091
##
File path:
apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisClientConstructorInterceptor.java
##
@@ -0,0 +1,33 @@
+/*
+ * 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.redisson.v3;
+
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
+
+/**
+ * @author zhaoyuguang
+ */
+public class RedisClientConstructorInterceptor implements
InstanceConstructorInterceptor {
Review comment:
Oh. You need this to add `dynamicField`, right? I recommend you to put the
comments in this class, in order to tell the reader why you need an empty
interceptor.
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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] zhaoyuguang edited a comment on issue #2083: Support redisson plugin
zhaoyuguang edited a comment on issue #2083: Support redisson plugin URL: https://github.com/apache/incubator-skywalking/pull/2083#issuecomment-453518382 > Is this plugin only interceptor part that Redssion as easy java redis client, and other part is not support? if so, I suggest that you should make sense in the doc. Only intercepted redisson's all operation on redis. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] zhaoyuguang commented on a change in pull request #2083: Support redisson plugin
zhaoyuguang commented on a change in pull request #2083: Support redisson plugin
URL:
https://github.com/apache/incubator-skywalking/pull/2083#discussion_r247119170
##
File path:
apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisClientConstructorInterceptor.java
##
@@ -0,0 +1,33 @@
+/*
+ * 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.redisson.v3;
+
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
+
+/**
+ * @author zhaoyuguang
+ */
+public class RedisClientConstructorInterceptor implements
InstanceConstructorInterceptor {
Review comment:
Yes, the RedisConnection is the lowest level of redisson and netty
communication class, but RedisConnection and RedisClient do not store redisson
for redis cluster configuration information.
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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] wu-sheng commented on issue #2083: Support redisson plugin
wu-sheng commented on issue #2083: Support redisson plugin URL: https://github.com/apache/incubator-skywalking/pull/2083#issuecomment-453520886 > Only intercepted redisson's operation on redis. From the official website, https://redisson.org/, it have 7 use cases, which all include redis OPs. Are these supported too(If they use Easy Java Redis client as basic API, then maybe)? If not, we may need to change `supported-list` document like this * [Redisson](https://github.com/redisson/redisson) `Easy Java Redis client` 3.5.2+ This is an automated message from the Apache Git Service. To respond to the message, please log on 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] ascrutae commented on a change in pull request #2083: Support redisson plugin
ascrutae commented on a change in pull request #2083: Support redisson plugin
URL:
https://github.com/apache/incubator-skywalking/pull/2083#discussion_r247120886
##
File path:
apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisClientConstructorInterceptor.java
##
@@ -0,0 +1,33 @@
+/*
+ * 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.redisson.v3;
+
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
+import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
+
+/**
+ * @author zhaoyuguang
+ */
+public class RedisClientConstructorInterceptor implements
InstanceConstructorInterceptor {
Review comment:
OK，got it.
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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] ascrutae edited a comment on issue #2083: Support redisson plugin
ascrutae edited a comment on issue #2083: Support redisson plugin URL: https://github.com/apache/incubator-skywalking/pull/2083#issuecomment-453512334 Is this plugin only intercept the part that Redssion as easy java redis client, and other part is not support? if so, I suggest that you should make sense in the doc. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] zhaoyuguang commented on issue #2083: Support redisson plugin
zhaoyuguang commented on issue #2083: Support redisson plugin URL: https://github.com/apache/incubator-skywalking/pull/2083#issuecomment-453523311 > > Only intercepted redisson's operation on redis. > > From the official website, https://redisson.org/, it have 7 use cases, which all include redis OPs. Are these supported too(If they use Easy Java Redis client as basic API, then maybe)? > > If not, we may need to change `supported-list` document like this > > * [Redisson](https://github.com/redisson/redisson) `Easy Java Redis client` 3.5.2+ Well, it is like this. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] coveralls edited a comment on issue #2083: Support redisson plugin
coveralls edited a comment on issue #2083: Support redisson plugin URL: https://github.com/apache/incubator-skywalking/pull/2083#issuecomment-450781853 [](https://coveralls.io/builds/21024960) Coverage decreased (-0.03%) to 14.236% when pulling **8d824487353cc6adc4b918f5cb26685c4587580f on zhaoyuguang:local_plugin_redisson** into **9cc5e76d97230c4cb19acff43606091741e7a0f8 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] coveralls edited a comment on issue #2083: Support redisson plugin
coveralls edited a comment on issue #2083: Support redisson plugin URL: https://github.com/apache/incubator-skywalking/pull/2083#issuecomment-450781853 [](https://coveralls.io/builds/21025435) Coverage decreased (-0.03%) to 14.236% when pulling **463b3637f797da4aa44478f4facd7e67c8360e30 on zhaoyuguang:local_plugin_redisson** into **9cc5e76d97230c4cb19acff43606091741e7a0f8 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] wu-sheng closed pull request #2083: Support redisson plugin
wu-sheng closed pull request #2083: Support redisson plugin
URL: https://github.com/apache/incubator-skywalking/pull/2083
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
index adc249c6a7..2c0c566aec 100644
---
a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
+++
b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
@@ -105,8 +105,10 @@
public static final OfficialComponent RABBITMQ_CONSUMER = new
OfficialComponent(53,"rabbitmq-consumer");
public static final OfficialComponent CANAL = new
OfficialComponent(54,"Canal");
-
+
public static final OfficialComponent GSON = new
OfficialComponent(55,"Gson");
+
+public static final OfficialComponent REDISSON = new
OfficialComponent(56, "Redisson");
private static ComponentsDefine INSTANCE = new ComponentsDefine();
@@ -117,7 +119,7 @@ public static ComponentsDefine getInstance() {
}
public ComponentsDefine() {
-components = new String[56];
+components = new String[57];
addComponent(TOMCAT);
addComponent(HTTPCLIENT);
addComponent(DUBBO);
@@ -158,6 +160,7 @@ public ComponentsDefine() {
addComponent(RABBITMQ_CONSUMER);
addComponent(CANAL);
addComponent(GSON);
+addComponent(REDISSON);
}
private void addComponent(OfficialComponent component) {
diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml
b/apm-sniffer/apm-sdk-plugin/pom.xml
index 02ab4fa77d..20fd8bd7bd 100644
--- a/apm-sniffer/apm-sdk-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/pom.xml
@@ -32,6 +32,7 @@
jdbc-commons
httpClient-4.x-plugin
jedis-2.x-plugin
+redisson-3.x-plugin
tomcat-7.x-8.x-plugin
motan-plugin
mongodb-3.x-plugin
diff --git a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml
b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml
new file mode 100644
index 00..935b633eb3
--- /dev/null
+++ b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml
@@ -0,0 +1,46 @@
+
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+org.apache.skywalking
+apm-sdk-plugin
+6.0.0-GA-SNAPSHOT
+
+
+apm-redisson-3.x-plugin
+jar
+
+redisson-3.x-plugin
+http://maven.apache.org
+
+3.6.0
+
+
+
+
+org.redisson
+redisson
+${redisson.version}
+provided
+
+
+
+
\ No newline at end of file
diff --git
a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/ConnectionManagerInterceptor.java
b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/ConnectionManagerInterceptor.java
new file mode 100644
index 00..6ff4cec537
--- /dev/null
+++
b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/ConnectionManagerInterceptor.java
@@ -0,0 +1,107 @@
+/*
+ * 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.redisson.v3;
+
+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.plugi
[incubator-skywalking] branch master updated: Support redisson plugin (#2083)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 43b216a Support redisson plugin (#2083)
43b216a is described below
commit 43b216aa923262a1234ee02aa5ae2244b1a7c0fd
Author: 于玉桔 <769213...@qq.com>
AuthorDate: Fri Jan 11 22:32:09 2019 +0800
Support redisson plugin (#2083)
* plugin support redisson
---
.../network/trace/component/ComponentsDefine.java | 7 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
.../apm-sdk-plugin/redisson-3.x-plugin/pom.xml | 46 +
.../redisson/v3/ConnectionManagerInterceptor.java | 107 +++
.../v3/RedisClientConstructorInterceptor.java | 36 +++
.../v3/RedisConnectionMethodInterceptor.java | 113 +
.../define/ConnectionManagerInstrumentation.java | 72 +
.../v3/define/RedisClientInstrumentation.java | 67
.../v3/define/RedisConnectionInstrumentation.java | 85
.../src/main/resources/skywalking-plugin.def | 19
.../v3/RedisConnectionMethodInterceptorTest.java | 85
docker/config/component-libraries.yml | 4 +
docs/en/guides/Component-library-settings.md | 1 +
.../service-agent/java-agent/Supported-list.md | 1 +
.../src/test/resources/component-libraries.yml | 4 +
.../src/main/resources/component-libraries.yml | 4 +
16 files changed, 650 insertions(+), 2 deletions(-)
diff --git
a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
index adc249c..2c0c566 100644
---
a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
+++
b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
@@ -105,8 +105,10 @@ public class ComponentsDefine {
public static final OfficialComponent RABBITMQ_CONSUMER = new
OfficialComponent(53,"rabbitmq-consumer");
public static final OfficialComponent CANAL = new
OfficialComponent(54,"Canal");
-
+
public static final OfficialComponent GSON = new
OfficialComponent(55,"Gson");
+
+public static final OfficialComponent REDISSON = new
OfficialComponent(56, "Redisson");
private static ComponentsDefine INSTANCE = new ComponentsDefine();
@@ -117,7 +119,7 @@ public class ComponentsDefine {
}
public ComponentsDefine() {
-components = new String[56];
+components = new String[57];
addComponent(TOMCAT);
addComponent(HTTPCLIENT);
addComponent(DUBBO);
@@ -158,6 +160,7 @@ public class ComponentsDefine {
addComponent(RABBITMQ_CONSUMER);
addComponent(CANAL);
addComponent(GSON);
+addComponent(REDISSON);
}
private void addComponent(OfficialComponent component) {
diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml
b/apm-sniffer/apm-sdk-plugin/pom.xml
index 02ab4fa..20fd8bd 100644
--- a/apm-sniffer/apm-sdk-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/pom.xml
@@ -32,6 +32,7 @@
jdbc-commons
httpClient-4.x-plugin
jedis-2.x-plugin
+redisson-3.x-plugin
tomcat-7.x-8.x-plugin
motan-plugin
mongodb-3.x-plugin
diff --git a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml
b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml
new file mode 100644
index 000..935b633
--- /dev/null
+++ b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml
@@ -0,0 +1,46 @@
+
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+org.apache.skywalking
+apm-sdk-plugin
+6.0.0-GA-SNAPSHOT
+
+
+apm-redisson-3.x-plugin
+jar
+
+redisson-3.x-plugin
+http://maven.apache.org
+
+3.6.0
+
+
+
+
+org.redisson
+redisson
+${redisson.version}
+provided
+
+
+
+
\ No newline at end of file
diff --git
a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/ConnectionManagerInterceptor.java
b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/ConnectionManagerInterceptor.java
new file mode 100644
index 000..6ff4cec
--- /dev/null
+++
b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/ConnectionManagerInterceptor.java
@@ -0,0 +1,107 @@
+/*
+ *
[GitHub] wu-sheng closed issue #1564: does skywalking support trace redisson?
wu-sheng closed issue #1564: does skywalking support trace redisson? URL: https://github.com/apache/incubator-skywalking/issues/1564 This is an automated message from the Apache Git Service. To respond to the message, please log on 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] JaredTan95 opened a new pull request #10: add serviceInstanceId in TraceQueryCondition.
JaredTan95 opened a new pull request #10: add serviceInstanceId in TraceQueryCondition. URL: https://github.com/apache/incubator-skywalking-query-protocol/pull/10 main repo related PR: https://github.com/apache/incubator-skywalking/pull/2146 This is an automated message from the Apache Git Service. To respond to the message, please log on 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] wu-sheng closed pull request #10: add serviceInstanceId in TraceQueryCondition.
wu-sheng closed pull request #10: add serviceInstanceId in TraceQueryCondition.
URL: https://github.com/apache/incubator-skywalking-query-protocol/pull/10
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/trace.graphqls b/trace.graphqls
index 8f24d5a..f76f737 100644
--- a/trace.graphqls
+++ b/trace.graphqls
@@ -34,6 +34,7 @@ type BasicTrace {
input TraceQueryCondition {
# The value of 0 means all services.
serviceId: ID
+serviceInstanceId: ID
traceId: String
endpointId: ID
endpointName: String
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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
[incubator-skywalking-query-protocol] branch master updated: add serviceInstanceId in TraceQueryCondition. (#10)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git
The following commit(s) were added to refs/heads/master by this push:
new a5137b7 add serviceInstanceId in TraceQueryCondition. (#10)
a5137b7 is described below
commit a5137b7c510f74901e28b23227fd91ecf70ce577
Author: Jared Tan
AuthorDate: Fri Jan 11 22:38:16 2019 +0800
add serviceInstanceId in TraceQueryCondition. (#10)
---
trace.graphqls | 1 +
1 file changed, 1 insertion(+)
diff --git a/trace.graphqls b/trace.graphqls
index 8f24d5a..f76f737 100644
--- a/trace.graphqls
+++ b/trace.graphqls
@@ -34,6 +34,7 @@ type BasicTrace {
input TraceQueryCondition {
# The value of 0 means all services.
serviceId: ID
+serviceInstanceId: ID
traceId: String
endpointId: ID
endpointName: String
[GitHub] coveralls commented on issue #2146: add serviceInstanceId in Segment storage.
coveralls commented on issue #2146: add serviceInstanceId in Segment storage. URL: https://github.com/apache/incubator-skywalking/pull/2146#issuecomment-453543563 [](https://coveralls.io/builds/21025943) Coverage decreased (-0.002%) to 14.26% when pulling **a11a2e9909c3846b5d6e4e005d7e37bc92127cf4 on JaredTan95:extend_segment_storage** into **9cc5e76d97230c4cb19acff43606091741e7a0f8 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] liyongfa0311 opened a new issue #2149: Why is my link broken into two?
liyongfa0311 opened a new issue #2149: Why is my link broken into two? URL: https://github.com/apache/incubator-skywalking/issues/2149 Please answer these questions before submitting your issue. - Why do you submit this issue? - [x] Question or discussion - [ ] Bug - [ ] Requirement - [ ] Feature or performance improvement ___ ### Question - What do you want to know? Why is my link disconnected on the global topology map? ___ ### Bug - Which version of SkyWalking, OS and JRE? SkyWalking version 6.0.0-beta OS centos6.5 JRE 1.8 - Which company or project? - What happen? If possible, provide a way for reproducing the error. e.g. demo application, component version. project-mysql and 10.102.131.151:10008 is same service? but it shows two,resulting in incomplete access links  ___ ### Requirement or improvement - Please describe about your requirements or improvement suggestions. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] JaredTan95 opened a new issue #2150: [Proposal] Make Traces Data Query association with serviceInstanceId
JaredTan95 opened a new issue #2150: [Proposal] Make Traces Data Query
association with serviceInstanceId
URL: https://github.com/apache/incubator-skywalking/issues/2150
Hi, Based on the existing `QraphQL` API, we can query traces with
serviceInstanceId. @TinyAllen ,If you are interesting about this, the following
information may be helpful to build our UI query:
1、`getServiceInstances` `QraphQL` API:
```bash
getServiceInstances(duration: $duration, serviceId: $serviceId) {
key: id
name
attributes {
name
value
}
language
}
```
2、`queryBasicTraces` `QraphQL` API:
```bash
{"query":"query BasicTraces($condition: TraceQueryCondition) {
queryBasicTraces(condition: $condition) {
traces {
key: segmentId
endpointNames
duration
start
isError
traceIds
}
total
}
}"
,"variables":{
"condition": {
"serviceId": "2",
"serviceInstanceId":"2",
"traceState": "ALL",
"queryOrder": "BY_START_TIME",
"queryDuration": {
"start": "2019-01-11 2251",
"end": "2019-01-11 2254",
"step": "MINUTE"
},
"paging": {
"pageNum": 1,
"pageSize": 20,
"needTotal": true
}
}
}
}
```
CC @wu-sheng
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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] wu-sheng commented on issue #2149: Why is my link broken into two?
wu-sheng commented on issue #2149: Why is my link broken into two? URL: https://github.com/apache/incubator-skywalking/issues/2149#issuecomment-453548818 If `10.102.131.151:10008` is already instrumented by agent, it means the rpc between project-e and project-mysql is using the protocol SkyWalking doesn't support. We need inject header at project-e client side, and propagate the context to project-mysql side, powered by SkyWalking plugins. You need to find out whether your rpc lib is supported in our `supported-list`. If yes, maybe your scenario is not supported in our plugin. Then you could 1. Submit an issue to report that with demo codes to reproduce the issue. 1. Or try to find out why it is not supported, why propagation doesn't happen This is an automated message from the Apache Git Service. To respond to the message, please log on 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] wu-sheng closed issue #2149: Why is my link broken into two?
wu-sheng closed issue #2149: Why is my link broken into two? URL: https://github.com/apache/incubator-skywalking/issues/2149 This is an automated message from the Apache Git Service. To respond to the message, please log on 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] wu-sheng commented on issue #2150: [Proposal] Make Traces Data Query association with serviceInstanceId
wu-sheng commented on issue #2150: [Proposal] Make Traces Data Query association with serviceInstanceId URL: https://github.com/apache/incubator-skywalking/issues/2150#issuecomment-453555380 Add a selector for service instance, list all instance if the service selected. And this is an optional condition. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] coveralls edited a comment on issue #2146: add serviceInstanceId in Segment storage.
coveralls edited a comment on issue #2146: add serviceInstanceId in Segment storage. URL: https://github.com/apache/incubator-skywalking/pull/2146#issuecomment-453543563 [](https://coveralls.io/builds/21026733) Coverage decreased (-0.007%) to 14.23% when pulling **e455ffd6ddc6d900b7cae5476b72471013e694e6 on JaredTan95:extend_segment_storage** into **43b216aa923262a1234ee02aa5ae2244b1a7c0fd on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on 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] yannxia commented on a change in pull request #2148: Support service inventory extension fields in json format
yannxia commented on a change in pull request #2148: Support service inventory
extension fields in json format
URL:
https://github.com/apache/incubator-skywalking/pull/2148#discussion_r247190370
##
File path:
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
##
@@ -86,6 +90,24 @@ public void setServiceNodeType(NodeType nodeType) {
return result;
}
+public void setProperties(JsonObject properties) {
+this.properties = properties;
+if (properties != null && properties.keySet().size() > 0) {
+this.prop = properties.toString();
+}
+}
+
+private void setProp(String prop) {
+this.prop = prop;
+if (!Strings.isNullOrEmpty(prop)) {
+this.properties = new Gson().fromJson(prop, JsonObject.class);
Review comment:
这里的 `new Gson()` 是不是应该放到属性里面去，感觉没必要每次都new一个出来
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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] yannxia commented on a change in pull request #2148: Support service inventory extension fields in json format
yannxia commented on a change in pull request #2148: Support service inventory
extension fields in json format
URL:
https://github.com/apache/incubator-skywalking/pull/2148#discussion_r247190370
##
File path:
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
##
@@ -86,6 +90,24 @@ public void setServiceNodeType(NodeType nodeType) {
return result;
}
+public void setProperties(JsonObject properties) {
+this.properties = properties;
+if (properties != null && properties.keySet().size() > 0) {
+this.prop = properties.toString();
+}
+}
+
+private void setProp(String prop) {
+this.prop = prop;
+if (!Strings.isNullOrEmpty(prop)) {
+this.properties = new Gson().fromJson(prop, JsonObject.class);
Review comment:
not necessary `new Gson()` everytime. maybe member variable
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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] wu-sheng commented on a change in pull request #2148: Support service inventory extension fields in json format
wu-sheng commented on a change in pull request #2148: Support service inventory
extension fields in json format
URL:
https://github.com/apache/incubator-skywalking/pull/2148#discussion_r247298369
##
File path:
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
##
@@ -86,6 +90,24 @@ public void setServiceNodeType(NodeType nodeType) {
return result;
}
+public void setProperties(JsonObject properties) {
+this.properties = properties;
+if (properties != null && properties.keySet().size() > 0) {
+this.prop = properties.toString();
+}
+}
+
+private void setProp(String prop) {
+this.prop = prop;
+if (!Strings.isNullOrEmpty(prop)) {
+this.properties = new Gson().fromJson(prop, JsonObject.class);
Review comment:
Yes. Feel free to send a pull request to move this as static field.
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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] yannxia opened a new pull request #2151: Improve unessential gson instance
yannxia opened a new pull request #2151: Improve unessential gson instance URL: https://github.com/apache/incubator-skywalking/pull/2151 Please answer these questions before submitting pull request - Why submit this pull request? - [ ] Bug fix - [ ] New feature provided - [✓] Improve performance - Related issues ___ ### New feature or improvement - reduce unessential new instance This is an automated message from the Apache Git Service. To respond to the message, please log on 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] JaredTan95 closed pull request #2151: Improve unessential gson instance
JaredTan95 closed pull request #2151: Improve unessential gson instance
URL: https://github.com/apache/incubator-skywalking/pull/2151
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
index 676ba52b5e..9aaa37be0e 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
@@ -48,6 +48,7 @@
public static final String MAPPING_SERVICE_ID = "mapping_service_id";
public static final String MAPPING_LAST_UPDATE_TIME =
"mapping_last_update_time";
public static final String PROPERTIES = "properties";
+private static final Gson GSON = new Gson();
@Setter @Getter @Column(columnName = NAME, matchQuery = true) private
String name = Const.EMPTY_STRING;
@Setter @Getter @Column(columnName = IS_ADDRESS) private int isAddress;
@@ -100,7 +101,7 @@ public void setProperties(JsonObject properties) {
private void setProp(String prop) {
this.prop = prop;
if (!Strings.isNullOrEmpty(prop)) {
-this.properties = new Gson().fromJson(prop, JsonObject.class);
+this.properties = GSON.fromJson(prop, JsonObject.class);
}
}
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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] coveralls commented on issue #2151: Improve unessential gson instance
coveralls commented on issue #2151: Improve unessential gson instance URL: https://github.com/apache/incubator-skywalking/pull/2151#issuecomment-453717360 [](https://coveralls.io/builds/21037128) Coverage decreased (-0.003%) to 14.234% when pulling **1144f0df44130dd376240460d6951e12ea3bd1a8 on yannxia:master** into **43b216aa923262a1234ee02aa5ae2244b1a7c0fd on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on 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
[incubator-skywalking] branch master updated: Fix unessential gson instance (#2151)
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new f9fb693 Fix unessential gson instance (#2151)
f9fb693 is described below
commit f9fb69336e7d265650c7d4e6a7a22773317f4884
Author: Yann.Xia
AuthorDate: Sat Jan 12 12:01:11 2019 +0800
Fix unessential gson instance (#2151)
---
.../apache/skywalking/oap/server/core/register/ServiceInventory.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
index 676ba52..9aaa37b 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
@@ -48,6 +48,7 @@ public class ServiceInventory extends RegisterSource {
public static final String MAPPING_SERVICE_ID = "mapping_service_id";
public static final String MAPPING_LAST_UPDATE_TIME =
"mapping_last_update_time";
public static final String PROPERTIES = "properties";
+private static final Gson GSON = new Gson();
@Setter @Getter @Column(columnName = NAME, matchQuery = true) private
String name = Const.EMPTY_STRING;
@Setter @Getter @Column(columnName = IS_ADDRESS) private int isAddress;
@@ -100,7 +101,7 @@ public class ServiceInventory extends RegisterSource {
private void setProp(String prop) {
this.prop = prop;
if (!Strings.isNullOrEmpty(prop)) {
-this.properties = new Gson().fromJson(prop, JsonObject.class);
+this.properties = GSON.fromJson(prop, JsonObject.class);
}
}
