diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000000000000000000000000000000000..10f7e69f8b8d715269f578ee392addaeeeed197a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "sky-php7ext/protos"] + path = sky-php7ext/protos + url = https://github.com/apache/incubator-skywalking-data-collect-protocol.git diff --git a/sky-php7ext/protos b/sky-php7ext/protos new file mode 160000 index 0000000000000000000000000000000000000000..b66fa070fd647662f06497e4ed3657eb258cb6e9 --- /dev/null +++ b/sky-php7ext/protos @@ -0,0 +1 @@ +Subproject commit b66fa070fd647662f06497e4ed3657eb258cb6e9 diff --git a/sky-php7ext/protos/ApplicationRegisterService.proto b/sky-php7ext/protos/ApplicationRegisterService.proto deleted file mode 100644 index 567f6e66cacad229fddc444bb27cc732e1691346..0000000000000000000000000000000000000000 --- a/sky-php7ext/protos/ApplicationRegisterService.proto +++ /dev/null @@ -1,24 +0,0 @@ -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.proto"; - - -//register service for ApplicationCode, this service is called when service starts. -service ApplicationRegisterService { - rpc applicationCodeRegister (Application) returns (ApplicationMapping) { - } -} - -message KeyWithIntegerValue { - string key = 1; - int32 value = 2; -} - -message Application { - string applicationCode = 1; -} - -message ApplicationMapping { - KeyWithIntegerValue application = 1; -} diff --git a/sky-php7ext/protos/DiscoveryService.proto b/sky-php7ext/protos/DiscoveryService.proto deleted file mode 100644 index 7d4d57585d9255c52d1728dbbe2403ce347d01cb..0000000000000000000000000000000000000000 --- a/sky-php7ext/protos/DiscoveryService.proto +++ /dev/null @@ -1,65 +0,0 @@ -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.proto"; - - -service InstanceDiscoveryService { - rpc registerInstance (ApplicationInstance) returns (ApplicationInstanceMapping) { - } -} - -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; -} diff --git a/sky-php7ext/protos/TraceSegmentService.proto b/sky-php7ext/protos/TraceSegmentService.proto deleted file mode 100644 index 8b8aa512bbc87f413707073a257f468b2378f0aa..0000000000000000000000000000000000000000 --- a/sky-php7ext/protos/TraceSegmentService.proto +++ /dev/null @@ -1,93 +0,0 @@ -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.apache.skywalking.apm.network.proto"; - - -service TraceSegmentService { - rpc collect (stream UpstreamSegment) returns (Downstream) { - } -} - -message Downstream { -} - -message KeyWithStringValue { - string key = 1; - string value = 2; -} - -message UpstreamSegment { - repeated UniqueId globalTraceIds = 1; - bytes segment = 2; // the byte array of TraceSegmentObject -} - -message UniqueId { - repeated int64 idParts = 1; -} - -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; -} - -enum RefType { - CrossProcess = 0; - CrossThread = 1; -} - -enum SpanType { - Entry = 0; - Exit = 1; - Local = 2; -} - -enum SpanLayer { - Unknown = 0; - Database = 1; - RPCFramework = 2; - Http = 3; - MQ = 4; - Cache = 5; -} - -message LogMessage { - int64 time = 1; - repeated KeyWithStringValue data = 2; -}