Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
d7a2a198
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 1 年多
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d7a2a198
编写于
11月 13, 2017
作者:
wu-sheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move instruments into an independency module in collector, named `apm-collector-instrument`.
上级
9dbd4ef6
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
53 addition
and
50 deletion
+53
-50
apm-collector/apm-collector-core/pom.xml
apm-collector/apm-collector-core/pom.xml
+1
-6
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleProvider.java
.../skywalking/apm/collector/core/module/ModuleProvider.java
+0
-1
apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleManagerTest.java
...ywalking/apm/collector/core/module/ModuleManagerTest.java
+0
-34
apm-collector/apm-collector-instrument/pom.xml
apm-collector/apm-collector-instrument/pom.xml
+44
-0
apm-collector/apm-collector-instrument/src/main/java/org/skywalking/apm/collector/instrument/MetricCollector.java
.../skywalking/apm/collector/instrument/MetricCollector.java
+1
-1
apm-collector/apm-collector-instrument/src/main/java/org/skywalking/apm/collector/instrument/ServiceInstrumentation.java
...king/apm/collector/instrument/ServiceInstrumentation.java
+2
-1
apm-collector/apm-collector-instrument/src/main/java/org/skywalking/apm/collector/instrument/ServiceMetricTracing.java
...alking/apm/collector/instrument/ServiceMetricTracing.java
+1
-1
apm-collector/apm-collector-instrument/src/main/java/org/skywalking/apm/collector/instrument/TracedService.java
...rg/skywalking/apm/collector/instrument/TracedService.java
+2
-5
apm-collector/pom.xml
apm-collector/pom.xml
+2
-1
未找到文件。
apm-collector/apm-collector-core/pom.xml
浏览文件 @
d7a2a198
...
...
@@ -18,10 +18,5 @@
<artifactId>
gson
</artifactId>
<version>
2.8.1
</version>
</dependency>
<dependency>
<groupId>
net.bytebuddy
</groupId>
<artifactId>
byte-buddy
</artifactId>
<version>
1.7.8
</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
</project>
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleProvider.java
浏览文件 @
d7a2a198
...
...
@@ -21,7 +21,6 @@ package org.skywalking.apm.collector.core.module;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Properties
;
import
org.skywalking.apm.collector.core.module.instrument.ServiceInstrumentation
;
/**
* The <code>ModuleProvider</code> is an implementation of a {@link Module}.
...
...
apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleManagerTest.java
浏览文件 @
d7a2a198
...
...
@@ -20,7 +20,6 @@ package org.skywalking.apm.collector.core.module;
import
org.junit.Assert
;
import
org.junit.Test
;
import
org.skywalking.apm.collector.core.module.instrument.TracedService
;
/**
* @author wu-sheng
...
...
@@ -39,37 +38,4 @@ public class ModuleManagerTest {
BaseModuleA
.
ServiceABusiness1
serviceABusiness1
=
manager
.
find
(
"BaseA"
).
provider
().
getService
(
BaseModuleA
.
ServiceABusiness1
.
class
);
Assert
.
assertTrue
(
serviceABusiness1
!=
null
);
}
@Test
public
void
testInstrument
()
throws
ServiceNotProvidedException
,
ModuleNotFoundException
,
ProviderNotFoundException
,
DuplicateProviderException
{
ApplicationConfiguration
configuration
=
new
ApplicationConfiguration
();
configuration
.
addModule
(
"Test"
).
addProviderConfiguration
(
"TestModule-Provider"
,
null
);
configuration
.
addModule
(
"BaseA"
).
addProviderConfiguration
(
"P-A"
,
null
);
configuration
.
addModule
(
"BaseB"
).
addProviderConfiguration
(
"P-B"
,
null
);
ModuleManager
manager
=
new
ModuleManager
();
manager
.
init
(
configuration
);
BaseModuleA
.
ServiceABusiness1
serviceABusiness1
=
manager
.
find
(
"BaseA"
).
getService
(
BaseModuleA
.
ServiceABusiness1
.
class
);
Assert
.
assertTrue
(
serviceABusiness1
instanceof
TracedService
);
// for (int i = 0; i < 10000; i++)
// serviceABusiness1.print();
//
// try {
// Thread.sleep(60 * 1000L);
// } catch (InterruptedException e) {
// e.printStackTrace();
// }
//
// for (int i = 0; i < 10000; i++)
// serviceABusiness1.print();
//
// try {
// Thread.sleep(120 * 1000L);
// } catch (InterruptedException e) {
// e.printStackTrace();
// }
}
}
apm-collector/apm-collector-instrument/pom.xml
0 → 100644
浏览文件 @
d7a2a198
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017, OpenSkywalking Organization All rights reserved.
~
~ Licensed 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.
~
~ Project repository: https://github.com/OpenSkywalking/skywalking
-->
<project
xmlns=
"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"
>
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.2.4-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
apm-collector-instrument
</artifactId>
<dependencies>
<dependency>
<groupId>
org.skywalking
</groupId>
<artifactId>
apm-collector-core
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
net.bytebuddy
</groupId>
<artifactId>
byte-buddy
</artifactId>
<version>
1.7.8
</version>
</dependency>
</dependencies>
</project>
apm-collector/apm-collector-
core/src/main/java/org/skywalking/apm/collector/core/module
/instrument/MetricCollector.java
→
apm-collector/apm-collector-
instrument/src/main/java/org/skywalking/apm/collector
/instrument/MetricCollector.java
浏览文件 @
d7a2a198
...
...
@@ -16,7 +16,7 @@
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package
org.skywalking.apm.collector.
core.module.
instrument
;
package
org.skywalking.apm.collector.instrument
;
import
java.lang.reflect.Method
;
import
java.util.HashMap
;
...
...
apm-collector/apm-collector-
core/src/main/java/org/skywalking/apm/collector/core/module
/instrument/ServiceInstrumentation.java
→
apm-collector/apm-collector-
instrument/src/main/java/org/skywalking/apm/collector
/instrument/ServiceInstrumentation.java
浏览文件 @
d7a2a198
...
...
@@ -16,12 +16,13 @@
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package
org.skywalking.apm.collector.
core.module.
instrument
;
package
org.skywalking.apm.collector.instrument
;
import
net.bytebuddy.ByteBuddy
;
import
net.bytebuddy.description.method.MethodDescription
;
import
net.bytebuddy.implementation.MethodDelegation
;
import
net.bytebuddy.matcher.ElementMatcher
;
import
net.bytebuddy.matcher.ElementMatchers
;
import
org.skywalking.apm.collector.core.module.Service
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
apm-collector/apm-collector-
core/src/main/java/org/skywalking/apm/collector/core/module
/instrument/ServiceMetricTracing.java
→
apm-collector/apm-collector-
instrument/src/main/java/org/skywalking/apm/collector
/instrument/ServiceMetricTracing.java
浏览文件 @
d7a2a198
...
...
@@ -16,7 +16,7 @@
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package
org.skywalking.apm.collector.
core.module.
instrument
;
package
org.skywalking.apm.collector.instrument
;
import
java.lang.reflect.Method
;
import
java.util.concurrent.Callable
;
...
...
apm-collector/apm-collector-
core/src/main/java/org/skywalking/apm/collector/core/module
/instrument/TracedService.java
→
apm-collector/apm-collector-
instrument/src/main/java/org/skywalking/apm/collector
/instrument/TracedService.java
浏览文件 @
d7a2a198
...
...
@@ -16,13 +16,10 @@
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package
org.skywalking.apm.collector.core.module.instrument
;
import
org.skywalking.apm.collector.core.module.ModuleManager
;
package
org.skywalking.apm.collector.instrument
;
/**
* The <code>TracedService</code> implementation are dynamic class, generated by {@link ServiceInstrumentation}, when
* {@link ModuleManager#isServiceInstrument} is true.
* The <code>TracedService</code> implementation are dynamic class, generated by {@link ServiceInstrumentation}.
*
* By that, all the services metrics are collected, and report in the certain cycle through console.
*
...
...
apm-collector/pom.xml
浏览文件 @
d7a2a198
...
...
@@ -45,6 +45,7 @@
<module>
apm-collector-remote
</module>
<module>
apm-collector-stream
</module>
<module>
apm-collector-queue
</module>
<module>
apm-collector-instrument
</module>
</modules>
<properties>
...
...
@@ -83,4 +84,4 @@
</exclusions>
</dependency>
</dependencies>
</project>
\ No newline at end of file
</project>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录