You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2020/04/15 04:43:23 UTC
[skywalking] branch es/ttl updated (d33d7d0 -> 25ca2dd)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch es/ttl
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
discard d33d7d0 Keep today's index always present. * Avoid TTL timer to remove today's index * Create a today's index even without any data.
add 50a5416 Update Plugin-test.md (#4623)
add 6fe2041 Make 8.0.0 Core available. New protocol and register removed. (#4599)
add 44cae97 Set up restrict length rules for service, instance and endpoint (#4633)
add 3138515 Support to use empty string to override existing config. (#4635)
add 1601cc1 Support `java` -> `nginx` -> `java` e2e test, and v3 protocol (#4637)
add 5646dfb fix wrong correlation header name document (#4638)
add 4ce2e9e Fix security issue of the metrics query (#4639)
add 00e8f2d Fix bug that the agent heart beats too frequently (#4640)
add 950346c3 [CVE] Update Jetty version to fix its CVEs (#4642)
add b3b8aae Add Tomcat 9 's Java agent deployment instructions(Linux) (#4645)
add 171620b Add Nginx correlation e2e test (#4646)
add ecd7d99 fix profile main function file link. (#4650)
add ccb65ff Add `java` -> `go2sky` -> `java` e2e test case, and adapt v3 protocol (#4647)
new 25ca2dd Keep today's index always present. * Avoid TTL timer to remove today's index * Create a today's index even without any data.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d33d7d0)
\
N -- N -- N refs/heads/es/ttl (25ca2dd)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/e2e.cluster.yaml | 2 +-
.github/workflows/{e2e.php.yaml => e2e.go.yaml} | 8 +-
.github/workflows/e2e.php.yaml | 5 +-
.github/workflows/e2e.profiling.yaml | 2 +-
.github/workflows/e2e.storages.yaml | 2 +-
.github/workflows/e2e.ttl.yaml | 2 +-
.github/workflows/e2e.yaml | 8 +-
README.md | 12 +-
.../toolkit/opentracing/SkywalkingSpanBuilder.java | 13 +-
.../skywalking/apm/util/ConfigInitializer.java | 13 +-
.../org/apache/skywalking/apm/util/Length.java | 26 +-
.../apm/util/PropertyPlaceholderHelper.java | 22 +-
.../skywalking/apm/util/StringFormatGroup.java | 5 +-
apm-dist-es7/src/main/assembly/binary-es7.xml | 2 +-
apm-dist/src/main/assembly/binary.xml | 2 +-
.../trace/component/command/BaseCommand.java | 4 +-
.../component/command/CommandDeserializer.java | 6 +-
.../trace/component/command/Deserializable.java | 2 +-
.../component/command/EndpointResetCommand.java | 45 -
.../component/command/NetworkResetCommand.java | 45 -
.../component/command/ProfileTaskCommand.java | 4 +-
.../trace/component/command/Serializable.java | 2 +-
.../component/command/ServiceResetCommand.java | 54 -
.../component/command/TraceIgnoreCommand.java | 4 +-
.../command/UnsupportedCommandException.java | 2 +-
apm-protocol/apm-network/src/main/proto | 2 +-
.../component/command/ServiceResetCommandTest.java | 78 --
.../apm/network/trace/proto/GRPCNoServerTest.java | 8 +-
.../core/commands/CommandExecutionException.java | 2 +-
.../core/commands/CommandExecutorService.java | 10 +-
.../apm/agent/core/commands/CommandService.java | 4 +-
.../executor/ServiceResetCommandExecutor.java | 50 -
.../skywalking/apm/agent/core/conf/Config.java | 27 +-
.../agent/core/conf/RemoteDownstreamConfig.java | 35 -
.../agent/core/context/AbstractTracerContext.java | 2 +-
.../apm/agent/core/context/ContextCarrier.java | 183 +--
.../apm/agent/core/context/ContextManager.java | 21 +-
.../core/context/ContextManagerExtendService.java | 21 +-
.../apm/agent/core/context/ContextSnapshot.java | 92 +-
.../apm/agent/core/context/CorrelationContext.java | 7 +-
.../agent/core/context/IgnoredTracerContext.java | 4 +-
.../{SW6CarrierItem.java => SW8CarrierItem.java} | 10 +-
.../apm/agent/core/context/TracingContext.java | 115 +-
.../agent/core/context/ids/DistributedTraceId.java | 57 +-
.../agent/core/context/ids/GlobalIdGenerator.java | 34 +-
.../skywalking/apm/agent/core/context/ids/ID.java | 101 --
.../apm/agent/core/context/trace/AbstractSpan.java | 8 -
.../core/context/trace/AbstractTracingSpan.java | 25 +-
.../apm/agent/core/context/trace/EntrySpan.java | 10 -
.../apm/agent/core/context/trace/ExitSpan.java | 18 -
.../apm/agent/core/context/trace/ExitTypeSpan.java | 2 -
.../agent/core/context/trace/LogDataEntity.java | 2 +-
.../apm/agent/core/context/trace/NoopExitSpan.java | 11 -
.../apm/agent/core/context/trace/NoopSpan.java | 5 -
.../core/context/trace/StackBasedTracingSpan.java | 33 +-
.../apm/agent/core/context/trace/TraceSegment.java | 34 +-
.../agent/core/context/trace/TraceSegmentRef.java | 103 +-
.../apm/agent/core/context/util/KeyValuePair.java | 2 +-
.../apm/agent/core/context/util/TagValuePair.java | 2 +-
.../core/dictionary/NetworkAddressDictionary.java | 69 --
.../skywalking/apm/agent/core/jvm/JVMService.java | 115 +-
.../apm/agent/core/jvm/cpu/CPUMetricsAccessor.java | 2 +-
.../apm/agent/core/jvm/cpu/CPUProvider.java | 2 +-
.../apm/agent/core/jvm/gc/GCMetricAccessor.java | 2 +-
.../skywalking/apm/agent/core/jvm/gc/GCModule.java | 4 +-
.../apm/agent/core/jvm/gc/GCProvider.java | 2 +-
.../skywalking/apm/agent/core/jvm/gc/UnknowGC.java | 4 +-
.../apm/agent/core/jvm/memory/MemoryProvider.java | 2 +-
.../jvm/memorypool/MemoryPoolMetricsAccessor.java | 2 +-
.../core/jvm/memorypool/MemoryPoolModule.java | 6 +-
.../core/jvm/memorypool/MemoryPoolProvider.java | 2 +-
.../core/jvm/memorypool/UnknownMemoryPool.java | 4 +-
.../skywalking/apm/agent/core/os/OSUtil.java | 19 +-
.../core/profile/ProfileTaskChannelService.java | 73 +-
.../core/profile/ProfileTaskExecutionContext.java | 18 +-
.../core/profile/ProfileTaskExecutionService.java | 7 +-
.../apm/agent/core/profile/ThreadProfiler.java | 12 +-
.../agent/core/profile/TracingThreadSnapshot.java | 16 +-
.../agent/core/remote/ServiceManagementClient.java | 143 +++
.../agent/core/remote/ServiceRegisterClient.java | 217 ----
.../core/remote/TraceSegmentServiceClient.java | 10 +-
...ache.skywalking.apm.agent.core.boot.BootService | 2 +-
.../apm/agent/core/boot/ServiceManagerTest.java | 2 +-
...erTest.java => ContextCarrierV3HeaderTest.java} | 67 +-
.../apm/agent/core/context/ContextManagerTest.java | 72 +-
.../agent/core/context/CorrelationContextTest.java | 2 +-
.../core/context/IgnoredTracerContextTest.java | 20 +-
.../apm/agent/core/context/TracingContextTest.java | 13 +-
.../core/context/util/TraceSegmentRefHelper.java | 2 +-
.../agent/core/remote/GRPCChannelManagerTest.java | 89 --
.../core/remote/TraceSegmentServiceClientTest.java | 41 +-
.../apm/plugin/dubbo/DubboInterceptorTest.java | 9 +-
.../apm/plugin/dubbo/DubboInterceptorTest.java | 9 +-
.../apm/plugin/finagle/CodecUtilsTest.java | 4 +-
.../ServerTracingFilterInterceptorTest.java | 11 +-
.../jetty/v9/server/HandleInterceptorTest.java | 9 +-
.../apm/plugin/kafka/CallbackInterceptorTest.java | 1 -
.../plugin/kafka/KafkaConsumerInterceptorTest.java | 16 +-
.../plugin/motan/MotanProviderInterceptorTest.java | 31 +-
.../pulsar/PulsarConsumerInterceptorTest.java | 10 +-
.../plugin/pulsar/SendCallbackInterceptorTest.java | 4 +-
.../rabbitmq/RabbitMQConsumerInterceptorTest.java | 4 +-
.../apm/plugin/resteasy/v3/server/AssertTools.java | 4 +-
.../SynchronousDispatcherInterceptorTest.java | 4 +-
.../sofarpc/SofaRpcProviderInterceptorTest.java | 12 +-
.../v4/RequestMappingMethodInterceptorTest.java | 2 +-
.../mvc/v4/RestMappingMethodInterceptorTest.java | 8 +-
.../apm/plugin/struts2/Struts2InterceptorTest.java | 9 +-
.../tomcat78x/TomcatInvokeInterceptorTest.java | 9 +-
.../plugin/undertow/v2x/TracingHandlerTest.java | 8 +-
.../EventBusImplDeliverToHandlerInterceptor.java | 14 +-
.../vertx3/HandlerRegistrationInterceptor.java | 14 +-
.../agent/core/context/MockContextSnapshot.java | 9 +-
.../apm/agent/test/helper/SegmentRefHelper.java | 13 +-
.../apm/agent/test/tools/AgentServiceRule.java | 19 +-
.../apm/agent/test/tools/SegmentRefAssert.java | 5 -
.../ConstructorWithSpanBuilderInterceptor.java | 3 +-
.../opentracing/span/SpanSetTagInterceptor.java | 10 +-
.../opentracing/SkywalkingSpanActivationTest.java | 41 +-
apm-webapp/pom.xml | 2 +-
dist-material/application.yml | 316 -----
dist-material/release-docs/LICENSE | 2 +-
docs/README.md | 4 +-
docs/en/guides/Plugin-test.md | 2 +-
docs/en/guides/backend-profile.md | 2 +-
docs/en/protocols/HTTP-API-Protocol.md | 196 +--
docs/en/protocols/README.md | 2 +-
...ross-Process-Correlation-Headers-Protocol-v1.md | 2 +-
...ross-Process-Propagation-Headers-Protocol-v3.md | 57 +-
docs/en/protocols/Trace-Data-Protocol-v3.md | 32 +-
docs/en/setup/backend/backend-receivers.md | 9 +-
docs/en/setup/backend/backend-setup.md | 16 +-
docs/en/setup/backend/backend-storage.md | 68 +-
docs/en/setup/backend/backend-telemetry.md | 6 +-
.../mesh-mode-grafana.json => grafana.json} | 333 ++---
.../backend/telemetry/trace-mode-grafana.json | 1301 --------------------
docs/en/setup/backend/ttl.md | 38 +-
.../en/setup/service-agent/java-agent/Namespace.md | 4 +-
docs/en/setup/service-agent/java-agent/README.md | 16 +-
.../server/exporter/provider/MetricFormatter.java | 24 +-
.../provider/grpc/GRPCExporterProvider.java | 7 -
.../provider/grpc/GRPCExporterProviderTest.java | 5 -
.../server/exporter/provider/grpc/MockMetrics.java | 5 -
.../org/apache/skywalking/oal/rt/OALRuntime.java | 3 +-
.../resources/code-templates/metrics/hashCode.ftl | 2 +-
.../main/resources/code-templates/metrics/id.ftl | 4 +-
.../code-templates/metrics/remoteHashCode.ftl | 2 +-
.../resources/code-templates/metrics/toMonth.ftl | 26 -
.../skywalking/oal/rt/parser/DeepAnalysisTest.java | 4 +-
.../expectedFiles/MetricsImplementorExpected.java | 2 +-
oap-server/pom.xml | 2 +-
.../core/alarm/provider/AlarmModuleProvider.java | 4 +-
.../server/core/alarm/provider/NotifyHandler.java | 52 +-
.../alarm/provider/AlarmModuleProviderTest.java | 3 -
.../core/alarm/provider/NotifyHandlerTest.java | 64 +-
.../core/alarm/provider/RunningRuleTest.java | 10 -
oap-server/server-bootstrap/pom.xml | 1 -
.../starter/config/ApplicationConfigLoader.java | 57 +-
.../src/main/resources/application.yml | 68 +-
.../src/main/resources/component-libraries.yml | 3 +
.../resources/endpoint_naming_rules.properties | 18 -
.../apache/skywalking/oap/server/core/Const.java | 14 +-
.../skywalking/oap/server/core/CoreModule.java | 45 +-
.../oap/server/core/CoreModuleConfig.java | 74 +-
.../oap/server/core/CoreModuleProvider.java | 38 +-
.../skywalking/oap/server/core/DataTTLConfig.java | 32 -
.../oap/server/core/alarm/AlarmRecord.java | 2 +-
.../server/core/analysis/DispatcherManager.java | 4 +-
.../{Downsampling.java => DownSampling.java} | 7 +-
.../oap/server/core/analysis/IDManager.java | 288 +++++
.../core/{register => analysis}/NodeType.java | 50 +-
.../oap/server/core/analysis/Stream.java | 9 +-
.../core/analysis/StreamAnnotationListener.java | 8 +-
.../oap/server/core/analysis/TimeBucket.java | 35 +-
.../core/analysis/manual/RelationDefineUtil.java | 98 --
.../manual/database/TopNDatabaseStatement.java | 2 +-
.../analysis/manual/endpoint/EndpointTraffic.java | 152 +--
.../manual/endpoint/EndpointTrafficDispatcher.java | 6 -
.../analysis/manual/instance/InstanceTraffic.java | 178 +++
.../InstanceTrafficDispatcher.java} | 18 +-
.../InstanceUpdateDispatcher.java} | 19 +-
.../manual/networkalias/NetworkAddressAlias.java | 153 +++
.../NetworkAddressAliasSetupDispatcher.java} | 27 +-
.../endpoint}/EndpointCallRelationDispatcher.java | 9 +-
.../EndpointRelationServerSideMetrics.java | 58 +-
.../ServiceInstanceCallRelationDispatcher.java | 4 +-
.../ServiceInstanceRelationClientSideMetrics.java | 104 +-
.../ServiceInstanceRelationServerSideMetrics.java | 104 +-
.../service/ServiceCallRelationDispatcher.java | 4 +-
.../service/ServiceRelationClientSideMetrics.java | 94 +-
.../service/ServiceRelationServerSideMetrics.java | 90 +-
.../analysis/manual/segment/SegmentRecord.java | 8 +-
.../analysis/manual/service/ServiceTraffic.java | 121 ++
.../ServiceTrafficDispatcher.java} | 19 +-
.../ServiceUpdateDispatcher.java} | 19 +-
.../oap/server/core/analysis/metrics/Metrics.java | 30 +-
.../oap/server/core/analysis/topn/TopN.java | 2 +-
.../analysis/worker/MetricsStreamProcessor.java | 22 +-
.../core/analysis/worker/MetricsTransWorker.java | 22 +-
.../analysis/worker/NoneStreamingProcessor.java | 4 +-
.../analysis/worker/RecordStreamProcessor.java | 5 +-
.../core/analysis/worker/TopNStreamProcessor.java | 8 +-
.../oap/server/core/cache/CacheUpdateTimer.java | 133 +-
.../core/cache/NetworkAddressAliasCache.java | 63 +
.../core/cache/NetworkAddressInventoryCache.java | 96 --
.../oap/server/core/cache/ProfileTaskCache.java | 6 +-
.../core/cache/ServiceInstanceInventoryCache.java | 129 --
.../server/core/cache/ServiceInventoryCache.java | 134 --
.../oap/server/core/command/CommandService.java | 7 -
.../oap/server/core/config/ConfigService.java | 3 -
...Service.java => DownSamplingConfigService.java} | 16 +-
.../server/core/config/NamingLengthControl.java | 110 ++
.../server/core/profile/ProfileTaskLogRecord.java | 6 +-
.../core/profile/ProfileTaskMutationService.java | 10 +-
.../oap/server/core/profile/ProfileTaskRecord.java | 6 +-
.../core/profile/ProfileThreadSnapshotRecord.java | 2 +-
.../server/core/profile/analyze/ProfileStack.java | 2 +-
.../server/core/query/AggregationQueryService.java | 51 +-
.../oap/server/core/query/DurationUtils.java | 58 +-
.../oap/server/core/query/LogQueryService.java | 39 +-
.../server/core/query/MetadataQueryService.java | 30 +-
.../oap/server/core/query/MetricQueryService.java | 20 +-
.../server/core/query/ProfileTaskQueryService.java | 85 +-
.../core/query/ServiceInstanceTopologyBuilder.java | 177 +--
.../server/core/query/ServiceTopologyBuilder.java | 186 +++
...ToDownsampling.java => StepToDownSampling.java} | 16 +-
.../server/core/query/TopNRecordsQueryService.java | 2 +-
.../oap/server/core/query/TopologyBuilder.java | 188 ---
.../server/core/query/TopologyQueryService.java | 67 +-
.../oap/server/core/query/TraceQueryService.java | 79 +-
.../oap/server/core/query/entity/Call.java | 55 +-
.../oap/server/core/query/entity/Database.java | 2 +-
.../oap/server/core/query/entity/EndpointInfo.java | 2 +-
.../oap/server/core/query/entity/IntValues.java | 9 +
.../oap/server/core/query/entity/Log.java | 4 +-
.../oap/server/core/query/entity/ProfileTask.java | 2 +-
.../server/core/query/entity/ProfileTaskLog.java | 2 +-
.../oap/server/core/query/entity/ProfiledSpan.java | 6 +-
.../oap/server/core/query/entity/Service.java | 2 +-
.../core/query/entity/ServiceInstanceNode.java | 6 +-
.../oap/server/core/query/entity/Span.java | 2 +
.../oap/server/core/query/entity/Step.java | 2 +-
.../core/register/NetworkAddressInventory.java | 175 ---
.../oap/server/core/register/RegisterSource.java | 67 -
.../core/register/ServiceInstanceInventory.java | 341 -----
.../oap/server/core/register/ServiceInventory.java | 279 -----
.../service/INetworkAddressInventoryRegister.java | 33 -
.../service/IServiceInstanceInventoryRegister.java | 48 -
.../service/IServiceInventoryRegister.java | 50 -
.../service/NetworkAddressInventoryRegister.java | 141 ---
.../service/ServiceInstanceInventoryRegister.java | 170 ---
.../register/service/ServiceInventoryRegister.java | 170 ---
.../register/worker/InventoryStreamProcessor.java | 114 --
.../register/worker/RegisterDistinctWorker.java | 122 --
.../register/worker/RegisterPersistentWorker.java | 179 ---
.../core/register/worker/RegisterRemoteWorker.java | 51 -
.../oap/server/core/remote/client/Address.java | 2 +-
.../oap/server/core/source/DatabaseAccess.java | 7 +-
.../server/core/source/DatabaseSlowStatement.java | 2 +-
.../oap/server/core/source/DefaultScopeDefine.java | 7 +-
.../oap/server/core/source/DetectPoint.java | 2 +-
.../oap/server/core/source/Endpoint.java | 35 +-
.../oap/server/core/source/EndpointRelation.java | 40 +-
.../server/core/source/EnvoyInstanceMetric.java | 4 +-
...seAccess.java => NetworkAddressAliasSetup.java} | 37 +-
.../skywalking/oap/server/core/source/Segment.java | 4 +-
.../skywalking/oap/server/core/source/Service.java | 10 +-
.../oap/server/core/source/ServiceInstance.java | 17 +-
.../server/core/source/ServiceInstanceCLRCPU.java | 4 +-
.../server/core/source/ServiceInstanceCLRGC.java | 4 +-
.../core/source/ServiceInstanceCLRThread.java | 4 +-
.../server/core/source/ServiceInstanceJVMCPU.java | 4 +-
.../server/core/source/ServiceInstanceJVMGC.java | 4 +-
.../core/source/ServiceInstanceJVMMemory.java | 4 +-
.../core/source/ServiceInstanceJVMMemoryPool.java | 4 +-
.../core/source/ServiceInstanceRelation.java | 39 +-
...abaseAccess.java => ServiceInstanceUpdate.java} | 24 +-
.../oap/server/core/source/ServiceRelation.java | 31 +-
.../{DatabaseAccess.java => ServiceUpdate.java} | 31 +-
.../skywalking/oap/server/core/source/Source.java | 7 +
.../oap/server/core/storage/IHistoryDeleteDAO.java | 5 +-
.../oap/server/core/storage/IRegisterDAO.java | 44 -
.../oap/server/core/storage/IRegisterLockDAO.java | 36 -
.../oap/server/core/storage/StorageDAO.java | 3 -
.../oap/server/core/storage/StorageModule.java | 9 +-
.../server/core/storage/annotation/Storage.java | 16 +-
...yCacheDAO.java => INetworkAddressAliasDAO.java} | 17 +-
.../cache/IServiceInstanceInventoryCacheDAO.java | 34 -
.../storage/cache/IServiceInventoryCacheDAO.java | 34 -
.../oap/server/core/storage/model/Model.java | 29 +-
.../oap/server/core/storage/model/ModelColumn.java | 9 +-
.../oap/server/core/storage/model/ModelName.java | 39 -
.../server/core/storage/model/StorageModels.java | 9 +-
.../core/storage/profile/IProfileTaskQueryDAO.java | 2 +-
.../core/storage/query/IAggregationQueryDAO.java | 18 +-
.../core/storage/query/IMetadataQueryDAO.java | 2 +-
.../core/storage/query/IMetricsQueryDAO.java | 18 +-
.../core/storage/query/ITopNRecordsQueryDAO.java | 2 +-
.../core/storage/query/ITopologyQueryDAO.java | 46 +-
.../server/core/storage/query/ITraceQueryDAO.java | 2 +-
.../core/storage/ttl/DataTTLKeeperTimer.java | 14 +-
.../server/core/storage/ttl/DayTTLCalculator.java | 29 -
.../server/core/storage/ttl/GeneralStorageTTL.java | 44 -
.../server/core/storage/ttl/HourTTLCalculator.java | 29 -
.../core/storage/ttl/MinuteTTLCalculator.java | 30 -
.../core/storage/ttl/MonthTTLCalculator.java | 29 -
.../core/storage/ttl/RecordTTLCalculator.java | 33 -
.../core/storage/ttl/SecondTTLCalculator.java | 29 -
.../oap/server/core/storage/ttl/StorageTTL.java | 26 -
.../oap/server/core/storage/ttl/TTLCalculator.java | 26 -
.../skywalking/oap/server/core/CoreModuleTest.java | 2 +-
.../oap/server/core/analysis/IDManagerTest.java | 52 +
.../analysis/manual/RelationDefineUtilTest.java | 45 -
.../manual/endpoint/EndpointTrafficTest.java | 24 +-
.../core/analysis/metrics/ApdexMetricsTest.java | 5 -
.../core/analysis/metrics/CountMetricsTest.java | 5 -
.../core/analysis/metrics/LongAvgMetricsTest.java | 5 -
.../core/analysis/metrics/MaxLongMetricsTest.java | 5 -
.../server/core/analysis/metrics/MetricsTest.java | 12 -
.../core/analysis/metrics/MinLongMetricsTest.java | 5 -
.../core/analysis/metrics/PercentMetricsTest.java | 5 -
.../analysis/metrics/PercentileMetricsTest.java | 5 -
.../core/analysis/metrics/PxxMetricsTest.java | 5 -
.../analysis/metrics/ThermodynamicMetricsTest.java | 5 -
.../core/profile/analyze/ProfileStackData.java | 2 +-
.../core/storage/model/StorageModelsTest.java | 4 +-
.../oap/server/library/buffer/BufferData.java | 35 -
.../library/buffer/BufferDataCollection.java | 55 -
.../oap/server/library/buffer/BufferFileUtils.java | 50 -
.../oap/server/library/buffer/BufferStream.java | 132 --
.../oap/server/library/buffer/DataStream.java | 79 --
.../server/library/buffer/DataStreamReader.java | 201 ---
.../server/library/buffer/DataStreamWriter.java | 102 --
.../oap/server/library/buffer/Offset.java | 93 --
.../oap/server/library/buffer/OffsetStream.java | 135 --
.../library/buffer/BufferFileUtilsTestCase.java | 46 -
.../library-buffer/src/test/resources/log4j2.xml | 31 -
.../oap/server/library/util/ProtoBufJsonUtils.java | 7 +-
oap-server/server-library/pom.xml | 1 -
.../query/graphql/resolver/AggregationQuery.java | 16 +-
.../oap/query/graphql/resolver/MetadataQuery.java | 2 +-
.../oap/query/graphql/resolver/MetricQuery.java | 12 +-
.../oap/query/graphql/resolver/ProfileQuery.java | 2 +-
.../query/graphql/resolver/TopNRecordsQuery.java | 14 +-
.../oap/query/graphql/resolver/TopologyQuery.java | 18 +-
.../oap/query/graphql/resolver/TraceQuery.java | 22 +-
.../graphql/type/ProfileTaskCreationRequest.java | 2 +-
.../query/graphql/type/TopNRecordsCondition.java | 2 +-
.../src/main/resources/query-protocol | 2 +-
.../receiver/envoy/MetricServiceGRPCHandler.java | 69 +-
.../envoy/als/K8sALSServiceMeshHTTPAnalysis.java | 35 +-
.../receiver/envoy/als/K8sHTTPAnalysisTest.java | 25 +-
.../server/receiver/jaeger/JaegerGRPCHandler.java | 45 +-
.../receiver/jaeger/JaegerReceiverProvider.java | 3 -
oap-server/server-receiver-plugin/pom.xml | 7 +-
.../handler/CLRMetricReportServiceHandler.java | 37 +-
.../clr/provider/handler/CLRSourceDispatcher.java | 41 +-
.../provider/IstioTelemetryGRPCHandler.java | 13 +-
.../handler/JVMMetricReportServiceHandler.java | 38 +-
.../jvm/provider/handler/JVMSourceDispatcher.java | 97 +-
.../pom.xml | 0
.../receiver/register/module/RegisterModule.java | 0
.../register/provider/RegisterModuleProvider.java | 16 +-
.../handler/v8/grpc/ManagementServiceHandler.java | 103 ++
.../v8/rest/ManagementServiceKeepAliveHandler.java | 86 ++
.../ManagementServiceReportPropertiesHandler.java | 97 ++
...ywalking.oap.server.library.module.ModuleDefine | 0
...alking.oap.server.library.module.ModuleProvider | 0
.../src/test/resources/log4j2.xml | 0
.../server/receiver/mesh/EndpointNameFormater.java | 71 --
.../receiver/mesh/MeshDataBufferFileCache.java | 115 --
.../aop/server/receiver/mesh/MeshGRPCHandler.java | 25 +-
.../aop/server/receiver/mesh/MeshModuleConfig.java | 14 -
.../server/receiver/mesh/MeshReceiverProvider.java | 11 +-
.../mesh/ServiceMeshMetricDataDecorator.java | 125 --
.../receiver/mesh/TelemetryDataDispatcher.java | 275 ++---
.../oap/server/receiver/mesh/MeshDataMock.java | 85 ++
.../handler/ProfileTaskServiceHandler.java | 46 +-
.../handler/v6/grpc/RegisterServiceHandler.java | 260 ----
.../v6/grpc/ServiceInstancePingServiceHandler.java | 88 --
.../v6/rest/ServiceInstancePingServletHandler.java | 111 --
.../ServiceInstanceRegisterServletHandler.java | 152 ---
.../v6/rest/ServiceRegisterServletHandler.java | 92 --
.../sharing/server/CoreRegisterLinker.java | 63 -
.../so11y/So11yReceiverModuleProvider.java | 162 ++-
.../trace/provider/TraceModuleProvider.java | 73 +-
.../trace/provider/TraceServiceModuleConfig.java | 9 +-
.../v6/rest/TraceSegmentCollectServletHandler.java | 76 --
.../handler/v6/rest/reader/SegmentJsonReader.java | 33 -
.../handler/v6/rest/reader/StreamJsonReader.java | 25 -
.../v6/rest/reader/UpstreamSegmentJsonReader.java | 41 -
.../grpc/TraceSegmentReportServiceHandler.java | 60 +-
.../v8/rest/TraceSegmentReportServletHandler.java | 104 ++
.../parser/ISegmentParserListenerManager.java | 4 +-
.../provider/parser/ISegmentParserService.java | 4 +-
.../trace/provider/parser/SegmentParseV2.java | 342 -----
.../parser/SegmentParserListenerManager.java | 10 +-
.../provider/parser/SegmentParserServiceImpl.java | 23 +-
.../trace/provider/parser/SegmentSource.java | 33 -
.../receiver/trace/provider/parser/SpanTags.java | 2 +
.../trace/provider/parser/TraceAnalyzer.java | 128 ++
.../parser/decorator/ReferenceDecorator.java | 111 --
.../provider/parser/decorator/SegmentCoreInfo.java | 37 -
.../parser/decorator/SegmentDecorator.java | 75 --
.../provider/parser/decorator/SpanDecorator.java | 220 ----
.../{SpanListener.java => AnalysisListener.java} | 6 +-
...erFactory.java => AnalysisListenerFactory.java} | 8 +-
...panListener.java => EntryAnalysisListener.java} | 8 +-
...SpanListener.java => ExitAnalysisListener.java} | 8 +-
...panListener.java => FirstAnalysisListener.java} | 8 +-
.../parser/listener/GlobalTraceIdsListener.java | 30 -
...panListener.java => LocalAnalysisListener.java} | 8 +-
.../listener/MultiScopesAnalysisListener.java | 318 +++++
.../NetworkAddressAliasMappingListener.java | 114 ++
.../parser/listener/SegmentAnalysisListener.java | 187 +++
.../SegmentListener.java} | 13 +-
.../listener/{endpoint => }/SourceBuilder.java | 81 +-
...lSpanListener.java => TraceSegmentSampler.java} | 18 +-
.../listener/endpoint/MultiScopesSpanListener.java | 328 -----
.../listener/segment/SegmentSpanListener.java | 146 ---
.../listener/segment/TraceSegmentSampler.java | 53 -
.../ServiceInstanceMappingSpanListener.java | 159 ---
.../service/ServiceMappingSpanListener.java | 144 ---
.../parser/standardization/IdExchanger.java | 39 -
.../standardization/ReferenceIdExchanger.java | 87 --
.../standardization/SegmentStandardization.java | 62 -
.../SegmentStandardizationWorker.java | 103 --
.../parser/standardization/SpanExchanger.java | 176 ---
.../server/receiver/trace/mock/AgentDataMock.java | 94 +-
.../server/receiver/trace/mock/RegisterMock.java | 110 --
.../server/receiver/trace/mock/ServiceAMock.java | 74 +-
.../server/receiver/trace/mock/ServiceBMock.java | 114 +-
.../server/receiver/trace/mock/ServiceCMock.java | 91 +-
.../receiver/trace/mock/UniqueIdBuilder.java | 36 -
.../listener/segment/ProtoBufJsonUtilsTest.java | 85 +-
.../listener/segment/TraceSegmentSamplerTest.java | 83 --
.../receiver/zipkin/ZipkinReceiverProvider.java | 3 -
.../zipkin/analysis/Receiver2AnalysisBridge.java | 10 +-
.../zipkin/analysis/ZipkinSkyWalkingTransfer.java | 11 -
.../zipkin/analysis/ZipkinTraceOSInfoBuilder.java | 31 -
.../zipkin/analysis/data/SkyWalkingTrace.java | 36 +-
.../zipkin/analysis/transform/SegmentBuilder.java | 152 +--
.../receiver/zipkin/handler/SpanProcessor.java | 9 +-
.../zipkin/handler/SpanV1JettyHandler.java | 5 +-
.../zipkin/handler/SpanV2JettyHandler.java | 5 +-
.../server/receiver/zipkin/trace/SpanForward.java | 33 +-
.../transform/SpringSleuthSegmentBuilderTest.java | 136 +-
.../StorageModuleElasticsearchConfig.java | 43 -
.../StorageModuleElasticsearchProvider.java | 85 +-
.../elasticsearch/base/ColumnTypeEsMapping.java | 6 +-
.../elasticsearch/base/HistoryDeleteEsDAO.java | 95 +-
.../elasticsearch/base/MatchCNameBuilder.java | 2 +-
.../plugin/elasticsearch/base/MetricsEsDAO.java | 4 +-
.../plugin/elasticsearch/base/RecordEsDAO.java | 2 +-
.../plugin/elasticsearch/base/RegisterEsDAO.java | 59 -
.../plugin/elasticsearch/base/StorageEsDAO.java | 7 -
.../elasticsearch/base/StorageEsInstaller.java | 40 +-
.../plugin/elasticsearch/base/TimeSeriesUtils.java | 67 +-
.../cache/NetworkAddressAliasEsDAO.java} | 50 +-
.../cache/NetworkAddressInventoryCacheEsDAO.java | 105 --
.../cache/ServiceInstanceInventoryCacheDAO.java | 123 --
.../cache/ServiceInventoryCacheEsDAO.java | 122 --
.../elasticsearch/lock/RegisterLockDAOImpl.java | 74 --
.../elasticsearch/lock/RegisterLockIndex.java | 25 -
.../elasticsearch/lock/RegisterLockInstaller.java | 102 --
.../elasticsearch/query/AggregationQueryEsDAO.java | 58 +-
.../plugin/elasticsearch/query/LogQueryEsDAO.java | 11 +-
.../elasticsearch/query/MetadataQueryEsDAO.java | 152 +--
.../elasticsearch/query/MetricsQueryEsDAO.java | 28 +-
.../elasticsearch/query/ProfileTaskLogEsDAO.java | 19 +-
.../elasticsearch/query/ProfileTaskQueryEsDAO.java | 6 +-
.../query/ProfileThreadSnapshotQueryEsDAO.java | 8 +-
.../elasticsearch/query/TopNRecordsQueryEsDAO.java | 2 +-
.../elasticsearch/query/TopologyQueryEsDAO.java | 217 ++--
.../elasticsearch/query/TraceQueryEsDAO.java | 11 +-
.../elasticsearch/ttl/ElasticsearchStorageTTL.java | 46 -
.../elasticsearch/ttl/EsHourTTLCalculator.java | 30 -
.../elasticsearch/ttl/EsMinuteTTLCalculator.java | 30 -
.../elasticsearch/ttl/EsRecordTTLCalculator.java | 34 -
.../base/TimeSeriesUtilsTestCase.java | 2 +-
.../StorageModuleElasticsearch7Provider.java | 49 +-
.../cache/ServiceInstanceInventoryCacheEs7DAO.java | 58 -
.../cache/ServiceInventoryCacheEs7DAO.java | 58 -
.../plugin/elasticsearch7/dao/StorageEs7DAO.java | 8 -
.../lock/RegisterLockEs77DAOImpl.java | 75 --
.../lock/RegisterLockEs7Installer.java | 53 -
.../elasticsearch7/query/LogQueryEs7DAO.java | 10 +-
.../elasticsearch7/query/MetadataQueryEs7DAO.java | 21 +-
.../elasticsearch7/query/MetricsQueryEs7DAO.java | 13 +-
.../elasticsearch7/query/TraceQueryEs7DAO.java | 29 +-
.../storage-influxdb-plugin/pom.xml | 5 +-
.../storage/plugin/influxdb/InfluxClient.java | 4 +-
.../plugin/influxdb/InfluxStorageConfig.java | 7 -
.../plugin/influxdb/InfluxStorageProvider.java | 61 +-
.../storage/plugin/influxdb/TableMetaInfo.java | 21 +-
.../plugin/influxdb/base/HistoryDeleteDAO.java | 29 +-
.../plugin/influxdb/base/InfluxStorageDAO.java | 15 +-
.../storage/plugin/influxdb/base/MetricsDAO.java | 7 +-
.../installer/InfluxDBH2MetaDBInstaller.java | 44 -
.../installer/InfluxDBMySQLMetaDBInstaller.java | 43 -
.../plugin/influxdb/installer/MetaTableDefine.java | 43 -
.../plugin/influxdb/query/AggregationQuery.java | 30 +-
.../influxdb/query/InfluxMetadataQueryDAO.java | 80 +-
.../influxdb/query/InfluxNetworkAddressAlias.java | 21 +-
.../storage/plugin/influxdb/query/LogQuery.java | 4 +-
.../plugin/influxdb/query/MetricsQuery.java | 23 +-
.../plugin/influxdb/query/ProfileTaskLogQuery.java | 2 +-
.../plugin/influxdb/query/ProfileTaskQuery.java | 8 +-
.../influxdb/query/ProfileThreadSnapshotQuery.java | 2 +-
.../plugin/influxdb/query/TopNRecordsQuery.java | 8 +-
.../plugin/influxdb/query/TopologyQuery.java | 137 ++-
.../storage/plugin/influxdb/query/TraceQuery.java | 23 +-
.../server/storage/plugin/jaeger/JaegerSpan.java | 4 +-
.../storage/plugin/jaeger/JaegerSpanRecord.java | 8 +-
.../JaegerStorageModuleElasticsearchProvider.java | 14 +-
.../elasticsearch/JaegerTraceQueryEsDAO.java | 26 +-
.../storage/plugin/jdbc/h2/H2StorageProvider.java | 25 +-
.../plugin/jdbc/h2/dao/H2AggregationQueryDAO.java | 75 +-
.../storage/plugin/jdbc/h2/dao/H2BatchDAO.java | 17 +-
.../plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java | 48 +-
.../storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java | 4 +-
.../plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 157 +--
.../plugin/jdbc/h2/dao/H2MetricsQueryDAO.java | 94 +-
...CacheDAO.java => H2NetworkAddressAliasDAO.java} | 47 +-
.../jdbc/h2/dao/H2ProfileTaskLogQueryDAO.java | 2 +-
.../plugin/jdbc/h2/dao/H2ProfileTaskQueryDAO.java | 6 +-
.../h2/dao/H2ProfileThreadSnapshotQueryDAO.java | 40 +-
.../storage/plugin/jdbc/h2/dao/H2RegisterDAO.java | 66 -
.../plugin/jdbc/h2/dao/H2RegisterLockDAO.java | 63 -
.../jdbc/h2/dao/H2RegisterLockInstaller.java | 89 --
.../storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 28 +-
.../h2/dao/H2ServiceInstanceInventoryCacheDAO.java | 98 --
.../jdbc/h2/dao/H2ServiceInventoryCacheDAO.java | 93 --
.../storage/plugin/jdbc/h2/dao/H2StorageDAO.java | 7 -
.../plugin/jdbc/h2/dao/H2TableInstaller.java | 17 +-
.../plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java | 2 +-
.../plugin/jdbc/h2/dao/H2TopologyQueryDAO.java | 186 ++-
.../plugin/jdbc/h2/dao/H2TraceQueryDAO.java | 49 +-
.../jdbc/mysql/MySQLAggregationQueryDAO.java | 28 +-
.../plugin/jdbc/mysql/MySQLStorageProvider.java | 26 +-
.../server/storage/plugin/zipkin/ZipkinSpan.java | 4 +-
.../storage/plugin/zipkin/ZipkinSpanRecord.java | 8 +-
.../ZipkinStorageModuleElasticsearchProvider.java | 4 -
.../elasticsearch/ZipkinTraceQueryEsDAO.java | 22 +-
.../profile/exporter/ProfileSnapshotDumper.java | 4 +-
.../exporter/ProfileAnalyzeSnapshotDAO.java | 2 +-
.../profile/exporter/ProfileExportedAnalyze.java | 2 +-
.../exporter/test/ProfileExportSnapshotDAO.java | 2 +-
.../exporter/test/ProfileSnapshotExporterTest.java | 35 +-
.../profile/exporter/test/ProfileTraceDAO.java | 42 +-
.../tool/profile/core/MockCoreModuleProvider.java | 30 +-
.../core/mock/MockStreamAnnotationListener.java | 12 +-
skywalking-ui | 2 +-
.../creation/ProfileTaskCreationRequest.java | 2 +-
.../e2e/profile/query/ProfileTaskQuery.java | 2 +-
.../e2e/topo/ServiceInstanceTopologyMatcher.java | 2 +-
.../apache/skywalking/e2e/topo/TopoMatcher.java | 2 +-
.../e2e/TestServiceInstanceTopologyMatcher.java | 8 +-
.../org/apache/skywalking/e2e/TestTopoMatcher.java | 8 +-
test/e2e/e2e-protocol/src/main/proto | 2 +-
.../skywalking/e2e/controller/UserController.java | 22 +-
.../skywalking/apm/toolkit/trace/TraceContext.java | 0
.../apache/skywalking/e2e/lua/LuaController.java} | 37 +-
.../e2e/e2e-test/docker/cluster/docker-compose.yml | 5 +-
.../{lua/Dockerfile.nginx => go/Dockerfile.go} | 23 +-
.../docker/{agent-reboot => go}/docker-compose.yml | 52 +-
test/e2e/e2e-test/docker/lua/Dockerfile.nginx | 2 +-
test/e2e/e2e-test/docker/lua/docker-compose.yml | 27 +-
test/e2e/e2e-test/docker/lua/nginx.conf | 4 +-
.../e2e/e2e-test/docker/ttl/docker-compose.es6.yml | 4 +-
.../e2e/e2e-test/docker/ttl/docker-compose.es7.yml | 4 +-
.../e2e/{AgentRebootE2E.java => GOE2E.java} | 244 ++--
.../java/org/apache/skywalking/e2e/LuaE2E.java | 27 +-
.../apache/skywalking/e2e/profile/ProfileE2E.java | 6 +-
.../apache/skywalking/e2e/simple/SimpleE2E.java | 4 +-
.../apache/skywalking/e2e/storage/StorageE2E.java | 4 +-
.../apache/skywalking/e2e/ttl/StorageTTLE2E.java | 50 +-
.../test/resources/expected/agent-reboot/topo.yml | 39 -
.../test/resources/expected/cluster/instances.yml | 8 +-
.../expected/cluster/providerInstances.yml | 16 +-
.../expected/cluster/serviceInstanceTopo.yml | 14 +-
.../test/resources/expected/gateway/instances.yml | 8 +-
.../expected/gateway/providerInstances.yml | 16 +-
.../expected/gateway/serviceInstanceTopo.yml | 12 +-
.../endpoints.yml => go/endpoints-consumer.yml} | 7 +-
.../nginxEndpoints.yml => go/endpoints-go2sky.yml} | 7 +-
.../endpoints.yml => go/endpoints-provider.yml} | 7 +-
.../instances.yml => go/instances-go.yml} | 12 +-
.../instances.yml => go/instances-java.yml} | 10 +-
.../expected/{lua => go}/serviceInstanceTopo.yml | 25 +-
.../expected/{agent-reboot => go}/services.yml | 8 +-
.../test/resources/expected/{lua => go}/topo.yml | 47 +-
.../expected/{agent-reboot => go}/traces.yml | 4 +-
.../lua/{endpoints.yml => endpoints-end.yml} | 4 +-
.../endpoints.yml => lua/endpoints-entry.yml} | 2 +-
.../src/test/resources/expected/lua/instances.yml | 8 +-
.../test/resources/expected/lua/nginxEndpoints.yml | 2 +-
.../test/resources/expected/lua/nginxInstances.yml | 4 +-
.../resources/expected/lua/serviceInstanceTopo.yml | 27 +-
.../src/test/resources/expected/lua/services.yml | 10 +-
.../src/test/resources/expected/lua/topo.yml | 47 +-
.../src/test/resources/expected/lua/traces.yml | 13 +-
.../src/test/resources/expected/php/instances.yml | 6 +-
.../resources/expected/php/shadowInstances.yml | 6 +-
.../test/resources/expected/profile/endpoints.yml | 2 +-
.../test/resources/expected/profile/finished.yml | 8 +-
.../test/resources/expected/profile/instances.yml | 8 +-
.../test/resources/expected/profile/notified.yml | 6 +-
.../test/resources/expected/profile/services.yml | 2 +-
.../test/resources/expected/simple/instances.yml | 8 +-
.../expected/simple/serviceInstanceTopo.yml | 20 +-
.../test/resources/expected/simple/services.yml | 2 +-
.../src/test/resources/expected/simple/topo.yml | 18 +-
.../test/resources/expected/storage/instances.yml | 8 +-
.../expected/storage/serviceInstanceTopo.yml | 20 +-
.../test/resources/expected/storage/services.yml | 2 +-
.../src/test/resources/expected/storage/topo.yml | 18 +-
test/plugin/agent-test-tools/pom.xml | 2 +-
.../containers/jvm-container/docker/Dockerfile | 2 +-
test/plugin/containers/jvm-container/docker/run.sh | 3 +-
test/plugin/containers/jvm-container/pom.xml | 2 +-
test/plugin/containers/pom.xml | 2 +-
.../containers/tomcat-container/docker/Dockerfile | 2 +-
.../containers/tomcat-container/docker/catalina.sh | 2 +-
.../containers/tomcat-container/docker/run.sh | 1 -
test/plugin/containers/tomcat-container/pom.xml | 2 +-
.../activemq-scenario/config/expectedData.yaml | 105 +-
.../config/expectedData.yaml | 642 +++++-----
.../config/expectedData.yaml | 130 +-
.../config/expectedData.yaml | 122 +-
.../avro-scenario/config/expectedData.yaml | 109 +-
.../canal-scenario/config/expectedData.yaml | 83 +-
.../config/expectedData.yaml | 921 +++++++-------
.../customize-scenario/config/expectedData.yaml | 242 ++--
.../dubbo-2.5.x-scenario/config/expectedData.yaml | 118 +-
.../dubbo-2.7.x-scenario/config/expectedData.yaml | 118 +-
.../ehcache-2.x-scenario/config/expectedData.yaml | 208 ++--
.../config/expectedData.yaml | 286 ++---
.../config/expectedData.yaml | 492 ++++----
.../config/expectedData.yaml | 36 +-
.../feign-scenario/config/expectedData.yaml | 61 +-
.../config/expectedData.yaml | 101 +-
.../config/expectedData.yaml | 109 +-
.../config/expectedData.yaml | 101 +-
.../gateway-scenario/config/expectedData.yaml | 146 +--
.../grpc-scenario/config/expectedData.yaml | 316 ++---
.../gson-scenario/config/expectedData.yaml | 22 +-
.../scenarios/h2-scenario/config/expectedData.yaml | 181 ++-
.../config/expectedData.yaml | 114 +-
.../config/expectedData.yaml | 131 +-
.../config/expectedData.yaml | 123 +-
.../hystrix-scenario/config/expectedData.yaml | 41 +-
.../jdk-http-scenario/config/expectedData.yaml | 123 +-
.../config/expectedData.yaml | 189 ++-
.../jedis-scenario/config/expectedData.yaml | 172 ++-
.../jetty-scenario/config/expectedData.yaml | 22 +-
.../kafka-scenario/config/expectedData.yaml | 169 ++-
.../config/expectedData.yaml | 215 ++--
.../lettuce-scenario/config/expectedData.yaml | 110 +-
.../mongodb-3.x-scenario/config/expectedData.yaml | 34 +-
.../mysql-scenario/config/expectedData.yaml | 189 ++-
.../config/expectedData.yaml | 136 +-
.../okhttp-scenario/config/expectedData.yaml | 54 +-
.../oracle-scenario/config/expectedData.yaml | 31 +-
.../play-scenario/config/expectedData.yaml | 46 +-
.../config/expectedData.yaml | 171 ++-
.../postgresql-scenario/config/expectedData.yaml | 170 ++-
.../pulsar-scenario/config/expectedData.yaml | 32 +-
.../rabbitmq-scenario/config/expectedData.yaml | 23 +-
.../redisson-scenario/config/expectedData.yaml | 115 +-
.../config/expectedData.yaml | 244 ++--
.../config/expectedData.yaml | 119 +-
.../config/expectedData.yaml | 119 +-
.../config/expectedData.yaml | 340 +++--
.../config/expectedData.yaml | 340 +++--
.../config/expectedData.yaml | 340 +++--
.../sofarpc-scenario/config/expectedData.yaml | 122 +-
.../solrj-7.x-scenario/config/expectedData.yaml | 272 ++--
.../spring-3.0.x-scenario/config/expectedData.yaml | 135 +-
.../spring-3.1.x-scenario/config/expectedData.yaml | 516 ++++----
.../spring-4.1.x-scenario/config/expectedData.yaml | 508 ++++----
.../spring-4.3.x-scenario/config/expectedData.yaml | 735 +++++------
.../spring-async-scenario/config/expectedData.yaml | 276 ++---
.../config/expectedData.yaml | 159 ++-
.../config/expectedData.yaml | 159 ++-
.../config/expectedData.yaml | 390 +++---
.../spring-tx-scenario/config/expectedData.yaml | 281 ++---
.../struts2.3-scenario/config/expectedData.yaml | 135 +-
.../struts2.5-scenario/config/expectedData.yaml | 135 +-
.../undertow-scenario/config/expectedData.yaml | 274 ++---
.../webflux-scenario/config/expectedData.yaml | 678 +++++-----
.../zookeeper-scenario/config/expectedData.yaml | 215 ++--
.../library-buffer => test/untitled}/pom.xml | 37 +-
.../untitled/src/main/java/Main.java | 13 +-
.../known-oap-backend-dependencies-es7.txt | 12 +-
.../known-oap-backend-dependencies.txt | 12 +-
tools/profile-exporter/application.yml | 26 -
697 files changed, 13247 insertions(+), 26130 deletions(-)
copy .github/workflows/{e2e.php.yaml => e2e.go.yaml} (93%)
copy apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/ProtocolVersion.java => apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/Length.java (70%)
delete mode 100644 apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/EndpointResetCommand.java
delete mode 100644 apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/NetworkResetCommand.java
delete mode 100644 apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ServiceResetCommand.java
delete mode 100644 apm-protocol/apm-network/src/test/java/org/apache/skywalking/api/network/trace/component/command/ServiceResetCommandTest.java
delete mode 100755 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ServiceResetCommandExecutor.java
delete mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RemoteDownstreamConfig.java
rename apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/{SW6CarrierItem.java => SW8CarrierItem.java} (85%)
delete mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/ID.java
delete mode 100755 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NetworkAddressDictionary.java
create mode 100755 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceManagementClient.java
delete mode 100755 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceRegisterClient.java
rename apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/{ContextCarrierV2HeaderTest.java => ContextCarrierV3HeaderTest.java} (66%)
delete mode 100644 apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManagerTest.java
delete mode 100644 dist-material/application.yml
rename docs/en/setup/backend/{telemetry/mesh-mode-grafana.json => grafana.json} (85%)
delete mode 100644 docs/en/setup/backend/telemetry/trace-mode-grafana.json
delete mode 100644 oap-server/oal-rt/src/main/resources/code-templates/metrics/toMonth.ftl
delete mode 100644 oap-server/server-bootstrap/src/main/resources/endpoint_naming_rules.properties
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/DataTTLConfig.java
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{Downsampling.java => DownSampling.java} (92%)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/IDManager.java
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{register => analysis}/NodeType.java (73%)
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/RelationDefineUtil.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/instance/InstanceTraffic.java
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/{endpoint/EndpointTrafficDispatcher.java => instance/InstanceTrafficDispatcher.java} (68%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/{endpoint/EndpointTrafficDispatcher.java => instance/InstanceUpdateDispatcher.java} (68%)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/networkalias/NetworkAddressAlias.java
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/{endpoint/EndpointTrafficDispatcher.java => networkalias/NetworkAddressAliasSetupDispatcher.java} (53%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/{endpointrelation => relation/endpoint}/EndpointCallRelationDispatcher.java (79%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/{endpointrelation => relation/endpoint}/EndpointRelationServerSideMetrics.java (75%)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceTraffic.java
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/{endpoint/EndpointTrafficDispatcher.java => service/ServiceTrafficDispatcher.java} (65%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/{endpoint/EndpointTrafficDispatcher.java => service/ServiceUpdateDispatcher.java} (65%)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/NetworkAddressAliasCache.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/NetworkAddressInventoryCache.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/ServiceInstanceInventoryCache.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/ServiceInventoryCache.java
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/{DownsamplingConfigService.java => DownSamplingConfigService.java} (70%)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/NamingLengthControl.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ServiceTopologyBuilder.java
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/{StepToDownsampling.java => StepToDownSampling.java} (75%)
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/RegisterSource.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/INetworkAddressInventoryRegister.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IServiceInstanceInventoryRegister.java
delete mode 100755 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IServiceInventoryRegister.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/NetworkAddressInventoryRegister.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInstanceInventoryRegister.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInventoryRegister.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/InventoryStreamProcessor.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterDistinctWorker.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterPersistentWorker.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterRemoteWorker.java
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{DatabaseAccess.java => NetworkAddressAliasSetup.java} (55%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{DatabaseAccess.java => ServiceInstanceUpdate.java} (73%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{DatabaseAccess.java => ServiceUpdate.java} (69%)
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRegisterDAO.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRegisterLockDAO.java
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/{INetworkAddressInventoryCacheDAO.java => INetworkAddressAliasDAO.java} (70%)
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/IServiceInstanceInventoryCacheDAO.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/IServiceInventoryCacheDAO.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelName.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/DayTTLCalculator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/GeneralStorageTTL.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/HourTTLCalculator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/MinuteTTLCalculator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/MonthTTLCalculator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/RecordTTLCalculator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/SecondTTLCalculator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/StorageTTL.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/TTLCalculator.java
create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/IDManagerTest.java
delete mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/manual/RelationDefineUtilTest.java
delete mode 100644 oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferData.java
delete mode 100644 oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferDataCollection.java
delete mode 100644 oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferFileUtils.java
delete mode 100644 oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferStream.java
delete mode 100644 oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/DataStream.java
delete mode 100644 oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/DataStreamReader.java
delete mode 100644 oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/DataStreamWriter.java
delete mode 100644 oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/Offset.java
delete mode 100644 oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/OffsetStream.java
delete mode 100644 oap-server/server-library/library-buffer/src/test/java/org/apache/skywalking/oap/server/library/buffer/BufferFileUtilsTestCase.java
delete mode 100644 oap-server/server-library/library-buffer/src/test/resources/log4j2.xml
rename oap-server/server-receiver-plugin/{skywalking-register-receiver-plugin => skywalking-management-receiver-plugin}/pom.xml (100%)
rename oap-server/server-receiver-plugin/{skywalking-register-receiver-plugin => skywalking-management-receiver-plugin}/src/main/java/org/apache/skywalking/oap/server/receiver/register/module/RegisterModule.java (100%)
rename oap-server/server-receiver-plugin/{skywalking-register-receiver-plugin => skywalking-management-receiver-plugin}/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/RegisterModuleProvider.java (77%)
create mode 100644 oap-server/server-receiver-plugin/skywalking-management-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v8/grpc/ManagementServiceHandler.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-management-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v8/rest/ManagementServiceKeepAliveHandler.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-management-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v8/rest/ManagementServiceReportPropertiesHandler.java
rename oap-server/server-receiver-plugin/{skywalking-register-receiver-plugin => skywalking-management-receiver-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine (100%)
rename oap-server/server-receiver-plugin/{skywalking-register-receiver-plugin => skywalking-management-receiver-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (100%)
rename oap-server/server-receiver-plugin/{skywalking-register-receiver-plugin => skywalking-management-receiver-plugin}/src/test/resources/log4j2.xml (100%)
delete mode 100644 oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/EndpointNameFormater.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshDataBufferFileCache.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/mesh/MeshDataMock.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/grpc/RegisterServiceHandler.java
delete mode 100755 oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/grpc/ServiceInstancePingServiceHandler.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/rest/ServiceInstancePingServletHandler.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/rest/ServiceInstanceRegisterServletHandler.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/rest/ServiceRegisterServletHandler.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/CoreRegisterLinker.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v6/rest/TraceSegmentCollectServletHandler.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v6/rest/reader/SegmentJsonReader.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v6/rest/reader/StreamJsonReader.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v6/rest/reader/UpstreamSegmentJsonReader.java
rename oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/{v6 => v8}/grpc/TraceSegmentReportServiceHandler.java (53%)
create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v8/rest/TraceSegmentReportServletHandler.java
delete mode 100755 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParseV2.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentSource.java
create mode 100755 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/TraceAnalyzer.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/ReferenceDecorator.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/SegmentCoreInfo.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/SegmentDecorator.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/SpanDecorator.java
rename oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/{SpanListener.java => AnalysisListener.java} (88%)
rename oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/{SpanListenerFactory.java => AnalysisListenerFactory.java} (78%)
rename oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/{EntrySpanListener.java => EntryAnalysisListener.java} (73%)
rename oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/{ExitSpanListener.java => ExitAnalysisListener.java} (73%)
rename oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/{FirstSpanListener.java => FirstAnalysisListener.java} (74%)
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/GlobalTraceIdsListener.java
copy oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/{LocalSpanListener.java => LocalAnalysisListener.java} (73%)
create mode 100755 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/MultiScopesAnalysisListener.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/NetworkAddressAliasMappingListener.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/SegmentAnalysisListener.java
rename oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/{decorator/StandardBuilder.java => listener/SegmentListener.java} (73%)
rename oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/{endpoint => }/SourceBuilder.java (78%)
rename oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/{LocalSpanListener.java => TraceSegmentSampler.java} (68%)
delete mode 100755 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/SegmentSpanListener.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/TraceSegmentSampler.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/service/ServiceInstanceMappingSpanListener.java
delete mode 100755 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/service/ServiceMappingSpanListener.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/IdExchanger.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/ReferenceIdExchanger.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardization.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardizationWorker.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SpanExchanger.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/RegisterMock.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/UniqueIdBuilder.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/TraceSegmentSamplerTest.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/ZipkinTraceOSInfoBuilder.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RegisterEsDAO.java
rename oap-server/server-storage-plugin/{storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/NetworkAddressInventoryCacheEs7DAO.java => storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressAliasEsDAO.java} (51%)
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressInventoryCacheEsDAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInstanceInventoryCacheDAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInventoryCacheEsDAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockDAOImpl.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockIndex.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockInstaller.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/ElasticsearchStorageTTL.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsHourTTLCalculator.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsMinuteTTLCalculator.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsRecordTTLCalculator.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/ServiceInstanceInventoryCacheEs7DAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/ServiceInventoryCacheEs7DAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/lock/RegisterLockEs77DAOImpl.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/lock/RegisterLockEs7Installer.java
rename apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/ProtocolVersion.java => oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/TableMetaInfo.java (64%)
delete mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/installer/InfluxDBH2MetaDBInstaller.java
delete mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/installer/InfluxDBMySQLMetaDBInstaller.java
delete mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/installer/MetaTableDefine.java
rename apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/InstanceResetCommand.java => oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/InfluxNetworkAddressAlias.java (56%)
rename oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/{H2NetworkAddressInventoryCacheDAO.java => H2NetworkAddressAliasDAO.java} (52%)
delete mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterDAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterLockDAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterLockInstaller.java
delete mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ServiceInstanceInventoryCacheDAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ServiceInventoryCacheDAO.java
copy test/{plugin/scenarios/apm-toolkit-trace-scenario => e2e/e2e-service-provider}/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java (100%)
copy test/e2e/{e2e-service-consumer/src/main/java/org/apache/skywalking/e2e/controller/UserController.java => e2e-service-provider/src/main/java/org/apache/skywalking/e2e/lua/LuaController.java} (51%)
copy test/e2e/e2e-test/docker/{lua/Dockerfile.nginx => go/Dockerfile.go} (61%)
rename test/e2e/e2e-test/docker/{agent-reboot => go}/docker-compose.yml (56%)
rename test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/{AgentRebootE2E.java => GOE2E.java} (53%)
delete mode 100644 test/e2e/e2e-test/src/test/resources/expected/agent-reboot/topo.yml
copy test/e2e/e2e-test/src/test/resources/expected/{lua/endpoints.yml => go/endpoints-consumer.yml} (91%)
copy test/e2e/e2e-test/src/test/resources/expected/{lua/nginxEndpoints.yml => go/endpoints-go2sky.yml} (93%)
copy test/e2e/e2e-test/src/test/resources/expected/{lua/endpoints.yml => go/endpoints-provider.yml} (91%)
rename test/e2e/e2e-test/src/test/resources/expected/{agent-reboot/instances.yml => go/instances-go.yml} (89%)
copy test/e2e/e2e-test/src/test/resources/expected/{gateway/instances.yml => go/instances-java.yml} (89%)
copy test/e2e/e2e-test/src/test/resources/expected/{lua => go}/serviceInstanceTopo.yml (74%)
rename test/e2e/e2e-test/src/test/resources/expected/{agent-reboot => go}/services.yml (78%)
copy test/e2e/e2e-test/src/test/resources/expected/{lua => go}/topo.yml (56%)
rename test/e2e/e2e-test/src/test/resources/expected/{agent-reboot => go}/traces.yml (96%)
rename test/e2e/e2e-test/src/test/resources/expected/lua/{endpoints.yml => endpoints-end.yml} (96%)
rename test/e2e/e2e-test/src/test/resources/expected/{agent-reboot/endpoints.yml => lua/endpoints-entry.yml} (96%)
rename {oap-server/server-library/library-buffer => test/untitled}/pom.xml (53%)
rename apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryManager.java => test/untitled/src/main/java/Main.java (70%)
[skywalking] 01/01: Keep today's index always present. * Avoid TTL
timer to remove today's index * Create a today's index even without any
data.
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch es/ttl
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 25ca2dd00b10e615404821864d2e93fce985f4fb
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Wed Apr 15 12:42:23 2020 +0800
Keep today's index always present.
* Avoid TTL timer to remove today's index
* Create a today's index even without any data.
Signed-off-by: Gao Hongtao <ha...@gmail.com>
---
.../plugin/elasticsearch/base/HistoryDeleteEsDAO.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java
index d86bb43..e459e3a 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java
@@ -54,19 +54,21 @@ public class HistoryDeleteEsDAO extends EsDAO implements IHistoryDeleteDAO {
List<String> indexes = client.retrievalIndexByAliases(model.getName());
List<String> prepareDeleteIndexes = new ArrayList<>();
+ List<String> leftIndices = new ArrayList<>();
for (String index : indexes) {
long timeSeries = TimeSeriesUtils.isolateTimeFromIndexName(index);
if (deadline >= timeSeries) {
prepareDeleteIndexes.add(index);
+ } else {
+ leftIndices.add(index);
}
}
-
- if (indexes.size() == prepareDeleteIndexes.size()) {
- client.createIndex(TimeSeriesUtils.latestWriteIndexName(model));
- }
-
for (String prepareDeleteIndex : prepareDeleteIndexes) {
client.deleteByIndexName(prepareDeleteIndex);
}
+ String todayIndex = TimeSeriesUtils.latestWriteIndexName(model);
+ if (!leftIndices.contains(todayIndex)) {
+ client.createIndex(TimeSeriesUtils.timeSeries(model));
+ }
}
}