From f2f57c172aa7fedb7ea3244464bb619a57fdc2df Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Fri, 17 Jan 2020 18:04:51 +0800 Subject: [PATCH] Delete protocol version 1 (#16) --- .../ApplicationRegisterService.proto | 39 -------- language-agent/DiscoveryService.proto | 91 ------------------- language-agent/Downstream.proto | 27 ------ language-agent/JVMMetricsService.proto | 36 -------- language-agent/KeyWithIntegerValue.proto | 28 ------ language-agent/KeyWithStringValue.proto | 28 ------ .../NetworkAddressRegisterService.proto | 38 -------- language-agent/TraceSegmentService.proto | 78 ---------------- 8 files changed, 365 deletions(-) delete mode 100644 language-agent/ApplicationRegisterService.proto delete mode 100644 language-agent/DiscoveryService.proto delete mode 100644 language-agent/Downstream.proto delete mode 100644 language-agent/JVMMetricsService.proto delete mode 100644 language-agent/KeyWithIntegerValue.proto delete mode 100644 language-agent/KeyWithStringValue.proto delete mode 100644 language-agent/NetworkAddressRegisterService.proto delete mode 100644 language-agent/TraceSegmentService.proto diff --git a/language-agent/ApplicationRegisterService.proto b/language-agent/ApplicationRegisterService.proto deleted file mode 100644 index fd8ee0d..0000000 --- a/language-agent/ApplicationRegisterService.proto +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.language.agent"; -option csharp_namespace = "SkyWalking.NetworkProtocol"; - -import "language-agent/KeyWithIntegerValue.proto"; - -//register service for ApplicationCode, this service is called when service starts. -service ApplicationRegisterService { - rpc applicationCodeRegister (Application) returns (ApplicationMapping) { - } -} - -message Application { - string applicationCode = 1; -} - -message ApplicationMapping { - KeyWithIntegerValue application = 1; -} diff --git a/language-agent/DiscoveryService.proto b/language-agent/DiscoveryService.proto deleted file mode 100644 index bc392a7..0000000 --- a/language-agent/DiscoveryService.proto +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.language.agent"; -option csharp_namespace = "SkyWalking.NetworkProtocol"; - -import "language-agent/Downstream.proto"; -import "common/trace-common.proto"; - -service InstanceDiscoveryService { - rpc registerInstance (ApplicationInstance) returns (ApplicationInstanceMapping) { - } - - rpc heartbeat (ApplicationInstanceHeartbeat) returns (Downstream) { - } - -} - -message ApplicationInstance { - int32 applicationId = 1; - string agentUUID = 2; - int64 registerTime = 3; - OSInfo osinfo = 4; -} - -message ApplicationInstanceMapping { - int32 applicationId = 1; - int32 applicationInstanceId = 2; -} - -message ApplicationInstanceRecover { - int32 applicationId = 1; - int32 applicationInstanceId = 2; - int64 registerTime = 3; - OSInfo osinfo = 4; -} - -message ApplicationInstanceHeartbeat { - int32 applicationInstanceId = 1; - int64 heartbeatTime = 2; -} - -message OSInfo { - string osName = 1; - string hostname = 2; - int32 processNo = 3; - repeated string ipv4s = 4; -} - -//discovery service for ServiceName by Network address or application code -service ServiceNameDiscoveryService { - rpc discovery (ServiceNameCollection) returns (ServiceNameMappingCollection) { - } -} - -message ServiceNameCollection { - repeated ServiceNameElement elements = 1; -} - -message ServiceNameMappingCollection { - repeated ServiceNameMappingElement elements = 1; -} - -message ServiceNameMappingElement { - int32 serviceId = 1; - ServiceNameElement element = 2; -} - -message ServiceNameElement { - string serviceName = 1; - int32 applicationId = 2; - SpanType srcSpanType = 3; -} diff --git a/language-agent/Downstream.proto b/language-agent/Downstream.proto deleted file mode 100644 index e7bbb39..0000000 --- a/language-agent/Downstream.proto +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.language.agent"; -option csharp_namespace = "SkyWalking.NetworkProtocol"; - -// nothing down stream from collector yet. -message Downstream { -} diff --git a/language-agent/JVMMetricsService.proto b/language-agent/JVMMetricsService.proto deleted file mode 100644 index 229f41a..0000000 --- a/language-agent/JVMMetricsService.proto +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.language.agent"; -option csharp_namespace = "SkyWalking.NetworkProtocol"; - -import "language-agent/Downstream.proto"; -import "common/JVM.proto"; - -service JVMMetricsService { - rpc collect (JVMMetrics) returns (Downstream) { - } -} - -message JVMMetrics { - repeated JVMMetric metrics = 1; - int32 applicationInstanceId = 2; -} diff --git a/language-agent/KeyWithIntegerValue.proto b/language-agent/KeyWithIntegerValue.proto deleted file mode 100644 index ed48a54..0000000 --- a/language-agent/KeyWithIntegerValue.proto +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.language.agent"; -option csharp_namespace = "SkyWalking.NetworkProtocol"; - -message KeyWithIntegerValue { - string key = 1; - int32 value = 2; -} diff --git a/language-agent/KeyWithStringValue.proto b/language-agent/KeyWithStringValue.proto deleted file mode 100644 index 1114267..0000000 --- a/language-agent/KeyWithStringValue.proto +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.language.agent"; -option csharp_namespace = "SkyWalking.NetworkProtocol"; - -message KeyWithStringValue { - string key = 1; - string value = 2; -} diff --git a/language-agent/NetworkAddressRegisterService.proto b/language-agent/NetworkAddressRegisterService.proto deleted file mode 100644 index a299edc..0000000 --- a/language-agent/NetworkAddressRegisterService.proto +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.language.agent"; -option csharp_namespace = "SkyWalking.NetworkProtocol"; - -import "language-agent/KeyWithIntegerValue.proto"; - -service NetworkAddressRegisterService { - rpc batchRegister (NetworkAddresses) returns (NetworkAddressMappings) { - } -} - -message NetworkAddresses { - repeated string addresses = 1; -} - -message NetworkAddressMappings { - repeated KeyWithIntegerValue addressIds = 1; -} diff --git a/language-agent/TraceSegmentService.proto b/language-agent/TraceSegmentService.proto deleted file mode 100644 index f8566b2..0000000 --- a/language-agent/TraceSegmentService.proto +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.language.agent"; -option csharp_namespace = "SkyWalking.NetworkProtocol"; - -import "language-agent/Downstream.proto"; -import "language-agent/KeyWithStringValue.proto"; -import "common/trace-common.proto"; - -service TraceSegmentService { - rpc collect (stream UpstreamSegment) returns (Downstream) { - } -} - -message TraceSegmentObject { - UniqueId traceSegmentId = 1; - repeated SpanObject spans = 2; - int32 applicationId = 3; - int32 applicationInstanceId = 4; - bool isSizeLimited = 5; -} - -message TraceSegmentReference { - RefType refType = 1; - UniqueId parentTraceSegmentId = 2; - int32 parentSpanId = 3; - int32 parentApplicationInstanceId = 4; - string networkAddress = 5; - int32 networkAddressId = 6; - int32 entryApplicationInstanceId = 7; - string entryServiceName = 8; - int32 entryServiceId = 9; - string parentServiceName = 10; - int32 parentServiceId = 11; -} - -message SpanObject { - int32 spanId = 1; - int32 parentSpanId = 2; - int64 startTime = 3; - int64 endTime = 4; - repeated TraceSegmentReference refs = 5; - int32 operationNameId = 6; - string operationName = 7; - int32 peerId = 8; - string peer = 9; - SpanType spanType = 10; - SpanLayer spanLayer = 11; - int32 componentId = 12; - string component = 13; - bool isError = 14; - repeated KeyWithStringValue tags = 15; - repeated LogMessage logs = 16; -} - -message LogMessage { - int64 time = 1; - repeated KeyWithStringValue data = 2; -} -- GitLab