diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java index 7d58e573a..8c23d849f 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java @@ -23,10 +23,10 @@ import org.apache.skywalking.apm.collector.analysis.register.define.AnalysisRegi import org.apache.skywalking.apm.collector.analysis.register.define.service.IApplicationIDService; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.server.grpc.GRPCHandler; -import org.apache.skywalking.apm.network.proto.Application; -import org.apache.skywalking.apm.network.proto.ApplicationMapping; -import org.apache.skywalking.apm.network.proto.ApplicationRegisterServiceGrpc; -import org.apache.skywalking.apm.network.proto.KeyWithIntegerValue; +import org.apache.skywalking.apm.network.language.agent.Application; +import org.apache.skywalking.apm.network.language.agent.ApplicationMapping; +import org.apache.skywalking.apm.network.language.agent.ApplicationRegisterServiceGrpc; +import org.apache.skywalking.apm.network.language.agent.KeyWithIntegerValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java index 9fec7e910..b044211c4 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java @@ -26,12 +26,12 @@ import org.apache.skywalking.apm.collector.analysis.register.define.service.Agen import org.apache.skywalking.apm.collector.analysis.register.define.service.IInstanceIDService; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.server.grpc.GRPCHandler; -import org.apache.skywalking.apm.network.proto.ApplicationInstance; -import org.apache.skywalking.apm.network.proto.ApplicationInstanceHeartbeat; -import org.apache.skywalking.apm.network.proto.ApplicationInstanceMapping; -import org.apache.skywalking.apm.network.proto.Downstream; -import org.apache.skywalking.apm.network.proto.InstanceDiscoveryServiceGrpc; -import org.apache.skywalking.apm.network.proto.OSInfo; +import org.apache.skywalking.apm.network.language.agent.ApplicationInstance; +import org.apache.skywalking.apm.network.language.agent.ApplicationInstanceHeartbeat; +import org.apache.skywalking.apm.network.language.agent.ApplicationInstanceMapping; +import org.apache.skywalking.apm.network.language.agent.Downstream; +import org.apache.skywalking.apm.network.language.agent.InstanceDiscoveryServiceGrpc; +import org.apache.skywalking.apm.network.language.agent.OSInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java index 54dfb2249..2608e42f1 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java @@ -27,7 +27,7 @@ import org.apache.skywalking.apm.collector.analysis.metric.define.service.IInsta import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.core.util.TimeBucketUtils; import org.apache.skywalking.apm.collector.server.grpc.GRPCHandler; -import org.apache.skywalking.apm.network.proto.*; +import org.apache.skywalking.apm.network.language.agent.*; import org.slf4j.*; /** diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/NetworkAddressRegisterServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/NetworkAddressRegisterServiceHandler.java index 35d46bab6..0ebaf87cc 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/NetworkAddressRegisterServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/NetworkAddressRegisterServiceHandler.java @@ -24,10 +24,10 @@ import org.apache.skywalking.apm.collector.analysis.register.define.AnalysisRegi import org.apache.skywalking.apm.collector.analysis.register.define.service.INetworkAddressIDService; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.server.grpc.GRPCHandler; -import org.apache.skywalking.apm.network.proto.KeyWithIntegerValue; -import org.apache.skywalking.apm.network.proto.NetworkAddressMappings; -import org.apache.skywalking.apm.network.proto.NetworkAddressRegisterServiceGrpc; -import org.apache.skywalking.apm.network.proto.NetworkAddresses; +import org.apache.skywalking.apm.network.language.agent.KeyWithIntegerValue; +import org.apache.skywalking.apm.network.language.agent.NetworkAddressMappings; +import org.apache.skywalking.apm.network.language.agent.NetworkAddressRegisterServiceGrpc; +import org.apache.skywalking.apm.network.language.agent.NetworkAddresses; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java index 61c1e1726..50bd2bf48 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java @@ -24,11 +24,11 @@ import org.apache.skywalking.apm.collector.analysis.register.define.AnalysisRegi import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.server.grpc.GRPCHandler; -import org.apache.skywalking.apm.network.proto.ServiceNameCollection; -import org.apache.skywalking.apm.network.proto.ServiceNameDiscoveryServiceGrpc; -import org.apache.skywalking.apm.network.proto.ServiceNameElement; -import org.apache.skywalking.apm.network.proto.ServiceNameMappingCollection; -import org.apache.skywalking.apm.network.proto.ServiceNameMappingElement; +import org.apache.skywalking.apm.network.language.agent.ServiceNameCollection; +import org.apache.skywalking.apm.network.language.agent.ServiceNameDiscoveryServiceGrpc; +import org.apache.skywalking.apm.network.language.agent.ServiceNameElement; +import org.apache.skywalking.apm.network.language.agent.ServiceNameMappingCollection; +import org.apache.skywalking.apm.network.language.agent.ServiceNameMappingElement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java index e8fd6dc39..5c5c0a99a 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java @@ -23,7 +23,7 @@ import org.apache.skywalking.apm.collector.analysis.segment.parser.define.Analys import org.apache.skywalking.apm.collector.analysis.segment.parser.define.service.ISegmentParseService; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.server.grpc.GRPCHandler; -import org.apache.skywalking.apm.network.proto.*; +import org.apache.skywalking.apm.network.language.agent.*; import org.slf4j.*; /** diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AuthenticationSimpleCheckerTest.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AuthenticationSimpleCheckerTest.java index fea67e916..fc3df53d9 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AuthenticationSimpleCheckerTest.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AuthenticationSimpleCheckerTest.java @@ -25,10 +25,10 @@ import org.apache.skywalking.apm.collector.core.module.MockModule; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.server.ServerException; import org.apache.skywalking.apm.collector.server.grpc.GRPCServer; -import org.apache.skywalking.apm.network.proto.Application; -import org.apache.skywalking.apm.network.proto.ApplicationMapping; -import org.apache.skywalking.apm.network.proto.ApplicationRegisterServiceGrpc; -import org.apache.skywalking.apm.network.proto.KeyWithIntegerValue; +import org.apache.skywalking.apm.network.language.agent.Application; +import org.apache.skywalking.apm.network.language.agent.ApplicationMapping; +import org.apache.skywalking.apm.network.language.agent.ApplicationRegisterServiceGrpc; +import org.apache.skywalking.apm.network.language.agent.KeyWithIntegerValue; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandlerTest.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandlerTest.java index 554aead6d..13b4a1a15 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandlerTest.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandlerTest.java @@ -21,8 +21,8 @@ import io.grpc.stub.StreamObserver; import org.apache.skywalking.apm.collector.analysis.register.define.service.IApplicationIDService; import org.apache.skywalking.apm.collector.core.module.MockModule; import org.apache.skywalking.apm.collector.core.module.ModuleManager; -import org.apache.skywalking.apm.network.proto.Application; -import org.apache.skywalking.apm.network.proto.ApplicationMapping; +import org.apache.skywalking.apm.network.language.agent.Application; +import org.apache.skywalking.apm.network.language.agent.ApplicationMapping; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandlerTest.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandlerTest.java index a7484c8b0..6ec0f458b 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandlerTest.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandlerTest.java @@ -23,11 +23,11 @@ import org.apache.skywalking.apm.collector.analysis.metric.define.service.IInsta import org.apache.skywalking.apm.collector.analysis.register.define.service.IInstanceIDService; import org.apache.skywalking.apm.collector.core.module.MockModule; import org.apache.skywalking.apm.collector.core.module.ModuleManager; -import org.apache.skywalking.apm.network.proto.ApplicationInstance; -import org.apache.skywalking.apm.network.proto.ApplicationInstanceHeartbeat; -import org.apache.skywalking.apm.network.proto.ApplicationInstanceMapping; -import org.apache.skywalking.apm.network.proto.Downstream; -import org.apache.skywalking.apm.network.proto.OSInfo; +import org.apache.skywalking.apm.network.language.agent.ApplicationInstance; +import org.apache.skywalking.apm.network.language.agent.ApplicationInstanceHeartbeat; +import org.apache.skywalking.apm.network.language.agent.ApplicationInstanceMapping; +import org.apache.skywalking.apm.network.language.agent.Downstream; +import org.apache.skywalking.apm.network.language.agent.OSInfo; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandlerTest.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandlerTest.java index 3194d9254..b5963e90e 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandlerTest.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandlerTest.java @@ -25,7 +25,7 @@ import org.apache.skywalking.apm.collector.analysis.jvm.define.service.IMemoryPo import org.apache.skywalking.apm.collector.analysis.metric.define.service.IInstanceHeartBeatService; import org.apache.skywalking.apm.collector.core.module.MockModule; import org.apache.skywalking.apm.collector.core.module.ModuleManager; -import org.apache.skywalking.apm.network.proto.*; +import org.apache.skywalking.apm.network.language.agent.*; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/NetworkAddressRegisterServiceHandlerTest.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/NetworkAddressRegisterServiceHandlerTest.java index 5becd467a..cf4d2be54 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/NetworkAddressRegisterServiceHandlerTest.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/NetworkAddressRegisterServiceHandlerTest.java @@ -21,8 +21,8 @@ import io.grpc.stub.StreamObserver; import org.apache.skywalking.apm.collector.analysis.register.define.service.INetworkAddressIDService; import org.apache.skywalking.apm.collector.core.module.MockModule; import org.apache.skywalking.apm.collector.core.module.ModuleManager; -import org.apache.skywalking.apm.network.proto.NetworkAddressMappings; -import org.apache.skywalking.apm.network.proto.NetworkAddresses; +import org.apache.skywalking.apm.network.language.agent.NetworkAddressMappings; +import org.apache.skywalking.apm.network.language.agent.NetworkAddresses; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandlerTest.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandlerTest.java index cf91d47a0..a67632a85 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandlerTest.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandlerTest.java @@ -21,7 +21,7 @@ import io.grpc.stub.StreamObserver; import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService; import org.apache.skywalking.apm.collector.core.module.MockModule; import org.apache.skywalking.apm.collector.core.module.ModuleManager; -import org.apache.skywalking.apm.network.proto.*; +import org.apache.skywalking.apm.network.language.agent.*; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandlerTest.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandlerTest.java index 3a260c535..dd55a73bf 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandlerTest.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandlerTest.java @@ -21,8 +21,8 @@ import io.grpc.stub.StreamObserver; import org.apache.skywalking.apm.collector.analysis.segment.parser.define.service.ISegmentParseService; import org.apache.skywalking.apm.collector.core.module.MockModule; import org.apache.skywalking.apm.collector.core.module.ModuleManager; -import org.apache.skywalking.apm.network.proto.Downstream; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; +import org.apache.skywalking.apm.network.language.agent.Downstream; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/AgentDataMock.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/AgentDataMock.java index 728c024a7..7fba65379 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/AgentDataMock.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/AgentDataMock.java @@ -23,9 +23,9 @@ import io.grpc.ManagedChannelBuilder; import io.grpc.stub.StreamObserver; import java.util.LinkedList; import java.util.List; -import org.apache.skywalking.apm.network.proto.Downstream; -import org.apache.skywalking.apm.network.proto.TraceSegmentServiceGrpc; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; +import org.apache.skywalking.apm.network.language.agent.Downstream; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentServiceGrpc; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ConsumerMock.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ConsumerMock.java index e080d3da0..90fdfe0cf 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ConsumerMock.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ConsumerMock.java @@ -20,7 +20,7 @@ package org.apache.skywalking.apm.collector.agent.grpc.provider.handler.mock; import com.google.protobuf.ByteString; import io.grpc.stub.StreamObserver; -import org.apache.skywalking.apm.network.proto.*; +import org.apache.skywalking.apm.network.language.agent.*; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; /** diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/JVMMetricMock.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/JVMMetricMock.java index 9368f2fc6..bb8f492fe 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/JVMMetricMock.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/JVMMetricMock.java @@ -23,15 +23,15 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.skywalking.apm.network.proto.CPU; -import org.apache.skywalking.apm.network.proto.GC; -import org.apache.skywalking.apm.network.proto.GCPhrase; -import org.apache.skywalking.apm.network.proto.JVMMetric; -import org.apache.skywalking.apm.network.proto.JVMMetrics; -import org.apache.skywalking.apm.network.proto.JVMMetricsServiceGrpc; -import org.apache.skywalking.apm.network.proto.Memory; -import org.apache.skywalking.apm.network.proto.MemoryPool; -import org.apache.skywalking.apm.network.proto.PoolType; +import org.apache.skywalking.apm.network.language.agent.CPU; +import org.apache.skywalking.apm.network.language.agent.GC; +import org.apache.skywalking.apm.network.language.agent.GCPhrase; +import org.apache.skywalking.apm.network.language.agent.JVMMetric; +import org.apache.skywalking.apm.network.language.agent.JVMMetrics; +import org.apache.skywalking.apm.network.language.agent.JVMMetricsServiceGrpc; +import org.apache.skywalking.apm.network.language.agent.Memory; +import org.apache.skywalking.apm.network.language.agent.MemoryPool; +import org.apache.skywalking.apm.network.language.agent.PoolType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ProviderMock.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ProviderMock.java index ae6d692e0..11538b0a5 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ProviderMock.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ProviderMock.java @@ -20,14 +20,14 @@ package org.apache.skywalking.apm.collector.agent.grpc.provider.handler.mock; import com.google.protobuf.ByteString; import io.grpc.stub.StreamObserver; -import org.apache.skywalking.apm.network.proto.RefType; -import org.apache.skywalking.apm.network.proto.SpanLayer; -import org.apache.skywalking.apm.network.proto.SpanObject; -import org.apache.skywalking.apm.network.proto.SpanType; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; -import org.apache.skywalking.apm.network.proto.TraceSegmentReference; -import org.apache.skywalking.apm.network.proto.UniqueId; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; +import org.apache.skywalking.apm.network.language.agent.RefType; +import org.apache.skywalking.apm.network.language.agent.SpanLayer; +import org.apache.skywalking.apm.network.language.agent.SpanObject; +import org.apache.skywalking.apm.network.language.agent.SpanType; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentReference; +import org.apache.skywalking.apm.network.language.agent.UniqueId; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; /** diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java index 00ab6c805..3463d1f54 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java @@ -22,19 +22,19 @@ import io.grpc.ManagedChannel; import java.util.UUID; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.apache.skywalking.apm.network.proto.Application; -import org.apache.skywalking.apm.network.proto.ApplicationInstance; -import org.apache.skywalking.apm.network.proto.ApplicationInstanceHeartbeat; -import org.apache.skywalking.apm.network.proto.ApplicationInstanceMapping; -import org.apache.skywalking.apm.network.proto.ApplicationMapping; -import org.apache.skywalking.apm.network.proto.ApplicationRegisterServiceGrpc; -import org.apache.skywalking.apm.network.proto.InstanceDiscoveryServiceGrpc; -import org.apache.skywalking.apm.network.proto.OSInfo; -import org.apache.skywalking.apm.network.proto.ServiceNameCollection; -import org.apache.skywalking.apm.network.proto.ServiceNameDiscoveryServiceGrpc; -import org.apache.skywalking.apm.network.proto.ServiceNameElement; -import org.apache.skywalking.apm.network.proto.ServiceNameMappingCollection; -import org.apache.skywalking.apm.network.proto.SpanType; +import org.apache.skywalking.apm.network.language.agent.Application; +import org.apache.skywalking.apm.network.language.agent.ApplicationInstance; +import org.apache.skywalking.apm.network.language.agent.ApplicationInstanceHeartbeat; +import org.apache.skywalking.apm.network.language.agent.ApplicationInstanceMapping; +import org.apache.skywalking.apm.network.language.agent.ApplicationMapping; +import org.apache.skywalking.apm.network.language.agent.ApplicationRegisterServiceGrpc; +import org.apache.skywalking.apm.network.language.agent.InstanceDiscoveryServiceGrpc; +import org.apache.skywalking.apm.network.language.agent.OSInfo; +import org.apache.skywalking.apm.network.language.agent.ServiceNameCollection; +import org.apache.skywalking.apm.network.language.agent.ServiceNameDiscoveryServiceGrpc; +import org.apache.skywalking.apm.network.language.agent.ServiceNameElement; +import org.apache.skywalking.apm.network.language.agent.ServiceNameMappingCollection; +import org.apache.skywalking.apm.network.language.agent.SpanType; import org.apache.skywalking.apm.util.RunnableWithExceptionProtection; import org.joda.time.DateTime; import org.slf4j.Logger; diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TraceSegmentMock.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TraceSegmentMock.java index 1e14e2119..ff881ca1a 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TraceSegmentMock.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TraceSegmentMock.java @@ -20,8 +20,8 @@ package org.apache.skywalking.apm.collector.agent.grpc.provider.handler.mock; import io.grpc.stub.StreamObserver; import java.util.List; -import org.apache.skywalking.apm.network.proto.UniqueId; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; +import org.apache.skywalking.apm.network.language.agent.UniqueId; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/UniqueIdBuilder.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/UniqueIdBuilder.java index 2fb040bfa..248cc0f1f 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/UniqueIdBuilder.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/UniqueIdBuilder.java @@ -19,7 +19,7 @@ package org.apache.skywalking.apm.collector.agent.grpc.provider.handler.mock; import java.util.concurrent.atomic.AtomicLong; -import org.apache.skywalking.apm.network.proto.UniqueId; +import org.apache.skywalking.apm.network.language.agent.UniqueId; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/KeyWithStringValueJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/KeyWithStringValueJsonReader.java index f2b129791..55024913e 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/KeyWithStringValueJsonReader.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/KeyWithStringValueJsonReader.java @@ -21,7 +21,7 @@ package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader; import com.google.gson.stream.JsonReader; import java.io.IOException; -import org.apache.skywalking.apm.network.proto.KeyWithStringValue; +import org.apache.skywalking.apm.network.language.agent.KeyWithStringValue; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReader.java index 150fa83fc..aeb5f9058 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReader.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReader.java @@ -21,7 +21,7 @@ package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader; import com.google.gson.stream.JsonReader; import java.io.IOException; -import org.apache.skywalking.apm.network.proto.LogMessage; +import org.apache.skywalking.apm.network.language.agent.LogMessage; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/ReferenceJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/ReferenceJsonReader.java index b7dc32921..2536b6368 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/ReferenceJsonReader.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/ReferenceJsonReader.java @@ -20,7 +20,7 @@ package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader; import com.google.gson.stream.JsonReader; import java.io.IOException; -import org.apache.skywalking.apm.network.proto.TraceSegmentReference; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentReference; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReader.java index 489886408..77f32f6b0 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReader.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReader.java @@ -20,7 +20,7 @@ package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader; import com.google.gson.stream.JsonReader; import java.io.IOException; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SpanJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SpanJsonReader.java index 111ea1a72..174ac8ec4 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SpanJsonReader.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SpanJsonReader.java @@ -21,7 +21,7 @@ package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader; import com.google.gson.stream.JsonReader; import java.io.IOException; -import org.apache.skywalking.apm.network.proto.SpanObject; +import org.apache.skywalking.apm.network.language.agent.SpanObject; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegment.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegment.java index c53c4b642..154645b9e 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegment.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegment.java @@ -19,9 +19,9 @@ package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; -import org.apache.skywalking.apm.network.proto.UniqueId; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.UniqueId; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/UniqueIdJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/UniqueIdJsonReader.java index 54d0c32dc..c2d48abbb 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/UniqueIdJsonReader.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/UniqueIdJsonReader.java @@ -21,7 +21,7 @@ package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader; import com.google.gson.stream.JsonReader; import java.io.IOException; -import org.apache.skywalking.apm.network.proto.UniqueId; +import org.apache.skywalking.apm.network.language.agent.UniqueId; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/KeyWithStringValueJsonReaderTest.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/KeyWithStringValueJsonReaderTest.java index 7607ba22d..35ef27571 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/KeyWithStringValueJsonReaderTest.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/KeyWithStringValueJsonReaderTest.java @@ -19,7 +19,7 @@ package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader; import com.google.gson.Gson; import com.google.gson.JsonObject; -import org.apache.skywalking.apm.network.proto.KeyWithStringValue; +import org.apache.skywalking.apm.network.language.agent.KeyWithStringValue; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReaderTest.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReaderTest.java index b3ca1cfbf..5b66b9e6e 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReaderTest.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReaderTest.java @@ -20,7 +20,7 @@ package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import org.apache.skywalking.apm.network.proto.LogMessage; +import org.apache.skywalking.apm.network.language.agent.LogMessage; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/ReferenceJsonReaderTest.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/ReferenceJsonReaderTest.java index 4ceeabac4..e705f907b 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/ReferenceJsonReaderTest.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/ReferenceJsonReaderTest.java @@ -20,7 +20,7 @@ package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import org.apache.skywalking.apm.network.proto.TraceSegmentReference; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentReference; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReaderTest.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReaderTest.java index 712948dac..011694a65 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReaderTest.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReaderTest.java @@ -19,7 +19,7 @@ package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SpanJsonReaderTest.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SpanJsonReaderTest.java index eb4e649bd..ecac28705 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SpanJsonReaderTest.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SpanJsonReaderTest.java @@ -19,7 +19,7 @@ package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import org.apache.skywalking.apm.network.proto.SpanObject; +import org.apache.skywalking.apm.network.language.agent.SpanObject; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegmentJsonReaderTest.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegmentJsonReaderTest.java index 969c9b00a..e834f23db 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegmentJsonReaderTest.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegmentJsonReaderTest.java @@ -19,7 +19,7 @@ package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import org.apache.skywalking.apm.network.proto.UniqueId; +import org.apache.skywalking.apm.network.language.agent.UniqueId; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java index c30a29a7d..8a0d4859c 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java @@ -29,7 +29,7 @@ import org.apache.skywalking.apm.collector.core.graph.*; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.core.util.Const; import org.apache.skywalking.apm.collector.storage.table.application.ApplicationMapping; -import org.apache.skywalking.apm.network.proto.SpanLayer; +import org.apache.skywalking.apm.network.language.agent.SpanLayer; import org.slf4j.*; /** diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java index 655fb4d3a..285949d6d 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java @@ -27,7 +27,7 @@ import org.apache.skywalking.apm.collector.core.graph.*; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.core.util.Const; import org.apache.skywalking.apm.collector.storage.table.global.GlobalTrace; -import org.apache.skywalking.apm.network.proto.UniqueId; +import org.apache.skywalking.apm.network.language.agent.UniqueId; import org.slf4j.*; /** diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java index fe0395445..49609ebc4 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.core.util.Const; import org.apache.skywalking.apm.collector.storage.table.MetricSource; import org.apache.skywalking.apm.collector.storage.table.service.ServiceReferenceMetric; -import org.apache.skywalking.apm.network.proto.SpanLayer; +import org.apache.skywalking.apm.network.language.agent.SpanLayer; import org.slf4j.*; import static java.util.Objects.nonNull; diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/ReferenceDecorator.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/ReferenceDecorator.java index 5f21f8229..9417099e5 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/ReferenceDecorator.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/ReferenceDecorator.java @@ -19,9 +19,9 @@ package org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator; -import org.apache.skywalking.apm.network.proto.RefType; -import org.apache.skywalking.apm.network.proto.TraceSegmentReference; -import org.apache.skywalking.apm.network.proto.UniqueId; +import org.apache.skywalking.apm.network.language.agent.RefType; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentReference; +import org.apache.skywalking.apm.network.language.agent.UniqueId; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/SegmentDecorator.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/SegmentDecorator.java index 260bebdb6..cddf0cd92 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/SegmentDecorator.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/SegmentDecorator.java @@ -18,8 +18,8 @@ package org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; -import org.apache.skywalking.apm.network.proto.UniqueId; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.UniqueId; import static java.util.Objects.isNull; diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/SpanDecorator.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/SpanDecorator.java index 1f1f8d82d..5ad35330f 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/SpanDecorator.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/SpanDecorator.java @@ -18,7 +18,7 @@ package org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator; -import org.apache.skywalking.apm.network.proto.*; +import org.apache.skywalking.apm.network.language.agent.*; import static java.util.Objects.isNull; diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/listener/GlobalTraceIdsListener.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/listener/GlobalTraceIdsListener.java index da7431b7d..85e6e2449 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/listener/GlobalTraceIdsListener.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/listener/GlobalTraceIdsListener.java @@ -19,7 +19,7 @@ package org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener; import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.SegmentCoreInfo; -import org.apache.skywalking.apm.network.proto.UniqueId; +import org.apache.skywalking.apm.network.language.agent.UniqueId; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/service/ISegmentParseService.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/service/ISegmentParseService.java index 2547cc64a..18935932e 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/service/ISegmentParseService.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/service/ISegmentParseService.java @@ -19,7 +19,7 @@ package org.apache.skywalking.apm.collector.analysis.segment.parser.define.service; import org.apache.skywalking.apm.collector.core.module.Service; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferManager.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferManager.java index 75f5cc68e..5f7e5460a 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferManager.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferManager.java @@ -22,7 +22,7 @@ import java.io.*; import java.nio.channels.FileLock; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.core.util.*; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; import org.slf4j.*; /** diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferReader.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferReader.java index d1ce1c4e6..a94be0c7d 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferReader.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferReader.java @@ -33,7 +33,7 @@ import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.core.util.CollectionUtils; import org.apache.skywalking.apm.collector.core.util.Const; import org.apache.skywalking.apm.collector.core.util.StringUtils; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; import org.apache.skywalking.apm.util.RunnableWithExceptionProtection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java index 2c6ef5812..2b7fe7cd8 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.core.graph.*; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.core.util.TimeBucketUtils; import org.apache.skywalking.apm.collector.storage.table.segment.Segment; -import org.apache.skywalking.apm.network.proto.*; +import org.apache.skywalking.apm.network.language.agent.*; import org.slf4j.*; /** diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java index e879bd7af..15f2653fa 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java @@ -28,7 +28,7 @@ import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputing import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.core.util.Const; import org.apache.skywalking.apm.collector.core.util.StringUtils; -import org.apache.skywalking.apm.network.proto.SpanType; +import org.apache.skywalking.apm.network.language.agent.SpanType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SegmentStandardization.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SegmentStandardization.java index bb247fa0b..7c02b6bd8 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SegmentStandardization.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SegmentStandardization.java @@ -20,7 +20,7 @@ package org.apache.skywalking.apm.collector.analysis.segment.parser.provider.par import org.apache.skywalking.apm.collector.core.data.QueueData; import org.apache.skywalking.apm.collector.core.queue.EndOfBatchContext; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/service/SegmentParseService.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/service/SegmentParseService.java index c848fe4ea..aaea24c4c 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/service/SegmentParseService.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/service/SegmentParseService.java @@ -22,7 +22,7 @@ import org.apache.skywalking.apm.collector.analysis.segment.parser.define.servic import org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser.SegmentParse; import org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser.SegmentParserListenerManager; import org.apache.skywalking.apm.collector.core.module.ModuleManager; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/test/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/service/SegmentBase64Printer.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/test/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/service/SegmentBase64Printer.java index 2fdd34688..13f7d5921 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/test/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/service/SegmentBase64Printer.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/test/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/service/SegmentBase64Printer.java @@ -21,9 +21,9 @@ package org.apache.skywalking.apm.collector.analysis.segment.parser.provider.ser import com.google.protobuf.InvalidProtocolBufferException; import java.util.Base64; import java.util.List; -import org.apache.skywalking.apm.network.proto.SpanObject; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; -import org.apache.skywalking.apm.network.proto.UniqueId; +import org.apache.skywalking.apm.network.language.agent.SpanObject; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.UniqueId; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IGCMetricUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IGCMetricUIDAO.java index 7fe2bf384..2fb7b27d4 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IGCMetricUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IGCMetricUIDAO.java @@ -39,7 +39,7 @@ public interface IGCMetricUIDAO extends DAO { * duration, which represents by the DurationPoint list in the `step` Unit. *

SQL as: select COUNT, TIMES, DURATION from GC_METRIC where ID in (durationPoints), rule of * ID generation is "${durationPoint}_${instanceId}_${gcPhrase}", - * {@link org.apache.skywalking.apm.network.proto.GCPhrase#NEW_VALUE} + * {@link org.apache.skywalking.apm.network.language.agent.GCPhrase#NEW_VALUE} *

The young generation GC count *

The average young generation GC average duration formula is "DURATION / TIMES". *

Every element in return list must match DurationPoint list, which also means that, @@ -54,7 +54,7 @@ public interface IGCMetricUIDAO extends DAO { * @param durationPoints the time points in the time span * @return every duration points average young generation GC count and duration metrics. * @see org.apache.skywalking.apm.collector.storage.ui.common.Step - * @see org.apache.skywalking.apm.network.proto.GCPhrase + * @see org.apache.skywalking.apm.network.language.agent.GCPhrase */ List getYoungGCTrend(int instanceId, Step step, List durationPoints); @@ -63,7 +63,7 @@ public interface IGCMetricUIDAO extends DAO { * duration, which represents by the DurationPoint list in the `step` Unit. *

SQL as: select COUNT, TIMES, DURATION from GC_METRIC where ID in (durationPoints), rule of * ID generation is "${durationPoint}_${instanceId}_${gcPhrase}", - * {@link org.apache.skywalking.apm.network.proto.GCPhrase#OLD_VALUE} + * {@link org.apache.skywalking.apm.network.language.agent.GCPhrase#OLD_VALUE} *

The old generation GC count *

The average old generation GC average duration formula is "DURATION / TIMES". *

Every element in return list must match DurationPoint list, which also means that, @@ -78,7 +78,7 @@ public interface IGCMetricUIDAO extends DAO { * @param durationPoints the time points in the time span * @return every duration points average old generation GC count and duration metrics. * @see org.apache.skywalking.apm.collector.storage.ui.common.Step - * @see org.apache.skywalking.apm.network.proto.GCPhrase + * @see org.apache.skywalking.apm.network.language.agent.GCPhrase */ List getOldGCTrend(int instanceId, Step step, List durationPoints); diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/ISegmentUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/ISegmentUIDAO.java index e290666b3..208bb27f0 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/ISegmentUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/ISegmentUIDAO.java @@ -19,7 +19,7 @@ package org.apache.skywalking.apm.collector.storage.dao.ui; import org.apache.skywalking.apm.collector.storage.base.dao.DAO; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; /** * Interface to be implemented for execute database query operation diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/GCMetricEsUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/GCMetricEsUIDAO.java index 251ec4b42..64a72ee53 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/GCMetricEsUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/GCMetricEsUIDAO.java @@ -26,7 +26,7 @@ import org.apache.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.apache.skywalking.apm.collector.storage.table.jvm.GCMetricTable; import org.apache.skywalking.apm.collector.storage.ui.common.Step; import org.apache.skywalking.apm.collector.storage.utils.*; -import org.apache.skywalking.apm.network.proto.GCPhrase; +import org.apache.skywalking.apm.network.language.agent.GCPhrase; import org.elasticsearch.action.get.*; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/NetworkAddressEsUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/NetworkAddressEsUIDAO.java index 711f32678..22af24122 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/NetworkAddressEsUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/NetworkAddressEsUIDAO.java @@ -25,7 +25,7 @@ import org.apache.skywalking.apm.collector.storage.dao.ui.INetworkAddressUIDAO; import org.apache.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.apache.skywalking.apm.collector.storage.table.register.NetworkAddressTable; import org.apache.skywalking.apm.collector.storage.ui.overview.ConjecturalApp; -import org.apache.skywalking.apm.network.proto.SpanLayer; +import org.apache.skywalking.apm.network.language.agent.SpanLayer; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/SegmentEsUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/SegmentEsUIDAO.java index 135619015..344d9322d 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/SegmentEsUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/SegmentEsUIDAO.java @@ -26,7 +26,7 @@ import org.apache.skywalking.apm.collector.core.util.StringUtils; import org.apache.skywalking.apm.collector.storage.dao.ui.ISegmentUIDAO; import org.apache.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.apache.skywalking.apm.collector.storage.table.segment.SegmentTable; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; import org.elasticsearch.action.get.GetResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceNameServiceEsUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceNameServiceEsUIDAO.java index d28846a3d..249a90547 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceNameServiceEsUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceNameServiceEsUIDAO.java @@ -25,7 +25,7 @@ import org.apache.skywalking.apm.collector.storage.dao.ui.IServiceNameServiceUID import org.apache.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.apache.skywalking.apm.collector.storage.table.register.ServiceNameTable; import org.apache.skywalking.apm.collector.storage.ui.service.ServiceInfo; -import org.apache.skywalking.apm.network.proto.SpanType; +import org.apache.skywalking.apm.network.language.agent.SpanType; import org.elasticsearch.action.search.*; import org.elasticsearch.index.query.*; import org.elasticsearch.search.SearchHit; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/GCMetricH2UIDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/GCMetricH2UIDAO.java index b139f645f..a7fc1f63f 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/GCMetricH2UIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/GCMetricH2UIDAO.java @@ -28,7 +28,7 @@ import org.apache.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.apache.skywalking.apm.collector.storage.table.jvm.GCMetricTable; import org.apache.skywalking.apm.collector.storage.ui.common.Step; import org.apache.skywalking.apm.collector.storage.utils.*; -import org.apache.skywalking.apm.network.proto.GCPhrase; +import org.apache.skywalking.apm.network.language.agent.GCPhrase; import org.slf4j.*; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/SegmentH2UIDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/SegmentH2UIDAO.java index 33d44eea9..9678f0011 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/SegmentH2UIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/SegmentH2UIDAO.java @@ -28,7 +28,7 @@ import org.apache.skywalking.apm.collector.storage.dao.ui.ISegmentUIDAO; import org.apache.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.apache.skywalking.apm.collector.storage.table.segment.SegmentTable; import org.apache.skywalking.apm.collector.client.h2.H2ClientException; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceNameServiceH2UIDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceNameServiceH2UIDAO.java index 16923f2a6..910e417a0 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceNameServiceH2UIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceNameServiceH2UIDAO.java @@ -26,7 +26,7 @@ import org.apache.skywalking.apm.collector.storage.dao.ui.IServiceNameServiceUID import org.apache.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.apache.skywalking.apm.collector.storage.table.register.ServiceNameTable; import org.apache.skywalking.apm.collector.storage.ui.service.ServiceInfo; -import org.apache.skywalking.apm.network.proto.SpanType; +import org.apache.skywalking.apm.network.language.agent.SpanType; import org.slf4j.*; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/dao/ui/GCMetricShardingjdbcUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/dao/ui/GCMetricShardingjdbcUIDAO.java index 521ef999f..b7e86fcf0 100644 --- a/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/dao/ui/GCMetricShardingjdbcUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/dao/ui/GCMetricShardingjdbcUIDAO.java @@ -28,7 +28,7 @@ import org.apache.skywalking.apm.collector.storage.shardingjdbc.base.dao.Shardin import org.apache.skywalking.apm.collector.storage.table.jvm.GCMetricTable; import org.apache.skywalking.apm.collector.storage.ui.common.Step; import org.apache.skywalking.apm.collector.storage.utils.*; -import org.apache.skywalking.apm.network.proto.GCPhrase; +import org.apache.skywalking.apm.network.language.agent.GCPhrase; import org.slf4j.*; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/dao/ui/NetworkAddressShardingjdbcUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/dao/ui/NetworkAddressShardingjdbcUIDAO.java index 0177bd065..e10928b5c 100644 --- a/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/dao/ui/NetworkAddressShardingjdbcUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/dao/ui/NetworkAddressShardingjdbcUIDAO.java @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.dao.ui.INetworkAddressUIDAO; import org.apache.skywalking.apm.collector.storage.shardingjdbc.base.dao.ShardingjdbcDAO; import org.apache.skywalking.apm.collector.storage.table.register.NetworkAddressTable; import org.apache.skywalking.apm.collector.storage.ui.overview.ConjecturalApp; -import org.apache.skywalking.apm.network.proto.SpanLayer; +import org.apache.skywalking.apm.network.language.agent.SpanLayer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/dao/ui/SegmentShardingjdbcUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/dao/ui/SegmentShardingjdbcUIDAO.java index ebdcbf251..f38a01030 100644 --- a/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/dao/ui/SegmentShardingjdbcUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/dao/ui/SegmentShardingjdbcUIDAO.java @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.base.sql.SqlBuilder; import org.apache.skywalking.apm.collector.storage.dao.ui.ISegmentUIDAO; import org.apache.skywalking.apm.collector.storage.shardingjdbc.base.dao.ShardingjdbcDAO; import org.apache.skywalking.apm.collector.storage.table.segment.SegmentTable; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/dao/ui/ServiceNameServiceShardingjdbcUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/dao/ui/ServiceNameServiceShardingjdbcUIDAO.java index eb1db4d98..c8d368345 100644 --- a/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/dao/ui/ServiceNameServiceShardingjdbcUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/dao/ui/ServiceNameServiceShardingjdbcUIDAO.java @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.dao.ui.IServiceNameServiceUID import org.apache.skywalking.apm.collector.storage.shardingjdbc.base.dao.ShardingjdbcDAO; import org.apache.skywalking.apm.collector.storage.table.register.ServiceNameTable; import org.apache.skywalking.apm.collector.storage.ui.service.ServiceInfo; -import org.apache.skywalking.apm.network.proto.SpanType; +import org.apache.skywalking.apm.network.language.agent.SpanType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/data/SkyWalkingTrace.java b/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/data/SkyWalkingTrace.java index 517bc0328..d02b0caab 100644 --- a/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/data/SkyWalkingTrace.java +++ b/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/data/SkyWalkingTrace.java @@ -18,9 +18,9 @@ package org.apache.skywalking.apm.collector.receiver.zipkin.provider.data; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; -import org.apache.skywalking.apm.network.proto.UniqueId; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.UniqueId; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; import java.util.LinkedList; import java.util.List; diff --git a/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/transform/SegmentBuilder.java b/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/transform/SegmentBuilder.java index 8266eac58..c9d6cdbce 100644 --- a/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/transform/SegmentBuilder.java +++ b/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/transform/SegmentBuilder.java @@ -22,7 +22,7 @@ import org.apache.skywalking.apm.collector.analysis.metric.define.service.IInsta import org.apache.skywalking.apm.collector.core.util.StringUtils; import org.apache.skywalking.apm.collector.receiver.zipkin.provider.RegisterServices; import org.apache.skywalking.apm.collector.receiver.zipkin.provider.data.SkyWalkingTrace; -import org.apache.skywalking.apm.network.proto.*; +import org.apache.skywalking.apm.network.language.agent.*; import org.eclipse.jetty.util.StringUtil; import zipkin2.Endpoint; import zipkin2.Span; diff --git a/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/test/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/transform/SpringSleuthSegmentBuilderTest.java b/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/test/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/transform/SpringSleuthSegmentBuilderTest.java index 8a5e1c7f8..16a673a32 100644 --- a/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/test/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/transform/SpringSleuthSegmentBuilderTest.java +++ b/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/test/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/transform/SpringSleuthSegmentBuilderTest.java @@ -25,10 +25,10 @@ import org.apache.skywalking.apm.collector.analysis.register.define.service.IIns import org.apache.skywalking.apm.collector.receiver.zipkin.provider.RegisterServices; import org.apache.skywalking.apm.collector.receiver.zipkin.provider.data.SkyWalkingTrace; import org.apache.skywalking.apm.collector.receiver.zipkin.provider.data.ZipkinTrace; -import org.apache.skywalking.apm.network.proto.SpanObject; -import org.apache.skywalking.apm.network.proto.SpanType; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; -import org.apache.skywalking.apm.network.proto.TraceSegmentReference; +import org.apache.skywalking.apm.network.language.agent.SpanObject; +import org.apache.skywalking.apm.network.language.agent.SpanType; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentReference; import org.junit.Assert; import org.junit.Test; import zipkin2.Span; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/NetworkAddressService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/NetworkAddressService.java index ed7045365..a9317128a 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/NetworkAddressService.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/NetworkAddressService.java @@ -21,7 +21,7 @@ package org.apache.skywalking.apm.collector.ui.service; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.dao.ui.INetworkAddressUIDAO; -import org.apache.skywalking.apm.network.proto.SpanLayer; +import org.apache.skywalking.apm.network.language.agent.SpanLayer; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/SpanService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/SpanService.java index 0d4f26fbf..5508eb080 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/SpanService.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/SpanService.java @@ -31,10 +31,10 @@ import org.apache.skywalking.apm.collector.core.util.StringUtils; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.dao.ui.ISegmentUIDAO; import org.apache.skywalking.apm.collector.storage.table.register.ServiceName; -import org.apache.skywalking.apm.network.proto.KeyWithStringValue; -import org.apache.skywalking.apm.network.proto.LogMessage; -import org.apache.skywalking.apm.network.proto.SpanObject; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.KeyWithStringValue; +import org.apache.skywalking.apm.network.language.agent.LogMessage; +import org.apache.skywalking.apm.network.language.agent.SpanObject; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TraceStackService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TraceStackService.java index ab5282eeb..7aaa11395 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TraceStackService.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TraceStackService.java @@ -32,9 +32,9 @@ import org.apache.skywalking.apm.collector.storage.dao.ui.IGlobalTraceUIDAO; import org.apache.skywalking.apm.collector.storage.dao.ui.ISegmentUIDAO; import org.apache.skywalking.apm.collector.storage.table.register.ServiceName; import org.apache.skywalking.apm.collector.storage.ui.trace.*; -import org.apache.skywalking.apm.network.proto.SpanObject; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; -import org.apache.skywalking.apm.network.proto.UniqueId; +import org.apache.skywalking.apm.network.language.agent.SpanObject; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.UniqueId; import java.util.ArrayList; import java.util.LinkedList; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/SpanServiceTest.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/SpanServiceTest.java index 67aacb439..625271871 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/SpanServiceTest.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/SpanServiceTest.java @@ -23,10 +23,10 @@ import org.apache.skywalking.apm.collector.cache.service.ServiceNameCacheService import org.apache.skywalking.apm.collector.core.module.MockModule; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.dao.ui.ISegmentUIDAO; -import org.apache.skywalking.apm.network.proto.KeyWithStringValue; -import org.apache.skywalking.apm.network.proto.LogMessage; -import org.apache.skywalking.apm.network.proto.SpanObject; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.KeyWithStringValue; +import org.apache.skywalking.apm.network.language.agent.LogMessage; +import org.apache.skywalking.apm.network.language.agent.SpanObject; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/TraceStackServiceTest.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/TraceStackServiceTest.java index b40c882fa..892c202d1 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/TraceStackServiceTest.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/TraceStackServiceTest.java @@ -27,7 +27,7 @@ import org.apache.skywalking.apm.collector.storage.dao.ui.IGlobalTraceUIDAO; import org.apache.skywalking.apm.collector.storage.dao.ui.ISegmentUIDAO; import org.apache.skywalking.apm.collector.storage.table.register.Application; import org.apache.skywalking.apm.collector.storage.ui.trace.Trace; -import org.apache.skywalking.apm.network.proto.*; +import org.apache.skywalking.apm.network.language.agent.*; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/apm-protocol/apm-network/src/main/proto b/apm-protocol/apm-network/src/main/proto index c02c12af1..8ca567248 160000 --- a/apm-protocol/apm-network/src/main/proto +++ b/apm-protocol/apm-network/src/main/proto @@ -1 +1 @@ -Subproject commit c02c12af12116121e25155d1f3fca0fadee5f2e9 +Subproject commit 8ca567248b88d2faa849139e2a42d375c61522f2 diff --git a/apm-protocol/apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java b/apm-protocol/apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java index 0675f3f0c..ef47cb9e9 100644 --- a/apm-protocol/apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java +++ b/apm-protocol/apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java @@ -27,9 +27,9 @@ import io.grpc.internal.DnsNameResolverProvider; import io.grpc.netty.NettyChannelBuilder; import io.grpc.stub.StreamObserver; import org.junit.Assert; -import org.apache.skywalking.apm.network.proto.Downstream; -import org.apache.skywalking.apm.network.proto.TraceSegmentServiceGrpc; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; +import org.apache.skywalking.apm.network.language.agent.Downstream; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentServiceGrpc; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; /** * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceId.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceId.java index b139b368f..b60ad3306 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceId.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceId.java @@ -19,7 +19,7 @@ package org.apache.skywalking.apm.agent.core.context.ids; -import org.apache.skywalking.apm.network.proto.UniqueId; +import org.apache.skywalking.apm.network.language.agent.*; /** * The DistributedTraceId presents a distributed call chain. diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/ID.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/ID.java index ecc456dd9..4fb604205 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/ID.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/ID.java @@ -19,8 +19,7 @@ package org.apache.skywalking.apm.agent.core.context.ids; -import org.apache.skywalking.apm.network.proto.UniqueId; - +import org.apache.skywalking.apm.network.language.agent.*; /** * @author wusheng */ diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java index 4b80e0d30..b0116c1d8 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java @@ -24,8 +24,7 @@ import java.util.Map; import org.apache.skywalking.apm.agent.core.context.util.KeyValuePair; import org.apache.skywalking.apm.agent.core.context.util.ThrowableTransformer; import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil; -import org.apache.skywalking.apm.network.proto.SpanObject; -import org.apache.skywalking.apm.network.proto.SpanType; +import org.apache.skywalking.apm.network.language.agent.*; import org.apache.skywalking.apm.network.trace.component.Component; /** diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java index 2a2776d01..aeae4a25d 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java @@ -20,7 +20,8 @@ package org.apache.skywalking.apm.agent.core.context.trace; import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil; -import org.apache.skywalking.apm.network.proto.SpanObject; +import org.apache.skywalking.apm.network.language.agent.*; + import org.apache.skywalking.apm.network.trace.component.Component; /** diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LogDataEntity.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LogDataEntity.java index a2a42e216..9aa7b0af6 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LogDataEntity.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LogDataEntity.java @@ -22,7 +22,7 @@ package org.apache.skywalking.apm.agent.core.context.trace; import java.util.LinkedList; import java.util.List; import org.apache.skywalking.apm.agent.core.context.util.KeyValuePair; -import org.apache.skywalking.apm.network.proto.LogMessage; +import org.apache.skywalking.apm.network.language.agent.*; /** * The LogDataEntity represents a collection of {@link KeyValuePair}, diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegment.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegment.java index d60728e7e..f5c458171 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegment.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegment.java @@ -27,8 +27,7 @@ import org.apache.skywalking.apm.agent.core.context.ids.DistributedTraceIds; import org.apache.skywalking.apm.agent.core.context.ids.GlobalIdGenerator; import org.apache.skywalking.apm.agent.core.context.ids.ID; import org.apache.skywalking.apm.agent.core.context.ids.NewDistributedTraceId; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; +import org.apache.skywalking.apm.network.language.agent.*; /** * {@link TraceSegment} is a segment or fragment of the distributed trace. See https://github.com/opentracing/specification/blob/master/specification.md#the-opentracing-data-model diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegmentRef.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegmentRef.java index d51362958..5ea44f681 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegmentRef.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegmentRef.java @@ -24,8 +24,7 @@ import org.apache.skywalking.apm.agent.core.context.ContextCarrier; import org.apache.skywalking.apm.agent.core.context.ContextSnapshot; import org.apache.skywalking.apm.agent.core.context.ids.ID; import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil; -import org.apache.skywalking.apm.network.proto.RefType; -import org.apache.skywalking.apm.network.proto.TraceSegmentReference; +import org.apache.skywalking.apm.network.language.agent.*; /** * {@link TraceSegmentRef} is like a pointer, which ref to another {@link TraceSegment}, diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/KeyValuePair.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/KeyValuePair.java index 9f72883d4..e9ddc640d 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/KeyValuePair.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/KeyValuePair.java @@ -19,7 +19,7 @@ package org.apache.skywalking.apm.agent.core.context.util; -import org.apache.skywalking.apm.network.proto.KeyWithStringValue; +import org.apache.skywalking.apm.network.language.agent.*; /** * The KeyValuePair represents a object which contains a string key and a string value. diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NetworkAddressDictionary.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NetworkAddressDictionary.java index b48b02446..208ba1725 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NetworkAddressDictionary.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NetworkAddressDictionary.java @@ -23,10 +23,7 @@ import io.netty.util.internal.ConcurrentSet; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.apache.skywalking.apm.network.proto.KeyWithIntegerValue; -import org.apache.skywalking.apm.network.proto.NetworkAddressMappings; -import org.apache.skywalking.apm.network.proto.NetworkAddressRegisterServiceGrpc; -import org.apache.skywalking.apm.network.proto.NetworkAddresses; +import org.apache.skywalking.apm.network.language.agent.*; import static org.apache.skywalking.apm.agent.core.conf.Config.Dictionary.APPLICATION_CODE_BUFFER_SIZE; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/OperationNameDictionary.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/OperationNameDictionary.java index ed4832f32..7f743b593 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/OperationNameDictionary.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/OperationNameDictionary.java @@ -22,12 +22,7 @@ import io.netty.util.internal.ConcurrentSet; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.apache.skywalking.apm.network.proto.ServiceNameCollection; -import org.apache.skywalking.apm.network.proto.ServiceNameDiscoveryServiceGrpc; -import org.apache.skywalking.apm.network.proto.ServiceNameElement; -import org.apache.skywalking.apm.network.proto.ServiceNameMappingCollection; -import org.apache.skywalking.apm.network.proto.ServiceNameMappingElement; -import org.apache.skywalking.apm.network.proto.SpanType; +import org.apache.skywalking.apm.network.language.agent.*; import static org.apache.skywalking.apm.agent.core.conf.Config.Dictionary.OPERATION_NAME_BUFFER_SIZE; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java index e1be08bae..37b92962a 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java @@ -35,9 +35,7 @@ import org.apache.skywalking.apm.agent.core.logging.api.LogManager; import org.apache.skywalking.apm.agent.core.remote.GRPCChannelListener; import org.apache.skywalking.apm.agent.core.remote.GRPCChannelManager; import org.apache.skywalking.apm.agent.core.remote.GRPCChannelStatus; -import org.apache.skywalking.apm.network.proto.JVMMetric; -import org.apache.skywalking.apm.network.proto.JVMMetrics; -import org.apache.skywalking.apm.network.proto.JVMMetricsServiceGrpc; +import org.apache.skywalking.apm.network.language.agent.*; import org.apache.skywalking.apm.util.RunnableWithExceptionProtection; import java.util.LinkedList; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUMetricAccessor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUMetricAccessor.java index a6c1ae659..c6e8cbdd8 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUMetricAccessor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUMetricAccessor.java @@ -19,7 +19,7 @@ package org.apache.skywalking.apm.agent.core.jvm.cpu; -import org.apache.skywalking.apm.network.proto.CPU; +import org.apache.skywalking.apm.network.language.agent.*; /** * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUProvider.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUProvider.java index 647f96eb0..6701b508a 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUProvider.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUProvider.java @@ -22,7 +22,7 @@ package org.apache.skywalking.apm.agent.core.jvm.cpu; 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.os.ProcessorUtil; -import org.apache.skywalking.apm.network.proto.CPU; +import org.apache.skywalking.apm.network.language.agent.*; /** * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCMetricAccessor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCMetricAccessor.java index a8be4a06c..f706b9a87 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCMetricAccessor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCMetricAccessor.java @@ -20,7 +20,7 @@ package org.apache.skywalking.apm.agent.core.jvm.gc; import java.util.List; -import org.apache.skywalking.apm.network.proto.GC; +import org.apache.skywalking.apm.network.language.agent.*; /** * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCModule.java index 7f88a07f1..4090b0fca 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCModule.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCModule.java @@ -21,8 +21,7 @@ package org.apache.skywalking.apm.agent.core.jvm.gc; import java.lang.management.GarbageCollectorMXBean; import java.util.LinkedList; import java.util.List; -import org.apache.skywalking.apm.network.proto.GC; -import org.apache.skywalking.apm.network.proto.GCPhrase; +import org.apache.skywalking.apm.network.language.agent.*; /** * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCProvider.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCProvider.java index d95646e26..d28f1d7b7 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCProvider.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCProvider.java @@ -22,7 +22,7 @@ package org.apache.skywalking.apm.agent.core.jvm.gc; import java.lang.management.GarbageCollectorMXBean; import java.lang.management.ManagementFactory; import java.util.List; -import org.apache.skywalking.apm.network.proto.GC; +import org.apache.skywalking.apm.network.language.agent.*; /** * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/UnknowGC.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/UnknowGC.java index 3d5a6c1c9..dc71cfff6 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/UnknowGC.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/UnknowGC.java @@ -21,8 +21,7 @@ package org.apache.skywalking.apm.agent.core.jvm.gc; import java.util.LinkedList; import java.util.List; -import org.apache.skywalking.apm.network.proto.GC; -import org.apache.skywalking.apm.network.proto.GCPhrase; +import org.apache.skywalking.apm.network.language.agent.*; /** * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memory/MemoryProvider.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memory/MemoryProvider.java index 5b6a1b257..f31e068e0 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memory/MemoryProvider.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memory/MemoryProvider.java @@ -24,7 +24,7 @@ import java.lang.management.MemoryMXBean; import java.lang.management.MemoryUsage; import java.util.LinkedList; import java.util.List; -import org.apache.skywalking.apm.network.proto.Memory; +import org.apache.skywalking.apm.network.language.agent.*; /** * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolMetricAccessor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolMetricAccessor.java index 025b98096..9734ce922 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolMetricAccessor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolMetricAccessor.java @@ -20,7 +20,7 @@ package org.apache.skywalking.apm.agent.core.jvm.memorypool; import java.util.List; -import org.apache.skywalking.apm.network.proto.MemoryPool; +import org.apache.skywalking.apm.network.language.agent.*; /** * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolModule.java index 0fa6c3411..36a7617f4 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolModule.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolModule.java @@ -23,8 +23,7 @@ import java.lang.management.MemoryPoolMXBean; import java.lang.management.MemoryUsage; import java.util.LinkedList; import java.util.List; -import org.apache.skywalking.apm.network.proto.MemoryPool; -import org.apache.skywalking.apm.network.proto.PoolType; +import org.apache.skywalking.apm.network.language.agent.*; /** * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolProvider.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolProvider.java index aabd25422..4dc296206 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolProvider.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolProvider.java @@ -22,7 +22,7 @@ package org.apache.skywalking.apm.agent.core.jvm.memorypool; import java.lang.management.ManagementFactory; import java.lang.management.MemoryPoolMXBean; import java.util.List; -import org.apache.skywalking.apm.network.proto.MemoryPool; +import org.apache.skywalking.apm.network.language.agent.*; /** * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/UnknownMemoryPool.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/UnknownMemoryPool.java index 9196c5281..3b9bbf8e8 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/UnknownMemoryPool.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/UnknownMemoryPool.java @@ -21,8 +21,7 @@ package org.apache.skywalking.apm.agent.core.jvm.memorypool; import java.util.LinkedList; import java.util.List; -import org.apache.skywalking.apm.network.proto.MemoryPool; -import org.apache.skywalking.apm.network.proto.PoolType; +import org.apache.skywalking.apm.network.language.agent.*; /** * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/os/OSUtil.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/os/OSUtil.java index de94fa274..d3434e8fa 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/os/OSUtil.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/os/OSUtil.java @@ -28,7 +28,7 @@ import java.net.UnknownHostException; import java.util.Enumeration; import java.util.LinkedList; import java.util.List; -import org.apache.skywalking.apm.network.proto.OSInfo; +import org.apache.skywalking.apm.network.language.agent.*; /** * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AppAndServiceRegisterClient.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AppAndServiceRegisterClient.java index 666581c68..3ce38d970 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AppAndServiceRegisterClient.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AppAndServiceRegisterClient.java @@ -34,7 +34,7 @@ import org.apache.skywalking.apm.agent.core.dictionary.OperationNameDictionary; 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.os.OSUtil; -import org.apache.skywalking.apm.network.proto.*; +import org.apache.skywalking.apm.network.language.agent.*; import org.apache.skywalking.apm.util.RunnableWithExceptionProtection; import java.util.UUID; @@ -82,12 +82,13 @@ public class AppAndServiceRegisterClient implements BootService, GRPCChannelList @Override public void boot() throws Throwable { applicationRegisterFuture = Executors - .newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("AppAndServiceRegisterClient")) - .scheduleAtFixedRate(new RunnableWithExceptionProtection(this, new RunnableWithExceptionProtection.CallbackWhenException() { - @Override public void handle(Throwable t) { - logger.error("unexpected exception.", t); - } - }), 0, Config.Collector.APP_AND_SERVICE_REGISTER_CHECK_INTERVAL, TimeUnit.SECONDS); + .newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("AppAndServiceRegisterClient")) + .scheduleAtFixedRate(new RunnableWithExceptionProtection(this, new RunnableWithExceptionProtection.CallbackWhenException() { + @Override + public void handle(Throwable t) { + logger.error("unexpected exception.", t); + } + }), 0, Config.Collector.APP_AND_SERVICE_REGISTER_CHECK_INTERVAL, TimeUnit.SECONDS); } @Override @@ -110,7 +111,7 @@ public class AppAndServiceRegisterClient implements BootService, GRPCChannelList if (RemoteDownstreamConfig.Agent.APPLICATION_ID == DictionaryUtil.nullValue()) { if (applicationRegisterServiceBlockingStub != null) { ApplicationMapping applicationMapping = applicationRegisterServiceBlockingStub.applicationCodeRegister( - Application.newBuilder().setApplicationCode(Config.Agent.APPLICATION_CODE).build()); + Application.newBuilder().setApplicationCode(Config.Agent.APPLICATION_CODE).build()); if (applicationMapping != null) { RemoteDownstreamConfig.Agent.APPLICATION_ID = applicationMapping.getApplication().getValue(); shouldTry = true; @@ -121,21 +122,21 @@ public class AppAndServiceRegisterClient implements BootService, GRPCChannelList if (RemoteDownstreamConfig.Agent.APPLICATION_INSTANCE_ID == DictionaryUtil.nullValue()) { ApplicationInstanceMapping instanceMapping = instanceDiscoveryServiceBlockingStub.registerInstance(ApplicationInstance.newBuilder() - .setApplicationId(RemoteDownstreamConfig.Agent.APPLICATION_ID) - .setAgentUUID(PROCESS_UUID) - .setRegisterTime(System.currentTimeMillis()) - .setOsinfo(OSUtil.buildOSInfo()) - .build()); + .setApplicationId(RemoteDownstreamConfig.Agent.APPLICATION_ID) + .setAgentUUID(PROCESS_UUID) + .setRegisterTime(System.currentTimeMillis()) + .setOsinfo(OSUtil.buildOSInfo()) + .build()); if (instanceMapping.getApplicationInstanceId() != DictionaryUtil.nullValue()) { RemoteDownstreamConfig.Agent.APPLICATION_INSTANCE_ID - = instanceMapping.getApplicationInstanceId(); + = instanceMapping.getApplicationInstanceId(); } } else { if (lastSegmentTime - System.currentTimeMillis() > 60 * 1000) { instanceDiscoveryServiceBlockingStub.heartbeat(ApplicationInstanceHeartbeat.newBuilder() - .setApplicationInstanceId(RemoteDownstreamConfig.Agent.APPLICATION_INSTANCE_ID) - .setHeartbeatTime(System.currentTimeMillis()) - .build()); + .setApplicationInstanceId(RemoteDownstreamConfig.Agent.APPLICATION_INSTANCE_ID) + .setHeartbeatTime(System.currentTimeMillis()) + .build()); } NetworkAddressDictionary.INSTANCE.syncRemoteDictionary(networkAddressRegisterServiceBlockingStub); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java index 8fe211ec4..697d747fd 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java @@ -19,8 +19,9 @@ package org.apache.skywalking.apm.agent.core.remote; import io.grpc.Channel; -import io.grpc.stub.StreamObserver; import java.util.List; + +import io.grpc.stub.StreamObserver; import org.apache.skywalking.apm.agent.core.boot.BootService; import org.apache.skywalking.apm.agent.core.boot.DefaultImplementor; import org.apache.skywalking.apm.agent.core.boot.ServiceManager; @@ -32,9 +33,7 @@ import org.apache.skywalking.apm.agent.core.logging.api.LogManager; import org.apache.skywalking.apm.commons.datacarrier.DataCarrier; import org.apache.skywalking.apm.commons.datacarrier.buffer.BufferStrategy; import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer; -import org.apache.skywalking.apm.network.proto.Downstream; -import org.apache.skywalking.apm.network.proto.TraceSegmentServiceGrpc; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; +import org.apache.skywalking.apm.network.language.agent.*; import static org.apache.skywalking.apm.agent.core.conf.Config.Buffer.BUFFER_SIZE; import static org.apache.skywalking.apm.agent.core.conf.Config.Buffer.CHANNEL_SIZE; diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/ContextManagerTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/ContextManagerTest.java index 71ffda157..659fe3281 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/ContextManagerTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/ContextManagerTest.java @@ -43,13 +43,13 @@ import org.apache.skywalking.apm.agent.core.context.util.SpanHelper; import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil; import org.apache.skywalking.apm.agent.core.test.tools.SegmentStorage; import org.apache.skywalking.apm.agent.core.test.tools.SegmentStoragePoint; -import org.apache.skywalking.apm.network.proto.KeyWithStringValue; -import org.apache.skywalking.apm.network.proto.LogMessage; -import org.apache.skywalking.apm.network.proto.SpanObject; -import org.apache.skywalking.apm.network.proto.SpanType; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; -import org.apache.skywalking.apm.network.proto.TraceSegmentReference; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; +import org.apache.skywalking.apm.network.language.agent.KeyWithStringValue; +import org.apache.skywalking.apm.network.language.agent.LogMessage; +import org.apache.skywalking.apm.network.language.agent.SpanObject; +import org.apache.skywalking.apm.network.language.agent.SpanType; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentReference; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; import static org.hamcrest.CoreMatchers.is; diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClientTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClientTest.java index 1d8e1b552..56cba0f78 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClientTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClientTest.java @@ -39,12 +39,12 @@ import org.apache.skywalking.apm.agent.core.boot.ServiceManager; import org.apache.skywalking.apm.agent.core.context.ContextManager; import org.apache.skywalking.apm.agent.core.test.tools.SegmentStorage; import org.apache.skywalking.apm.agent.core.test.tools.SegmentStoragePoint; -import org.apache.skywalking.apm.network.proto.Downstream; -import org.apache.skywalking.apm.network.proto.SpanObject; -import org.apache.skywalking.apm.network.proto.SpanType; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; -import org.apache.skywalking.apm.network.proto.TraceSegmentServiceGrpc; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; +import org.apache.skywalking.apm.network.language.agent.Downstream; +import org.apache.skywalking.apm.network.language.agent.SpanObject; +import org.apache.skywalking.apm.network.language.agent.SpanType; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentObject; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentServiceGrpc; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; import static org.hamcrest.CoreMatchers.is; diff --git a/docs/en/protocols/README.md b/docs/en/protocols/README.md index 2300dc9e7..3677d3974 100644 --- a/docs/en/protocols/README.md +++ b/docs/en/protocols/README.md @@ -30,49 +30,6 @@ the following key info: 1. Protocol. HTTP, gRPC 1. DetectPoint. In Service Mesh sidecar, `client` or `server`. In normal L7 proxy, value is `proxy`. -```proto -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.servicemesh"; - -service ServiceMeshMetricService { - rpc collect(stream serviceMeshMetric) returns (Downstream) { - } -} - -message serviceMeshMetric { - string sourceServiceName = 1; - int32 sourceServiceId = 2; - string sourceServiceInstance = 3; - int32 sourceServiceInstanceId = 4; - string destServiceName = 5; - int32 destServiceId = 6; - string destServiceInstance = 7; - int32 destServiceInstanceId = 8; - string endpoint = 9; - int32 latency = 10; - int32 responseCode = 11; - bool status = 12; - Protocol protocol = 13; - DetectPoint detectPoint = 14; -} - -enum Protocol { - HTTP = 0; - gRPC = 1; -} - -enum DetectPoint { - client = 0; - server = 1; - proxy = 2; -} - -message Downstream { -} - -``` ### 3rd-party instrument protocol 3rd-party instrument protocols are not defined by SkyWalking. They are just protocols/formats, which SkyWalking is compatible and