Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
3df2e8dd
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,发现更多精彩内容 >>
未验证
提交
3df2e8dd
编写于
7月 06, 2020
作者:
A
Ax1an
提交者:
GitHub
7月 06, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix no telemetry metrics when the oap role is receiver. (#5038)
上级
a3ae7b4d
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
4 addition
and
14 deletion
+4
-14
oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java
...g/oap/server/cluster/plugin/consul/ConsulCoordinator.java
+0
-2
oap-server/server-cluster-plugin/cluster-consul-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ITClusterModuleConsulProviderFunctionalTest.java
...n/consul/ITClusterModuleConsulProviderFunctionalTest.java
+0
-2
oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinator.java
...lking/oap/server/cluster/plugin/etcd/EtcdCoordinator.java
+0
-2
oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java
...rver/cluster/plugin/kubernetes/KubernetesCoordinator.java
+0
-2
oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManager.java
...p/server/cluster/plugin/standalone/StandaloneManager.java
+0
-2
oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ZookeeperCoordinator.java
...server/cluster/plugin/zookeeper/ZookeeperCoordinator.java
+0
-2
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
...apache/skywalking/oap/server/core/CoreModuleProvider.java
+4
-2
未找到文件。
oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java
浏览文件 @
3df2e8dd
...
...
@@ -33,7 +33,6 @@ import org.apache.skywalking.oap.server.core.cluster.RemoteInstance;
import
org.apache.skywalking.oap.server.core.cluster.ServiceRegisterException
;
import
org.apache.skywalking.oap.server.core.remote.client.Address
;
import
org.apache.skywalking.oap.server.library.util.CollectionUtils
;
import
org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext
;
public
class
ConsulCoordinator
implements
ClusterRegister
,
ClusterNodesQuery
{
...
...
@@ -79,7 +78,6 @@ public class ConsulCoordinator implements ClusterRegister, ClusterNodesQuery {
AgentClient
agentClient
=
client
.
agentClient
();
this
.
selfAddress
=
remoteInstance
.
getAddress
();
TelemetryRelatedContext
.
INSTANCE
.
setId
(
selfAddress
.
toString
());
Registration
registration
=
ImmutableRegistration
.
builder
()
.
id
(
remoteInstance
.
getAddress
().
toString
())
...
...
oap-server/server-cluster-plugin/cluster-consul-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ITClusterModuleConsulProviderFunctionalTest.java
浏览文件 @
3df2e8dd
...
...
@@ -31,7 +31,6 @@ import org.apache.skywalking.oap.server.core.cluster.ClusterRegister;
import
org.apache.skywalking.oap.server.core.cluster.RemoteInstance
;
import
org.apache.skywalking.oap.server.core.remote.client.Address
;
import
org.apache.skywalking.oap.server.library.module.ModuleProvider
;
import
org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.powermock.reflect.Whitebox
;
...
...
@@ -196,7 +195,6 @@ public class ITClusterModuleConsulProviderFunctionalTest {
Consul
client
=
Whitebox
.
getInternalState
(
consulCoordinator
,
"client"
);
AgentClient
agentClient
=
client
.
agentClient
();
Whitebox
.
setInternalState
(
consulCoordinator
,
"selfAddress"
,
remoteInstance
.
getAddress
());
TelemetryRelatedContext
.
INSTANCE
.
setId
(
remoteInstance
.
getAddress
().
toString
());
Registration
registration
=
ImmutableRegistration
.
builder
()
.
id
(
remoteInstance
.
getAddress
().
toString
())
.
name
(
serviceName
)
...
...
oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinator.java
浏览文件 @
3df2e8dd
...
...
@@ -33,7 +33,6 @@ import org.apache.skywalking.oap.server.core.cluster.ClusterRegister;
import
org.apache.skywalking.oap.server.core.cluster.RemoteInstance
;
import
org.apache.skywalking.oap.server.core.cluster.ServiceRegisterException
;
import
org.apache.skywalking.oap.server.core.remote.client.Address
;
import
org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -93,7 +92,6 @@ public class EtcdCoordinator implements ClusterRegister, ClusterNodesQuery {
}
this
.
selfAddress
=
remoteInstance
.
getAddress
();
TelemetryRelatedContext
.
INSTANCE
.
setId
(
selfAddress
.
toString
());
EtcdEndpoint
endpoint
=
new
EtcdEndpoint
.
Builder
().
serviceName
(
serviceName
)
.
host
(
selfAddress
.
getHost
())
...
...
oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java
浏览文件 @
3df2e8dd
...
...
@@ -33,7 +33,6 @@ import org.apache.skywalking.oap.server.core.cluster.ServiceRegisterException;
import
org.apache.skywalking.oap.server.core.config.ConfigService
;
import
org.apache.skywalking.oap.server.core.remote.client.Address
;
import
org.apache.skywalking.oap.server.library.module.ModuleDefineHolder
;
import
org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext
;
/**
* Read collector pod info from api-server of kubernetes, then using all containerIp list to construct the list of
...
...
@@ -81,7 +80,6 @@ public class KubernetesCoordinator implements ClusterRegister, ClusterNodesQuery
@Override
public
void
registerRemote
(
final
RemoteInstance
remoteInstance
)
throws
ServiceRegisterException
{
this
.
port
=
remoteInstance
.
getAddress
().
getPort
();
TelemetryRelatedContext
.
INSTANCE
.
setId
(
remoteInstance
.
toString
());
}
private
List
<
V1Pod
>
selfPod
()
{
...
...
oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManager.java
浏览文件 @
3df2e8dd
...
...
@@ -23,7 +23,6 @@ import java.util.List;
import
org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery
;
import
org.apache.skywalking.oap.server.core.cluster.ClusterRegister
;
import
org.apache.skywalking.oap.server.core.cluster.RemoteInstance
;
import
org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext
;
/**
* A cluster manager simulator. Work in memory only. Also return the current instance.
...
...
@@ -36,7 +35,6 @@ public class StandaloneManager implements ClusterNodesQuery, ClusterRegister {
public
void
registerRemote
(
RemoteInstance
remoteInstance
)
{
this
.
remoteInstance
=
remoteInstance
;
this
.
remoteInstance
.
getAddress
().
setSelf
(
true
);
TelemetryRelatedContext
.
INSTANCE
.
setId
(
"standalone"
);
}
@Override
...
...
oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ZookeeperCoordinator.java
浏览文件 @
3df2e8dd
...
...
@@ -30,7 +30,6 @@ import org.apache.skywalking.oap.server.core.cluster.ClusterRegister;
import
org.apache.skywalking.oap.server.core.cluster.RemoteInstance
;
import
org.apache.skywalking.oap.server.core.cluster.ServiceRegisterException
;
import
org.apache.skywalking.oap.server.core.remote.client.Address
;
import
org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -74,7 +73,6 @@ public class ZookeeperCoordinator implements ClusterRegister, ClusterNodesQuery
serviceDiscovery
.
registerService
(
thisInstance
);
this
.
selfAddress
=
remoteInstance
.
getAddress
();
TelemetryRelatedContext
.
INSTANCE
.
setId
(
selfAddress
.
toString
());
}
catch
(
Exception
e
)
{
throw
new
ServiceRegisterException
(
e
.
getMessage
());
}
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
浏览文件 @
3df2e8dd
...
...
@@ -92,6 +92,7 @@ import org.apache.skywalking.oap.server.library.server.grpc.GRPCServer;
import
org.apache.skywalking.oap.server.library.server.jetty.JettyServer
;
import
org.apache.skywalking.oap.server.library.util.ResourceUtils
;
import
org.apache.skywalking.oap.server.telemetry.TelemetryModule
;
import
org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext
;
/**
* Core module provider includes the recommended and default implementations of {@link CoreModule#services()}. All
...
...
@@ -282,14 +283,15 @@ public class CoreModuleProvider extends ModuleProvider {
throw
new
ModuleStartException
(
e
.
getMessage
(),
e
);
}
Address
gRPCServerInstanceAddress
=
new
Address
(
moduleConfig
.
getGRPCHost
(),
moduleConfig
.
getGRPCPort
(),
true
);
TelemetryRelatedContext
.
INSTANCE
.
setId
(
gRPCServerInstanceAddress
.
toString
());
if
(
CoreModuleConfig
.
Role
.
Mixed
.
name
()
.
equalsIgnoreCase
(
moduleConfig
.
getRole
())
||
CoreModuleConfig
.
Role
.
Aggregator
.
name
()
.
equalsIgnoreCase
(
moduleConfig
.
getRole
()))
{
RemoteInstance
gRPCServerInstance
=
new
RemoteInstance
(
new
Address
(
moduleConfig
.
getGRPCHost
(),
moduleConfig
.
getGRPCPort
(),
true
));
RemoteInstance
gRPCServerInstance
=
new
RemoteInstance
(
gRPCServerInstanceAddress
);
this
.
getManager
()
.
find
(
ClusterModule
.
NAME
)
.
provider
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录