From 293980ba95128517117997f4716b3db7af12f9c5 Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Mon, 23 Oct 2017 16:05:08 +0800 Subject: [PATCH 1/2] Service Id register by collector #537 --- .../servicename/ServiceNameRegisterSerialWorker.java | 2 +- .../META-INF/defines/remote_worker_provider.define | 3 +++ .../segment/standardization/ReferenceIdExchanger.java | 11 ++++++++--- .../segment/standardization/SpanIdExchanger.java | 9 +++++++-- .../META-INF/defines/remote_worker_provider.define | 4 ---- .../src/main/resources/application.yml | 7 ++++++- .../src/main/resources/META-INF/defines/h2_dao.define | 6 +++--- 7 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 apm-collector/apm-collector-agentregister/src/main/resources/META-INF/defines/remote_worker_provider.define diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterSerialWorker.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterSerialWorker.java index 396542d39..612d82a27 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterSerialWorker.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterSerialWorker.java @@ -56,7 +56,7 @@ public class ServiceNameRegisterSerialWorker extends AbstractLocalAsyncWorker { ServiceNameDataDefine.ServiceName serviceName = (ServiceNameDataDefine.ServiceName)message; logger.debug("register service name: {}, application id: {}", serviceName.getServiceName(), serviceName.getApplicationId()); - IServiceNameCacheDAO cacheDao = (IServiceNameCacheDAO)DAOContainer.INSTANCE.get(IServiceNameDAO.class.getName()); + IServiceNameCacheDAO cacheDao = (IServiceNameCacheDAO)DAOContainer.INSTANCE.get(IServiceNameCacheDAO.class.getName()); int serviceId = cacheDao.getServiceId(serviceName.getApplicationId(), serviceName.getServiceName()); IServiceNameDAO dao = (IServiceNameDAO)DAOContainer.INSTANCE.get(IServiceNameDAO.class.getName()); diff --git a/apm-collector/apm-collector-agentregister/src/main/resources/META-INF/defines/remote_worker_provider.define b/apm-collector/apm-collector-agentregister/src/main/resources/META-INF/defines/remote_worker_provider.define new file mode 100644 index 000000000..2dc6e3e73 --- /dev/null +++ b/apm-collector/apm-collector-agentregister/src/main/resources/META-INF/defines/remote_worker_provider.define @@ -0,0 +1,3 @@ +org.skywalking.apm.collector.agentregister.worker.application.ApplicationRegisterRemoteWorker$Factory +org.skywalking.apm.collector.agentregister.worker.instance.InstanceRegisterRemoteWorker$Factory +org.skywalking.apm.collector.agentregister.worker.servicename.ServiceNameRegisterRemoteWorker$Factory \ No newline at end of file diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceIdExchanger.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceIdExchanger.java index 10b43955c..5456cf43c 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceIdExchanger.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceIdExchanger.java @@ -18,9 +18,9 @@ package org.skywalking.apm.collector.agentstream.worker.segment.standardization; +import org.skywalking.apm.collector.agentregister.servicename.ServiceNameService; import org.skywalking.apm.collector.cache.ApplicationCache; import org.skywalking.apm.collector.cache.InstanceCache; -import org.skywalking.apm.collector.cache.ServiceIdCache; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.StringUtils; import org.slf4j.Logger; @@ -34,6 +34,7 @@ public class ReferenceIdExchanger implements IdExchanger { private final Logger logger = LoggerFactory.getLogger(ReferenceIdExchanger.class); private static ReferenceIdExchanger EXCHANGER; + private ServiceNameService serviceNameService; public static ReferenceIdExchanger getInstance() { if (EXCHANGER == null) { @@ -42,9 +43,13 @@ public class ReferenceIdExchanger implements IdExchanger { return EXCHANGER; } + public ReferenceIdExchanger() { + serviceNameService = new ServiceNameService(); + } + @Override public boolean exchange(ReferenceDecorator standardBuilder, int applicationId) { if (standardBuilder.getEntryServiceId() == 0 && StringUtils.isNotEmpty(standardBuilder.getEntryServiceName())) { - int entryServiceId = ServiceIdCache.get(InstanceCache.get(standardBuilder.getEntryApplicationInstanceId()), standardBuilder.getEntryServiceName()); + int entryServiceId = serviceNameService.getOrCreate(InstanceCache.get(standardBuilder.getEntryApplicationInstanceId()), standardBuilder.getEntryServiceName()); if (entryServiceId == 0) { return false; } else { @@ -55,7 +60,7 @@ public class ReferenceIdExchanger implements IdExchanger { } if (standardBuilder.getParentServiceId() == 0 && StringUtils.isNotEmpty(standardBuilder.getParentServiceName())) { - int parentServiceId = ServiceIdCache.get(InstanceCache.get(standardBuilder.getParentApplicationInstanceId()), standardBuilder.getParentServiceName()); + int parentServiceId = serviceNameService.getOrCreate(InstanceCache.get(standardBuilder.getParentApplicationInstanceId()), standardBuilder.getParentServiceName()); if (parentServiceId == 0) { return false; } else { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanIdExchanger.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanIdExchanger.java index b06a1c540..51e1fcf88 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanIdExchanger.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanIdExchanger.java @@ -18,8 +18,8 @@ package org.skywalking.apm.collector.agentstream.worker.segment.standardization; +import org.skywalking.apm.collector.agentregister.servicename.ServiceNameService; import org.skywalking.apm.collector.cache.ApplicationCache; -import org.skywalking.apm.collector.cache.ServiceIdCache; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.StringUtils; @@ -29,6 +29,7 @@ import org.skywalking.apm.collector.core.util.StringUtils; public class SpanIdExchanger implements IdExchanger { private static SpanIdExchanger EXCHANGER; + private ServiceNameService serviceNameService; public static SpanIdExchanger getInstance() { if (EXCHANGER == null) { @@ -37,6 +38,10 @@ public class SpanIdExchanger implements IdExchanger { return EXCHANGER; } + public SpanIdExchanger() { + serviceNameService = new ServiceNameService(); + } + @Override public boolean exchange(SpanDecorator standardBuilder, int applicationId) { if (standardBuilder.getPeerId() == 0 && StringUtils.isNotEmpty(standardBuilder.getPeer())) { int peerId = ApplicationCache.get(standardBuilder.getPeer()); @@ -50,7 +55,7 @@ public class SpanIdExchanger implements IdExchanger { } if (standardBuilder.getOperationNameId() == 0 && StringUtils.isNotEmpty(standardBuilder.getOperationName())) { - int operationNameId = ServiceIdCache.get(applicationId, standardBuilder.getOperationName()); + int operationNameId = serviceNameService.getOrCreate(applicationId, standardBuilder.getOperationName()); if (operationNameId == 0) { return false; } else { diff --git a/apm-collector/apm-collector-agentstream/src/main/resources/META-INF/defines/remote_worker_provider.define b/apm-collector/apm-collector-agentstream/src/main/resources/META-INF/defines/remote_worker_provider.define index 5608386d3..17a6ae7b5 100644 --- a/apm-collector/apm-collector-agentstream/src/main/resources/META-INF/defines/remote_worker_provider.define +++ b/apm-collector/apm-collector-agentstream/src/main/resources/META-INF/defines/remote_worker_provider.define @@ -1,7 +1,3 @@ -org.skywalking.apm.collector.agentregister.worker.application.ApplicationRegisterRemoteWorker$Factory -org.skywalking.apm.collector.agentregister.worker.instance.InstanceRegisterRemoteWorker$Factory -org.skywalking.apm.collector.agentregister.worker.servicename.ServiceNameRegisterRemoteWorker$Factory - org.skywalking.apm.collector.agentstream.worker.node.component.NodeComponentRemoteWorker$Factory org.skywalking.apm.collector.agentstream.worker.node.mapping.NodeMappingRemoteWorker$Factory org.skywalking.apm.collector.agentstream.worker.noderef.NodeReferenceRemoteWorker$Factory diff --git a/apm-collector/apm-collector-boot/src/main/resources/application.yml b/apm-collector/apm-collector-boot/src/main/resources/application.yml index e6d654a9d..437f39b4d 100644 --- a/apm-collector/apm-collector-boot/src/main/resources/application.yml +++ b/apm-collector/apm-collector-boot/src/main/resources/application.yml @@ -33,4 +33,9 @@ collector_inside: # cluster_transport_sniffer: true # cluster_nodes: localhost:9300 # index_shards_number: 2 -# index_replicas_number: 0 \ No newline at end of file +# index_replicas_number: 0 +storage: + h2: + url: jdbc:h2:tcp://localhost/~/test + user_name: sa + password: \ No newline at end of file diff --git a/apm-collector/apm-collector-cache/src/main/resources/META-INF/defines/h2_dao.define b/apm-collector/apm-collector-cache/src/main/resources/META-INF/defines/h2_dao.define index 2384a773a..7e0ec1b7d 100644 --- a/apm-collector/apm-collector-cache/src/main/resources/META-INF/defines/h2_dao.define +++ b/apm-collector/apm-collector-cache/src/main/resources/META-INF/defines/h2_dao.define @@ -1,3 +1,3 @@ -org.skywalking.apm.collector.cache.dao.ApplicationH2DAO -org.skywalking.apm.collector.cache.dao.InstanceH2DAO -org.skywalking.apm.collector.cache.dao.ServiceNameH2DAO \ No newline at end of file +org.skywalking.apm.collector.cache.dao.ApplicationH2CacheDAO +org.skywalking.apm.collector.cache.dao.InstanceH2CacheDAO +org.skywalking.apm.collector.cache.dao.ServiceNameH2CacheDAO \ No newline at end of file From 6dab2c990df18f6d5140e1979e62e901d5fb7320 Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Mon, 23 Oct 2017 16:07:36 +0800 Subject: [PATCH 2/2] Reset the application yml config. #537 --- .../src/main/resources/application.yml | 7 +-- .../main/resources/application-default.yml | 48 +++++++++++-------- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/apm-collector/apm-collector-boot/src/main/resources/application.yml b/apm-collector/apm-collector-boot/src/main/resources/application.yml index 437f39b4d..e6d654a9d 100644 --- a/apm-collector/apm-collector-boot/src/main/resources/application.yml +++ b/apm-collector/apm-collector-boot/src/main/resources/application.yml @@ -33,9 +33,4 @@ collector_inside: # cluster_transport_sniffer: true # cluster_nodes: localhost:9300 # index_shards_number: 2 -# index_replicas_number: 0 -storage: - h2: - url: jdbc:h2:tcp://localhost/~/test - user_name: sa - password: \ No newline at end of file +# index_replicas_number: 0 \ No newline at end of file diff --git a/apm-collector/apm-collector-core/src/main/resources/application-default.yml b/apm-collector/apm-collector-core/src/main/resources/application-default.yml index 1e4e62547..e6d654a9d 100644 --- a/apm-collector/apm-collector-core/src/main/resources/application-default.yml +++ b/apm-collector/apm-collector-core/src/main/resources/application-default.yml @@ -1,26 +1,36 @@ -cluster: - zookeeper: - hostPort: localhost:2181 - sessionTimeout: 100000 -# redis: -# host: localhost -# port: 6379 -queue: - disruptor: on - data_carrier: off -agentstream: - grpc: - host: localhost - port: 1000 +#cluster: +# zookeeper: +# hostPort: localhost:2181 +# sessionTimeout: 100000 +agent_server: jetty: host: localhost - port: 2000 + port: 10800 context_path: / -discovery: - grpc: localhost - port: 1000 +agent_stream: + grpc: + host: localhost + port: 11800 + jetty: + host: localhost + port: 12800 + context_path: / + config: + buffer_offset_max_file_size: 10M + buffer_segment_max_file_size: 500M ui: jetty: host: localhost port: 12800 - + context_path: / +collector_inside: + grpc: + host: localhost + port: 11800 +#storage: +# elasticsearch: +# cluster_name: CollectorDBCluster +# cluster_transport_sniffer: true +# cluster_nodes: localhost:9300 +# index_shards_number: 2 +# index_replicas_number: 0 \ No newline at end of file