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 2018/11/13 03:18:31 UTC
[incubator-skywalking] branch backend-init updated (cf44720 ->
7f3ad02)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch backend-init
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from cf44720 Merge branch 'master' into backend-init
add 6dd98b3 Extend StorageEntity annotation to support source scope metadata (#1904)
add 645a9a5 New v2 header with header key `sw6` (#1894)
add 7f3ad02 Merge branch 'master' into backend-init
No new revisions were added by this update.
Summary of changes:
.../skywalking/apm/agent/core/base64/Base64.java | 45 +++--
.../skywalking/apm/agent/core/conf/Config.java | 10 ++
.../apm/agent/core/context/ContextCarrier.java | 170 +++++++++++++-----
.../apm/agent/core/context/ContextSnapshot.java | 10 +-
.../apm/agent/core/context/SW3CarrierItem.java | 4 +-
.../{SW3CarrierItem.java => SW6CarrierItem.java} | 13 +-
.../apm/agent/core/context/TracingContext.java | 29 +--
.../agent/core/context/trace/TraceSegmentRef.java | 62 ++++---
.../core/context/ContextCarrierV2HeaderTest.java | 195 +++++++++++++++++++++
.../apm/agent/core/context/ContextManagerTest.java | 6 +-
.../activemq/ActiveMQConsumerInterceptor.java | 28 +--
.../activemq/ActiveMQConsumerInterceptorTest.java | 18 +-
.../apm/plugin/dubbo/DubboInterceptorTest.java | 7 +
.../jetty/v9/server/HandleInterceptorTest.java | 8 +
.../kafka/v11/KafkaConsumerInterceptorTest.java | 8 +
.../plugin/motan/MotanProviderInterceptorTest.java | 9 +
.../sofarpc/SofaRpcProviderInterceptorTest.java | 13 +-
.../apm/plugin/struts2/Struts2InterceptorTest.java | 8 +
.../tomcat78x/TomcatInvokeInterceptorTest.java | 10 +-
.../v2x/ExecuteRootHandlerInterceptorTest.java | 12 +-
.../opentracing/SkywalkingSpanActivationTest.java | 63 ++++---
.../oap/server/core/alarm/AlarmRecord.java | 3 +-
.../core/analysis/generated/all/AllDispatcher.java | 2 +-
.../generated/all/AllHeatmapIndicator.java | 9 +-
.../analysis/generated/all/AllP50Indicator.java | 9 +-
.../analysis/generated/all/AllP75Indicator.java | 9 +-
.../analysis/generated/all/AllP90Indicator.java | 9 +-
.../analysis/generated/all/AllP95Indicator.java | 9 +-
.../analysis/generated/all/AllP99Indicator.java | 9 +-
.../generated/endpoint/EndpointAvgIndicator.java | 11 +-
.../generated/endpoint/EndpointCpmIndicator.java | 11 +-
.../generated/endpoint/EndpointDispatcher.java | 2 +-
.../generated/endpoint/EndpointP50Indicator.java | 11 +-
.../generated/endpoint/EndpointP75Indicator.java | 11 +-
.../generated/endpoint/EndpointP90Indicator.java | 11 +-
.../generated/endpoint/EndpointP95Indicator.java | 11 +-
.../generated/endpoint/EndpointP99Indicator.java | 11 +-
.../generated/endpoint/EndpointSlaIndicator.java | 11 +-
.../EndpointRelationCpmIndicator.java | 11 +-
.../EndpointRelationDispatcher.java | 2 +-
.../EndpointRelationRespTimeIndicator.java | 11 +-
.../generated/service/ServiceCpmIndicator.java | 11 +-
.../generated/service/ServiceDispatcher.java | 2 +-
.../generated/service/ServiceP50Indicator.java | 11 +-
.../generated/service/ServiceP75Indicator.java | 11 +-
.../generated/service/ServiceP90Indicator.java | 11 +-
.../generated/service/ServiceP95Indicator.java | 11 +-
.../generated/service/ServiceP99Indicator.java | 11 +-
.../service/ServiceRespTimeIndicator.java | 11 +-
.../generated/service/ServiceSlaIndicator.java | 11 +-
.../ServiceInstanceCpmIndicator.java | 11 +-
.../serviceinstance/ServiceInstanceDispatcher.java | 2 +-
.../ServiceInstanceRespTimeIndicator.java | 11 +-
.../InstanceJvmCpuIndicator.java | 11 +-
.../ServiceInstanceJVMCPUDispatcher.java | 2 +-
.../InstanceJvmOldGcCountIndicator.java | 11 +-
.../InstanceJvmOldGcTimeIndicator.java | 11 +-
.../InstanceJvmYoungGcCountIndicator.java | 11 +-
.../InstanceJvmYoungGcTimeIndicator.java | 11 +-
.../ServiceInstanceJVMGCDispatcher.java | 2 +-
.../InstanceJvmMemoryHeapIndicator.java | 11 +-
.../InstanceJvmMemoryHeapMaxIndicator.java | 11 +-
.../InstanceJvmMemoryNoheapIndicator.java | 11 +-
.../InstanceJvmMemoryNoheapMaxIndicator.java | 11 +-
.../ServiceInstanceJVMMemoryDispatcher.java | 4 +-
.../ServiceInstanceJVMMemoryPoolDispatcher.java | 2 +-
.../ServiceInstanceRelationDispatcher.java | 2 +-
.../ServiceRelationClientCallSlaIndicator.java | 11 +-
.../ServiceRelationClientCpmIndicator.java | 11 +-
.../ServiceRelationClientRespTimeIndicator.java | 11 +-
.../servicerelation/ServiceRelationDispatcher.java | 2 +-
.../ServiceRelationServerCallSlaIndicator.java | 11 +-
.../ServiceRelationServerCpmIndicator.java | 11 +-
.../ServiceRelationServerRespTimeIndicator.java | 11 +-
.../EndpointRelationServerSideIndicator.java | 3 +-
.../analysis/manual/segment/SegmentRecord.java | 3 +-
.../ServiceRelationClientSideIndicator.java | 3 +-
.../ServiceRelationServerSideIndicator.java | 4 +-
.../server/core/register/EndpointInventory.java | 4 +-
.../core/register/NetworkAddressInventory.java | 4 +-
.../core/register/ServiceInstanceInventory.java | 4 +-
.../oap/server/core/register/ServiceInventory.java | 13 +-
.../annotation/InventoryAnnotationUtils.java | 37 ----
.../core/register/annotation/InventoryType.java | 7 +-
.../core/register/worker/InventoryProcess.java | 25 ++-
.../skywalking/oap/server/core/source/Scope.java | 4 +-
.../annotation/StorageAnnotationListener.java | 18 +-
.../core/storage/annotation/StorageEntity.java | 3 +
.../annotation/StorageEntityAnnotationUtils.java | 10 ++
.../oap/server/core/storage/model/Model.java | 7 +-
.../listener/endpoint/MultiScopesSpanListener.java | 10 +-
.../parser/listener/endpoint/SourceBuilder.java | 4 +
.../elasticsearch/lock/RegisterLockInstaller.java | 16 +-
93 files changed, 918 insertions(+), 455 deletions(-)
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/{SW3CarrierItem.java => SW6CarrierItem.java} (76%)
create mode 100644 apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/ContextCarrierV2HeaderTest.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/annotation/InventoryAnnotationUtils.java