You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2021/08/27 07:19:36 UTC
[skywalking] branch remove-agent-codes updated (f536867 -> 357c900)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch remove-agent-codes
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
discard f536867 Remove agent codes and clean up
add e50f4f8 Doc: Reorganize dynamic configuration doc (#7586)
add 1c436d7 refine backend doc (#7587)
new 357c900 Remove agent codes and clean up
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 (f536867)
\
N -- N -- N refs/heads/remove-agent-codes (357c900)
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:
CHANGES.md | 1 +
docs/en/setup/backend/dynamic-config-apollo.md | 14 ++
docs/en/setup/backend/dynamic-config-configmap.md | 112 +++++++++++++++
docs/en/setup/backend/dynamic-config-consul.md | 15 ++
docs/en/setup/backend/dynamic-config-etcd.md | 17 +++
docs/en/setup/backend/dynamic-config-nacos.md | 21 +++
docs/en/setup/backend/dynamic-config-service.md | 14 ++
docs/en/setup/backend/dynamic-config-zookeeper.md | 61 ++++++++
docs/en/setup/backend/dynamic-config.md | 162 ++++++----------------
docs/en/setup/backend/service-auto-grouping.md | 13 +-
docs/en/setup/backend/slow-db-statement.md | 15 +-
docs/en/setup/backend/spring-sleuth-setup.md | 27 ++--
docs/en/setup/backend/trace-sampling.md | 38 +++--
13 files changed, 338 insertions(+), 172 deletions(-)
create mode 100755 docs/en/setup/backend/dynamic-config-apollo.md
create mode 100755 docs/en/setup/backend/dynamic-config-configmap.md
create mode 100755 docs/en/setup/backend/dynamic-config-consul.md
create mode 100755 docs/en/setup/backend/dynamic-config-etcd.md
create mode 100755 docs/en/setup/backend/dynamic-config-nacos.md
create mode 100755 docs/en/setup/backend/dynamic-config-service.md
create mode 100755 docs/en/setup/backend/dynamic-config-zookeeper.md
[skywalking] 01/01: Remove agent codes and clean up
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch remove-agent-codes
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 357c9003fd47800f6c5a37b3cf26bb9af4f771f7
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Fri Aug 27 15:17:48 2021 +0800
Remove agent codes and clean up
---
.github/PULL_REQUEST_TEMPLATE | 7 -
.github/actions/e2e-test/action.yml | 33 +-
.github/actions/plugins-test/action.yml | 87 --
.github/workflows/ci-it.yaml | 50 +-
.github/workflows/e2e.istio.yaml | 36 +-
.github/workflows/plugins-jdk14-test.0.yaml | 61 -
.github/workflows/plugins-test.0.yaml | 88 --
.github/workflows/plugins-test.1.yaml | 80 --
.github/workflows/plugins-test.2.yaml | 82 --
.github/workflows/plugins-test.3.yaml | 117 --
.gitignore | 6 -
Makefile | 12 +-
apm-application-toolkit/apm-toolkit-kafka/pom.xml | 32 -
.../apm/toolkit/kafka/KafkaPollAndInvoke.java | 30 -
.../apm-toolkit-log4j-1.x/pom.xml | 42 -
.../v1/x/SkyWalkingContextPatternConverter.java | 35 -
.../log/log4j/v1/x/TraceIdPatternConverter.java | 35 -
.../log/log4j/v1/x/TraceIdPatternLayout.java | 33 -
.../log/log4j/v1/x/TraceIdPatternParser.java | 47 -
.../log/log4j/v1/x/log/GRPCLogClientAppender.java | 48 -
.../apm-toolkit-log4j-2.x/pom.xml | 42 -
.../log/log4j/v2/x/Log4j2OutputAppender.java | 31 -
.../x/Log4j2SkyWalkingContextOutputAppender.java | 31 -
.../log/log4j/v2/x/SkyWalkingContextConverter.java | 53 -
.../toolkit/log/log4j/v2/x/TraceIdConverter.java | 53 -
.../log/log4j/v2/x/log/GRPCLogClientAppender.java | 78 --
.../apm-toolkit-logback-1.x/pom.xml | 49 -
.../log/logback/v1/x/LogbackPatternConverter.java | 36 -
.../LogbackSkyWalkingContextPatternConverter.java | 36 -
.../logback/v1/x/TraceIdPatternLogbackLayout.java | 33 -
.../logback/v1/x/log/GRPCLogClientAppender.java | 43 -
.../x/logstash/SkyWalkingContextJsonProvider.java | 50 -
.../logback/v1/x/logstash/TraceIdJsonProvider.java | 51 -
.../v1/x/mdc/LogbackMDCPatternConverter.java | 63 --
.../v1/x/mdc/TraceIdMDCPatternLogbackLayout.java | 31 -
apm-application-toolkit/apm-toolkit-meter/pom.xml | 31 -
.../skywalking/apm/toolkit/meter/BaseBuilder.java | 80 --
.../skywalking/apm/toolkit/meter/BaseMeter.java | 46 -
.../skywalking/apm/toolkit/meter/Counter.java | 89 --
.../apache/skywalking/apm/toolkit/meter/Gauge.java | 65 --
.../skywalking/apm/toolkit/meter/Histogram.java | 98 --
.../skywalking/apm/toolkit/meter/MeterCenter.java | 33 -
.../skywalking/apm/toolkit/meter/MeterFactory.java | 67 --
.../skywalking/apm/toolkit/meter/MeterId.java | 128 ---
.../skywalking/apm/toolkit/meter/CounterTest.java | 30 -
.../skywalking/apm/toolkit/meter/GaugeTest.java | 30 -
.../apm/toolkit/meter/HistogramTest.java | 34 -
.../skywalking/apm/toolkit/meter/MeterIdTest.java | 37 -
.../apm-toolkit-micrometer-registry/pom.xml | 48 -
.../apm/meter/micrometer/MeterBuilder.java | 103 --
.../apm/meter/micrometer/SkywalkingConfig.java | 58 -
.../apm/meter/micrometer/SkywalkingCounter.java | 45 -
.../meter/micrometer/SkywalkingCustomCounter.java | 66 --
.../micrometer/SkywalkingDistributionSummary.java | 100 --
.../meter/micrometer/SkywalkingLongTaskTimer.java | 46 -
.../meter/micrometer/SkywalkingMeterRegistry.java | 189 ----
.../apm/meter/micrometer/SkywalkingTimer.java | 100 --
.../apm/meter/micrometer/MeterBuilderTest.java | 81 --
.../meter/micrometer/SkywalkingCounterTest.java | 56 -
.../micrometer/SkywalkingCustomCounterTest.java | 42 -
.../SkywalkingDistributionSummaryTest.java | 65 --
.../micrometer/SkywalkingLongTaskTimerTest.java | 65 --
.../micrometer/SkywalkingMeterRegistryTest.java | 128 ---
.../apm/meter/micrometer/SkywalkingTimerTest.java | 69 --
.../apm-toolkit-opentracing/pom.xml | 48 -
.../apm/toolkit/opentracing/ByteBufferContext.java | 43 -
.../toolkit/opentracing/NeedSnifferActivation.java | 37 -
.../toolkit/opentracing/SkywalkingActiveSpan.java | 139 ---
.../apm/toolkit/opentracing/SkywalkingContext.java | 38 -
.../opentracing/SkywalkingContinuation.java | 34 -
.../apm/toolkit/opentracing/SkywalkingSpan.java | 138 ---
.../toolkit/opentracing/SkywalkingSpanBuilder.java | 177 ---
.../apm/toolkit/opentracing/SkywalkingTracer.java | 58 -
.../skywalking/apm/toolkit/opentracing/Tag.java | 37 -
.../apm/toolkit/opentracing/TextMapContext.java | 33 -
.../META-INF.services/io.opentracing.Tracer | 19 -
apm-application-toolkit/apm-toolkit-trace/pom.xml | 31 -
.../skywalking/apm/toolkit/trace/ActiveSpan.java | 49 -
.../apm/toolkit/trace/CallableWrapper.java | 39 -
.../apm/toolkit/trace/IgnoredException.java | 35 -
.../apm/toolkit/trace/RunnableWrapper.java | 36 -
.../apm/toolkit/trace/SupplierWrapper.java | 39 -
.../apache/skywalking/apm/toolkit/trace/Tag.java | 47 -
.../apache/skywalking/apm/toolkit/trace/Tags.java | 46 -
.../apache/skywalking/apm/toolkit/trace/Trace.java | 38 -
.../skywalking/apm/toolkit/trace/TraceContext.java | 76 --
.../apm/toolkit/trace/TraceCrossThread.java | 30 -
apm-application-toolkit/pom.xml | 39 -
apm-commons/apm-datacarrier/pom.xml | 2 +-
.../skywalking/apm/util/ConfigInitializer.java | 207 ----
.../org/apache/skywalking/apm/util/Length.java | 34 -
.../skywalking/apm/util/ConfigInitializerTest.java | 93 --
apm-dist-es7/pom.xml | 13 -
apm-dist-es7/src/main/assembly/binary-es7.xml | 6 -
apm-dist/pom.xml | 13 -
apm-dist/src/main/assembly/binary.xml | 6 -
apm-protocol/apm-network/pom.xml | 2 +-
apm-protocol/pom.xml | 4 +-
apm-sniffer/apm-agent-core/pom.xml | 270 -----
.../apm/agent/core/ServiceInstanceGenerator.java | 59 -
.../skywalking/apm/agent/core/base64/Base64.java | 41 -
.../core/boot/AgentPackageNotFoundException.java | 25 -
.../apm/agent/core/boot/AgentPackagePath.java | 84 --
.../apm/agent/core/boot/BootService.java | 42 -
.../apm/agent/core/boot/DefaultImplementor.java | 29 -
.../agent/core/boot/DefaultNamedThreadFactory.java | 39 -
.../apm/agent/core/boot/OverrideImplementor.java | 30 -
.../apm/agent/core/boot/PluginConfig.java | 39 -
.../agent/core/boot/ServiceConflictException.java | 25 -
.../apm/agent/core/boot/ServiceManager.java | 148 ---
.../core/commands/CommandExecutionException.java | 51 -
.../apm/agent/core/commands/CommandExecutor.java | 32 -
.../core/commands/CommandExecutorService.java | 80 --
.../core/commands/CommandSerialNumberCache.java | 48 -
.../apm/agent/core/commands/CommandService.java | 125 --
.../ConfigurationDiscoveryCommandExecutor.java | 45 -
.../commands/executor/NoopCommandExecutor.java | 35 -
.../executor/ProfileTaskCommandExecutor.java | 53 -
.../skywalking/apm/agent/core/conf/Config.java | 341 ------
.../agent/core/conf/ConfigNotFoundException.java | 29 -
.../skywalking/apm/agent/core/conf/Constants.java | 27 -
.../apm/agent/core/conf/OPGroupDefinition.java | 22 -
.../core/conf/RuntimeContextConfiguration.java | 29 -
.../agent/core/conf/SnifferConfigInitializer.java | 226 ----
.../conf/dynamic/AgentConfigChangeWatcher.java | 62 -
.../dynamic/ConfigurationDiscoveryService.java | 283 -----
.../watcher/IgnoreSuffixPatternsWatcher.java | 73 --
.../conf/dynamic/watcher/SamplingRateWatcher.java | 77 --
.../conf/dynamic/watcher/SpanLimitWatcher.java | 69 --
.../agent/core/context/AbstractTracerContext.java | 136 ---
.../apm/agent/core/context/AsyncSpan.java | 53 -
.../apm/agent/core/context/CarrierItem.java | 71 --
.../apm/agent/core/context/CarrierItemHead.java | 25 -
.../apm/agent/core/context/ContextCarrier.java | 185 ---
.../apm/agent/core/context/ContextManager.java | 242 ----
.../core/context/ContextManagerExtendService.java | 110 --
.../apm/agent/core/context/ContextSnapshot.java | 63 --
.../apm/agent/core/context/CorrelationContext.java | 209 ----
.../apm/agent/core/context/ExtensionContext.java | 161 ---
.../apm/agent/core/context/ExtensionInjector.java | 38 -
.../core/context/IgnoreTracerContextListener.java | 23 -
.../agent/core/context/IgnoredTracerContext.java | 159 ---
.../apm/agent/core/context/RuntimeContext.java | 81 --
.../agent/core/context/RuntimeContextSnapshot.java | 35 -
.../apm/agent/core/context/SW8CarrierItem.java | 34 -
.../core/context/SW8CorrelationCarrierItem.java | 33 -
.../core/context/SW8ExtensionCarrierItem.java | 35 -
.../apm/agent/core/context/TracingContext.java | 571 ----------
.../agent/core/context/TracingContextListener.java | 25 -
.../agent/core/context/TracingThreadListener.java | 24 -
.../agent/core/context/ids/DistributedTraceId.java | 43 -
.../agent/core/context/ids/GlobalIdGenerator.java | 94 --
.../core/context/ids/NewDistributedTraceId.java | 28 -
.../agent/core/context/ids/PropagatedTraceId.java | 28 -
.../AnnotationMatchExceptionCheckStrategy.java | 36 -
.../core/context/status/ExceptionCheckContext.java | 50 -
.../context/status/ExceptionCheckStrategy.java | 27 -
.../HierarchyMatchExceptionCheckStrategy.java | 46 -
.../context/status/OffExceptionCheckStrategy.java | 29 -
.../core/context/status/StatusCheckService.java | 69 --
.../agent/core/context/status/StatusChecker.java | 90 --
.../apm/agent/core/context/tag/AbstractTag.java | 81 --
.../apm/agent/core/context/tag/IntegerTag.java | 44 -
.../apm/agent/core/context/tag/StringTag.java | 45 -
.../apm/agent/core/context/tag/Tags.java | 123 --
.../apm/agent/core/context/trace/AbstractSpan.java | 127 ---
.../core/context/trace/AbstractTracingSpan.java | 349 ------
.../apm/agent/core/context/trace/EntrySpan.java | 113 --
.../apm/agent/core/context/trace/ExitSpan.java | 127 ---
.../apm/agent/core/context/trace/ExitTypeSpan.java | 30 -
.../apm/agent/core/context/trace/LocalSpan.java | 46 -
.../agent/core/context/trace/LogDataEntity.java | 69 --
.../apm/agent/core/context/trace/NoopExitSpan.java | 44 -
.../apm/agent/core/context/trace/NoopSpan.java | 135 ---
.../apm/agent/core/context/trace/SpanLayer.java | 53 -
.../core/context/trace/StackBasedTracingSpan.java | 69 --
.../apm/agent/core/context/trace/TraceSegment.java | 174 ---
.../agent/core/context/trace/TraceSegmentRef.java | 114 --
.../apm/agent/core/context/util/KeyValuePair.java | 51 -
.../apm/agent/core/context/util/PeerFormat.java | 34 -
.../apm/agent/core/context/util/TagValuePair.java | 73 --
.../core/context/util/ThrowableTransformer.java | 89 --
.../apm/agent/core/dictionary/DictionaryUtil.java | 29 -
.../apm/agent/core/dictionary/Found.java | 25 -
.../apm/agent/core/dictionary/NotFound.java | 25 -
.../apm/agent/core/dictionary/PossibleFound.java | 68 --
.../apm/agent/core/jvm/JVMMetricsSender.java | 110 --
.../skywalking/apm/agent/core/jvm/JVMService.java | 111 --
.../apm/agent/core/jvm/LoadedLibraryCollector.java | 145 ---
.../apm/agent/core/jvm/clazz/ClassProvider.java | 43 -
.../apm/agent/core/jvm/cpu/CPUMetricsAccessor.java | 56 -
.../apm/agent/core/jvm/cpu/CPUProvider.java | 47 -
.../agent/core/jvm/cpu/NoSupportedCPUAccessor.java | 30 -
.../apm/agent/core/jvm/cpu/SunCpuAccessor.java | 37 -
.../apm/agent/core/jvm/gc/CMSGCModule.java | 38 -
.../apm/agent/core/jvm/gc/G1GCModule.java | 38 -
.../apm/agent/core/jvm/gc/GCMetricAccessor.java | 26 -
.../skywalking/apm/agent/core/jvm/gc/GCModule.java | 78 --
.../apm/agent/core/jvm/gc/GCProvider.java | 70 --
.../apm/agent/core/jvm/gc/ParallelGCModule.java | 39 -
.../apm/agent/core/jvm/gc/SerialGCModule.java | 38 -
.../skywalking/apm/agent/core/jvm/gc/UnknowGC.java | 34 -
.../apm/agent/core/jvm/memory/MemoryProvider.java | 60 -
.../core/jvm/memorypool/CMSCollectorModule.java | 61 -
.../core/jvm/memorypool/G1CollectorModule.java | 61 -
.../jvm/memorypool/MemoryPoolMetricsAccessor.java | 26 -
.../core/jvm/memorypool/MemoryPoolModule.java | 89 --
.../core/jvm/memorypool/MemoryPoolProvider.java | 69 --
.../jvm/memorypool/ParallelCollectorModule.java | 62 -
.../core/jvm/memorypool/SerialCollectorModule.java | 61 -
.../core/jvm/memorypool/UnknownMemoryPool.java | 38 -
.../apm/agent/core/jvm/thread/ThreadProvider.java | 78 --
.../apm/agent/core/logging/api/ILog.java | 63 --
.../apm/agent/core/logging/api/LogManager.java | 55 -
.../apm/agent/core/logging/api/LogResolver.java | 37 -
.../apm/agent/core/logging/api/NoopLogger.java | 122 --
.../agent/core/logging/core/AbstractLogger.java | 222 ----
.../apm/agent/core/logging/core/Converter.java | 30 -
.../apm/agent/core/logging/core/FileWriter.java | 223 ----
.../apm/agent/core/logging/core/IWriter.java | 23 -
.../agent/core/logging/core/JsonLogResolver.java | 37 -
.../apm/agent/core/logging/core/JsonLogger.java | 80 --
.../apm/agent/core/logging/core/LogEvent.java | 69 --
.../apm/agent/core/logging/core/LogLevel.java | 23 -
.../agent/core/logging/core/LogMessageHolder.java | 35 -
.../apm/agent/core/logging/core/LogOutput.java | 23 -
.../apm/agent/core/logging/core/Parser.java | 190 ----
.../core/logging/core/PatternLogResolver.java | 36 -
.../apm/agent/core/logging/core/PatternLogger.java | 64 --
.../apm/agent/core/logging/core/ResolverType.java | 23 -
.../agent/core/logging/core/SystemOutWriter.java | 34 -
.../apm/agent/core/logging/core/WriterFactory.java | 57 -
.../core/converters/AgentNameConverter.java | 35 -
.../logging/core/converters/ClassConverter.java | 38 -
.../logging/core/converters/DateConverter.java | 41 -
.../logging/core/converters/LevelConverter.java | 37 -
.../logging/core/converters/LiteralConverter.java | 44 -
.../logging/core/converters/MessageConverter.java | 37 -
.../logging/core/converters/ThreadConverter.java | 37 -
.../core/converters/ThrowableConverter.java | 54 -
.../apm/agent/core/meter/AbstractBuilder.java | 77 --
.../skywalking/apm/agent/core/meter/BaseMeter.java | 86 --
.../skywalking/apm/agent/core/meter/Counter.java | 119 --
.../apm/agent/core/meter/CounterMode.java | 34 -
.../skywalking/apm/agent/core/meter/Gauge.java | 88 --
.../skywalking/apm/agent/core/meter/Histogram.java | 192 ----
.../apm/agent/core/meter/MeterFactory.java | 54 -
.../skywalking/apm/agent/core/meter/MeterId.java | 84 --
.../apm/agent/core/meter/MeterSender.java | 155 ---
.../apm/agent/core/meter/MeterService.java | 105 --
.../skywalking/apm/agent/core/meter/MeterTag.java | 67 --
.../skywalking/apm/agent/core/meter/MeterType.java | 37 -
.../skywalking/apm/agent/core/os/OSUtil.java | 130 ---
.../apm/agent/core/os/ProcessorUtil.java | 27 -
.../plugin/AbstractClassEnhancePluginDefine.java | 203 ----
.../agent/core/plugin/ByteBuddyCoreClasses.java | 36 -
.../apm/agent/core/plugin/DynamicPluginLoader.java | 46 -
.../apm/agent/core/plugin/EnhanceContext.java | 51 -
.../core/plugin/InstrumentDebuggingClass.java | 71 --
.../apm/agent/core/plugin/PluginBootstrap.java | 80 --
.../apm/agent/core/plugin/PluginCfg.java | 65 --
.../apm/agent/core/plugin/PluginDefine.java | 63 --
.../apm/agent/core/plugin/PluginException.java | 31 -
.../apm/agent/core/plugin/PluginFinder.java | 110 --
.../agent/core/plugin/PluginResourcesResolver.java | 54 -
.../apm/agent/core/plugin/PluginSelector.java | 48 -
.../apm/agent/core/plugin/WitnessFinder.java | 83 --
.../apm/agent/core/plugin/WitnessMethod.java | 45 -
.../plugin/bootstrap/BootstrapInstrumentBoost.java | 304 -----
.../plugin/bootstrap/BootstrapPluginLogBridge.java | 102 --
.../agent/core/plugin/bootstrap/IBootstrapLog.java | 52 -
.../template/ConstructorInterTemplate.java | 89 --
.../template/InstanceMethodInterTemplate.java | 135 ---
...nstanceMethodInterWithOverrideArgsTemplate.java | 135 ---
.../template/StaticMethodInterTemplate.java | 123 --
.../StaticMethodInterWithOverrideArgsTemplate.java | 123 --
.../template/v2/InstanceMethodInterV2Template.java | 127 ---
...tanceMethodInterV2WithOverrideArgsTemplate.java | 128 ---
.../template/v2/StaticMethodInterV2Template.java | 116 --
...taticMethodInterV2WithOverrideArgsTemplate.java | 116 --
.../core/plugin/bytebuddy/AbstractJunction.java | 33 -
.../plugin/bytebuddy/AnnotationTypeNameMatch.java | 71 --
.../plugin/bytebuddy/ArgumentTypeNameMatch.java | 80 --
.../bytebuddy/CacheableTransformerDecorator.java | 195 ----
.../core/plugin/bytebuddy/ClassCacheMode.java | 26 -
.../core/plugin/bytebuddy/ReturnTypeNameMatch.java | 65 --
.../exception/IllegalPluginDefineException.java | 28 -
.../interceptor/ConstructorInterceptPoint.java | 44 -
.../DeclaredInstanceMethodsInterceptPoint.java | 26 -
.../core/plugin/interceptor/EnhanceException.java | 33 -
.../interceptor/InstanceMethodsInterceptPoint.java | 45 -
.../interceptor/StaticMethodsInterceptPoint.java | 45 -
.../enhance/BootstrapInterRuntimeAssist.java | 74 --
.../enhance/ClassEnhancePluginDefine.java | 236 ----
.../ClassInstanceMethodsEnhancePluginDefine.java | 39 -
.../ClassStaticMethodsEnhancePluginDefine.java | 47 -
.../interceptor/enhance/ConstructorInter.java | 71 --
.../interceptor/enhance/EnhancedInstance.java | 25 -
.../interceptor/enhance/InstMethodsInter.java | 104 --
.../enhance/InstMethodsInterWithOverrideArgs.java | 103 --
.../enhance/InstanceConstructorInterceptor.java | 31 -
.../enhance/InstanceMethodsAroundInterceptor.java | 52 -
.../interceptor/enhance/MethodInterceptResult.java | 59 -
.../interceptor/enhance/OverrideCallable.java | 23 -
.../enhance/StaticMethodsAroundInterceptor.java | 51 -
.../interceptor/enhance/StaticMethodsInter.java | 101 --
.../StaticMethodsInterWithOverrideArgs.java | 100 --
.../enhance/v2/ClassEnhancePluginDefineV2.java | 179 ---
.../ClassInstanceMethodsEnhancePluginDefineV2.java | 38 -
.../ClassStaticMethodsEnhancePluginDefineV2.java | 47 -
.../interceptor/enhance/v2/InstMethodsInterV2.java | 85 --
.../v2/InstMethodsInterV2WithOverrideArgs.java | 105 --
.../v2/InstanceMethodsAroundInterceptorV2.java | 54 -
.../enhance/v2/MethodInvocationContext.java | 34 -
.../v2/StaticMethodsAroundInterceptorV2.java | 52 -
.../enhance/v2/StaticMethodsInterV2.java | 101 --
.../v2/StaticMethodsInterV2WithOverrideArgs.java | 101 --
.../v2/ConstructorInterceptV2Point.java | 38 -
.../DeclaredInstanceMethodsInterceptV2Point.java | 26 -
.../v2/InstanceMethodsInterceptV2Point.java | 46 -
.../v2/StaticMethodsInterceptV2Point.java | 46 -
.../core/plugin/jdk9module/JDK9ModuleExporter.java | 87 --
.../agent/core/plugin/loader/AgentClassLoader.java | 212 ----
.../core/plugin/loader/InstrumentationLoader.java | 32 -
.../plugin/loader/InterceptorInstanceLoader.java | 79 --
.../core/plugin/match/ClassAnnotationMatch.java | 78 --
.../apm/agent/core/plugin/match/ClassMatch.java | 22 -
.../agent/core/plugin/match/HierarchyMatch.java | 102 --
.../apm/agent/core/plugin/match/IndirectMatch.java | 31 -
.../core/plugin/match/MethodAnnotationMatch.java | 87 --
.../match/MethodInheritanceAnnotationMatcher.java | 100 --
.../core/plugin/match/MultiClassNameMatch.java | 63 --
.../apm/agent/core/plugin/match/NameMatch.java | 38 -
.../apm/agent/core/plugin/match/PrefixMatch.java | 67 --
.../core/plugin/match/ProtectiveShieldMatcher.java | 55 -
.../apm/agent/core/plugin/match/RegexMatch.java | 67 --
.../core/plugin/match/logical/LogicalAndMatch.java | 66 --
.../match/logical/LogicalMatchOperation.java | 51 -
.../core/plugin/match/logical/LogicalOrMatch.java | 66 --
.../agent/core/profile/ProfileSnapshotSender.java | 126 ---
.../apm/agent/core/profile/ProfileStatus.java | 46 -
.../agent/core/profile/ProfileStatusReference.java | 69 --
.../apm/agent/core/profile/ProfileTask.java | 131 ---
.../core/profile/ProfileTaskChannelService.java | 205 ----
.../core/profile/ProfileTaskExecutionContext.java | 170 ---
.../core/profile/ProfileTaskExecutionService.java | 280 -----
.../apm/agent/core/profile/ProfileThread.java | 113 --
.../apm/agent/core/profile/ThreadProfiler.java | 156 ---
.../agent/core/profile/TracingThreadSnapshot.java | 71 --
.../apm/agent/core/remote/AgentIDDecorator.java | 86 --
.../agent/core/remote/AuthenticationDecorator.java | 59 -
.../apm/agent/core/remote/ChannelBuilder.java | 25 -
.../apm/agent/core/remote/ChannelDecorator.java | 25 -
.../core/remote/EventReportServiceClient.java | 182 ---
.../apm/agent/core/remote/GRPCChannel.java | 113 --
.../apm/agent/core/remote/GRPCChannelListener.java | 23 -
.../apm/agent/core/remote/GRPCChannelManager.java | 226 ----
.../apm/agent/core/remote/GRPCChannelStatus.java | 23 -
.../agent/core/remote/GRPCStreamServiceStatus.java | 71 --
.../agent/core/remote/LogReportServiceClient.java | 75 --
.../agent/core/remote/ServiceManagementClient.java | 140 ---
.../agent/core/remote/StandardChannelBuilder.java | 31 -
.../apm/agent/core/remote/TLSChannelBuilder.java | 53 -
.../core/remote/TraceSegmentServiceClient.java | 188 ---
.../apm/agent/core/sampling/SamplingService.java | 136 ---
.../apm/agent/core/util/CollectionUtil.java | 44 -
.../apm/agent/core/util/CustomizeExpression.java | 159 ---
.../skywalking/apm/agent/core/util/FileUtils.java | 57 -
.../skywalking/apm/agent/core/util/IOUtils.java | 149 ---
.../skywalking/apm/agent/core/util/MethodUtil.java | 84 --
.../org/slf4j/impl/InternalLoggerFactory.java | 49 -
.../org/slf4j/impl/Slf4jLoggerAdapter.java | 342 ------
.../org/slf4j/impl/StaticLoggerBinder.java | 81 --
...ache.skywalking.apm.agent.core.boot.BootService | 38 -
.../apm/agent/core/base64/Base64Test.java | 36 -
.../core/boot/DefaultNamedThreadFactoryTest.java | 40 -
.../apm/agent/core/boot/ServiceManagerTest.java | 141 ---
.../core/conf/SnifferConfigInitializerTest.java | 133 ---
.../watcher/IgnoreSuffixPatternsWatcherTest.java | 72 --
.../core/conf/watcher/SamplingRateWatcherTest.java | 72 --
.../core/conf/watcher/SpanLimitWatcherTest.java | 65 --
.../core/context/ContextCarrierV3HeaderTest.java | 165 ---
.../core/context/ContextManagerBenchmark.java | 97 --
.../context/ContextManagerExtendServiceTest.java | 59 -
.../apm/agent/core/context/ContextManagerTest.java | 287 -----
.../agent/core/context/CorrelationContextTest.java | 123 --
.../agent/core/context/ExtensionContextTest.java | 110 --
.../core/context/IgnoredTracerContextTest.java | 106 --
.../apm/agent/core/context/TracingContextTest.java | 83 --
.../context/status/ExceptionCheckStrategyTest.java | 70 --
.../status/StatusCheckServiceCheckTest.java | 83 --
.../core/context/status/StatusCheckerTest.java | 77 --
.../status/TestAnnotationMatchException.java | 56 -
.../status/TestHierarchyMatchException.java | 44 -
.../context/status/TestNamedMatchException.java | 44 -
.../context/util/AbstractTracingSpanHelper.java | 44 -
.../apm/agent/core/context/util/FieldGetter.java | 37 -
.../apm/agent/core/context/util/SegmentHelper.java | 35 -
.../apm/agent/core/context/util/SpanHelper.java | 44 -
.../core/context/util/TraceSegmentRefHelper.java | 32 -
.../agent/core/dictionary/DictionaryUtilTests.java | 36 -
.../core/jvm/clazz/ClassProviderBenchmark.java | 63 --
.../core/jvm/thread/ThreadProviderBenchmark.java | 64 --
.../agent/core/logging/core/FileWriterTest.java | 92 --
.../agent/core/logging/core/JsonLoggerTest.java | 183 ---
.../agent/core/logging/core/LoggingBenchmark.java | 96 --
.../core/logging/core/PatternLogResolverTest.java | 31 -
.../agent/core/logging/core/PatternLoggerTest.java | 177 ---
.../core/logging/core/SystemOutWriterTest.java | 52 -
.../agent/core/logging/core/WriterFactoryTest.java | 69 --
.../apm/agent/core/meter/CounterTest.java | 102 --
.../skywalking/apm/agent/core/meter/GaugeTest.java | 80 --
.../apm/agent/core/meter/HistogramTest.java | 104 --
.../apm/agent/core/meter/MeterDataBaseTest.java | 81 --
.../apm/agent/core/meter/MeterFactoryTest.java | 79 --
.../apm/agent/core/meter/MeterIdTest.java | 61 -
.../apm/agent/core/meter/MeterServiceTest.java | 225 ----
.../apm/agent/core/meter/MeterTagTest.java | 38 -
.../apm/agent/core/plugin/PluginSelectorTest.java | 57 -
.../bytebuddy/AnnotationTypeNameMatchTest.java | 35 -
.../apm/agent/core/plugin/bytebuddy/Inject.java | 35 -
.../MethodInheritanceAnnotationMatcherTest.java | 85 --
.../apm/agent/core/plugin/bytebuddy/Person.java | 43 -
.../plugin/bytebuddy/ReturnTypeNameMatchTest.java | 35 -
.../apm/agent/core/plugin/match/MatchTest.java | 84 --
.../core/plugin/match/MatchTestAnnotation.java | 28 -
.../apm/agent/core/plugin/witness/WitnessTest.java | 67 --
.../core/remote/TraceSegmentServiceClientTest.java | 158 ---
.../agent/core/test/tools/AgentServiceRule.java | 49 -
.../apm/agent/core/test/tools/SegmentStorage.java | 50 -
.../agent/core/test/tools/SegmentStoragePoint.java | 29 -
.../core/test/tools/TracingSegmentRunner.java | 93 --
.../apm/agent/core/util/MethodUtilTest.java | 33 -
.../apm/agent/core/util/PeerFormatTest.java | 35 -
.../src/test/resources/config/agent.config | 19 -
.../src/test/resources/skywalking-plugin.def | 17 -
apm-sniffer/apm-agent/pom.xml | 146 ---
.../skywalking/apm/agent/SkyWalkingAgent.java | 242 ----
.../apm-sdk-plugin/activemq-5.x-plugin/pom.xml | 45 -
.../ActiveMQConsumerConstructorInterceptor.java | 31 -
.../activemq/ActiveMQConsumerInterceptor.java | 93 --
.../ActiveMQProducerConstructorInterceptor.java | 31 -
.../activemq/ActiveMQProducerInterceptor.java | 86 --
.../define/ActiveMQConsumerInstrumentation.java | 86 --
.../define/ActiveMQProducerInstrumentation.java | 87 --
.../src/main/resources/skywalking-plugin.def | 18 -
...sumerAndProducerConstructorInterceptorTest.java | 221 ----
.../activemq/ActiveMQConsumerInterceptorTest.java | 148 ---
.../activemq/ActiveMQProducerInterceptorTest.java | 363 ------
.../apm-sdk-plugin/armeria-0.84.x-plugin/pom.xml | 40 -
.../armeria/Armeria084ClientInterceptor.java | 93 --
.../armeria/Armeria084ServerInterceptor.java | 74 --
.../define/Armeria084ClientInstrumentation.java | 85 --
.../define/Armeria084ServerInstrumentation.java | 80 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../apm-sdk-plugin/armeria-0.85.x-plugin/pom.xml | 40 -
.../armeria/Armeria085ClientInterceptor.java | 61 -
.../armeria/Armeria085ServerInterceptor.java | 74 --
.../armeria/Armeria086ClientInterceptor.java | 61 -
.../armeria/Armeria098ClientInterceptor.java | 61 -
.../plugin/armeria/ArmeriaClientInterceptor.java | 79 --
.../define/Armeria085ClientInstrumentation.java | 87 --
.../define/Armeria085ServerInstrumentation.java | 83 --
.../define/Armeria086ClientInstrumentation.java | 88 --
.../define/Armeria098ClientInstrumentation.java | 88 --
.../src/main/resources/skywalking-plugin.def | 20 -
.../asynchttpclient-2.x-plugin/pom.xml | 44 -
.../asynchttpclient/v2/AsyncHandlerWrapper.java | 166 ---
.../asynchttpclient/v2/ExecuteInterceptor.java | 85 --
.../DefaultAsyncHttpClientInstrumentation.java | 70 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../asynchttpclient/v2/ExecuteInterceptorTest.java | 147 ---
apm-sniffer/apm-sdk-plugin/avro-plugin/pom.xml | 44 -
.../plugin/avro/AbstractRequestInterceptor.java | 70 --
.../skywalking/apm/plugin/avro/AvroInstance.java | 29 -
.../plugin/avro/GenericRequestorInterceptor.java | 42 -
.../apm/plugin/avro/ResponderInterceptor.java | 62 -
.../apm/plugin/avro/SWClientRPCPlugin.java | 47 -
.../apm/plugin/avro/SWServerRPCPlugin.java | 63 --
.../plugin/avro/SpecificRequestorInterceptor.java | 44 -
.../define/GenericRequestorInstrumentation.java | 77 --
.../avro/define/ResponderInstrumentation.java | 77 --
.../define/SpecificRequestorInstrumentation.java | 77 --
.../src/main/resources/skywalking-plugin.def | 19 -
.../avro/GenericRequestorInterceptorTest.java | 106 --
.../avro/SpecificRequestorInterceptorTest.java | 116 --
.../apm-sdk-plugin/baidu-brpc-plugin/pom.xml | 44 -
.../apm/plugin/baidu/brpc/ClientInterceptor.java | 85 --
.../apm/plugin/baidu/brpc/ServerInterceptor.java | 81 --
.../baidu/brpc/define/ClientInstrumentation.java | 68 --
.../baidu/brpc/define/ServerInstrumentation.java | 68 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../apm-sdk-plugin/canal-1.x-plugin/pom.xml | 45 -
.../plugin/canal/CanalConstructorInterceptor.java | 39 -
.../apm/plugin/canal/CanalEnhanceInfo.java | 50 -
.../apm/plugin/canal/CanalInterceptor.java | 83 --
.../canal/ClusterNodeConstructInterceptor.java | 56 -
.../plugin/canal/define/CanalInstrumentation.java | 81 --
.../canal/define/ClusterNodeInstrumentation.java | 61 -
.../src/main/resources/skywalking-plugin.def | 18 -
.../apm/plugin/canal/CanalInterceptorTest.java | 112 --
.../cassandra-java-driver-3.x-plugin/pom.xml | 44 -
.../java/driver/v3/ClusterConnectInterceptor.java | 57 -
...ConstructorWithStateListenerArgInterceptor.java | 43 -
.../cassandra/java/driver/v3/ConnectionInfo.java | 41 -
.../plugin/cassandra/java/driver/v3/Constants.java | 24 -
...sultSetFutureGetUninterruptiblyInterceptor.java | 59 -
...AndExecuteAsyncWithStatementArgInterceptor.java | 83 --
.../driver/v3/define/ClusterInstrumentation.java | 81 --
.../DefaultResultSetFutureInstrumentation.java | 67 --
.../v3/define/SessionManagerInstrumentation.java | 69 --
.../src/main/resources/skywalking-plugin.def | 19 -
.../driver/v3/ClusterConnectInterceptorTest.java | 65 --
...tructorWithStateListenerArgInterceptorTest.java | 74 --
...SetFutureGetUninterruptiblyInterceptorTest.java | 79 --
...xecuteAsyncWithStatementArgInterceptorTest.java | 88 --
apm-sniffer/apm-sdk-plugin/cxf-3.x-plugin/pom.xml | 53 -
.../MessageSenderInterceptorInterceptor.java | 105 --
.../MessageSenderInterceptorInstrumentation.java | 74 --
.../server/AsyncInvokeConstructorInterceptor.java | 36 -
.../v3/server/AsyncInvokeMethodInterceptor.java | 72 --
.../ServiceInvokerInterceptorInstrumentation.java | 93 --
.../src/main/resources/skywalking-plugin.def | 18 -
apm-sniffer/apm-sdk-plugin/dbcp-2.x-plugin/pom.xml | 44 -
.../dbcp/v2/PoolingCloseConnectInterceptor.java | 50 -
.../dbcp/v2/PoolingGetConnectInterceptor.java | 50 -
.../v2/define/BasicDataSourceInstrumentation.java | 75 --
.../DelegatingConnectionInstrumentation.java | 76 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../dubbo-2.7.x-conflict-patch/pom.xml | 44 -
.../asf/dubbo/patch/MakeWrapperInterceptor.java | 321 ------
.../asf/dubbo/patch/WrapperInstrumentation.java | 64 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml | 46 -
.../apm/plugin/asf/dubbo/DubboInstrumentation.java | 68 --
.../apm/plugin/asf/dubbo/DubboInterceptor.java | 199 ----
.../apm/plugin/asf/dubbo/DubboPluginConfig.java | 39 -
.../src/main/resources/skywalking-plugin.def | 17 -
.../dubbo/ContextManagerExtendOverrideService.java | 26 -
.../apm/plugin/dubbo/DubboInterceptorTest.java | 225 ----
.../apm/plugin/dubbo/PluginBootService.java | 43 -
...ache.skywalking.apm.agent.core.boot.BootService | 20 -
.../apm-sdk-plugin/dubbo-conflict-patch/pom.xml | 44 -
.../plugin/dubbo/patch/MakeWrapperInterceptor.java | 321 ------
.../plugin/dubbo/patch/WrapperInstrumentation.java | 64 --
.../src/main/resources/skywalking-plugin.def | 17 -
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 46 -
.../apm/plugin/dubbo/DubboInstrumentation.java | 67 --
.../apm/plugin/dubbo/DubboInterceptor.java | 159 ---
.../src/main/resources/skywalking-plugin.def | 17 -
.../dubbo/ContextManagerExtendOverrideService.java | 26 -
.../apm/plugin/dubbo/DubboInterceptorTest.java | 224 ----
.../apm/plugin/dubbo/PluginBootService.java | 43 -
...ache.skywalking.apm.agent.core.boot.BootService | 20 -
.../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 55 -
.../apm/plugin/esjob/JobExecutorInterceptor.java | 73 --
.../esjob/define/JobExecutorInstrumentation.java | 72 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../plugin/esjob/JobExecutorInterceptorTest.java | 141 ---
.../apm-sdk-plugin/elasticjob-3.x-plugin/pom.xml | 52 -
.../elasticjob/ElasticJobExecutorInterceptor.java | 61 -
.../define/ElasticJobExecutorInstrumentation.java | 74 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../elasticsearch-5.x-plugin/pom.xml | 50 -
.../v5/AddTransportAddressesInterceptor.java | 50 -
.../apm/plugin/elasticsearch/v5/Constants.java | 46 -
.../elasticsearch/v5/ElasticSearchEnhanceInfo.java | 94 --
.../v5/ElasticsearchPluginConfig.java | 35 -
.../v5/GenericActionConstructorInterceptor.java | 28 -
.../v5/PlainListenableActionFutureInterceptor.java | 71 --
.../v5/RemoveTransportAddressInterceptor.java | 50 -
.../v5/TransportActionNodeProxyInterceptor.java | 82 --
.../elasticsearch/v5/TransportAddressCache.java | 60 -
.../v5/TransportProxyClientInterceptor.java | 139 ---
.../apm/plugin/elasticsearch/v5/Util.java | 32 -
.../v5/define/GenericActionInstrumentation.java | 70 --
...PlainListenableActionFutureInstrumentation.java | 77 --
.../TransportActionNodeProxyInstrumentation.java | 93 --
...TransportClientNodesServiceInstrumentation.java | 90 --
.../TransportProxyClientInstrumentation.java | 74 --
.../src/main/resources/skywalking-plugin.def | 21 -
.../elasticsearch-6.x-plugin/pom.xml | 46 -
.../v6/ElasticsearchPluginConfig.java | 35 -
.../plugin/elasticsearch/v6/RemotePeerCache.java | 42 -
.../elasticsearch/v6/RestClientEnhanceInfo.java | 34 -
.../elasticsearch/v6/TransportAddressCache.java | 61 -
.../v6/TransportClientEnhanceInfo.java | 48 -
.../define/AdapterActionFutureInstrumentation.java | 89 --
.../v6/define/ClusterClientInstrumentation.java | 105 --
.../v6/define/IndicesClientInstrumentation.java | 111 --
.../define/RestHighLevelClientInstrumentation.java | 265 -----
.../TransportActionNodeProxyInstrumentation.java | 90 --
...TransportClientNodesServiceInstrumentation.java | 109 --
.../v6/define/TransportServiceInstrumentation.java | 73 --
...terActionFutureActionGetMethodsInterceptor.java | 160 ---
...ClusterClientGetSettingsMethodsInterceptor.java | 68 --
.../ClusterClientHealthMethodsInterceptor.java | 67 --
...ClusterClientPutSettingsMethodsInterceptor.java | 87 --
.../elasticsearch/v6/interceptor/Constants.java | 75 --
.../IndicesClientAnalyzeMethodsInterceptor.java | 76 --
.../IndicesClientCreateMethodsInterceptor.java | 76 --
.../IndicesClientDeleteMethodsInterceptor.java | 72 --
...ghLevelClientClearScrollMethodsInterceptor.java | 69 --
...stHighLevelClientClusterMethodsInterceptor.java | 48 -
.../RestHighLevelClientConInterceptor.java | 54 -
...LevelClientDeleteByQueryMethodsInterceptor.java | 75 --
.../RestHighLevelClientGetMethodsInterceptor.java | 68 --
...RestHighLevelClientIndexMethodsInterceptor.java | 68 --
...stHighLevelClientIndicesMethodsInterceptor.java | 48 -
...estHighLevelClientSearchMethodsInterceptor.java | 69 --
...hLevelClientSearchScrollMethodsInterceptor.java | 68 --
...evelClientSearchTemplateMethodsInterceptor.java | 72 --
...estHighLevelClientUpdateMethodsInterceptor.java | 68 --
...rtActionNodeProxyExecuteMethodsInterceptor.java | 159 ---
.../TransportClientNodesServiceInterceptor.java | 117 --
.../TransportServiceConInterceptor.java | 40 -
.../src/main/resources/skywalking-plugin.def | 23 -
...ctionFutureActionGetMethodsInterceptorTest.java | 142 ---
...terClientGetSettingsMethodsInterceptorTest.java | 123 --
.../ClusterClientHealthMethodsInterceptorTest.java | 123 --
...terClientPutSettingsMethodsInterceptorTest.java | 137 ---
...IndicesClientAnalyzeMethodsInterceptorTest.java | 129 ---
.../IndicesClientCreateMethodsInterceptorTest.java | 133 ---
.../IndicesClientDeleteMethodsInterceptorTest.java | 123 --
...velClientClearScrollMethodsInterceptorTest.java | 130 ---
.../RestHighLevelClientConInterceptorTest.java | 92 --
...lClientDeleteByQueryMethodsInterceptorTest.java | 129 ---
...stHighLevelClientGetMethodsInterceptorTest.java | 129 ---
...HighLevelClientIndexMethodsInterceptorTest.java | 129 ---
...ighLevelClientSearchMethodsInterceptorTest.java | 131 ---
...elClientSearchScrollMethodsInterceptorTest.java | 127 ---
...ClientSearchTemplateMethodsInterceptorTest.java | 127 ---
...ighLevelClientUpdateMethodsInterceptorTest.java | 129 ---
...tionNodeProxyExecuteMethodsInterceptorTest.java | 254 -----
.../v6/interceptor/TransportAddressCacheTest.java | 54 -
.../TransportServiceConInterceptorTest.java | 82 --
.../elasticsearch-7.x-plugin/pom.xml | 52 -
.../define/AdapterActionFutureInstrumentation.java | 89 --
...terActionFutureActionGetMethodsInterceptor.java | 161 ---
.../src/main/resources/skywalking-plugin.def | 17 -
.../feign-default-http-9.x-plugin/pom.xml | 43 -
.../http/v9/DefaultHttpClientInterceptor.java | 174 ---
.../plugin/feign/http/v9/FeignPluginConfig.java | 45 -
.../apm/plugin/feign/http/v9/FeignResolvedURL.java | 58 -
.../http/v9/LoadBalancerHttpClientInterceptor.java | 102 --
.../plugin/feign/http/v9/PathVarInterceptor.java | 72 --
.../define/DefaultHttpClientInstrumentation.java | 74 --
.../http/v9/define/PathVarInstrumentation.java | 74 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../http/v9/DefaultHttpClientInterceptorTest.java | 195 ----
.../feign/http/v9/PathVarInterceptorTest.java | 90 --
.../apm-sdk-plugin/finagle-6.25.x-plugin/pom.xml | 81 --
.../apm/plugin/finagle/AbstractInterceptor.java | 112 --
.../apm/plugin/finagle/AnnotationInterceptor.java | 73 --
.../ClientDestTracingFilterInterceptor.java | 89 --
.../finagle/ClientTracingFilterInterceptor.java | 98 --
.../skywalking/apm/plugin/finagle/CodecUtils.java | 170 ---
.../skywalking/apm/plugin/finagle/Constants.java | 26 -
.../apm/plugin/finagle/ContextCarrierHelper.java | 63 --
.../apm/plugin/finagle/ContextHolder.java | 90 --
.../apm/plugin/finagle/ContextHolderFactory.java | 238 ----
.../skywalking/apm/plugin/finagle/FinagleCtxs.java | 70 --
.../finagle/ServerTracingFilterInterceptor.java | 94 --
.../finagle/define/AbstractInstrumentation.java | 34 -
.../finagle/define/AnnotationInstrumentation.java | 81 --
.../ClientDestTracingFilterInstrumetation.java | 79 --
.../define/ClientTracingFilterInstrumentation.java | 67 --
.../define/ServerTracingFilterInstrumentation.java | 66 --
.../src/main/resources/skywalking-plugin.def | 20 -
.../apm/plugin/finagle/SWContextCarrier.scala | 57 -
.../plugin/finagle/AbstractTracingFilterTest.java | 117 --
.../ClientTracingFilterInterceptorTest.java | 112 --
.../apm/plugin/finagle/CodecUtilsTest.java | 86 --
.../plugin/finagle/ContextHolderFactoryTest.java | 145 ---
.../apm/plugin/finagle/MockEnhancedInstance.java | 36 -
.../ServerTracingFilterInterceptorTest.java | 143 ---
.../graphql-plugin/graphql-12.x-plugin/pom.xml | 39 -
.../apm/plugin/graphql/v12/GraphqlInterceptor.java | 69 --
.../graphql/v12/define/GraphqlInstrumentation.java | 69 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../graphql-plugin/graphql-8.x-plugin/pom.xml | 38 -
.../apm/plugin/graphql/v8/GraphqlInterceptor.java | 100 --
.../graphql/v8/define/GraphqlInstrumentation.java | 69 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../graphql-plugin/graphql-9.x-plugin/pom.xml | 38 -
.../apm/plugin/graphql/v9/GraphqlInterceptor.java | 69 --
.../graphql/v9/define/GraphqlInstrumentation.java | 69 --
.../src/main/resources/skywalking-plugin.def | 17 -
apm-sniffer/apm-sdk-plugin/graphql-plugin/pom.xml | 41 -
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 45 -
.../skywalking/apm/plugin/grpc/v1/Constants.java | 70 --
.../plugin/grpc/v1/OperationNameFormatUtil.java | 44 -
.../grpc/v1/client/AbstractStubInterceptor.java | 55 -
.../grpc/v1/client/BlockingCallInterceptor.java | 60 -
.../plugin/grpc/v1/client/ClientInterceptor.java | 33 -
.../plugin/grpc/v1/client/TracingClientCall.java | 214 ----
.../AbstractServerImplBuilderInstrumentation.java | 70 --
.../v1/define/AbstractStubInstrumentation.java | 81 --
.../grpc/v1/define/ClientCallsInstrumentation.java | 61 -
.../AbstractServerImplBuilderInterceptor.java | 51 -
.../plugin/grpc/v1/server/ServerInterceptor.java | 44 -
.../plugin/grpc/v1/server/TracingServerCall.java | 107 --
.../grpc/v1/server/TracingServerCallListener.java | 124 --
.../src/main/resources/skywalking-plugin.def | 19 -
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 60 -
.../h2/JdbcXAConnectionConstructorInterceptor.java | 35 -
...PooledJdbcConnectionConstructorInterceptor.java | 29 -
.../define/AbstractConnectionInstrumentation.java | 150 ---
.../jdbc/h2/define/DriverInstrumentation.java | 36 -
.../h2/define/JdbcConnectionInstrumentation.java | 35 -
.../h2/define/JdbcXAConnectionInstrumentation.java | 58 -
.../PooledJdbcConnectionInstrumentation.java | 59 -
.../src/main/resources/skywalking-plugin.def | 20 -
.../apm-sdk-plugin/hbase-1.x-2.x-plugin/pom.xml | 45 -
.../apm/plugin/hbase/HTable100Interceptor.java | 41 -
.../apm/plugin/hbase/HTable200Interceptor.java | 41 -
.../apm/plugin/hbase/HTable220Interceptor.java | 43 -
.../apm/plugin/hbase/HTableInterceptor.java | 122 --
.../plugin/hbase/define/HTableInstrumentation.java | 143 ---
.../src/main/resources/skywalking-plugin.def | 17 -
.../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 62 -
.../v4/HttpClientExecuteInterceptor.java | 161 ---
.../define/AbstractHttpClientInstrumentation.java | 67 --
.../DefaultRequestDirectorInstrumentation.java | 65 --
.../v4/define/HttpClientInstrumentation.java | 36 -
.../define/InternalHttpClientInstrumentation.java | 63 --
.../define/MinimalHttpClientInstrumentation.java | 63 --
.../src/main/resources/skywalking-plugin.def | 20 -
.../v4/HttpClientExecuteInterceptorTest.java | 234 ----
.../httpasyncclient-4.x-plugin/pom.xml | 52 -
.../v4/HttpAsyncClientInterceptor.java | 60 -
.../v4/HttpAsyncRequestExecutorInterceptor.java | 104 --
.../v4/SessionRequestCompleteInterceptor.java | 63 --
.../v4/SessionRequestConstructorInterceptor.java | 46 -
.../v4/SessionRequestFailInterceptor.java | 52 -
.../v4/define/HttpAsyncClientInstrumentation.java | 78 --
.../HttpAsyncRequestExecutorInstrumentation.java | 70 --
.../v4/define/SessionRequestInstrumentation.java | 106 --
.../v4/wrapper/FutureCallbackWrapper.java | 71 --
.../wrapper/HttpAsyncResponseConsumerWrapper.java | 109 --
.../src/main/resources/skywalking-plugin.def | 21 -
.../v4/HttpAsyncClientInterceptorTest.java | 289 -----
.../apm-sdk-plugin/httpclient-3.x-plugin/pom.xml | 54 -
.../v3/HttpClientExecuteInterceptor.java | 115 --
.../v3/define/HttpClientInstrumentation.java | 71 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../apm-sdk-plugin/httpclient-commons/pom.xml | 40 -
.../plugin/httpclient/HttpClientPluginConfig.java | 43 -
.../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 42 -
.../apm/plugin/hystrix/v1/Constants.java | 24 -
.../hystrix/v1/EnhanceRequireObjectCache.java | 46 -
.../v1/HystrixCommandConstructorInterceptor.java | 58 -
.../v1/HystrixCommandGetFallbackInterceptor.java | 56 -
.../hystrix/v1/HystrixCommandRunInterceptor.java | 60 -
.../v1/HystrixConcurrencyStrategyInterceptor.java | 85 --
.../hystrix/v1/HystrixPluginsInterceptor.java | 88 --
.../plugin/hystrix/v1/SWExecutionHookWrapper.java | 226 ----
.../v1/SWHystrixConcurrencyStrategyWrapper.java | 73 --
...WHystrixLifecycleForwardingRequestVariable.java | 84 --
.../hystrix/v1/SWHystrixPluginsWrapperCache.java | 45 -
.../v1/define/HystrixCommandInstrumentation.java | 97 --
.../v1/define/HystrixPluginsInstrumentation.java | 86 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../HystrixConcurrencyStrategyInterceptorTest.java | 102 --
.../hystrix/v1/HystrixPluginsInterceptorTest.java | 102 --
.../apm-sdk-plugin/influxdb-2.x-plugin/pom.xml | 45 -
.../apm/plugin/influxdb/InfluxDBPluginConfig.java | 33 -
.../apm/plugin/influxdb/define/Constants.java | 45 -
.../influxdb/define/InfluxDBInstrumentation.java | 100 --
.../InfluxDBConstructorInterceptor.java | 32 -
.../interceptor/InfluxDBMethodInterceptor.java | 97 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../InfluxDBConstructorInterceptorTest.java | 65 --
.../influxdb/InfluxDBMethodInterceptorTest.java | 169 ---
apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml | 53 -
.../jdbc/ConnectionServiceMethodInterceptor.java | 68 --
.../apm/plugin/jdbc/JDBCDriverInterceptor.java | 55 -
.../apm/plugin/jdbc/JDBCPluginConfig.java | 48 -
.../plugin/jdbc/JDBCPrepareCallInterceptor.java | 55 -
.../jdbc/JDBCPrepareStatementInterceptor.java | 55 -
...reparedStatementIgnorableSetterInterceptor.java | 50 -
...entNullSetterInstanceMethodsInterceptPoint.java | 43 -
...JDBCPreparedStatementNullSetterInterceptor.java | 49 -
.../JDBCPreparedStatementSetterInterceptor.java | 50 -
.../apm/plugin/jdbc/JDBCStatementInterceptor.java | 54 -
.../PSSetterDefinitionOfJDBCInstrumentation.java | 62 -
.../jdbc/PreparedStatementParameterBuilder.java | 72 --
.../skywalking/apm/plugin/jdbc/SqlBodyUtil.java | 40 -
.../connectionurl/parser/AbstractURLParser.java | 72 --
.../connectionurl/parser/ConnectionURLParser.java | 30 -
.../jdbc/connectionurl/parser/H2URLParser.java | 128 ---
.../connectionurl/parser/MariadbURLParser.java | 27 -
.../connectionurl/parser/MssqlJdbcURLParser.java | 110 --
.../connectionurl/parser/MssqlJtdsURLParser.java | 122 --
.../jdbc/connectionurl/parser/MysqlURLParser.java | 111 --
.../jdbc/connectionurl/parser/OracleURLParser.java | 156 ---
.../connectionurl/parser/PostgreSQLURLParser.java | 78 --
.../jdbc/connectionurl/parser/URLLocation.java | 37 -
.../jdbc/connectionurl/parser/URLParser.java | 57 -
.../jdbc/define/AbstractDriverInstrumentation.java | 59 -
.../apm/plugin/jdbc/define/Constants.java | 54 -
.../plugin/jdbc/define/StatementEnhanceInfos.java | 79 --
.../jdbc/trace/CallableStatementTracing.java | 55 -
.../apm/plugin/jdbc/trace/ConnectionInfo.java | 77 --
.../jdbc/trace/PreparedStatementTracing.java | 56 -
.../apm/plugin/jdbc/trace/SWCallableStatement.java | 1194 --------------------
.../apm/plugin/jdbc/trace/SWPreparedStatement.java | 627 ----------
.../apm/plugin/jdbc/trace/SWStatement.java | 315 ------
.../apm/plugin/jdbc/trace/StatementTracing.java | 55 -
.../apm/plugin/jdbc/AbstractStatementTest.java | 61 -
.../apm/plugin/jdbc/ConnectionTracing.java | 52 -
.../PreparedStatementParameterBuilderTest.java | 110 --
.../apm/plugin/jdbc/SWCallableStatementTest.java | 719 ------------
.../skywalking/apm/plugin/jdbc/SWConnection.java | 300 -----
.../apm/plugin/jdbc/SWConnectionTest.java | 353 ------
.../apm/plugin/jdbc/SWStatementTest.java | 279 -----
.../apm/plugin/jdbc/SqlBodyUtilTest.java | 53 -
.../apm/plugin/jdbc/SwPreparedStatementTest.java | 569 ----------
.../jdbc/connectionurl/parser/URLParserTest.java | 163 ---
.../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 46 -
...erConstructorWithHostAndPortArgInterceptor.java | 32 -
...nstructorWithListHostAndPortArgInterceptor.java | 40 -
...edisConstructorWithShardInfoArgInterceptor.java | 34 -
.../JedisConstructorWithStringArgInterceptor.java | 36 -
.../v2/JedisConstructorWithUriArgInterceptor.java | 32 -
.../plugin/jedis/v2/JedisMethodInterceptor.java | 63 --
.../v2/PipelineSetClientMethodInterceptor.java | 52 -
.../apm/plugin/jedis/v2/RedisMethodMatch.java | 212 ----
.../v2/define/JedisClusterInstrumentation.java | 96 --
.../jedis/v2/define/JedisInstrumentation.java | 121 --
.../MultiKeyPipelineBaseInstrumentation.java | 67 --
.../v2/define/PipelineBaseInstrumentation.java | 67 --
.../jedis/v2/define/PipelineInstrumentation.java | 68 --
.../src/main/resources/skywalking-plugin.def | 23 -
...nstructorWithHostAndPortArgInterceptorTest.java | 56 -
...uctorWithListHostAndPortArgInterceptorTest.java | 89 --
...ConstructorWithShardInfoArgInterceptorTest.java | 55 -
...disConstructorWithStringArgInterceptorTest.java | 60 -
.../JedisConstructorWithUriArgInterceptorTest.java | 53 -
.../jedis/v2/JedisMethodInterceptorTest.java | 163 ---
.../v2/PipelineSetClientMethodInterceptorTest.java | 72 --
.../jetty-plugin/jetty-client-9.0-plugin/pom.xml | 45 -
.../v90/client/SyncHttpRequestSendInterceptor.java | 88 --
.../client/define/HttpRequestInstrumentation.java | 81 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../client/SyncHttpRequestSendInterceptorTest.java | 150 ---
.../jetty-plugin/jetty-client-9.x-plugin/pom.xml | 45 -
.../v9/client/SyncHttpRequestSendInterceptor.java | 81 --
.../client/define/HttpRequestInstrumentation.java | 81 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../client/SyncHttpRequestSendInterceptorTest.java | 149 ---
.../jetty-plugin/jetty-server-9.x-plugin/pom.xml | 45 -
.../apm/plugin/jetty/v9/server/Constants.java | 24 -
.../plugin/jetty/v9/server/ForwardInterceptor.java | 62 -
.../plugin/jetty/v9/server/HandleInterceptor.java | 88 --
.../server/define/DispatcherInstrumentation.java | 81 --
.../v9/server/define/JettyInstrumentation.java | 72 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../jetty/v9/server/HandleInterceptorTest.java | 172 ---
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml | 44 -
.../apm-sdk-plugin/jsonrpc4j-1.x-plugin/pom.xml | 55 -
.../JsonRpcBasicServerInvokeInterceptor.java | 46 -
.../apm/plugin/jsonrpc4j/JsonRpcConstants.java | 25 -
.../jsonrpc4j/JsonRpcHttpClientInterceptor.java | 82 --
...nRpcHttpClientPrepareConnectionInterceptor.java | 62 -
.../apm/plugin/jsonrpc4j/JsonRpcPeerInfo.java | 51 -
.../jsonrpc4j/JsonServiceExporterInterceptor.java | 82 --
.../define/JsonRpcBasicServerInstrumentation.java | 67 --
.../define/JsonRpcHttpClientInstrumentation.java | 116 --
.../define/JsonServiceExporterInstrumentation.java | 67 --
.../src/main/resources/skywalking-plugin.def | 19 -
.../plugin/jsonrpc4j/JsonRpcHttpClientTests.java | 121 --
.../apm/plugin/jsonrpc4j/JsonRpcServerTests.java | 136 ---
apm-sniffer/apm-sdk-plugin/kafka-commons/pom.xml | 44 -
.../apm/plugin/kafka/CallbackAdapter.java | 62 -
.../AbstractKafkaTemplateInstrumentation.java | 32 -
.../apm/plugin/kafka/define/Constants.java | 27 -
.../apm/plugin/kafka/define/InterceptorMethod.java | 48 -
.../apm/plugin/kafka/define/KafkaContext.java | 47 -
apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml | 48 -
.../kafka/AbstractConstructorInterceptPoint.java | 32 -
.../apm/plugin/kafka/AssignMethodInterceptor.java | 56 -
.../plugin/kafka/CallbackAdapterInterceptor.java | 77 --
.../skywalking/apm/plugin/kafka/CallbackCache.java | 53 -
.../kafka/CallbackConstructorInterceptor.java | 39 -
.../apm/plugin/kafka/CallbackInterceptor.java | 90 --
...onstructorWithConsumerConfigInterceptPoint.java | 37 -
.../kafka/ConstructorWithMapInterceptPoint.java | 53 -
.../plugin/kafka/ConsumerEnhanceRequiredInfo.java | 62 -
.../apm/plugin/kafka/KafkaConsumerInterceptor.java | 114 --
.../apm/plugin/kafka/KafkaProducerInterceptor.java | 102 --
.../kafka/ProducerConstructorInterceptor.java | 34 -
.../kafka/ProducerConstructorMapInterceptor.java | 45 -
.../plugin/kafka/SubscribeMethodInterceptor.java | 57 -
.../kafka/define/AbstractKafkaInstrumentation.java | 29 -
.../kafka/define/CallbackInstrumentation.java | 67 --
.../kafka/define/KafkaConsumerInstrumentation.java | 165 ---
.../kafka/define/KafkaProducerInstrumentation.java | 93 --
.../define/KafkaProducerMapInstrumentation.java | 65 --
.../KafkaTemplateCallbackInstrumentation.java | 65 --
.../src/main/resources/skywalking-plugin.def | 21 -
.../plugin/kafka/AssignMethodInterceptorTest.java | 70 --
.../apm/plugin/kafka/CallbackInterceptorTest.java | 183 ---
...ructorWithConsumerConfigInterceptPointTest.java | 76 --
.../ConstructorWithMapInterceptPointTest.java | 72 --
.../plugin/kafka/KafkaConsumerInterceptorTest.java | 150 ---
.../plugin/kafka/KafkaProducerInterceptorTest.java | 153 ---
.../kafka/ProducerConstructorInterceptorTest.java | 72 --
.../ProducerConstructorMapInterceptorTest.java | 90 --
.../kafka/SubscribeMethodInterceptorTest.java | 80 --
.../apm-sdk-plugin/lettuce-5.x-plugin/pom.xml | 45 -
.../lettuce/v5/AbstractRedisClientInterceptor.java | 54 -
.../lettuce/v5/AsyncCommandMethodInterceptor.java | 66 --
.../v5/ClientOptionsConstructorInterceptor.java | 33 -
.../apm/plugin/lettuce/v5/LettucePluginConfig.java | 41 -
.../lettuce/v5/RedisChannelWriterInterceptor.java | 110 --
.../v5/RedisClientConstructorInterceptor.java | 46 -
.../RedisClusterClientConstructorInterceptor.java | 40 -
.../apm/plugin/lettuce/v5/SWBiConsumer.java | 57 -
.../apm/plugin/lettuce/v5/SWConsumer.java | 57 -
.../define/AbstractRedisClientInstrumentation.java | 69 --
.../v5/define/AsyncCommandInstrumentation.java | 70 --
.../v5/define/ClientOptionsInstrumentation.java | 63 --
.../define/RedisChannelWriterInstrumentation.java | 84 --
.../v5/define/RedisClientInstrumentation.java | 63 --
.../define/RedisClusterClientInstrumentation.java | 63 --
.../src/main/resources/skywalking-plugin.def | 22 -
.../v5/RedisChannelWriterInterceptorTest.java | 138 ---
.../plugin/lettuce/v5/mock/MockClientOptions.java | 45 -
.../lettuce/v5/mock/MockRedisClusterClient.java | 37 -
.../light4j-plugins/light4j-plugin/pom.xml | 51 -
.../plugin/light4j/HandleRequestInterceptor.java | 136 ---
.../apm/plugin/light4j/Light4JPluginConfig.java | 34 -
.../light4j/define/LightInstrumentation.java | 71 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../light4j/HandleRequestInterceptorTest.java | 84 --
apm-sniffer/apm-sdk-plugin/light4j-plugins/pom.xml | 42 -
.../apm-sdk-plugin/mariadb-2.x-plugin/pom.xml | 60 -
.../apm/plugin/jdbc/mariadb/v2/Constants.java | 25 -
.../v2/CreateCallableStatementInterceptor.java | 49 -
.../v2/CreatePreparedStatementInterceptor.java | 50 -
.../mariadb/v2/CreateStatementInterceptor.java | 50 -
...PreparedStatementExecuteMethodsInterceptor.java | 94 --
.../jdbc/mariadb/v2/SetCatalogInterceptor.java | 48 -
.../v2/StatementExecuteMethodsInterceptor.java | 75 --
.../v2/define/ConnectionInstrumentation.java | 139 ---
.../mariadb/v2/define/DriverInstrumentation.java | 36 -
...paredStatementIgnoredSetterInstrumentation.java | 33 -
.../define/PreparedStatementInstrumentation.java | 78 --
...PreparedStatementNullSetterInstrumentation.java | 33 -
.../PreparedStatementSetterInstrumentation.java | 33 -
.../v2/define/StatementInstrumentation.java | 71 --
.../src/main/resources/skywalking-plugin.def | 23 -
.../v2/CreateCallableStatementInterceptorTest.java | 68 --
.../v2/CreatePreparedStatementInterceptorTest.java | 68 --
.../mariadb/v2/CreateStatementInterceptorTest.java | 68 --
...aredStatementExecuteMethodsInterceptorTest.java | 153 ---
.../v2/StatementExecuteMethodsInterceptorTest.java | 123 --
.../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 50 -
.../v2/MongoDBCollectionMethodInterceptor.java | 96 --
.../plugin/mongodb/v2/define/InterceptPoint.java | 35 -
.../MongoDBCollectionImplInstrumentation.java | 132 ---
.../define/MongoDBCollectionInstrumentation.java | 163 ---
.../src/main/resources/skywalking-plugin.def | 18 -
.../v2/MongoDBCollectionMethodInterceptorTest.java | 123 --
.../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 46 -
.../apm/plugin/mongodb/v3/MongoPluginConfig.java | 42 -
.../v3/define/v30/MongoDBInstrumentation.java | 100 --
.../v3/define/v36/MongoDBInstrumentation.java | 94 --
.../MongoDBOperationExecutorInstrumentation.java | 74 --
.../v37/MongoDBClientDelegateInstrumentation.java | 99 --
.../MongoDBOperationExecutorInstrumentation.java | 94 --
.../MongoDBOperationExecutorInstrumentation.java | 88 --
.../v3/interceptor/v30/MongoDBInterceptor.java | 80 --
.../v37/MongoDBClientDelegateInterceptor.java | 72 --
.../v37/MongoDBOperationExecutorInterceptor.java | 64 --
.../plugin/mongodb/v3/support/MongoConstants.java | 32 -
.../mongodb/v3/support/MongoOperationHelper.java | 146 ---
.../mongodb/v3/support/MongoRemotePeerHelper.java | 39 -
.../plugin/mongodb/v3/support/MongoSpanHelper.java | 45 -
.../src/main/resources/skywalking-plugin.def | 26 -
.../v3/interceptor/v30/MongoDBInterceptorTest.java | 146 ---
.../v37/MongoDBClientDelegateInterceptorTest.java | 71 --
.../MongoDBOperationExecutorInterceptorTest.java | 139 ---
.../apm-sdk-plugin/mongodb-4.x-plugin/pom.xml | 46 -
.../MongoDBClientDelegateInstrumentation.java | 100 --
.../MongoDBOperationExecutorInstrumentation.java | 87 --
.../MongoDBClientDelegateInterceptor.java | 70 --
.../MongoDBOperationExecutorInterceptor.java | 64 --
.../plugin/mongodb/v4/support/MongoConstants.java | 32 -
.../mongodb/v4/support/MongoOperationHelper.java | 143 ---
.../mongodb/v4/support/MongoPluginConfig.java | 42 -
.../mongodb/v4/support/MongoRemotePeerHelper.java | 44 -
.../plugin/mongodb/v4/support/MongoSpanHelper.java | 50 -
.../src/main/resources/skywalking-plugin.def | 19 -
.../v4/MongoDBClientDelegateInterceptorTest.java | 72 --
.../MongoDBOperationExecutorInterceptorTest.java | 141 ---
apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml | 66 --
.../apm/plugin/motan/MotanConsumerInterceptor.java | 100 --
.../apm/plugin/motan/MotanProviderInterceptor.java | 85 --
.../motan/define/MotanConsumerInstrumentation.java | 90 --
.../motan/define/MotanProviderInstrumentation.java | 68 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../plugin/motan/MotanConsumerInterceptorTest.java | 140 ---
.../plugin/motan/MotanProviderInterceptorTest.java | 173 ---
apm-sniffer/apm-sdk-plugin/mssql-commons/pom.xml | 53 -
.../apm/plugin/mssql/commons/Constants.java | 31 -
.../CreateCallableStatementInterceptor.java | 49 -
.../CreatePreparedStatementInterceptor.java | 48 -
.../mssql/commons/CreateStatementInterceptor.java | 49 -
...PreparedStatementExecuteMethodsInterceptor.java | 92 --
.../StatementExecuteMethodsInterceptor.java | 81 --
.../define/AbstractConnectionInstrumentation.java | 119 --
.../apm-sdk-plugin/mssql-jdbc-plugin/pom.xml | 58 -
.../jdbc/define/ConnectionInstrumentation.java | 36 -
.../mssql/jdbc/define/DriverInstrumentation.java | 36 -
...paredStatementIgnoredSetterInstrumentation.java | 33 -
.../define/PreparedStatementInstrumentation.java | 69 --
...PreparedStatementNullSetterInstrumentation.java | 33 -
.../PreparedStatementSetterInstrumentation.java | 33 -
.../jdbc/define/StatementInstrumentation.java | 70 --
.../src/main/resources/skywalking-plugin.def | 23 -
.../apm-sdk-plugin/mssql-jtds-1.x-plugin/pom.xml | 58 -
.../jtds/v1/define/ConnectionInstrumentation.java | 36 -
.../jtds/v1/define/DriverInstrumentation.java | 36 -
.../define/PreparedStatementInstrumentation.java | 69 --
.../jtds/v1/define/StatementInstrumentation.java | 70 --
.../src/main/resources/skywalking-plugin.def | 20 -
.../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 66 --
.../mysql/v5/ConnectionCreate5xInterceptor.java | 59 -
.../define/AbstractConnectionInstrumentation.java | 138 ---
.../v5/define/AbstractMysqlInstrumentation.java | 47 -
.../mysql/v5/define/CacheIpsInstrumentation.java | 68 --
.../mysql/v5/define/CallableInstrumentation.java | 71 --
.../ConnectionImplCreateInstrumentation.java | 62 -
.../apm/plugin/jdbc/mysql/v5/define/Constants.java | 23 -
.../define/Mysql50ConnectionInstrumentation.java | 39 -
.../define/Mysql5xConnectionInstrumentation.java | 37 -
...paredStatementIgnoredSetterInstrumentation.java | 31 -
.../define/PreparedStatementInstrumentation.java | 76 --
...PreparedStatementNullSetterInstrumentation.java | 33 -
.../PreparedStatementSetterInstrumentation.java | 33 -
.../mysql/v5/define/StatementInstrumentation.java | 77 --
.../src/main/resources/skywalking-plugin.def | 26 -
.../v5/ConnectionImplCreateInterceptorTest.java | 54 -
.../apm-sdk-plugin/mysql-6.x-plugin/pom.xml | 66 --
.../mysql/v6/ConnectionCreateNewInterceptor.java | 57 -
.../mysql/v6/ConnectionCreateOldInterceptor.java | 55 -
.../v6/define/AbstractMysqlInstrumentation.java | 47 -
.../mysql/v6/define/CacheIpsInstrumentation.java | 66 --
.../mysql/v6/define/CallableInstrumentation.java | 71 --
.../ConnectionImplCreateInstrumentation.java | 85 --
.../mysql/v6/define/ConnectionInstrumentation.java | 133 ---
.../apm/plugin/jdbc/mysql/v6/define/Constants.java | 23 -
.../mysql/v6/define/DriverInstrumentation.java | 39 -
...paredStatementIgnoredSetterInstrumentation.java | 33 -
.../define/PreparedStatementInstrumentation.java | 74 --
...PreparedStatementNullSetterInstrumentation.java | 33 -
.../PreparedStatementSetterInstrumentation.java | 33 -
.../mysql/v6/define/StatementInstrumentation.java | 77 --
.../src/main/resources/skywalking-plugin.def | 26 -
.../apm-sdk-plugin/mysql-8.x-plugin/pom.xml | 66 --
.../jdbc/mysql/v8/ConnectionCreateInterceptor.java | 54 -
.../v8/define/AbstractMysqlInstrumentation.java | 47 -
.../mysql/v8/define/CacheIpsInstrumentation.java | 66 --
.../mysql/v8/define/CallableInstrumentation.java | 66 --
.../ConnectionImplCreateInstrumentation.java | 67 --
.../mysql/v8/define/ConnectionInstrumentation.java | 132 ---
.../apm/plugin/jdbc/mysql/v8/define/Constants.java | 23 -
...paredStatementIgnoredSetterInstrumentation.java | 33 -
.../define/PreparedStatementInstrumentation.java | 71 --
...PreparedStatementNullSetterInstrumentation.java | 33 -
.../PreparedStatementSetterInstrumentation.java | 33 -
.../mysql/v8/define/StatementInstrumentation.java | 71 --
.../src/main/resources/skywalking-plugin.def | 25 -
.../v8/ConnectionImplCreateInterceptorTest.java | 51 -
apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml | 60 -
.../apm/plugin/jdbc/mysql/ConnectionCache.java | 47 -
.../apm/plugin/jdbc/mysql/Constants.java | 33 -
.../mysql/CreateCallableStatementInterceptor.java | 50 -
.../mysql/CreatePreparedStatementInterceptor.java | 49 -
.../jdbc/mysql/CreateStatementInterceptor.java | 50 -
.../jdbc/mysql/DriverConnectInterceptor.java | 47 -
...PreparedStatementExecuteMethodsInterceptor.java | 102 --
.../plugin/jdbc/mysql/SetCatalogInterceptor.java | 48 -
.../mysql/StatementExecuteMethodsInterceptor.java | 92 --
.../CreateCallableStatementInterceptorTest.java | 66 --
.../CreatePreparedStatementInterceptorTest.java | 65 --
.../jdbc/mysql/CreateStatementInterceptorTest.java | 66 --
.../StatementExecuteMethodsInterceptorTest.java | 124 --
.../apm-sdk-plugin/neo4j-4.x-plugin/pom.xml | 45 -
.../apm/plugin/neo4j/v4x/Neo4jPluginConfig.java | 50 -
.../apm/plugin/neo4j/v4x/Neo4jPluginConstants.java | 32 -
.../v4x/SessionAcquireConnectionInterceptor.java | 90 --
.../v4x/SessionBeginTransactionInterceptor.java | 63 --
.../neo4j/v4x/SessionConstructorInterceptor.java | 38 -
.../apm/plugin/neo4j/v4x/SessionRequiredInfo.java | 47 -
.../plugin/neo4j/v4x/SessionRunInterceptor.java | 79 --
.../neo4j/v4x/TransactionRunInterceptor.java | 81 --
.../v4x/define/NetworkSessionInstrumentation.java | 135 ---
.../UnmanagedTransactionInstrumentation.java | 79 --
.../apm/plugin/neo4j/v4x/util/CypherUtils.java | 64 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../apm/plugin/neo4j/v4x/MockMethod.java | 26 -
.../plugin/neo4j/v4x/MockUnmanagedTransaction.java | 44 -
.../SessionAcquireConnectionInterceptorTest.java | 106 --
.../SessionBeginTransactionInterceptorTest.java | 103 --
.../v4x/SessionConstructorInterceptorTest.java | 76 --
.../neo4j/v4x/SessionRunInterceptorTest.java | 204 ----
.../neo4j/v4x/TransactionRunInterceptorTest.java | 172 ---
.../apm-sdk-plugin/netty-socketio-plugin/pom.xml | 46 -
.../netty/socketio/NettySocketIOClientInfo.java | 50 -
.../NettySocketIOConnectionInterceptor.java | 66 --
.../NettySocketIOConstructorInterceptor.java | 40 -
.../socketio/NettySocketIOOnEventInterceptor.java | 61 -
.../socketio/NettySocketIORoomInterceptor.java | 56 -
.../NettySocketIOPluginClientInstrumentation.java | 81 --
...ettySocketIOPluginNameSpaceInstrumentation.java | 99 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../plugin/netty/socketio/NettySocketIOTest.java | 160 ---
.../nutz-plugins/http-1.x-plugin/pom.xml | 45 -
.../http/sync/SenderConstructorInterceptor.java | 30 -
.../nutz/http/sync/SenderSendInterceptor.java | 82 --
.../define/AbstractNutzHttpInstrumentation.java | 78 --
.../NutzHttpFilePostSenderInstrumentation.java | 30 -
.../define/NutzHttpGetSenderInstrumentation.java | 30 -
.../define/NutzHttpPostSenderInstrumentation.java | 30 -
.../src/main/resources/skywalking-plugin.def | 19 -
.../nutz/http/sync/SenderInterceptorTest.java | 129 ---
.../nutz-plugins/mvc-annotation-1.x-plugin/pom.xml | 52 -
.../nutz/mvc/ActionConstructorInterceptor.java | 37 -
.../plugin/nutz/mvc/ActionMethodInterceptor.java | 90 --
.../apm/plugin/nutz/mvc/PathMappingCache.java | 43 -
.../nutz/mvc/define/ActionInstrumentation.java | 84 --
.../src/main/resources/skywalking-plugin.def | 17 -
apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml | 45 -
.../apm-sdk-plugin/okhttp-3.x-plugin/pom.xml | 50 -
.../v3/define/AbstractOkhttpInstrumentation.java | 29 -
.../okhttp/v3/define/AsyncCallInstrumentation.java | 76 --
.../okhttp/v3/define/CallbackInstrumentation.java | 78 --
.../okhttp/v3/define/RealCallInstrumentation.java | 103 --
.../src/main/resources/skywalking-plugin.def | 19 -
.../plugin/okhttp/v3/RealCallInterceptorTest.java | 175 ---
.../apm-sdk-plugin/okhttp-4.x-plugin/pom.xml | 50 -
.../v4/define/AbstractOkhttpInstrumentation.java | 29 -
.../okhttp/v4/define/AsyncCallInstrumentation.java | 76 --
.../okhttp/v4/define/CallbackInstrumentation.java | 78 --
.../okhttp/v4/define/RealCallInstrumentation.java | 103 --
.../src/main/resources/skywalking-plugin.def | 19 -
apm-sniffer/apm-sdk-plugin/okhttp-common/pom.xml | 54 -
.../plugin/okhttp/common/AsyncCallInterceptor.java | 113 --
.../plugin/okhttp/common/EnhanceRequiredInfo.java | 44 -
.../plugin/okhttp/common/EnqueueInterceptor.java | 73 --
.../plugin/okhttp/common/OnFailureInterceptor.java | 46 -
.../okhttp/common/OnResponseInterceptor.java | 55 -
.../plugin/okhttp/common/RealCallInterceptor.java | 125 --
apm-sniffer/apm-sdk-plugin/play-2.x-plugin/pom.xml | 46 -
.../plugin/play/v2x/HttpFiltersInterceptor.java | 66 --
.../apm/plugin/play/v2x/TracingFilter.java | 97 --
.../play/v2x/define/Play2xInstrumentation.java | 95 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../play/v2x/HttpFiltersInterceptorTest.java | 93 --
.../plugin/play/v2x/Play2xInstrumentationTest.java | 43 -
.../apm/plugin/play/v2x/TracingFilterTest.java | 237 ----
apm-sniffer/apm-sdk-plugin/pom.xml | 226 ----
.../apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 60 -
.../CreateCallableStatementInterceptor.java | 49 -
.../CreatePreparedStatementInterceptor.java | 49 -
.../postgresql/CreateStatementInterceptor.java | 51 -
...PrepareStatementWithStringArrayInterceptor.java | 64 --
...PreparedStatementExecuteMethodsInterceptor.java | 98 --
.../StatementExecuteMethodsInterceptor.java | 76 --
.../apm/plugin/jdbc/postgresql/Variables.java | 25 -
.../AbstractJdbc2StatementInstrumentation.java | 89 --
.../define/ConnectionInstrumentation.java | 151 ---
.../plugin/jdbc/postgresql/define/Constants.java | 28 -
.../postgresql/define/DriverInstrumentation.java | 35 -
.../define/Jdbc3ConnectionInstrumentation.java | 127 ---
.../define/Jdbc4ConnectionInstrumentation.java | 127 ---
.../define/PgCallableStatementInstrumentation.java | 65 --
.../define/PgPreparedStatementInstrumentation.java | 68 --
.../PgPreparedStatementSetterInstrumentation.java | 33 -
.../define/PgStatementInstrumentation.java | 71 --
.../src/main/resources/skywalking-plugin.def | 25 -
apm-sniffer/apm-sdk-plugin/pulsar-plugin/pom.xml | 42 -
.../pulsar/ConsumerConstructorInterceptor.java | 50 -
.../plugin/pulsar/ConsumerEnhanceRequiredInfo.java | 65 --
.../pulsar/MessageConstructorInterceptor.java | 39 -
.../plugin/pulsar/MessageEnhanceRequiredInfo.java | 53 -
.../pulsar/ProducerConstructorInterceptor.java | 47 -
.../plugin/pulsar/ProducerEnhanceRequiredInfo.java | 51 -
.../plugin/pulsar/PulsarConsumerInterceptor.java | 101 --
.../pulsar/PulsarConsumerListenerInterceptor.java | 86 --
.../plugin/pulsar/PulsarProducerInterceptor.java | 111 --
.../pulsar/SendCallbackEnhanceRequiredInfo.java | 54 -
.../apm/plugin/pulsar/SendCallbackInterceptor.java | 82 --
.../pulsar/TopicMessageConstructorInterceptor.java | 45 -
.../pulsar/define/MessageInstrumentation.java | 71 --
.../define/PulsarConsumerInstrumentation.java | 97 --
.../PulsarConsumerListenerInstrumentation.java | 76 --
.../define/PulsarProducerInstrumentation.java | 103 --
.../pulsar/define/SendCallbackInstrumentation.java | 79 --
.../pulsar/define/TopicMessageInstrumentation.java | 71 --
.../src/main/resources/skywalking-plugin.def | 22 -
.../pulsar/ConsumerConstructorInterceptorTest.java | 88 --
.../skywalking/apm/plugin/pulsar/MockConsumer.java | 181 ---
.../skywalking/apm/plugin/pulsar/MockMessage.java | 82 --
.../pulsar/ProducerConstructorInterceptorTest.java | 80 --
.../pulsar/PulsarConsumerInterceptorTest.java | 158 ---
.../PulsarConsumerListenerInterceptorTest.java | 171 ---
.../pulsar/PulsarProducerInterceptorTest.java | 117 --
.../plugin/pulsar/SendCallbackInterceptorTest.java | 144 ---
apm-sniffer/apm-sdk-plugin/quasar-plugin/pom.xml | 45 -
.../apm/plugin/quasar/FiberInterceptor.java | 67 --
.../plugin/quasar/define/FiberInstrumentation.java | 82 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml | 45 -
.../rabbitmq/RabbitMQConsumerInterceptor.java | 78 --
...QProducerAndConsumerConstructorInterceptor.java | 32 -
.../rabbitmq/RabbitMQProducerInterceptor.java | 105 --
.../define/RabbitMQConsumerInstrumentation.java | 82 --
.../define/RabbitMQProducerInstrumentation.java | 81 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../rabbitmq/RabbitMQConsumerInterceptorTest.java | 122 --
...ducerAndConsumerConstructorInterceptorTest.java | 237 ----
.../rabbitmq/RabbitMQProducerInterceptorTest.java | 101 --
.../apm-sdk-plugin/redisson-3.x-plugin/pom.xml | 45 -
.../redisson/v3/ConnectionManagerInterceptor.java | 125 --
.../v3/RedisClientConstructorInterceptor.java | 33 -
.../v3/RedisConnectionMethodInterceptor.java | 125 --
.../define/ConnectionManagerInstrumentation.java | 68 --
.../v3/define/RedisClientInstrumentation.java | 63 --
.../v3/define/RedisConnectionInstrumentation.java | 81 --
.../apm/plugin/redisson/v3/util/ClassUtil.java | 34 -
.../src/main/resources/skywalking-plugin.def | 19 -
.../v3/RedisConnectionMethodInterceptorTest.java | 94 --
apm-sniffer/apm-sdk-plugin/resteasy-plugin/pom.xml | 41 -
.../resteasy-server-3.x-plugin/pom.xml | 45 -
.../SynchronousDispatcherExceptionInterceptor.java | 50 -
.../server/SynchronousDispatcherInterceptor.java | 84 --
.../SynchronousDispatcherInstrumentation.java | 86 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../apm/plugin/resteasy/v3/server/AssertTools.java | 47 -
.../SynchronousDispatcherInterceptorTest.java | 184 ---
.../apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 52 -
.../v3/AbstractMessageConsumeInterceptor.java | 77 --
.../v3/MessageConcurrentlyConsumeInterceptor.java | 48 -
.../v3/MessageOrderlyConsumeInterceptor.java | 49 -
.../plugin/rocketMQ/v3/MessageSendInterceptor.java | 101 --
.../plugin/rocketMQ/v3/OnExceptionInterceptor.java | 60 -
.../plugin/rocketMQ/v3/OnSuccessInterceptor.java | 67 --
.../rocketMQ/v3/UpdateNameServerInterceptor.java | 44 -
.../ConsumeMessageConcurrentlyInstrumentation.java | 72 --
.../ConsumeMessageOrderlyInstrumentation.java | 72 --
.../v3/define/MQClientAPIImplInstrumentation.java | 96 --
.../v3/define/SendCallBackEnhanceInfo.java | 42 -
.../v3/define/SendCallbackInstrumentation.java | 93 --
.../src/main/resources/skywalking-plugin.def | 20 -
.../rocketMQ/v3/MessageSendInterceptorTest.java | 152 ---
.../rocketMQ/v3/OnExceptionInterceptorTest.java | 87 --
.../rocketMQ/v3/OnSuccessInterceptorTest.java | 113 --
.../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 52 -
.../v4/AbstractMessageConsumeInterceptor.java | 77 --
.../v4/MessageConcurrentlyConsumeInterceptor.java | 48 -
.../v4/MessageOrderlyConsumeInterceptor.java | 49 -
.../plugin/rocketMQ/v4/MessageSendInterceptor.java | 101 --
.../plugin/rocketMQ/v4/OnExceptionInterceptor.java | 69 --
.../plugin/rocketMQ/v4/OnSuccessInterceptor.java | 67 --
.../rocketMQ/v4/UpdateNameServerInterceptor.java | 44 -
.../ConsumeMessageConcurrentlyInstrumentation.java | 67 --
.../ConsumeMessageOrderlyInstrumentation.java | 67 --
.../v4/define/MQClientAPIImplInstrumentation.java | 87 --
.../v4/define/SendCallBackEnhanceInfo.java | 42 -
.../v4/define/SendCallbackInstrumentation.java | 87 --
.../src/main/resources/skywalking-plugin.def | 20 -
.../rocketMQ/v4/MessageSendInterceptorTest.java | 152 ---
.../rocketMQ/v4/OnExceptionInterceptorTest.java | 103 --
.../rocketMQ/v4/OnSuccessInterceptorTest.java | 113 --
.../apm-sdk-plugin/servicecomb-plugin/pom.xml | 43 -
.../servicecomb-java-chassis-0.x-plugin/pom.xml | 46 -
.../ProducerOperationHandlerInterceptor.java | 75 --
.../TransportClientHandlerInterceptor.java | 96 --
.../ProducerOperationHandlerInstrumentation.java | 73 --
.../TransportClientHandlerInstrumentation.java | 72 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../ProducerOperationHandlerInterceptorTest.java | 133 ---
.../TransportClientHandlerInterceptorTest.java | 128 ---
.../servicecomb-java-chassis-1.x-plugin/pom.xml | 46 -
.../v1/ProducerOperationHandlerInterceptor.java | 75 --
.../v1/TransportClientHandlerInterceptor.java | 96 --
.../ProducerOperationHandlerInstrumentation.java | 73 --
.../TransportClientHandlerInstrumentation.java | 72 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../ProducerOperationHandlerInterceptorTest.java | 133 ---
.../v1/TransportClientHandlerInterceptorTest.java | 128 ---
.../apm-sdk-plugin/shardingsphere-plugins/pom.xml | 43 -
.../sharding-sphere-3.x-plugin/pom.xml | 72 --
.../apm/plugin/shardingsphere/Constant.java | 24 -
.../plugin/shardingsphere/ExecuteInterceptor.java | 64 --
.../shardingsphere/JDBCRootInvokeInterceptor.java | 56 -
.../plugin/shardingsphere/ParseInterceptor.java | 57 -
.../shardingsphere/ProxyRootInvokeInterceptor.java | 56 -
.../define/ExecuteInstrumentation.java | 71 --
.../define/JDBCRootInvokeInstrumentation.java | 72 --
.../define/ParseInstrumentation.java | 71 --
.../define/ProxyRootInvokeInstrumentation.java | 71 --
.../src/main/resources/skywalking-plugin.def | 20 -
.../apm/plugin/shardingsphere/InterceptorTest.java | 126 ---
.../sharding-sphere-4.0.x-plugin/pom.xml | 65 --
.../apm/plugin/shardingsphere/v40/Constant.java | 30 -
.../shardingsphere/v40/ExecuteInterceptor.java | 64 --
.../v40/JDBCRootInvokeInterceptor.java | 56 -
.../shardingsphere/v40/ParseInterceptor.java | 57 -
.../v40/ProxyRootInvokeInterceptor.java | 56 -
.../AbstractShardingSphere40Instrumentation.java | 29 -
.../v40/define/ExecuteInstrumentation.java | 70 --
.../v40/define/JDBCRootInvokeInstrumentation.java | 70 --
.../v40/define/ParseInstrumentation.java | 70 --
.../v40/define/ProxyRootInvokeInstrumentation.java | 70 --
.../src/main/resources/skywalking-plugin.def | 19 -
.../apm/plugin/shardingsphere/InterceptorTest.java | 130 ---
.../sharding-sphere-4.1.0-plugin/pom.xml | 58 -
.../apm/plugin/shardingsphere/v41/Constant.java | 30 -
.../shardingsphere/v41/ExecuteInterceptor.java | 64 --
.../v41/JDBCRootInvokeInterceptor.java | 56 -
.../shardingsphere/v41/ParseInterceptor.java | 56 -
.../v41/ProxyRootInvokeInterceptor.java | 56 -
.../AbstractShardingSphere41Instrumentation.java | 29 -
.../v41/define/ExecuteInstrumentation.java | 70 --
.../v41/define/JDBCRootInvokeInstrumentation.java | 70 --
.../v41/define/ParseInstrumentation.java | 71 --
.../v41/define/ProxyRootInvokeInstrumentation.java | 70 --
.../src/main/resources/skywalking-plugin.def | 19 -
.../apm/plugin/shardingsphere/InterceptorTest.java | 129 ---
.../shardingsphere-5.0.0-beta-plugin/pom.xml | 73 --
.../plugin/shardingsphere/v500beta/Constant.java | 24 -
.../v500beta/ExecuteInterceptor.java | 59 -
.../v500beta/JDBCRootInvokeInterceptor.java | 52 -
.../shardingsphere/v500beta/ParseInterceptor.java | 53 -
.../v500beta/ProxyRootInvokeInterceptor.java | 52 -
.../v500beta/RewriteInterceptor.java | 50 -
.../shardingsphere/v500beta/RouteInterceptor.java | 50 -
...tractShardingSphereV500BetaInstrumentation.java | 28 -
.../v500beta/define/ExecuteInstrumentation.java | 71 --
.../define/JDBCRootInvokeInstrumentation.java | 87 --
.../v500beta/define/ParseInstrumentation.java | 69 --
.../define/ProxyRootInvokeInstrumentation.java | 69 --
.../v500beta/define/RewriteInstrumentation.java | 69 --
.../v500beta/define/RouteInstrumentation.java | 69 --
.../src/main/resources/skywalking-plugin.def | 21 -
.../shardingsphere/v500beta/InterceptorTest.java | 168 ---
apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml | 46 -
.../sofarpc/SofaRpcConsumerInstrumentation.java | 67 --
.../plugin/sofarpc/SofaRpcConsumerInterceptor.java | 128 ---
.../sofarpc/SofaRpcProviderInstrumentation.java | 67 --
.../plugin/sofarpc/SofaRpcProviderInterceptor.java | 109 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../sofarpc/SofaRpcConsumerInterceptorTest.java | 179 ---
.../sofarpc/SofaRpcProviderInterceptorTest.java | 153 ---
.../apm-sdk-plugin/solrj-7.x-plugin/pom.xml | 53 -
.../apm/plugin/solrj/SolrClientInterceptor.java | 230 ----
.../apm/plugin/solrj/SolrConnectorInterceptor.java | 63 --
.../apm/plugin/solrj/SolrJPluginConfig.java | 39 -
.../apm/plugin/solrj/commons/SolrjInstance.java | 40 -
.../apm/plugin/solrj/commons/SolrjTags.java | 40 -
.../solrj/define/SolrClientInstrumentation.java | 92 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../plugin/solrj/SolrClientInterceptorTest.java | 434 -------
.../plugin/solrj/StringFormatBenchmarkTest.java | 68 --
.../spring-plugins/async-annotation-plugin/pom.xml | 45 -
.../spring/async/DoSubmitMethodInterceptor.java | 49 -
.../apm/plugin/spring/async/SWCallable.java | 55 -
.../AsyncExecutionInterceptorInstrumentation.java | 65 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../concurrent-util-4.x-plugin/pom.xml | 50 -
.../concurrent/FailureCallbackInterceptor.java | 66 --
.../concurrent/SuccessCallbackInterceptor.java | 64 --
.../define/FailureCallbackInstrumentation.java | 67 --
.../ListenableFutureCallbackInstrumentation.java | 85 --
.../define/SuccessCallbackInstrumentation.java | 71 --
.../concurrent/match/EitherInterfaceMatch.java | 96 --
.../concurrent/match/FailedCallbackMatch.java | 49 -
.../match/ListenableFutureCallbackMatch.java | 85 --
.../concurrent/match/SuccessCallbackMatch.java | 48 -
.../src/main/resources/skywalking-plugin.def | 19 -
.../spring-plugins/core-patch/pom.xml | 44 -
.../patch/AopExpressionMatchInterceptor.java | 55 -
.../AspectJExpressionPointCutInterceptor.java | 54 -
.../AutowiredAnnotationProcessorInterceptor.java | 110 --
.../spring/patch/CreateAopProxyInterceptor.java | 56 -
.../patch/GetPropertyDescriptorsInterceptor.java | 64 --
.../apm/plugin/spring/patch/MatchUtil.java | 57 -
.../define/AopExpressionMatchInstrumentation.java | 72 --
.../define/AopProxyFactoryInstrumentation.java | 69 --
.../AspectJExpressionPointCutInstrumentation.java | 75 --
...utowiredAnnotationProcessorInstrumentation.java | 85 --
.../define/BeanWrapperImplInstrumentation.java | 67 --
.../src/main/resources/skywalking-plugin.def | 21 -
.../patch/AopExpressionMatchInterceptorTest.java | 73 --
.../patch/CreateAopProxyInterceptorTest.java | 75 --
.../mvc-annotation-3.x-plugin/pom.xml | 65 --
.../mvc/v3/ControllerConstructorInterceptor.java | 47 -
.../mvc/v3/HandlerMethodInvokerInterceptor.java | 56 -
.../v3/define/AbstractSpring3Instrumentation.java | 35 -
.../mvc/v3/define/ControllerInstrumentation.java | 88 --
.../v3/define/HandlerMethodInstrumentation.java | 71 --
.../HandlerMethodInvokerInstrumentation.java | 70 --
.../v3/define/InvocableHandlerInstrumentation.java | 71 --
.../src/main/resources/skywalking-plugin.def | 20 -
.../v3/ControllerConstructorInterceptorTest.java | 107 --
.../mvc-annotation-4.x-plugin/pom.xml | 65 --
.../mvc/v4/ControllerConstructorInterceptor.java | 58 -
...trollerForLowVersionConstructorInterceptor.java | 42 -
.../define/AbstractControllerInstrumentation.java | 114 --
.../v4/define/AbstractSpring4Instrumentation.java | 33 -
.../ControllerForLowVersionInstrumentation.java | 61 -
.../mvc/v4/define/ControllerInstrumentation.java | 29 -
.../v4/define/HandlerMethodInstrumentation.java | 71 --
.../v4/define/InvocableHandlerInstrumentation.java | 71 --
...RestControllerForLowVersionInstrumentation.java | 61 -
.../v4/define/RestControllerInstrumentation.java | 40 -
.../src/main/resources/skywalking-plugin.def | 22 -
.../v4/ControllerConstructorInterceptorTest.java | 128 ---
.../plugin/spring/mvc/v4/PathMappingCacheTest.java | 74 --
.../v4/RequestMappingMethodInterceptorTest.java | 200 ----
.../mvc/v4/RestMappingMethodInterceptorTest.java | 401 -------
.../plugin/spring/mvc/v4/SpringTestCaseHelper.java | 41 -
.../v4/define/ControllerInstrumentationTest.java | 75 --
.../define/RestControllerInstrumentationTest.java | 63 --
.../mvc-annotation-5.x-plugin/pom.xml | 71 --
.../mvc/v5/ControllerConstructorInterceptor.java | 58 -
.../plugin/spring/mvc/v5/GetBeanInterceptor.java | 68 --
.../plugin/spring/mvc/v5/InvokeInterceptor.java | 86 --
.../define/AbstractControllerInstrumentation.java | 113 --
.../v5/define/AbstractSpring5Instrumentation.java | 29 -
.../mvc/v5/define/ControllerInstrumentation.java | 28 -
.../v5/define/HandlerMethodInstrumentation.java | 69 --
.../v5/define/RestControllerInstrumentation.java | 29 -
.../AbstractReactiveControllerInstrumentation.java | 120 --
.../AbstractSpring5ReactiveInstrumentation.java | 29 -
.../AbstractSpring5ReactiveInstrumentationV2.java | 29 -
.../InvocableHandlerMethodInstrumentation.java | 63 --
.../ReactiveControllerInstrumentation.java | 28 -
.../ReactiveRestControllerInstrumentation.java | 29 -
.../src/main/resources/skywalking-plugin.def | 22 -
.../spring-plugins/mvc-annotation-commons/pom.xml | 65 --
.../apm/plugin/spring/mvc/commons/Constants.java | 44 -
.../mvc/commons/EnhanceRequireObjectCache.java | 41 -
.../plugin/spring/mvc/commons/ParsePathUtil.java | 70 --
.../spring/mvc/commons/PathMappingCache.java | 54 -
.../apm/plugin/spring/mvc/commons/RequestUtil.java | 110 --
.../spring/mvc/commons/SpringMVCPluginConfig.java | 64 --
...otationMethodHandlerAdapterInstrumentation.java | 63 --
.../IllegalMethodStackDepthException.java | 24 -
.../ServletResponseNotFoundException.java | 24 -
.../interceptor/AbstractMethodInterceptor.java | 261 -----
.../commons/interceptor/GetBeanInterceptor.java | 58 -
.../interceptor/InvokeForRequestInterceptor.java | 53 -
.../InvokeHandlerMethodInterceptor.java | 51 -
.../RequestMappingMethodInterceptor.java | 63 --
.../interceptor/RestMappingMethodInterceptor.java | 99 --
.../spring/mvc/commons/interceptor/StackDepth.java | 41 -
.../src/main/resources/skywalking-plugin.def | 17 -
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 56 -
.../spring-plugins/resttemplate-4.x-plugin/pom.xml | 51 -
.../resttemplate/async/FutureGetInterceptor.java | 51 -
.../async/ResponseCallBackInterceptor.java | 51 -
.../resttemplate/async/RestExecuteInterceptor.java | 85 --
.../resttemplate/async/RestRequestInterceptor.java | 58 -
.../ResponseExtractorFutureInstrumentation.java | 100 --
.../async/define/RestTemplateInstrumentation.java | 97 --
.../helper/RestTemplateRuntimeContextHelper.java | 53 -
.../resttemplate/sync/RestExecuteInterceptor.java | 70 --
.../resttemplate/sync/RestRequestInterceptor.java | 60 -
.../resttemplate/sync/RestResponseInterceptor.java | 57 -
.../sync/define/RestTemplateInstrumentation.java | 114 --
.../src/main/resources/skywalking-plugin.def | 19 -
.../scheduled-annotation-plugin/pom.xml | 45 -
...uledMethodConstructorWithMethodInterceptor.java | 46 -
...uledMethodConstructorWithStringInterceptor.java | 41 -
.../scheduled/ScheduledMethodInterceptor.java | 57 -
.../ScheduledMethodInterceptorInstrumentation.java | 112 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../spring-cloud/netflix-plugins/pom.xml | 43 -
.../spring-cloud-feign-1.x-plugin/pom.xml | 36 -
.../v11/define/NetflixFeignInstrumentation.java | 73 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../spring-plugins/spring-cloud/pom.xml | 44 -
.../spring-cloud-feign-2.x-plugin/pom.xml | 35 -
.../LoadBalancerFeignClientInstrumentation.java | 68 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../spring-plugins/spring-commons/pom.xml | 30 -
.../plugin/spring/commons/EnhanceCacheObjects.java | 63 --
.../spring-plugins/spring-kafka-1.x-plugin/pom.xml | 48 -
.../spring/kafka/PostRunMethodInterceptor.java | 43 -
.../kafka/ProcessSeeksMethodInterceptor.java | 61 -
.../LegacyListenerConsumerInstrumentation.java | 89 --
.../src/main/resources/skywalking-plugin.def | 16 -
.../spring-plugins/spring-kafka-2.x-plugin/pom.xml | 48 -
.../kafka/KafkaTemplateCallbackInterceptor.java | 48 -
.../kafka/PollAndInvokeMethodInterceptor.java | 50 -
.../kafka/define/KafkaTemplateInstrumentation.java | 71 --
.../define/ListenerConsumerInstrumentation.java | 65 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../spring-webflux-5.x-webclient-plugin/pom.xml | 40 -
.../webclient/BodyInserterRequestInterceptor.java | 54 -
.../v5/webclient/WebFluxWebClientInterceptor.java | 112 --
.../define/BodyInserterRequestInstrumentation.java | 65 --
.../define/WebFluxWebClientInstrumentation.java | 72 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml | 46 -
...torWithInetSocketAddressListArgInterceptor.java | 42 -
.../v2/MemcachedMethodInterceptor.java | 67 --
.../v2/define/MemcachedInstrumentation.java | 110 --
.../src/main/resources/skywalking-plugin.def | 17 -
...ithInetSocketAddressListArgInterceptorTest.java | 58 -
.../v2/MemcachedMethodInterceptorTest.java | 146 ---
.../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 74 --
.../apm/plugin/struts2/Struts2Interceptor.java | 85 --
.../struts2/define/Struts2Instrumentation.java | 73 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../apm/plugin/struts2/Struts2InterceptorTest.java | 182 ---
apm-sniffer/apm-sdk-plugin/thrift-plugin/pom.xml | 45 -
.../thrift/TBaseAsyncProcessorInterceptor.java | 76 --
.../plugin/thrift/TBaseProcessorInterceptor.java | 76 --
.../apm/plugin/thrift/TServerInterceptor.java | 54 -
.../thrift/client/TAsyncClientInterceptor.java | 52 -
.../thrift/client/TAsyncMethodCallInterceptor.java | 104 --
.../thrift/client/TServiceClientInterceptor.java | 113 --
.../client/TServiceClientReceiveInterceptor.java | 63 --
.../apm/plugin/thrift/commons/ReflectionUtils.java | 37 -
.../define/TBaseAsyncProcessorInstrumentation.java | 79 --
.../define/TBaseProcessorInstrumentation.java | 79 --
.../thrift/define/TServerInstrumentation.java | 63 --
.../define/client/TAsyncClientInstrumentation.java | 65 --
.../client/TAsyncMethodCallInstrumentation.java | 78 --
.../client/TServiceClientInstrumentation.java | 101 --
.../define/transport/TSocketInstrumentation.java | 61 -
.../thrift/transport/TSocketInterceptor.java | 35 -
.../apm/plugin/thrift/wrapper/AbstractContext.java | 37 -
.../thrift/wrapper/AbstractProtocolWrapper.java | 36 -
.../apm/plugin/thrift/wrapper/AsyncContext.java | 41 -
.../thrift/wrapper/ClientOutProtocolWrapper.java | 91 --
.../apm/plugin/thrift/wrapper/Context.java | 40 -
.../thrift/wrapper/ServerInProtocolWrapper.java | 134 ---
.../src/main/resources/skywalking-plugin.def | 23 -
.../apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml | 71 --
.../skywalking/apm/plugin/tomcat78x/Constants.java | 24 -
.../apm/plugin/tomcat78x/ForwardInterceptor.java | 63 --
.../tomcat78x/TomcatExceptionInterceptor.java | 45 -
.../plugin/tomcat78x/TomcatInvokeInterceptor.java | 133 ---
.../apm/plugin/tomcat78x/TomcatPluginConfig.java | 43 -
.../ApplicationDispatcherInstrumentation.java | 81 --
.../tomcat78x/define/TomcatInstrumentation.java | 95 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../tomcat78x/TomcatInvokeInterceptorTest.java | 183 ---
.../apm-sdk-plugin/undertow-plugins/pom.xml | 42 -
.../undertow-plugins/undertow-2.x-plugin/pom.xml | 52 -
.../apm/plugin/undertow/v2x/Constants.java | 24 -
.../plugin/undertow/v2x/ForwardInterceptor.java | 64 --
.../v2x/HttpServerExchangeInterceptor.java | 52 -
.../undertow/v2x/ListenerConfigInterceptor.java | 59 -
.../undertow/v2x/RootHandlerInterceptor.java | 54 -
.../undertow/v2x/RoutingHandlerInterceptor.java | 53 -
.../apm/plugin/undertow/v2x/SWRunnable.java | 50 -
.../define/HttpServerExchangeInstrumentation.java | 72 --
.../RequestDispatcherImplInstrumentation.java | 82 --
.../v2x/define/RoutingHandlerInstrumentation.java | 82 --
.../define/UndertowAddListenerInstrumentation.java | 76 --
.../UndertowListenerConfigInstrumentation.java | 74 --
.../define/UndertowRootHandlerInstrumentation.java | 71 --
.../undertow/v2x/handler/TracingHandler.java | 93 --
.../src/main/resources/skywalking-plugin.def | 23 -
.../undertow/v2x/ForwardInterceptorTest.java | 107 --
.../undertow/v2x/RootHandlerInterceptorTest.java | 91 --
.../v2x/RoutingHandlerInterceptorTest.java | 145 ---
.../plugin/undertow/v2x/TracingHandlerTest.java | 141 ---
.../v2x/UndertowBuilderMethodMatcherTest.java | 64 --
apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml | 43 -
.../vertx-plugins/vertx-core-3.x-plugin/pom.xml | 57 -
.../ClusteredEventBusSendRemoteInterceptor.java | 83 --
.../EventBusImplDeliverToHandlerInterceptor.java | 81 --
.../vertx3/HandlerRegistrationInterceptor.java | 95 --
...lientRequestImplHandleExceptionInterceptor.java | 48 -
...ClientRequestImplHandleResponseInterceptor.java | 71 --
.../vertx3/HttpClientRequestImplInterceptor.java | 124 --
...tpContextHandleDispatchResponseInterceptor.java | 66 --
.../vertx3/HttpContextSendRequestInterceptor.java | 50 -
...ttpServerRequestImplConstructorInterceptor.java | 30 -
...ServerRequestWrapperConstructorInterceptor.java | 30 -
...rverResponseImplHandleExceptionInterceptor.java | 48 -
.../vertx3/HttpServerResponseImplInterceptor.java | 62 -
.../plugin/vertx3/RouteImplHandlerInterceptor.java | 50 -
.../apm/plugin/vertx3/RouteStateInterceptor.java | 117 --
...utingContextImplBaseConstructorInterceptor.java | 32 -
...outingContextWrapperConstructorInterceptor.java | 30 -
.../ServerConnectionHandleMessageInterceptor.java | 83 --
.../skywalking/apm/plugin/vertx3/VertxContext.java | 85 --
...ClusteredEventBusSendRemoteInstrumentation.java | 78 --
...ventBusImplDeliverToHandlerInstrumentation.java | 78 --
.../define/HandlerRegistrationInstrumentation.java | 78 --
...tRequestImplHandleExceptionInstrumentation.java | 73 --
...ntRequestImplHandleResponseInstrumentation.java | 75 --
.../HttpClientRequestImplInstrumentation.java | 109 --
...ntextHandleDispatchResponseInstrumentation.java | 75 --
.../HttpContextSendRequestInstrumentation.java | 73 --
...erverRequestImplConstructorInstrumentation.java | 67 --
...erRequestWrapperConstructorInstrumentation.java | 67 --
...ResponseImplHandleExceptionInstrumentation.java | 73 --
.../HttpServerResponseImplInstrumentation.java | 91 --
.../define/RouteImplHandlerInstrumentation.java | 75 --
.../vertx3/define/RouteImplInstrumentation.java | 88 --
.../vertx3/define/RouteStateInstrumentation.java | 90 --
...rContextImplBaseConstructorInstrumentation.java | 67 --
...ngContextWrapperConstructorInstrumentation.java | 69 --
...rverConnectionHandleMessageInstrumentation.java | 77 --
.../src/main/resources/skywalking-plugin.def | 34 -
.../apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml | 45 -
...cachedConstructorWithComplexArgInterceptor.java | 56 -
...achedConstructorWithHostPortArgInterceptor.java | 32 -
...tructorWithInetSocketAddressArgInterceptor.java | 35 -
...torWithInetSocketAddressListArgInterceptor.java | 44 -
.../xmemcached/v2/XMemcachedMethodInterceptor.java | 64 --
.../v2/define/XMemcachedInstrumentation.java | 138 ---
.../src/main/resources/skywalking-plugin.def | 17 -
...edConstructorWithComplexArgInterceptorTest.java | 63 --
...dConstructorWithHostPortArgInterceptorTest.java | 52 -
...torWithInetSocketAddressArgInterceptorTest.java | 51 -
...ithInetSocketAddressListArgInterceptorTest.java | 56 -
.../v2/XMemcachedMethodInterceptorTest.java | 137 ---
.../apm-sdk-plugin/xxl-job-2.x-plugin/pom.xml | 44 -
.../skywalking/apm/plugin/xxljob/Constants.java | 32 -
.../MethodJobHandlerConstructorInterceptor.java | 46 -
.../xxljob/MethodJobHandlerMethodInterceptor.java | 61 -
.../ScriptJobHandlerConstructorInterceptor.java | 39 -
.../xxljob/ScriptJobHandlerMethodInterceptor.java | 61 -
.../xxljob/SimpleJobHandlerMethodInterceptor.java | 60 -
.../define/MethodJobHandlerInstrumentation.java | 99 --
.../define/ScriptJobHandlerInstrumentation.java | 93 --
.../define/SimpleJobHandlerInstrumentation.java | 92 --
.../src/main/resources/skywalking-plugin.def | 19 -
apm-sniffer/apm-test-tools/pom.xml | 56 -
.../agent/core/context/MockContextSnapshot.java | 42 -
.../apm/agent/test/helper/FieldGetter.java | 47 -
.../apm/agent/test/helper/FieldSetter.java | 39 -
.../apm/agent/test/helper/SegmentHelper.java | 35 -
.../apm/agent/test/helper/SegmentRefHelper.java | 59 -
.../apm/agent/test/helper/SpanHelper.java | 138 ---
.../apm/agent/test/tools/AgentServiceRule.java | 59 -
.../apm/agent/test/tools/SegmentRefAssert.java | 39 -
.../apm/agent/test/tools/SegmentStorage.java | 50 -
.../apm/agent/test/tools/SegmentStoragePoint.java | 29 -
.../apm/agent/test/tools/SpanAssert.java | 79 --
.../apm/agent/test/tools/TracingSegmentRunner.java | 93 --
.../skywalking/apm/plugin/ArbitrarySetTest.java | 114 --
.../apm-toolkit-kafka-activation/pom.xml | 44 -
.../KafkaOnMessageAnnotationMethodInterceptor.java | 50 -
.../KafkaOnMessageAnnotationInstrumentation.java | 69 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../apm-toolkit-log4j-1.x-activation/pom.xml | 52 -
.../v1/x/PrintSkyWalkingContextInterceptor.java | 51 -
.../log/log4j/v1/x/PrintTraceIdInterceptor.java | 46 -
...kyWalkingContextPatternConverterActivation.java | 83 --
.../v1/x/TraceIdPatternConverterActivation.java | 83 --
.../log4j/v1/x/log/GRPCLogAppenderActivation.java | 84 --
.../log4j/v1/x/log/GRPCLogAppenderInterceptor.java | 115 --
.../src/main/resources/skywalking-plugin.def | 19 -
.../apm-toolkit-log4j-2.x-activation/pom.xml | 47 -
.../v2/x/SkyWalkingContextConverterActivation.java | 70 --
...kyWalkingContextConverterMethodInterceptor.java | 64 --
.../log/log4j/v2/x/TraceIdConverterActivation.java | 70 --
.../v2/x/TraceIdConverterMethodInterceptor.java | 61 -
.../v2/x/async/AsyncAppenderInstrumentation.java | 83 --
.../v2/x/async/AsyncAppenderMethodInterceptor.java | 53 -
.../x/async/AsyncLoggerConfigInstrumentation.java | 74 --
.../async/AsyncLoggerConfigMethodInterceptor.java | 57 -
.../v2/x/async/CreateMementoInstrumentation.java | 83 --
.../log4j/v2/x/async/CreateMementoInterceptor.java | 51 -
.../async/Log4jLogEventConstructorInterceptor.java | 40 -
.../v2/x/async/Log4jLogEventInstrumentation.java | 63 --
.../x/async/RingBufferLogEventInstrumentation.java | 68 --
.../async/RingBufferLogEventMethodInterceptor.java | 53 -
.../log4j/v2/x/log/GRPCLogAppenderActivation.java | 75 --
.../log4j/v2/x/log/GRPCLogAppenderInterceptor.java | 129 ---
.../src/main/resources/skywalking-plugin.def | 24 -
.../apm-toolkit-logback-1.x-activation/pom.xml | 47 -
.../v1/x/LogbackPatternConverterActivation.java | 87 --
...kyWalkingContextPatternConverterActivation.java | 87 --
.../v1/x/PrintSkyWalkingContextInterceptor.java | 59 -
.../log/logback/v1/x/PrintTraceIdInterceptor.java | 56 -
.../x/async/AsyncAppenderBaseInstrumentation.java | 63 --
.../async/AsyncAppenderBaseMethodInterceptor.java | 53 -
.../async/LoggingEventConstructorInterceptor.java | 34 -
.../v1/x/async/LoggingEventInstrumentation.java | 58 -
.../v1/x/log/GRPCLogAppenderActivation.java | 75 --
.../v1/x/log/GRPCLogAppenderInterceptor.java | 130 ---
.../SkyWalkingContextJsonProviderActivation.java | 68 --
.../SkyWalkingContextJsonProviderInterceptor.java | 59 -
.../v1/x/logstash/TcpSocketAppenderActivation.java | 72 --
.../x/logstash/TcpSocketAppenderInterceptor.java | 57 -
.../x/logstash/TraceIdJsonProviderActivation.java | 68 --
.../x/logstash/TraceIdJsonProviderInterceptor.java | 56 -
.../logback/v1/x/mdc/MDCConverterActivation.java | 90 --
.../mdc/PrintMDCSkyWalkingContextInterceptor.java | 57 -
.../v1/x/mdc/PrintMDCTraceIdInterceptor.java | 55 -
.../src/main/resources/skywalking-plugin.def | 25 -
.../apm-toolkit-logging-common/pom.xml | 80 --
.../common/log/GRPCLogReportServiceClient.java | 181 ---
.../logging/common/log/SkyWalkingContext.java | 48 -
.../toolkit/logging/common/log/ToolkitConfig.java | 61 -
...ache.skywalking.apm.agent.core.boot.BootService | 19 -
.../apm-toolkit-meter-activation/pom.xml | 38 -
.../activation/meter/CounterActivation.java | 93 --
.../meter/CounterConstructInterceptor.java | 48 -
.../activation/meter/CounterGetInterceptor.java | 41 -
.../meter/CounterIncrementInterceptor.java | 43 -
.../toolkit/activation/meter/GaugeActivation.java | 77 --
.../meter/GaugeConstructInterceptor.java | 47 -
.../activation/meter/GaugeGetInterceptor.java | 42 -
.../activation/meter/HistogramActivation.java | 77 --
.../meter/HistogramAddValueInterceptor.java | 43 -
.../meter/HistogramConstructInterceptor.java | 48 -
.../activation/meter/util/MeterIdConverter.java | 57 -
.../src/main/resources/skywalking-plugin.def | 19 -
.../meter/CounterConstructInterceptorTest.java | 81 --
.../meter/GaugeConstructInterceptorTest.java | 83 --
.../meter/HistogramConstructInterceptorTest.java | 81 --
.../apm-toolkit-opentracing-activation/pom.xml | 38 -
.../continuation/ActivateInterceptor.java | 49 -
.../continuation/ConstructorInterceptor.java | 30 -
.../SkywalkingContinuationActivation.java | 89 --
.../ConstructorWithSpanBuilderInterceptor.java | 58 -
.../span/ConstructorWithTracerInterceptor.java | 31 -
.../opentracing/span/SkywalkingSpanActivation.java | 169 ---
.../opentracing/span/SpanFinishInterceptor.java | 50 -
.../opentracing/span/SpanLogInterceptor.java | 50 -
.../span/SpanSetOperationNameInterceptor.java | 49 -
.../opentracing/span/SpanSetTagInterceptor.java | 56 -
.../tracer/SkywalkingTracerActivation.java | 92 --
.../tracer/SkywalkingTracerExtractInterceptor.java | 72 --
.../tracer/SkywalkingTracerInjectInterceptor.java | 63 --
.../src/main/resources/skywalking-plugin.def | 19 -
.../opentracing/SkywalkingSpanActivationTest.java | 399 -------
.../apm-toolkit-trace-activation/pom.xml | 38 -
.../toolkit/activation/ToolkitPluginConfig.java | 34 -
.../activation/trace/ActiveSpanActivation.java | 185 ---
.../trace/ActiveSpanDebugInterceptor.java | 57 -
.../trace/ActiveSpanErrorInterceptor.java | 51 -
.../trace/ActiveSpanErrorMsgInterceptor.java | 58 -
.../trace/ActiveSpanErrorThrowableInteceptor.java | 51 -
.../trace/ActiveSpanInfoInterceptor.java | 57 -
.../ActiveSpanSetOperationNameInterceptor.java | 58 -
.../activation/trace/ActiveSpanTagInterceptor.java | 50 -
.../trace/BaseTagAnnotationInterceptor.java | 78 --
.../trace/BaseTraceAnnotationInterceptor.java | 89 --
.../trace/CallableOrRunnableActivation.java | 92 --
.../CallableOrRunnableConstructInterceptor.java | 32 -
.../trace/CallableOrRunnableInvokeInterceptor.java | 53 -
.../trace/CorrelationContextGetInterceptor.java | 45 -
.../trace/CorrelationContextPutInterceptor.java | 46 -
.../IgnoredExceptionAnnotationActivation.java | 65 --
.../IgnoredExceptionConstructInterceptor.java | 36 -
.../activation/trace/SegmentIDInterceptor.java | 49 -
.../activation/trace/SpanIDInterceptor.java | 49 -
.../activation/trace/TagAnnotationActivation.java | 103 --
.../trace/TagAnnotationMethodInterceptor.java | 50 -
.../TagAnnotationStaticMethodInterceptor.java | 45 -
.../trace/TraceAnnotationActivation.java | 97 --
.../trace/TraceAnnotationMethodInterceptor.java | 51 -
.../TraceAnnotationStaticMethodInterceptor.java | 45 -
.../activation/trace/TraceContextActivation.java | 148 ---
.../activation/trace/TraceIDInterceptor.java | 49 -
.../apm/toolkit/activation/util/TagUtil.java | 43 -
.../src/main/resources/skywalking-plugin.def | 22 -
.../toolkit/activation/trace/ActiveSpanTest.java | 185 ---
.../trace/CallableOrRunnableInterceptorTest.java | 114 --
.../activation/trace/TagAnnotationTest.java | 343 ------
.../activation/trace/TraceAnnotationTest.java | 191 ----
apm-sniffer/apm-toolkit-activation/pom.xml | 153 ---
.../bootstrap-plugins/jdk-http-plugin/pom.xml | 45 -
.../jdk/http/HttpClientNewInstanceInterceptor.java | 49 -
.../jdk/http/HttpClientParseHttpInterceptor.java | 81 --
.../http/HttpClientWriteRequestInterceptor.java | 85 --
.../http/HttpsClientNewInstanceInterceptor.java | 49 -
.../jdk/http/define/HttpClientInstrumentation.java | 126 ---
.../http/define/HttpsClientInstrumentation.java | 85 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../bootstrap-plugins/jdk-threading-plugin/pom.xml | 45 -
.../jdk/threading/JDKThreadingPluginConfig.java | 36 -
.../apm/plugin/jdk/threading/ThreadingConfig.java | 59 -
.../threading/ThreadingConstructorInterceptor.java | 34 -
.../jdk/threading/ThreadingMethodInterceptor.java | 68 --
.../threading/define/CallableInstrumentation.java | 103 --
.../threading/define/RunnableInstrumentation.java | 103 --
.../src/main/resources/skywalking-plugin.def | 18 -
apm-sniffer/bootstrap-plugins/pom.xml | 139 ---
apm-sniffer/config/agent.config | 257 -----
.../customize-enhance-plugin/pom.xml | 31 -
.../customize/conf/CustomizeConfiguration.java | 343 ------
.../customize/conf/CustomizePluginConfig.java | 33 -
.../plugin/customize/conf/MethodConfiguration.java | 132 ---
.../apm/plugin/customize/constants/Constants.java | 74 --
.../define/CustomizeInstanceInstrumentation.java | 78 --
.../define/CustomizeStaticInstrumentation.java | 71 --
.../interceptor/BaseInterceptorMethods.java | 92 --
.../interceptor/CustomizeInstanceInterceptor.java | 46 -
.../interceptor/CustomizeStaticInterceptor.java | 45 -
.../loader/CustomizeInstrumentationLoader.java | 63 --
.../apm/plugin/customize/util/CustomizeUtil.java | 69 --
....agent.core.plugin.loader.InstrumentationLoader | 19 -
.../customize/util/CustomizeExpressionTest.java | 174 ---
.../plugin/customize/util/CustomizeUtilTest.java | 36 -
.../optional-plugins/ehcache-2.x-plugin/pom.xml | 49 -
.../ehcache/v2/EhcacheCacheNameInterceptor.java | 46 -
.../ehcache/v2/EhcacheConstructorInterceptor.java | 35 -
.../apm/plugin/ehcache/v2/EhcacheEnhanceInfo.java | 39 -
.../plugin/ehcache/v2/EhcacheLockInterceptor.java | 66 --
.../ehcache/v2/EhcacheOperateAllInterceptor.java | 55 -
.../v2/EhcacheOperateElementInterceptor.java | 62 -
.../v2/EhcacheOperateObjectInterceptor.java | 61 -
.../v2/EhcachePrivateConstructorInterceptor.java | 35 -
.../v2/define/EhcachePluginInstrumentation.java | 214 ----
.../src/main/resources/skywalking-plugin.def | 17 -
.../plugin/ehcache/v2/EhcacheInterceptorTest.java | 207 ----
.../optional-plugins/gson-2.8.x-plugin/pom.xml | 45 -
.../apm/plugin/gson/GsonFromJsonInterceptor.java | 56 -
.../apm/plugin/gson/GsonToJsonInterceptor.java | 56 -
.../gson/define/GsonFromJsonInstrumentation.java | 68 --
.../gson/define/GsonToJsonInstrumentation.java | 84 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../plugin/gson/GsonFromJsonInterceptorTest.java | 75 --
.../apm/plugin/gson/GsonToJsonInterceptorTest.java | 75 --
.../optional-plugins/guava-cache-plugin/pom.xml | 48 -
.../guava/cache/GuavaCacheAllInterceptor.java | 50 -
.../plugin/guava/cache/GuavaCacheInterceptor.java | 55 -
.../define/GuavaCachePluginInstrumentation.java | 99 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../guava/cache/GuavaCacheInterceptorTest.java | 146 ---
.../kotlin-coroutine-plugin/pom.xml | 46 -
.../kotlin/coroutine/DispatcherInterceptor.java | 45 -
.../plugin/kotlin/coroutine/TracingRunnable.java | 79 --
.../define/DispatcherInstrumentation.java | 69 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../optional-plugins/mybatis-3.x-plugin/pom.xml | 44 -
.../skywalking/apm/plugin/mybatis/Constants.java | 27 -
.../apm/plugin/mybatis/MyBatisInterceptor.java | 59 -
.../apm/plugin/mybatis/MyBatisMethodMatch.java | 46 -
.../mybatis/MyBatisShellMethodInterceptor.java | 57 -
.../mybatis/define/MyBatisInstrumentation.java | 64 --
.../define/MyBatisShellMethodInstrumentation.java | 64 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../gateway-2.0.x-plugin/pom.xml | 86 --
.../gateway/v20x/HttpClientRequestInterceptor.java | 117 --
.../v20x/HttpclientRequestHeadersInterceptor.java | 62 -
.../v20x/NettyRoutingFilterInterceptor.java | 71 --
.../AbstractGateway200EnhancePluginDefine.java | 30 -
.../cloud/gateway/v20x/define/Constants.java | 32 -
.../define/DispatcherHandlerInstrumentation.java | 29 -
.../gateway/v20x/define/EnhanceCacheObject.java | 38 -
.../v20x/define/HttpClientInstrumentation.java | 62 -
.../define/HttpClientRequestInstrumentation.java | 62 -
.../define/NettyRoutingFilterInstrumentation.java | 64 --
.../define/ServerWebExchangeInstrumentation.java | 29 -
.../src/main/resources/skywalking-plugin.def | 21 -
.../gateway-2.1.x-plugin/pom.xml | 87 --
.../HttpClientFinalizerConstructorInterceptor.java | 34 -
...ientFinalizerResponseConnectionInterceptor.java | 69 --
.../v21x/HttpClientFinalizerSendInterceptor.java | 98 --
.../v21x/HttpClientFinalizerURIInterceptor.java | 46 -
.../v21x/NettyRoutingFilterInterceptor.java | 69 --
.../v21x/TcpClientConstructorInterceptor.java | 29 -
.../AbstractGateway210EnhancePluginDefine.java | 30 -
.../cloud/gateway/v21x/define/Constants.java | 36 -
.../define/DispatcherHandlerInstrumentation.java | 29 -
.../gateway/v21x/define/EnhanceObjectCache.java | 50 -
.../define/HttpClientFinalizerInstrumentation.java | 107 --
.../define/NettyRoutingFilterInstrumentation.java | 64 --
.../define/ServerWebExchangeInstrumentation.java | 29 -
.../v21x/define/TcpClientInstrumentation.java | 57 -
.../src/main/resources/skywalking-plugin.def | 21 -
.../gateway-3.x-plugin/pom.xml | 78 --
.../HttpClientFinalizerConstructorInterceptor.java | 43 -
...ientFinalizerResponseConnectionInterceptor.java | 77 --
.../v3x/HttpClientFinalizerSendInterceptor.java | 105 --
.../v3x/HttpClientFinalizerUriInterceptor.java | 52 -
.../gateway/v3x/NettyRoutingFilterInterceptor.java | 76 --
.../AbstractGatewayV3EnhancePluginDefine.java | 32 -
.../define/DispatcherHandlerInstrumentation.java | 32 -
.../gateway/v3x/define/EnhanceObjectCache.java | 54 -
.../define/HttpClientFinalizerInstrumentation.java | 121 --
.../define/NettyRoutingFilterInstrumentation.java | 75 --
.../define/ServerWebExchangeInstrumentation.java | 32 -
.../src/main/resources/skywalking-plugin.def | 20 -
...pClientFinalizerConstructorInterceptorTest.java | 70 --
.../v3x/HttpClientFinalizerInterceptorTest.java | 171 ---
.../cloud/gateway/v3x/MockCliengRequest.java | 125 --
.../cloud/gateway/v3x/MockClientResponse.java | 104 --
.../v3x/NettyRoutingFilterInterceptorTest.java | 104 --
.../optional-spring-cloud/pom.xml | 45 -
.../optional-spring-plugins/pom.xml | 42 -
.../spring-annotation-plugin/pom.xml | 43 -
.../AbstractSpringBeanInstrumentation.java | 87 --
.../spring/annotations/SpringAnnotationConfig.java | 34 -
.../annotations/SpringAnnotationInterceptor.java | 50 -
.../bean/SpringBeanInstrumentation.java | 31 -
.../component/SpringComponentInstrumentation.java | 31 -
.../SpringRepositoryInstrumentation.java | 31 -
.../services/SpringServicesInstrumentation.java | 31 -
.../src/main/resources/skywalking-plugin.def | 20 -
.../spring-tx-plugin/pom.xml | 43 -
.../EndTransactionMethodInterceptor.java | 57 -
.../GetTransactionMethodInterceptor.java | 81 --
.../spring/transaction/SpringTXPluginConfig.java | 34 -
.../spring/transaction/context/Constants.java | 35 -
...tPlatformTransactionManagerInstrumentation.java | 79 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../spring-webflux-5.x-plugin/pom.xml | 40 -
.../DispatcherHandlerHandleMethodInterceptor.java | 136 ---
.../ServerWebExchangeConstructorInterceptor.java | 28 -
.../define/DispatcherHandlerInstrumentation.java | 63 --
.../define/ServerWebExchangeInstrumentation.java | 58 -
.../src/main/resources/skywalking-plugin.def | 18 -
apm-sniffer/optional-plugins/pom.xml | 148 ---
.../quartz-scheduler-2.x-plugin/pom.xml | 45 -
.../quartz/JobExecuteStateMethodInterceptor.java | 56 -
.../quartz/JobRunShellConstructorInterceptor.java | 36 -
.../quartz/JobRunShellMethodInterceptor.java | 85 --
.../JobRunShellInterceptorInstrumentation.java | 116 --
.../src/main/resources/skywalking-plugin.def | 17 -
.../optional-plugins/sentinel-1.x-plugin/pom.xml | 43 -
.../apm/plugin/sentinel/v1/Constants.java | 26 -
.../plugin/sentinel/v1/EntryMethodInterceptor.java | 74 --
.../SentinelAsyncEntryConstructorInterceptor.java | 53 -
.../sentinel/v1/SentinelAsyncExitInterceptor.java | 54 -
.../v1/SentinelCtEntryConstructorInterceptor.java | 52 -
.../sentinel/v1/SentinelExitInterceptor.java | 55 -
.../define/SentinelAsyncEntryInstrumentation.java | 81 --
.../v1/define/SentinelCtEntryInstrumentation.java | 80 --
.../v1/define/SentinelCtSphInstrumentation.java | 80 --
.../src/main/resources/skywalking-plugin.def | 19 -
.../apm-trace-ignore-plugin.config | 23 -
.../optional-plugins/trace-ignore-plugin/pom.xml | 45 -
.../trace/ignore/TraceIgnoreExtendService.java | 96 --
.../trace/ignore/TraceIgnorePatternWatcher.java | 69 --
.../apm/plugin/trace/ignore/conf/IgnoreConfig.java | 31 -
.../trace/ignore/conf/IgnoreConfigInitializer.java | 101 --
.../trace/ignore/matcher/FastPathMatcher.java | 153 ---
.../trace/ignore/matcher/TracePathMatcher.java | 24 -
...ache.skywalking.apm.agent.core.boot.BootService | 19 -
.../ignore/TraceIgnorePatternWatcherTest.java | 66 --
.../apm/plugin/trace/ignore/TraceIgnoreTest.java | 73 --
.../plugin/trace/ignore/TracePathMatcherTest.java | 114 --
...ache.skywalking.apm.agent.core.boot.BootService | 19 -
.../zookeeper-3.4.x-plugin/pom.xml | 45 -
.../plugin/zookeeper/ClientCnxnInterceptor.java | 97 --
.../zookeeper/EventThreadMethodInterceptor.java | 71 --
.../skywalking/apm/plugin/zookeeper/ZooOpt.java | 149 ---
.../define/ClientCnxnInstrumentation.java | 83 --
.../define/EventThreadInstrumentation.java | 69 --
.../src/main/resources/skywalking-plugin.def | 18 -
.../zookeeper/ClientCnxnInterceptorTest.java | 121 --
.../kafka-reporter-plugin/pom.xml | 167 ---
.../agent/core/kafka/KafkaConnectionStatus.java | 23 -
.../core/kafka/KafkaConnectionStatusListener.java | 23 -
.../kafka/KafkaContextManagerExtendService.java | 41 -
.../agent/core/kafka/KafkaJVMMetricsSender.java | 104 --
.../apm/agent/core/kafka/KafkaMeterSender.java | 82 --
.../apm/agent/core/kafka/KafkaProducerManager.java | 179 ---
.../core/kafka/KafkaProfileSnapshotSender.java | 83 --
.../core/kafka/KafkaReporterPluginConfig.java | 66 --
.../kafka/KafkaServiceManagementServiceClient.java | 133 ---
.../core/kafka/KafkaTraceSegmentServiceClient.java | 134 ---
...ache.skywalking.apm.agent.core.boot.BootService | 23 -
.../agent/core/kafka/KafkaProducerManagerTest.java | 69 --
.../KafkaServiceManagementServiceClientTest.java | 50 -
apm-sniffer/optional-reporter-plugins/pom.xml | 69 --
apm-sniffer/pom.xml | 45 -
docker/agent/Dockerfile.agent | 46 -
docs/en/guides/E2E-local-remote-debug.md | 28 -
docs/en/guides/How-to-build.md | 4 +-
docs/en/guides/How-to-release.md | 2 +-
docs/en/guides/README.md | 8 -
oap-server/server-core/pom.xml | 2 +-
pom.xml | 82 +-
.../src/test/resources/docker-compose.two.yml | 5 +-
test/e2e/e2e-test/docker/Dockerfile.consumer | 16 +-
test/e2e/e2e-test/docker/Dockerfile.provider | 16 +-
test/e2e/e2e-test/docker/base-compose.yml | 20 -
.../e2e/e2e-test/docker/cluster/docker-compose.yml | 15 +-
.../docker/cluster/docker-compose.zk.es6.yml | 6 -
.../docker/cluster/docker-compose.zk.es7.yml | 6 -
.../docker/cluster/docker-compose.zk.influxdb.yml | 6 -
.../docker/cluster/docker-compose.zk.mysql.yml | 6 -
.../e2e/e2e-test/docker/gateway/docker-compose.yml | 6 -
.../e2e-test/docker/kafka/docker-compose.base.yml | 5 -
.../e2e-test/docker/kafka/docker-compose.meter.yml | 5 -
.../docker/kafka/docker-compose.profiling.yml | 5 -
.../e2e-test/docker/simple/auth/docker-compose.yml | 5 +-
.../docker/simple/compat/docker-compose.yml | 3 -
test/e2e/e2e-test/pom.xml | 27 -
test/e2e/pom.xml | 10 +-
test/plugin/agent-test-tools/bin/fetch-code.sh | 36 -
test/plugin/agent-test-tools/pom.xml | 73 --
test/plugin/archetypes/jvm/pom.xml | 41 -
.../META-INF/maven/archetype-metadata.xml | 68 --
.../resources/archetype-resources/bin/startup.sh | 21 -
.../archetype-resources/config/expectedData.yaml | 27 -
.../archetype-resources/configuration.yml | 22 -
.../src/main/resources/archetype-resources/pom.xml | 118 --
.../src/main/assembly/assembly.xml | 41 -
.../src/main/java/Application.java | 34 -
.../src/main/java/controller/CaseController.java | 47 -
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/log4j2.xml | 30 -
.../archetype-resources/support-version.list | 17 -
test/plugin/archetypes/pom.xml | 38 -
test/plugin/archetypes/tomcat/pom.xml | 41 -
.../META-INF/maven/archetype-metadata.xml | 67 --
.../archetype-resources/config/expectedData.yaml | 27 -
.../archetype-resources/configuration.yml | 21 -
.../src/main/resources/archetype-resources/pom.xml | 77 --
.../src/main/java/CaseServlet.java | 44 -
.../src/main/java/HealthCheckServlet.java | 41 -
.../src/main/resources/log4j2.xml | 30 -
.../src/main/webapp/WEB-INF/web.xml | 44 -
.../archetype-resources/support-version.list | 17 -
test/plugin/containers/jvm-container/pom.xml | 126 ---
.../jvm-container/src/main/docker/assembly.xml | 42 -
.../jvm-container/src/main/docker/run.sh | 111 --
test/plugin/containers/pom.xml | 39 -
test/plugin/containers/tomcat-container/pom.xml | 135 ---
.../tomcat-container/src/main/docker/assembly.xml | 46 -
.../tomcat-container/src/main/docker/catalina.sh | 632 -----------
.../tomcat-container/src/main/docker/run.sh | 97 --
test/plugin/generator.sh | 77 --
test/plugin/pom.xml | 166 ---
test/plugin/run.sh | 249 ----
test/plugin/runner-helper/pom.xml | 84 --
.../test/helper/AbstractRunningGenerator.java | 65 --
.../plugin/test/helper/ConfigurationImpl.java | 255 -----
.../test/helper/DockerComposeRunningGenerator.java | 74 --
.../helper/DockerContainerRunningGenerator.java | 49 -
.../plugin/test/helper/IConfiguration.java | 64 --
.../apache/skywalking/plugin/test/helper/Main.java | 27 -
.../skywalking/plugin/test/helper/RunningType.java | 22 -
.../helper/ScenarioRunningScriptGenerator.java | 24 -
.../exception/ConfigureFileNotFoundException.java | 23 -
.../exception/GenerateAdditionFileException.java | 21 -
.../helper/exception/GenerateFailedException.java | 21 -
.../plugin/test/helper/vo/CaseConfiguration.java | 46 -
.../plugin/test/helper/vo/DependencyComponent.java | 44 -
.../plugin/test/helper/vo/DockerService.java | 39 -
.../plugin/test/helper/vo/RequestHeader.java | 30 -
.../main/resources/compose-start-script.template | 41 -
.../main/resources/container-start-script.template | 55 -
.../src/main/resources/docker-compose.template | 109 --
.../runner-helper/src/main/resources/log4j2.xml | 37 -
.../runner-helper/src/main/resources/scenario.sh | 31 -
.../DockerComposeV2RunningGeneratorTest.java | 61 -
.../DockerContainerRunningGeneratorTest.java | 55 -
.../test/helper/vo/CaseIConfigurationTest.java | 48 -
.../src/test/resources/configuration-test.yml | 37 -
.../src/test/resources/docker-compose-test.yml | 38 -
.../runner-helper/src/test/resources/scenario.sh | 22 -
.../scenarios/activemq-scenario/bin/startup.sh | 21 -
.../activemq-scenario/config/expectedData.yaml | 73 --
.../scenarios/activemq-scenario/configuration.yml | 29 -
test/plugin/scenarios/activemq-scenario/pom.xml | 118 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/activemq/Application.java | 34 -
.../activemq/controller/CaseController.java | 133 ---
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/log4j2.xml | 30 -
.../activemq-scenario/support-version.list | 22 -
.../apm-toolkit-trace-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 353 ------
.../apm-toolkit-trace-scenario/configuration.yml | 25 -
.../scenarios/apm-toolkit-trace-scenario/pom.xml | 123 --
.../src/main/assembly/assembly.xml | 41 -
.../apache/skywalking/apm/toolkit/model/User.java | 45 -
.../skywalking/apm/toolkit/trace/ActiveSpan.java | 49 -
.../apm/toolkit/trace/CallableWrapper.java | 39 -
.../apm/toolkit/trace/RunnableWrapper.java | 36 -
.../apm/toolkit/trace/SupplierWrapper.java | 39 -
.../apache/skywalking/apm/toolkit/trace/Tag.java | 47 -
.../apache/skywalking/apm/toolkit/trace/Tags.java | 46 -
.../apache/skywalking/apm/toolkit/trace/Trace.java | 38 -
.../skywalking/apm/toolkit/trace/TraceContext.java | 76 --
.../apm/toolkit/trace/TraceCrossThread.java | 30 -
.../apm/testcase/toolkit/Application.java | 30 -
.../toolkit/controller/TestController.java | 132 ---
.../testcase/toolkit/controller/TestService.java | 113 --
.../src/main/resources/application.yaml | 22 -
.../support-version.list | 17 -
.../armeria-0.96minus-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 75 --
.../armeria-0.96minus-scenario/configuration.yml | 20 -
.../scenarios/armeria-0.96minus-scenario/pom.xml | 97 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/armeria/Application.java | 28 -
.../apm/testcase/armeria/ClientApplication.java | 40 -
.../apm/testcase/armeria/ServerApplication.java | 41 -
.../src/main/resources/application.yaml | 19 -
.../support-version.list | 32 -
.../armeria-0.96plus-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 71 --
.../armeria-0.96plus-scenario/configuration.yml | 20 -
.../scenarios/armeria-0.96plus-scenario/pom.xml | 98 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/armeria/Application.java | 28 -
.../apm/testcase/armeria/ClientApplication.java | 40 -
.../apm/testcase/armeria/ServerApplication.java | 41 -
.../src/main/resources/application.yaml | 19 -
.../armeria-0.96plus-scenario/support-version.list | 19 -
.../asynchttpclient-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 73 --
.../asynchttpclient-scenario/configuration.yml | 20 -
.../scenarios/asynchttpclient-scenario/pom.xml | 135 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/asynchttpclient/Application.java | 34 -
.../testcase/asynchttpclient/CaseController.java | 73 --
.../src/main/resources/application.yaml | 21 -
.../src/main/resources/log4j2.xml | 30 -
.../asynchttpclient-scenario/support-version.list | 29 -
.../scenarios/avro-scenario/avro-client/pom.xml | 112 --
.../skywalking/apm/testcase/avro/Application.java | 34 -
.../testcase/avro/controller/CaseController.java | 61 -
.../src/main/resources/application.yaml | 23 -
.../avro-client/src/main/resources/log4j2.xml | 30 -
.../scenarios/avro-scenario/avro-common/pom.xml | 60 -
.../avro-common/src/main/avro/greeter.avpr | 44 -
.../avro-scenario/avro-dist/bin/startup.sh | 24 -
.../scenarios/avro-scenario/avro-dist/pom.xml | 54 -
.../avro-dist/src/main/assembly/assembly.xml | 46 -
.../scenarios/avro-scenario/avro-server/pom.xml | 82 --
.../skywalking/apm/testcase/avro/Application.java | 47 -
.../avro-scenario/config/expectedData.yaml | 60 -
.../scenarios/avro-scenario/configuration.yml | 22 -
test/plugin/scenarios/avro-scenario/pom.xml | 70 --
.../scenarios/avro-scenario/support-version.list | 18 -
.../scenarios/baidu-brpc-scenario/bin/startup.sh | 21 -
.../baidu-brpc-scenario/config/expectedData.yaml | 66 --
.../baidu-brpc-scenario/configuration.yml | 20 -
test/plugin/scenarios/baidu-brpc-scenario/pom.xml | 108 --
.../src/main/assembly/assembly.xml | 41 -
.../testcase/baidu.brpc/BaiduBrpcApplication.java | 46 -
.../baidu.brpc/controller/CaseController.java | 72 --
.../apm/testcase/baidu.brpc/interfaces/Echo.java | 1040 -----------------
.../baidu.brpc/interfaces/EchoService.java | 30 -
.../baidu.brpc/service/EchoServiceImpl.java | 46 -
.../src/main/resources/application.yml | 20 -
.../baidu-brpc-scenario/support-version.list | 19 -
.../plugin/scenarios/canal-scenario/bin/startup.sh | 21 -
.../canal-scenario/config/expectedData.yaml | 51 -
.../scenarios/canal-scenario/configuration.yml | 42 -
test/plugin/scenarios/canal-scenario/pom.xml | 157 ---
.../canal-scenario/src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/canal/Application.java | 34 -
.../testcase/canal/controller/CaseController.java | 85 --
.../src/main/resources/application.properties | 19 -
.../canal-scenario/src/main/resources/log4j2.xml | 30 -
.../scenarios/canal-scenario/support-version.list | 18 -
.../bin/startup.sh | 21 -
.../config/expectedData.yaml | 460 --------
.../configuration.yml | 29 -
.../cassandra-java-driver-3.x-scenario/pom.xml | 140 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/cassandra/Application.java | 34 -
.../cassandra/controller/CaseController.java | 171 ---
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/log4j2.xml | 30 -
.../support-version.list | 17 -
.../correlation-autotag-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 292 -----
.../correlation-autotag-scenario/configuration.yml | 22 -
.../scenarios/correlation-autotag-scenario/pom.xml | 165 ---
.../src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/grpc/Application.java | 34 -
.../testcase/grpc/consumr/ConsumerInterceptor.java | 109 --
.../testcase/grpc/controller/CaseController.java | 128 ---
.../grpc/provider/ProviderConfiguration.java | 40 -
.../provider/interceptor/ProviderInterceptor.java | 94 --
.../grpc/provider/service/GreeterServiceImpl.java | 52 -
.../src/main/proto/GreetService.proto | 43 -
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/log4j2.xml | 30 -
.../support-version.list | 22 -
.../scenarios/customize-scenario/bin/startup.sh | 23 -
.../config/customize_enhance.xml | 60 -
.../customize-scenario/config/expectedData.yaml | 123 --
.../scenarios/customize-scenario/configuration.yml | 22 -
test/plugin/scenarios/customize-scenario/pom.xml | 112 --
.../src/main/assembly/assembly.xml | 46 -
.../apm/testcase/customize/Application.java | 34 -
.../customize/controller/CustomizeController.java | 90 --
.../apm/testcase/customize/model/Model0.java | 89 --
.../apm/testcase/customize/model/Model1.java | 46 -
.../testcase/customize/service/TestService1.java | 47 -
.../testcase/customize/service/TestService2.java | 36 -
.../src/main/resources/application.yaml | 22 -
.../customize-scenario/support-version.list | 17 -
test/plugin/scenarios/cxf-scenario/bin/startup.sh | 21 -
.../cxf-scenario/config/expectedData.yaml | 90 --
.../scenarios/cxf-scenario/configuration.yml | 22 -
test/plugin/scenarios/cxf-scenario/pom.xml | 125 --
.../cxf-scenario/src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/cxf/Application.java | 34 -
.../skywalking/apm/testcase/cxf/CxfConfig.java | 67 --
.../testcase/cxf/controller/CaseController.java | 54 -
.../skywalking/apm/testcase/cxf/entity/User.java | 62 -
.../apm/testcase/cxf/service/UserService.java | 35 -
.../apm/testcase/cxf/service/UserServiceImpl.java | 49 -
.../src/main/resources/application.yaml | 23 -
.../cxf-scenario/src/main/resources/log4j2.xml | 30 -
.../scenarios/cxf-scenario/support-version.list | 21 -
.../scenarios/dbcp-2.x-scenario/bin/startup.sh | 21 -
.../dbcp-2.x-scenario/config/expectedData.yaml | 240 ----
.../scenarios/dbcp-2.x-scenario/configuration.yml | 32 -
test/plugin/scenarios/dbcp-2.x-scenario/pom.xml | 126 ---
.../src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/dbcp/Application.java | 34 -
.../skywalking/apm/testcase/dbcp/MysqlConfig.java | 57 -
.../testcase/dbcp/controller/CaseController.java | 58 -
.../apm/testcase/dbcp/service/CaseService.java | 71 --
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/jdbc.properties | 18 -
.../src/main/resources/log4j2.xml | 30 -
.../dbcp-2.x-scenario/support-version.list | 25 -
.../scenarios/dubbo-2.5.x-scenario/bin/startup.sh | 21 -
.../dubbo-2.5.x-scenario/config/expectedData.yaml | 70 --
.../dubbo-2.5.x-scenario/configuration.yml | 20 -
test/plugin/scenarios/dubbo-2.5.x-scenario/pom.xml | 119 --
.../src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/dubbo/Application.java | 73 --
.../testcase/dubbo/controller/CaseController.java | 50 -
.../apm/testcase/dubbo/services/GreetService.java | 23 -
.../dubbo/services/impl/GreetServiceImpl.java | 29 -
.../src/main/resources/application.yaml | 21 -
.../dubbo-2.5.x-scenario/support-version.list | 18 -
.../scenarios/dubbo-2.7.x-scenario/bin/startup.sh | 22 -
.../dubbo-2.7.x-scenario/config/expectedData.yaml | 73 --
.../dubbo-2.7.x-scenario/configuration.yml | 20 -
test/plugin/scenarios/dubbo-2.7.x-scenario/pom.xml | 119 --
.../src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/dubbo/Application.java | 73 --
.../testcase/dubbo/controller/CaseController.java | 50 -
.../apm/testcase/dubbo/services/GreetService.java | 23 -
.../dubbo/services/impl/GreetServiceImpl.java | 29 -
.../src/main/resources/application.yaml | 21 -
.../dubbo-2.7.x-scenario/support-version.list | 17 -
.../ehcache-2.x-scenario/config/expectedData.yaml | 109 --
.../ehcache-2.x-scenario/configuration.yml | 21 -
test/plugin/scenarios/ehcache-2.x-scenario/pom.xml | 77 --
.../apm/testcase/ehcache/v2/CaseServlet.java | 80 --
.../testcase/ehcache/v2/HealthCheckServlet.java | 40 -
.../src/main/resources/cache.xml | 41 -
.../src/main/resources/log4j2.xml | 30 -
.../src/main/webapp/WEB-INF/web.xml | 44 -
.../ehcache-2.x-scenario/support-version.list | 19 -
.../elasticjob-2.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 73 --
.../elasticjob-2.x-scenario/configuration.yml | 28 -
.../scenarios/elasticjob-2.x-scenario/pom.xml | 132 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/elasticjob/Application.java | 34 -
.../elasticjob/controller/CaseController.java | 45 -
.../apm/testcase/elasticjob/job/DemoSimpleJob.java | 48 -
.../apm/testcase/elasticjob/job/JobConfig.java | 78 --
.../src/main/resources/application.yaml | 28 -
.../src/main/resources/log4j2.xml | 30 -
.../elasticjob-2.x-scenario/support-version.list | 18 -
.../elasticjob-3.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 54 -
.../elasticjob-3.x-scenario/configuration.yml | 28 -
.../scenarios/elasticjob-3.x-scenario/pom.xml | 137 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/elasticjob/Application.java | 39 -
.../elasticjob/controller/CaseController.java | 48 -
.../apm/testcase/elasticjob/job/DemoSimpleJob.java | 64 --
.../src/main/resources/application.yaml | 34 -
.../src/main/resources/log4j2.xml | 30 -
.../elasticjob-3.x-scenario/support-version.list | 17 -
.../elasticsearch-5.x-scenario/bin/startup.sh | 20 -
.../config/expectedData.yaml | 156 ---
.../elasticsearch-5.x-scenario/configuration.yml | 34 -
.../scenarios/elasticsearch-5.x-scenario/pom.xml | 129 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/elasticsearch/Application.java | 34 -
.../elasticsearch/controller/CaseController.java | 142 ---
.../src/main/resources/application.yml | 19 -
.../src/main/resources/log4j2.xml | 31 -
.../support-version.list | 17 -
.../elasticsearch-6.x-scenario/bin/startup.sh | 20 -
.../config/expectedData.yaml | 469 --------
.../elasticsearch-6.x-scenario/configuration.yml | 33 -
.../scenarios/elasticsearch-6.x-scenario/pom.xml | 133 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/elasticsearch/Application.java | 34 -
.../elasticsearch/RestHighLevelClientCase.java | 473 --------
.../elasticsearch/TransportClientCase.java | 101 --
.../elasticsearch/config/ElasticsearchConfig.java | 56 -
.../config/TransportClientConfig.java | 72 --
.../elasticsearch/controller/CaseController.java | 57 -
.../src/main/resource/application.yml | 17 -
.../src/main/resource/log4j2.xml | 31 -
.../support-version.list | 18 -
.../elasticsearch-7.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 314 -----
.../elasticsearch-7.x-scenario/configuration.yml | 35 -
.../scenarios/elasticsearch-7.x-scenario/pom.xml | 159 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/elasticsearch/Application.java | 34 -
.../elasticsearch/RestHighLevelClientCase.java | 270 -----
.../elasticsearch/TransportClientCase.java | 100 --
.../elasticsearch/config/ElasticsearchConfig.java | 56 -
.../config/TransportClientConfig.java | 71 --
.../elasticsearch/controller/CaseController.java | 56 -
.../src/main/resources/application.yaml | 21 -
.../src/main/resources/log4j2.xml | 30 -
.../support-version.list | 22 -
.../bin/startup.sh | 21 -
.../config/expectedData.yaml | 148 ---
.../configuration.yml | 22 -
.../exception-checker-spring-scenario/pom.xml | 118 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/toolkit/trace/IgnoredException.java | 35 -
.../apm/testcase/exceptionchecker/Application.java | 34 -
.../controller/CaseController.java | 79 --
.../exception/TestAnnotatedException.java | 47 -
.../exceptionchecker/exception/TestException.java | 44 -
.../exception/TestHierarchyListedException.java | 44 -
.../exception/TestListedException.java | 44 -
.../exceptionchecker/service/TestService.java | 50 -
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/log4j2.xml | 30 -
.../support-version.list | 17 -
.../config/expectedData.yaml | 132 ---
.../configuration.yml | 23 -
.../exception-checker-tomcat-scenario/pom.xml | 97 --
.../apm/toolkit/trace/IgnoredException.java | 35 -
.../controller/CaseController.java | 79 --
.../exception/TestAnnotatedException.java | 47 -
.../exceptionchecker/exception/TestException.java | 44 -
.../exception/TestHierarchyListedException.java | 44 -
.../exception/TestListedException.java | 44 -
.../exception/TestOtherClassLoaderException.java | 44 -
.../exceptionchecker/service/TestService.java | 50 -
.../src/main/resources/log4j2.xml | 30 -
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 30 -
.../src/main/webapp/WEB-INF/web.xml | 34 -
.../support-version.list | 17 -
.../plugin/scenarios/feign-scenario/bin/startup.sh | 21 -
.../feign-scenario/config/expectedData.yaml | 219 ----
.../scenarios/feign-scenario/configuration.yml | 22 -
test/plugin/scenarios/feign-scenario/pom.xml | 141 ---
.../feign-scenario/src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/feign/Application.java | 34 -
.../testcase/feign/controller/CaseController.java | 52 -
.../testcase/feign/controller/RestController.java | 85 --
.../apm/testcase/feign/controller/RestRequest.java | 62 -
.../skywalking/apm/testcase/feign/entity/User.java | 53 -
.../src/main/resources/application.yaml | 23 -
.../feign-scenario/src/main/resources/log4j2.xml | 30 -
.../scenarios/feign-scenario/support-version.list | 22 -
.../finagle-17.10.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 57 -
.../finagle-17.10.x-scenario/configuration.yml | 22 -
.../scenarios/finagle-17.10.x-scenario/pom.xml | 170 ---
.../src/main/assembly/assembly.xml | 41 -
.../testcase/finagle/FinagleRpcApplication.java | 53 -
.../finagle/controller/CaseController.java | 49 -
.../finagle/service/FinagleRpcDemoServiceImpl.java | 29 -
.../src/main/resources/application.yaml | 21 -
.../src/main/thrift/service.thrift | 23 -
.../finagle-17.10.x-scenario/support-version.list | 35 -
.../finagle-6.44.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 57 -
.../finagle-6.44.x-scenario/configuration.yml | 22 -
.../scenarios/finagle-6.44.x-scenario/pom.xml | 170 ---
.../src/main/assembly/assembly.xml | 41 -
.../testcase/finagle/FinagleRpcApplication.java | 53 -
.../finagle/controller/CaseController.java | 49 -
.../finagle/service/FinagleRpcDemoServiceImpl.java | 29 -
.../src/main/resources/application.yaml | 21 -
.../src/main/thrift/service.thrift | 23 -
.../finagle-6.44.x-scenario/support-version.list | 20 -
.../config/expectedData.yaml | 93 --
.../gateway-2.0.x-scenario/configuration.yml | 22 -
.../gateway-dist/bin/startup.sh | 24 -
.../gateway-2.0.x-scenario/gateway-dist/pom.xml | 54 -
.../gateway-dist/src/main/assembly/assembly.xml | 46 -
.../gateway-projectA-scenario/pom.xml | 67 --
.../sc/gateway/projectA/ApiKeyResolver.java | 31 -
.../testcase/sc/gateway/projectA/Application.java | 29 -
.../testcase/sc/gateway/projectA/Test1Filter.java | 38 -
.../testcase/sc/gateway/projectA/Test2Filter.java | 39 -
.../sc/gateway/projectA/TestFilterConfig.java | 35 -
.../src/main/resources/application.yml | 27 -
.../gateway-projectB-scenario/pom.xml | 57 -
.../testcase/sc/gateway/projectB/Application.java | 31 -
.../projectB/controller/TestController.java | 35 -
.../src/main/resources/application.properties | 17 -
.../scenarios/gateway-2.0.x-scenario/pom.xml | 58 -
.../gateway-2.0.x-scenario/support-version.list | 17 -
.../config/expectedData.yaml | 93 --
.../gateway-2.1.x-scenario/configuration.yml | 22 -
.../gateway-dist/bin/startup.sh | 24 -
.../gateway-2.1.x-scenario/gateway-dist/pom.xml | 54 -
.../gateway-dist/src/main/assembly/assembly.xml | 46 -
.../gateway-projectA-scenario/pom.xml | 67 --
.../sc/gateway/projectA/ApiKeyResolver.java | 31 -
.../testcase/sc/gateway/projectA/Application.java | 29 -
.../testcase/sc/gateway/projectA/Test1Filter.java | 38 -
.../testcase/sc/gateway/projectA/Test2Filter.java | 39 -
.../sc/gateway/projectA/TestFilterConfig.java | 35 -
.../src/main/resources/application.yml | 27 -
.../gateway-projectB-scenario/pom.xml | 57 -
.../testcase/sc/gateway/projectB/Application.java | 31 -
.../projectB/controller/TestController.java | 35 -
.../src/main/resources/application.properties | 17 -
.../scenarios/gateway-2.1.x-scenario/pom.xml | 58 -
.../gateway-2.1.x-scenario/support-version.list | 18 -
.../gateway-3.x-scenario/config/expectedData.yaml | 93 --
.../gateway-3.x-scenario/configuration.yml | 22 -
.../gateway-dist/bin/startup.sh | 24 -
.../gateway-3.x-scenario/gateway-dist/pom.xml | 54 -
.../gateway-dist/src/main/assembly/assembly.xml | 46 -
.../gateway-projectA-scenario/pom.xml | 67 --
.../sc/gateway/projectA/ApiKeyResolver.java | 31 -
.../testcase/sc/gateway/projectA/Application.java | 29 -
.../testcase/sc/gateway/projectA/Test1Filter.java | 38 -
.../testcase/sc/gateway/projectA/Test2Filter.java | 39 -
.../sc/gateway/projectA/TestFilterConfig.java | 35 -
.../src/main/resources/application.yml | 27 -
.../gateway-projectB-scenario/pom.xml | 57 -
.../testcase/sc/gateway/projectB/Application.java | 31 -
.../projectB/controller/TestController.java | 35 -
.../src/main/resources/application.properties | 17 -
test/plugin/scenarios/gateway-3.x-scenario/pom.xml | 58 -
.../gateway-3.x-scenario/support-version.list | 19 -
.../scenarios/graphql-12.x-scenario/bin/startup.sh | 21 -
.../graphql-12.x-scenario/config/expectedData.yaml | 92 --
.../graphql-12.x-scenario/configuration.yml | 20 -
.../plugin/scenarios/graphql-12.x-scenario/pom.xml | 115 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/graphql/Application.java | 29 -
.../graphql/configuration/GraphSchema.java | 120 --
.../graphql/controller/CaseController.java | 53 -
.../skywalking/apm/testcase/graphql/data/User.java | 26 -
.../src/main/resources/application.yml | 20 -
.../graphql-12.x-scenario/support-version.list | 22 -
.../scenarios/graphql-8.x-scenario/bin/startup.sh | 21 -
.../graphql-8.x-scenario/config/expectedData.yaml | 92 --
.../graphql-8.x-scenario/configuration.yml | 20 -
test/plugin/scenarios/graphql-8.x-scenario/pom.xml | 114 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/graphql/Application.java | 29 -
.../graphql/configuration/GraphSchema.java | 119 --
.../apm/testcase/graphql/configuration/User.java | 26 -
.../graphql/controller/CaseController.java | 53 -
.../src/main/resources/application.yml | 20 -
.../graphql-8.x-scenario/support-version.list | 17 -
.../scenarios/graphql-9.x-scenario/bin/startup.sh | 21 -
.../graphql-9.x-scenario/config/expectedData.yaml | 92 --
.../graphql-9.x-scenario/configuration.yml | 20 -
test/plugin/scenarios/graphql-9.x-scenario/pom.xml | 114 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/graphql/Application.java | 29 -
.../graphql/configuration/GraphSchema.java | 120 --
.../graphql/controller/CaseController.java | 53 -
.../skywalking/apm/testcase/graphql/data/User.java | 26 -
.../src/main/resources/application.yml | 20 -
.../graphql-9.x-scenario/support-version.list | 21 -
test/plugin/scenarios/grpc-scenario/bin/startup.sh | 21 -
.../grpc-scenario/config/expectedData.yaml | 441 --------
.../scenarios/grpc-scenario/configuration.yml | 22 -
test/plugin/scenarios/grpc-scenario/pom.xml | 159 ---
.../grpc-scenario/src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/grpc/Application.java | 34 -
.../testcase/grpc/consumr/ConsumerInterceptor.java | 109 --
.../testcase/grpc/controller/CaseController.java | 137 ---
.../grpc/provider/ProviderConfiguration.java | 44 -
.../provider/interceptor/ProviderInterceptor.java | 96 --
.../service/GreeterBlockingErrorServiceImpl.java | 31 -
.../service/GreeterBlockingServiceImpl.java | 32 -
.../grpc/provider/service/GreeterServiceImpl.java | 52 -
.../src/main/proto/GreetService.proto | 43 -
.../src/main/resources/application.yaml | 23 -
.../grpc-scenario/src/main/resources/log4j2.xml | 30 -
.../scenarios/grpc-scenario/support-version.list | 41 -
test/plugin/scenarios/gson-scenario/bin/startup.sh | 21 -
.../gson-scenario/config/expectedData.yaml | 63 --
.../scenarios/gson-scenario/configuration.yml | 24 -
test/plugin/scenarios/gson-scenario/pom.xml | 119 --
.../gson-scenario/src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/gson/Application.java | 34 -
.../testcase/gson/controller/CaseController.java | 47 -
.../src/main/resources/application.yaml | 23 -
.../gson-scenario/src/main/resources/log4j2.xml | 30 -
.../scenarios/gson-scenario/support-version.list | 17 -
.../guava-cache-scenario/config/expectedData.yaml | 101 --
.../guava-cache-scenario/configuration.yml | 21 -
test/plugin/scenarios/guava-cache-scenario/pom.xml | 77 --
.../apm/testcase/guava/cache/CaseServlet.java | 71 --
.../testcase/guava/cache/HealthCheckServlet.java | 40 -
.../src/main/resources/log4j2.xml | 30 -
.../src/main/webapp/WEB-INF/web.xml | 44 -
.../guava-cache-scenario/support-version.list | 22 -
test/plugin/scenarios/h2-scenario/bin/startup.sh | 21 -
.../scenarios/h2-scenario/config/expectedData.yaml | 102 --
.../plugin/scenarios/h2-scenario/configuration.yml | 20 -
test/plugin/scenarios/h2-scenario/pom.xml | 124 --
.../h2-scenario/src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/h2/Application.java | 34 -
.../apm/testcase/h2/controller/CaseController.java | 60 -
.../apm/testcase/h2/controller/SQLExecutor.java | 75 --
.../src/main/resources/application.yaml | 23 -
.../h2-scenario/src/main/resources/log4j2.xml | 30 -
.../scenarios/h2-scenario/support-version.list | 17 -
.../plugin/scenarios/hbase-scenario/bin/startup.sh | 21 -
.../hbase-scenario/config/expectedData.yaml | 96 --
.../scenarios/hbase-scenario/configuration.yml | 31 -
test/plugin/scenarios/hbase-scenario/pom.xml | 137 ---
.../hbase-scenario/src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/hbase/Application.java | 34 -
.../testcase/hbase/controller/HBaseController.java | 122 --
.../src/main/resources/application.properties | 19 -
.../hbase-scenario/src/main/resources/log4j2.xml | 30 -
.../scenarios/hbase-scenario/support-version.list | 21 -
.../httpasyncclient-scenario/bin/startup.sh | 19 -
.../config/expectedData.yaml | 73 --
.../httpasyncclient-scenario/configuration.yml | 18 -
.../scenarios/httpasyncclient-scenario/pom.xml | 126 ---
.../src/main/assembly/assembly.xml | 41 -
.../testcase/httpasyncclient/BackController.java | 32 -
.../testcase/httpasyncclient/FrontController.java | 107 --
.../HttpasyncclientApplication.java | 33 -
.../src/main/resource/application.yml | 17 -
.../src/main/resource/log4j2.xml | 31 -
.../httpasyncclient-scenario/support-version.list | 18 -
.../config/expectedData.yaml | 81 --
.../httpclient-3.x-scenario/configuration.yml | 21 -
.../scenarios/httpclient-3.x-scenario/pom.xml | 76 --
.../apm/testcase/httpclient/CaseServlet.java | 51 -
.../testcase/httpclient/HealthCheckServlet.java | 39 -
.../httpclient/ServletForContextPropagate.java | 40 -
.../src/main/webapp/WEB-INF/web.xml | 54 -
.../httpclient-3.x-scenario/support-version.list | 19 -
.../config/expectedData.yaml | 72 --
.../httpclient-4.3.x-scenario/configuration.yml | 19 -
.../scenarios/httpclient-4.3.x-scenario/pom.xml | 76 --
.../apm/testcase/httpclient/CaseServlet.java | 60 -
.../testcase/httpclient/HealthCheckServlet.java | 40 -
.../httpclient/ServletForContextPropagate.java | 41 -
.../src/main/resources/log4j2.xml | 30 -
.../src/main/webapp/WEB-INF/web.xml | 54 -
.../httpclient-4.3.x-scenario/support-version.list | 19 -
.../scenarios/hystrix-scenario/bin/startup.sh | 21 -
.../hystrix-scenario/config/expectedData.yaml | 81 --
.../scenarios/hystrix-scenario/configuration.yml | 22 -
test/plugin/scenarios/hystrix-scenario/pom.xml | 121 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/hystrix/Application.java | 34 -
.../hystrix/controller/CaseController.java | 97 --
.../testcase/hystrix/controller/TestACommand.java | 58 -
.../testcase/hystrix/controller/TestBCommand.java | 60 -
.../src/main/resources/application.yaml | 23 -
.../hystrix-scenario/src/main/resources/log4j2.xml | 30 -
.../hystrix-scenario/support-version.list | 19 -
.../scenarios/influxdb-scenario/bin/startup.sh | 22 -
.../influxdb-scenario/config/expectedData.yaml | 131 ---
.../scenarios/influxdb-scenario/configuration.yml | 27 -
test/plugin/scenarios/influxdb-scenario/pom.xml | 114 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/influxdb/Application.java | 34 -
.../influxdb/controller/CaseController.java | 70 --
.../influxdb/executor/InfluxDBExecutor.java | 68 --
.../src/main/resources/application.yaml | 21 -
.../influxdb-scenario/support-version.list | 29 -
.../scenarios/jdk-http-scenario/bin/startup.sh | 21 -
.../jdk-http-scenario/config/expectedData.yaml | 72 --
.../scenarios/jdk-http-scenario/configuration.yml | 22 -
test/plugin/scenarios/jdk-http-scenario/pom.xml | 110 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/jdkhttp/Application.java | 34 -
.../jdkhttp/controller/CaseController.java | 63 --
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/log4j2.xml | 30 -
.../jdk-http-scenario/support-version.list | 17 -
.../jdk-threading-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 102 --
.../jdk-threading-scenario/configuration.yml | 22 -
.../scenarios/jdk-threading-scenario/pom.xml | 88 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/jdk/threading/Application.java | 80 --
.../src/main/resources/application.yaml | 19 -
.../jdk-threading-scenario/support-version.list | 17 -
.../jdk14-with-gson-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 77 --
.../jdk14-with-gson-scenario/configuration.yml | 24 -
.../scenarios/jdk14-with-gson-scenario/pom.xml | 149 ---
.../src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/gson/Application.java | 34 -
.../testcase/gson/controller/CaseController.java | 56 -
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/log4j2.xml | 30 -
.../jdk14-with-gson-scenario/support-version.list | 17 -
.../plugin/scenarios/jedis-scenario/bin/startup.sh | 22 -
.../jedis-scenario/config/expectedData.yaml | 141 ---
.../scenarios/jedis-scenario/configuration.yml | 28 -
test/plugin/scenarios/jedis-scenario/pom.xml | 108 --
.../jedis-scenario/src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/jedis/Application.java | 34 -
.../testcase/jedis/controller/CaseController.java | 61 -
.../jedis/controller/RedisCommandExecutor.java | 46 -
.../controller/RedisPipelineCommandExecutor.java | 42 -
.../src/main/resources/application.yaml | 21 -
.../scenarios/jedis-scenario/support-version.list | 22 -
.../jetty-scenario/config/expectedData.yaml | 74 --
.../scenarios/jetty-scenario/configuration.yml | 20 -
.../jetty-scenario/jetty-dist/bin/startup.sh | 24 -
.../scenarios/jetty-scenario/jetty-dist/pom.xml | 54 -
.../jetty-dist/src/main/assembly/assembly.xml | 46 -
.../jetty-scenario/jettyclient-scenario/pom.xml | 107 --
.../apm/testcase/jettyclient/Application.java | 39 -
.../jettyclient/controller/CaseController.java | 56 -
.../src/main/resources/application.properties | 17 -
.../src/main/resources/log4j2.xml | 30 -
.../jetty-scenario/jettyserver-scenario/pom.xml | 81 --
.../apm/testcase/jettyserver/Application.java | 37 -
.../testcase/jettyserver/servlet/CaseServlet.java | 37 -
test/plugin/scenarios/jetty-scenario/pom.xml | 63 --
.../scenarios/jetty-scenario/support-version.list | 20 -
.../jsonrpc4j-1.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 91 --
.../jsonrpc4j-1.x-scenario/configuration.yml | 20 -
.../scenarios/jsonrpc4j-1.x-scenario/pom.xml | 119 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/jsonrpc4j/Application.java | 36 -
.../jsonrpc4j/controller/CaseController.java | 52 -
.../testcase/jsonrpc4j/services/DemoService.java | 27 -
.../jsonrpc4j/services/DemoServiceImp.java | 32 -
.../src/main/resources/application.yml | 20 -
.../jsonrpc4j-1.x-scenario/support-version.list | 20 -
.../plugin/scenarios/kafka-scenario/bin/startup.sh | 21 -
.../kafka-scenario/config/expectedData.yaml | 263 -----
.../scenarios/kafka-scenario/configuration.yml | 39 -
test/plugin/scenarios/kafka-scenario/pom.xml | 145 ---
.../kafka-scenario/src/main/assembly/assembly.xml | 41 -
.../apm/toolkit/kafka/KafkaPollAndInvoke.java | 30 -
.../skywalking/apm/testcase/kafka/Application.java | 30 -
.../testcase/kafka/controller/CaseController.java | 352 ------
.../src/main/resources/application.properties | 19 -
.../kafka-scenario/src/main/resources/log4j2.xml | 30 -
.../scenarios/kafka-scenario/support-version.list | 27 -
.../kotlin-coroutine-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 117 --
.../kotlin-coroutine-scenario/configuration.yml | 22 -
.../scenarios/kotlin-coroutine-scenario/pom.xml | 156 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/kotlin/coroutine/Application.kt | 29 -
.../kotlin/coroutine/controller/DemoController.kt | 65 --
.../kotlin/coroutine/respository/DemoRepository.kt | 58 -
.../kotlin/coroutine/service/DemoService.kt | 35 -
.../testcase/kotlin/coroutine/util/Connection.kt | 30 -
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/log4j2.xml | 30 -
.../kotlin-coroutine-scenario/support-version.list | 20 -
.../scenarios/lettuce-scenario/bin/startup.sh | 21 -
.../lettuce-scenario/config/expectedData.yaml | 66 --
.../scenarios/lettuce-scenario/configuration.yml | 28 -
test/plugin/scenarios/lettuce-scenario/pom.xml | 133 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/lettuce/Application.java | 34 -
.../lettuce/controller/LettuceController.java | 72 --
.../src/main/resources/application.properties | 19 -
.../lettuce-scenario/src/main/resources/log4j2.xml | 30 -
.../lettuce-scenario/support-version.list | 19 -
.../scenarios/mariadb-scenario/bin/startup.sh | 21 -
.../mariadb-scenario/config/expectedData.yaml | 119 --
.../scenarios/mariadb-scenario/configuration.yml | 32 -
test/plugin/scenarios/mariadb-scenario/pom.xml | 120 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/mariadb/Application.java | 39 -
.../apm/testcase/mariadb/MariadbConfig.java | 58 -
.../apm/testcase/mariadb/SQLExecutor.java | 70 --
.../mariadb/controller/CaseController.java | 63 --
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/jdbc.properties | 18 -
.../mariadb-scenario/src/main/resources/log4j2.xml | 30 -
.../mariadb-scenario/support-version.list | 25 -
.../scenarios/mongodb-3.x-scenario/bin/startup.sh | 21 -
.../mongodb-3.x-scenario/config/expectedData.yaml | 141 ---
.../mongodb-3.x-scenario/configuration.yml | 24 -
test/plugin/scenarios/mongodb-3.x-scenario/pom.xml | 140 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/mongodb/Application.java | 30 -
.../mongodb/controller/CaseController.java | 83 --
.../src/main/resources/application.properties | 19 -
.../src/main/resources/log4j2.xml | 31 -
.../mongodb-3.x-scenario/support-version.list | 25 -
.../scenarios/mongodb-4.x-scenario/bin/startup.sh | 21 -
.../mongodb-4.x-scenario/config/expectedData.yaml | 141 ---
.../mongodb-4.x-scenario/configuration.yml | 24 -
test/plugin/scenarios/mongodb-4.x-scenario/pom.xml | 145 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/mongodb/Application.java | 34 -
.../mongodb/controller/CaseController.java | 81 --
.../src/main/resources/application.yaml | 25 -
.../src/main/resources/log4j2.xml | 30 -
.../mongodb-4.x-scenario/support-version.list | 18 -
.../scenarios/mssql-jdbc-scenario/bin/startup.sh | 21 -
.../mssql-jdbc-scenario/config/expectedData.yaml | 125 --
.../mssql-jdbc-scenario/configuration.yml | 32 -
test/plugin/scenarios/mssql-jdbc-scenario/pom.xml | 121 --
.../src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/mssql/Application.java | 34 -
.../skywalking/apm/testcase/mssql/MssqlConfig.java | 58 -
.../skywalking/apm/testcase/mssql/SQLExecutor.java | 96 --
.../testcase/mssql/controller/CaseController.java | 66 --
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/jdbc.properties | 18 -
.../src/main/resources/log4j2.xml | 30 -
.../mssql-jdbc-scenario/support-version.list | 23 -
.../scenarios/mssql-jtds-scenario/bin/startup.sh | 21 -
.../mssql-jtds-scenario/config/expectedData.yaml | 106 --
.../mssql-jtds-scenario/configuration.yml | 32 -
test/plugin/scenarios/mssql-jtds-scenario/pom.xml | 120 --
.../src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/mssql/Application.java | 34 -
.../skywalking/apm/testcase/mssql/MssqlConfig.java | 58 -
.../skywalking/apm/testcase/mssql/SQLExecutor.java | 88 --
.../testcase/mssql/controller/CaseController.java | 65 --
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/jdbc.properties | 18 -
.../src/main/resources/log4j2.xml | 30 -
.../mssql-jtds-scenario/support-version.list | 23 -
.../scenarios/mybatis-3.x-scenario/bin/startup.sh | 21 -
.../mybatis-3.x-scenario/config/expectedData.yaml | 128 ---
.../mybatis-3.x-scenario/configuration.yml | 33 -
test/plugin/scenarios/mybatis-3.x-scenario/pom.xml | 125 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/mybatis/Application.java | 33 -
.../apm/testcase/mybatis/config/JdbcConfig.java | 49 -
.../mybatis/controller/CaseController.java | 64 --
.../apm/testcase/mybatis/mapper/DemoMapper.java | 27 -
.../apm/testcase/mybatis/service/DemoService.java | 25 -
.../mybatis/service/impl/DemoServiceImpl.java | 37 -
.../src/main/resources/application.properties | 27 -
.../src/main/resources/mapper/DemoMapper.xml | 26 -
.../mybatis-3.x-scenario/support-version.list | 18 -
.../plugin/scenarios/mysql-scenario/bin/startup.sh | 21 -
.../mysql-scenario/config/expectedData.yaml | 173 ---
.../scenarios/mysql-scenario/configuration.yml | 32 -
test/plugin/scenarios/mysql-scenario/pom.xml | 120 --
.../mysql-scenario/src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/mysql/Application.java | 34 -
.../skywalking/apm/testcase/mysql/MysqlConfig.java | 58 -
.../skywalking/apm/testcase/mysql/SQLExecutor.java | 88 --
.../testcase/mysql/controller/CaseController.java | 71 --
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/jdbc.properties | 18 -
.../mysql-scenario/src/main/resources/log4j2.xml | 30 -
.../scenarios/mysql-scenario/support-version.list | 20 -
.../scenarios/neo4j-4.x-scenario/bin/startup.sh | 24 -
.../neo4j-4.x-scenario/config/expectedData.yaml | 146 ---
.../scenarios/neo4j-4.x-scenario/configuration.yml | 31 -
test/plugin/scenarios/neo4j-4.x-scenario/pom.xml | 123 --
.../src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/neo4j/Application.java | 46 -
.../testcase/neo4j/controller/CaseController.java | 53 -
.../testcase/neo4j/service/TestCaseService.java | 106 --
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/log4j2.xml | 31 -
.../neo4j-4.x-scenario/support-version.list | 20 -
.../config/expectedData.yaml | 74 --
.../netty-socketio-scenario/configuration.yml | 19 -
.../scenarios/netty-socketio-scenario/pom.xml | 82 --
.../apm/testcase/netty/socketio/CaseServlet.java | 79 --
.../netty/socketio/HealthCheckServlet.java | 47 -
.../testcase/netty/socketio/SocketIOStarter.java | 58 -
.../src/main/webapp/WEB-INF/web.xml | 44 -
.../netty-socketio-scenario/support-version.list | 17 -
.../scenarios/okhttp-scenario/bin/startup.sh | 21 -
.../okhttp-scenario/config/expectedData.yaml | 99 --
.../scenarios/okhttp-scenario/configuration.yml | 20 -
test/plugin/scenarios/okhttp-scenario/pom.xml | 143 ---
.../okhttp-scenario/src/main/assembly/assembly.xml | 41 -
.../skywalking/testcase/okhttp/Application.java | 39 -
.../testcase/okhttp/controller/CaseController.java | 77 --
.../src/main/resources/application.properties | 17 -
.../okhttp-scenario/src/main/resources/log4j2.xml | 30 -
.../scenarios/okhttp-scenario/support-version.list | 37 -
.../scenarios/oracle-scenario/bin/startup.sh | 21 -
.../oracle-scenario/config/expectedData.yaml | 118 --
.../scenarios/oracle-scenario/configuration.yml | 30 -
test/plugin/scenarios/oracle-scenario/pom.xml | 118 --
.../oracle-scenario/src/main/assembly/assembly.xml | 41 -
.../apm/testcase/oracle/Application.java | 34 -
.../testcase/oracle/controller/CaseController.java | 139 ---
.../src/main/resources/application.yaml | 23 -
.../oracle-scenario/src/main/resources/log4j2.xml | 30 -
.../scenarios/oracle-scenario/support-version.list | 17 -
.../app/controllers/HealthCheckController.scala | 30 -
.../app/controllers/ProjectsController.scala | 30 -
test/plugin/scenarios/play-scenario/bin/startup.sh | 21 -
test/plugin/scenarios/play-scenario/build.sbt | 31 -
.../scenarios/play-scenario/conf/application.conf | 19 -
.../scenarios/play-scenario/conf/logback.xml | 41 -
test/plugin/scenarios/play-scenario/conf/routes | 24 -
.../play-scenario/config/expectedData.yaml | 36 -
.../scenarios/play-scenario/configuration.yml | 20 -
test/plugin/scenarios/play-scenario/pom.xml | 141 ---
.../play-scenario/project/build.properties | 16 -
.../scenarios/play-scenario/project/plugins.sbt | 19 -
.../play-scenario/src/main/assembly/assembly.xml | 47 -
.../scenarios/play-scenario/support-version.list | 19 -
.../bin/startup.sh | 20 -
.../config/expectedData.yaml | 102 --
.../configuration.yml | 28 -
.../postgresql-above9.4.1207-scenario/pom.xml | 121 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/postgresql/Application.java | 34 -
.../postgresql/controller/CaseController.java | 83 --
.../testcase/postgresql/controller/ConstSql.java | 26 -
.../postgresql/controller/PostgresqlConfig.java | 50 -
.../postgresql/controller/SQLExecutor.java | 69 --
.../src/main/resources/application.yml | 17 -
.../src/main/resources/log4j2.xml | 31 -
.../support-version.list | 20 -
.../scenarios/postgresql-scenario/bin/startup.sh | 20 -
.../postgresql-scenario/config/expectedData.yaml | 101 --
.../postgresql-scenario/configuration.yml | 29 -
test/plugin/scenarios/postgresql-scenario/pom.xml | 121 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/postgresql/Application.java | 34 -
.../postgresql/controller/CaseController.java | 83 --
.../testcase/postgresql/controller/ConstSql.java | 26 -
.../postgresql/controller/PostgresqlConfig.java | 50 -
.../postgresql/controller/SQLExecutor.java | 69 --
.../src/main/resources/application.yml | 17 -
.../src/main/resources/log4j2.xml | 31 -
.../postgresql-scenario/support-version.list | 19 -
.../scenarios/pulsar-scenario/bin/startup.sh | 21 -
.../pulsar-scenario/config/expectedData.yaml | 236 ----
.../scenarios/pulsar-scenario/configuration.yml | 32 -
test/plugin/scenarios/pulsar-scenario/pom.xml | 139 ---
.../pulsar-scenario/src/main/assembly/assembly.xml | 41 -
.../apm/testcase/pulsar/Application.java | 38 -
.../testcase/pulsar/controller/CaseController.java | 179 ---
.../src/main/resources/application.properties | 19 -
.../pulsar-scenario/src/main/resources/log4j2.xml | 34 -
.../scenarios/pulsar-scenario/support-version.list | 22 -
.../quartz-scheduler-2.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 97 --
.../configuration.yml | 22 -
.../quartz-scheduler-2.x-scenario/pom.xml | 130 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/quartzscheduler/Application.java | 30 -
.../quartzscheduler/controller/CaseController.java | 44 -
.../apm/testcase/quartzscheduler/job/DemoJob.java | 48 -
.../testcase/quartzscheduler/job/ExceptionJob.java | 32 -
.../testcase/quartzscheduler/job/QuartzConfig.java | 86 --
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/log4j2.xml | 30 -
.../support-version.list | 20 -
.../scenarios/quasar-scenario/bin/startup.sh | 21 -
.../quasar-scenario/config/expectedData.yaml | 70 --
.../scenarios/quasar-scenario/configuration.yml | 20 -
test/plugin/scenarios/quasar-scenario/pom.xml | 128 ---
.../quasar-scenario/src/main/assembly/assembly.xml | 41 -
.../apm/testcase/quasar/Application.java | 39 -
.../testcase/quasar/controller/CaseController.java | 82 --
.../src/main/resources/application.yaml | 23 -
.../quasar-scenario/src/main/resources/log4j2.xml | 30 -
.../scenarios/quasar-scenario/support-version.list | 17 -
.../scenarios/rabbitmq-scenario/bin/startup.sh | 20 -
.../rabbitmq-scenario/config/expectedData.yaml | 75 --
.../scenarios/rabbitmq-scenario/configuration.yml | 31 -
test/plugin/scenarios/rabbitmq-scenario/pom.xml | 120 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/rabbitmq/Application.java | 34 -
.../rabbitmq/controller/CaseController.java | 151 ---
.../src/main/resources/application.properties | 19 -
.../src/main/resources/log4j2.xml | 31 -
.../rabbitmq-scenario/support-version.list | 22 -
.../scenarios/redisson-scenario/bin/startup.sh | 21 -
.../redisson-scenario/config/expectedData.yaml | 69 --
.../scenarios/redisson-scenario/configuration.yml | 28 -
test/plugin/scenarios/redisson-scenario/pom.xml | 105 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/redisson/Application.java | 30 -
.../redisson/controller/CaseController.java | 70 --
.../src/main/resources/application.properties | 19 -
.../redisson-scenario/support-version.list | 23 -
.../config/expectedData.yaml | 131 ---
.../resttemplate-4.x-scenario/configuration.yml | 17 -
.../scenarios/resttemplate-4.x-scenario/pom.xml | 79 --
.../testcase/resttemplate/BackController.java | 37 -
.../testcase/resttemplate/FrontController.java | 74 --
.../resttemplate/ResttemplateConfiguration.java | 38 -
.../src/main/resource/log4j2.xml | 31 -
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 30 -
.../src/main/webapp/WEB-INF/web.xml | 35 -
.../resttemplate-4.x-scenario/support-version.list | 20 -
.../retransform-class-scenario/bin/startup.sh | 24 -
.../config/expectedData.yaml | 36 -
.../retransform-class-scenario/configuration.yml | 22 -
.../scenarios/retransform-class-scenario/pom.xml | 126 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/retransform/Application.java | 47 -
.../apm/testcase/retransform/RetransformUtil.java | 86 --
.../retransform/controller/CaseController.java | 56 -
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/log4j2.xml | 30 -
.../support-version.list | 17 -
.../config/expectedData.yaml | 37 -
.../configuration.yml | 23 -
.../retransform-class-tomcat-scenario/pom.xml | 115 --
.../apm/testcase/retransform/CaseController.java | 50 -
.../apm/testcase/retransform/RetransformUtil.java | 81 --
.../apm/testcase/retransform/StartupListener.java | 33 -
.../src/main/resources/log4j2.xml | 30 -
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 30 -
.../src/main/webapp/WEB-INF/web.xml | 35 -
.../support-version.list | 17 -
.../scenarios/sentinel-scenario/bin/startup.sh | 21 -
.../sentinel-scenario/config/expectedData.yaml | 90 --
.../scenarios/sentinel-scenario/configuration.yml | 24 -
test/plugin/scenarios/sentinel-scenario/pom.xml | 121 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/sentinel/Application.java | 34 -
.../sentinel/controller/CaseController.java | 111 --
.../src/main/resources/application.yaml | 23 -
.../src/main/resources/log4j2.xml | 30 -
.../sentinel-scenario/support-version.list | 21 -
.../servicecomb-0.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 70 --
.../servicecomb-0.x-scenario/configuration.yml | 20 -
.../scenarios/servicecomb-0.x-scenario/pom.xml | 124 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/servicecomb/CodeFirstMain.java | 52 -
.../consumer/CodeFirstPojoConsumerHelloImpl.java | 50 -
.../provider/CodeFirstJaxrsHelloImpl.java | 47 -
.../provider/CodeFirstPojoHelloProviderImpl.java | 37 -
.../provider/CodeFirstSpringmvcHelloImpl.java | 45 -
.../apm/testcase/servicecomb/schema/Hello.java | 28 -
.../testcase/servicecomb/schema/models/Person.java | 32 -
.../main/resources/META-INF/spring/pojo.bean.xml | 29 -
.../main/resources/config/log4j.demo.properties | 18 -
.../src/main/resources/microservice.yaml | 28 -
.../servicecomb-0.x-scenario/support-version.list | 21 -
.../servicecomb-1.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 70 --
.../servicecomb-1.x-scenario/configuration.yml | 22 -
.../scenarios/servicecomb-1.x-scenario/pom.xml | 148 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/servicecomb/CodeFirstMain.java | 52 -
.../consumer/CodeFirstPojoConsumerHelloImpl.java | 50 -
.../provider/CodeFirstJaxrsHelloImpl.java | 47 -
.../provider/CodeFirstPojoHelloProviderImpl.java | 37 -
.../provider/CodeFirstSpringmvcHelloImpl.java | 45 -
.../apm/testcase/servicecomb/schema/Hello.java | 28 -
.../testcase/servicecomb/schema/models/Person.java | 32 -
.../main/resources/META-INF/spring/pojo.bean.xml | 29 -
.../main/resources/config/log4j.demo.properties | 18 -
.../src/main/resources/microservice.yaml | 28 -
.../servicecomb-1.x-scenario/support-version.list | 20 -
.../shardingsphere-3.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 174 ---
.../shardingsphere-3.x-scenario/configuration.yml | 20 -
.../scenarios/shardingsphere-3.x-scenario/pom.xml | 147 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/shardingsphere/Application.java | 31 -
.../shardingsphere/controller/CaseController.java | 60 -
.../shardingsphere/service/api/entity/Order.java | 61 -
.../service/api/entity/OrderItem.java | 71 --
.../service/api/repository/CommonRepository.java | 38 -
.../api/repository/OrderItemRepository.java | 24 -
.../service/api/repository/OrderRepository.java | 24 -
.../service/api/service/CommonService.java | 32 -
.../service/api/service/CommonServiceImpl.java | 108 --
...dingDatabasesAndTablesConfigurationPrecise.java | 79 --
.../jdbc/JDBCOrderItemRepositoryImpl.java | 126 ---
.../repository/jdbc/JDBCOrderRepositoryImpl.java | 124 --
.../service/repository/service/RawPojoService.java | 60 -
.../PreciseModuloShardingDatabaseAlgorithm.java | 37 -
.../PreciseModuloShardingTableAlgorithm.java | 36 -
.../RangeModuloShardingDatabaseAlgorithm.java | 53 -
.../RangeModuloShardingTableAlgorithm.java | 45 -
.../service/utility/config/DataSourceUtil.java | 54 -
.../utility/config/ExampleConfiguration.java | 29 -
.../src/main/resources/application.properties | 17 -
.../support-version.list | 17 -
.../shardingsphere-4.0.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 174 ---
.../configuration.yml | 20 -
.../shardingsphere-4.0.x-scenario/pom.xml | 149 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/shardingsphere/Application.java | 31 -
.../shardingsphere/controller/CaseController.java | 60 -
.../shardingsphere/service/api/entity/Order.java | 61 -
.../service/api/entity/OrderItem.java | 71 --
.../service/api/repository/CommonRepository.java | 38 -
.../api/repository/OrderItemRepository.java | 24 -
.../service/api/repository/OrderRepository.java | 24 -
.../service/api/service/CommonService.java | 32 -
.../service/api/service/CommonServiceImpl.java | 109 --
...dingDatabasesAndTablesConfigurationPrecise.java | 76 --
.../jdbc/JDBCOrderItemRepositoryImpl.java | 129 ---
.../repository/jdbc/JDBCOrderRepositoryImpl.java | 126 ---
.../service/repository/service/RawPojoService.java | 60 -
.../PreciseModuloShardingDatabaseAlgorithm.java | 38 -
.../PreciseModuloShardingTableAlgorithm.java | 37 -
.../RangeModuloShardingDatabaseAlgorithm.java | 54 -
.../RangeModuloShardingTableAlgorithm.java | 46 -
.../service/utility/config/DataSourceUtil.java | 55 -
.../utility/config/ExampleConfiguration.java | 29 -
.../src/main/resources/application.properties | 17 -
.../support-version.list | 17 -
.../shardingsphere-4.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 174 ---
.../shardingsphere-4.x-scenario/configuration.yml | 20 -
.../scenarios/shardingsphere-4.x-scenario/pom.xml | 148 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/shardingsphere/Application.java | 36 -
.../shardingsphere/controller/CaseController.java | 60 -
.../shardingsphere/service/api/entity/Order.java | 61 -
.../service/api/entity/OrderItem.java | 71 --
.../service/api/repository/CommonRepository.java | 38 -
.../api/repository/OrderItemRepository.java | 24 -
.../service/api/repository/OrderRepository.java | 24 -
.../service/api/service/CommonService.java | 32 -
.../service/api/service/CommonServiceImpl.java | 108 --
...dingDatabasesAndTablesConfigurationPrecise.java | 75 --
.../jdbc/JDBCOrderItemRepositoryImpl.java | 126 ---
.../repository/jdbc/JDBCOrderRepositoryImpl.java | 124 --
.../service/repository/service/RawPojoService.java | 60 -
.../PreciseModuloShardingDatabaseAlgorithm.java | 37 -
.../PreciseModuloShardingTableAlgorithm.java | 36 -
.../RangeModuloShardingDatabaseAlgorithm.java | 53 -
.../RangeModuloShardingTableAlgorithm.java | 45 -
.../service/utility/config/DataSourceUtil.java | 54 -
.../utility/config/ExampleConfiguration.java | 29 -
.../src/main/resources/application.properties | 17 -
.../support-version.list | 17 -
.../bin/startup.sh | 21 -
.../config/expectedData.yaml | 231 ----
.../configuration.yml | 20 -
.../shardingsphere-5.0.0-beta-scenario/pom.xml | 122 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/shardingsphere/Application.java | 35 -
.../shardingsphere/controller/CaseController.java | 60 -
.../shardingsphere/service/api/entity/Order.java | 61 -
.../service/api/entity/OrderItem.java | 71 --
.../service/api/repository/CommonRepository.java | 38 -
.../api/repository/OrderItemRepository.java | 24 -
.../service/api/repository/OrderRepository.java | 24 -
.../service/api/service/CommonService.java | 32 -
.../service/api/service/CommonServiceImpl.java | 108 --
...dingDatabasesAndTablesConfigurationPrecise.java | 94 --
.../jdbc/JDBCOrderItemRepositoryImpl.java | 126 ---
.../repository/jdbc/JDBCOrderRepositoryImpl.java | 124 --
.../service/repository/service/RawPojoService.java | 60 -
.../service/utility/config/DataSourceUtil.java | 54 -
.../utility/config/ExampleConfiguration.java | 27 -
.../src/main/resources/application.properties | 17 -
.../support-version.list | 17 -
.../scenarios/sofarpc-scenario/bin/startup.sh | 21 -
.../sofarpc-scenario/config/expectedData.yaml | 68 --
.../scenarios/sofarpc-scenario/configuration.yml | 20 -
test/plugin/scenarios/sofarpc-scenario/pom.xml | 119 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/sofarpc/SofaRpcApplication.java | 59 -
.../sofarpc/controller/CaseController.java | 50 -
.../sofarpc/interfaces/SofaRpcDemoService.java | 24 -
.../sofarpc/service/SofaRpcDemoServiceImpl.java | 28 -
.../src/main/resources/application.yml | 20 -
.../sofarpc-scenario/support-version.list | 19 -
.../scenarios/solrj-7.x-scenario/bin/startup.sh | 20 -
.../solrj-7.x-scenario/config/expectedData.yaml | 145 ---
.../scenarios/solrj-7.x-scenario/configuration.yml | 33 -
test/plugin/scenarios/solrj-7.x-scenario/pom.xml | 106 --
.../src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/solrj/Application.java | 34 -
.../testcase/solrj/controller/CaseController.java | 134 ---
.../src/main/resources/application.yml | 18 -
.../src/main/resources/log4j2.xml | 31 -
.../solrj-7.x-scenario/support-version.list | 24 -
.../spring-3.0.x-scenario/config/expectedData.yaml | 143 ---
.../spring-3.0.x-scenario/configuration.yml | 21 -
.../plugin/scenarios/spring-3.0.x-scenario/pom.xml | 97 --
.../apm/testcase/spring3/CaseController.java | 49 -
.../spring3/component/TestComponentBean.java | 29 -
.../testcase/spring3/dao/TestRepositoryBean.java | 29 -
.../spring3/implinterface/TestCaseController.java | 35 -
.../spring3/implinterface/TestCaseInterface.java | 34 -
.../testcase/spring3/service/TestServiceBean.java | 47 -
.../src/main/resources/log4j2.xml | 30 -
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 29 -
.../src/main/webapp/WEB-INF/web.xml | 35 -
.../spring-3.0.x-scenario/support-version.list | 17 -
.../spring-3.1.x-scenario/config/expectedData.yaml | 328 ------
.../spring-3.1.x-scenario/configuration.yml | 23 -
.../plugin/scenarios/spring-3.1.x-scenario/pom.xml | 125 --
.../skywalking/apm/testcase/entity/User.java | 53 -
.../testcase/implinterface/TestCaseController.java | 35 -
.../testcase/implinterface/TestCaseInterface.java | 34 -
.../apm/testcase/restapi/RestCaseController.java | 74 --
.../resttemplate/RestTemplateController.java | 82 --
.../apm/testcase/spring3/CaseController.java | 41 -
.../spring3/component/TestComponentBean.java | 29 -
.../testcase/spring3/dao/TestRepositoryBean.java | 29 -
.../testcase/spring3/service/TestServiceBean.java | 38 -
.../src/main/resources/log4j2.xml | 30 -
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 28 -
.../src/main/webapp/WEB-INF/web.xml | 37 -
.../spring-3.1.x-scenario/support-version.list | 22 -
.../spring-4.1.x-scenario/config/expectedData.yaml | 325 ------
.../spring-4.1.x-scenario/configuration.yml | 21 -
.../plugin/scenarios/spring-4.1.x-scenario/pom.xml | 114 --
.../skywalking/apm/testcase/entity/User.java | 53 -
.../testcase/implinterface/TestCaseController.java | 35 -
.../testcase/implinterface/TestCaseInterface.java | 31 -
.../apm/testcase/restapi/RestCaseController.java | 74 --
.../resttemplate/RestTemplateController.java | 82 --
.../apm/testcase/spring3/CaseController.java | 41 -
.../spring3/component/TestComponentBean.java | 29 -
.../testcase/spring3/dao/TestRepositoryBean.java | 29 -
.../testcase/spring3/service/TestServiceBean.java | 38 -
.../src/main/resources/log4j2.xml | 30 -
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 28 -
.../src/main/webapp/WEB-INF/web.xml | 37 -
.../spring-4.1.x-scenario/support-version.list | 18 -
.../spring-4.3.x-scenario/config/expectedData.yaml | 354 ------
.../spring-4.3.x-scenario/configuration.yml | 23 -
.../plugin/scenarios/spring-4.3.x-scenario/pom.xml | 121 --
.../skywalking/apm/testcase/entity/User.java | 53 -
.../testcase/implinterface/TestCaseController.java | 35 -
.../testcase/implinterface/TestCaseInterface.java | 31 -
.../apm/testcase/inherit/ChildController.java | 28 -
.../apm/testcase/inherit/ParentController.java | 32 -
.../apm/testcase/restapi/RestCaseController.java | 78 --
.../resttemplate/RestTemplateController.java | 85 --
.../apm/testcase/spring3/CaseController.java | 41 -
.../spring3/component/TestComponentBean.java | 29 -
.../testcase/spring3/dao/TestRepositoryBean.java | 29 -
.../testcase/spring3/service/TestServiceBean.java | 38 -
.../src/main/resources/log4j2.xml | 30 -
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 30 -
.../src/main/webapp/WEB-INF/web.xml | 35 -
.../spring-4.3.x-scenario/support-version.list | 22 -
.../spring-async-scenario/config/expectedData.yaml | 144 ---
.../spring-async-scenario/configuration.yml | 19 -
.../plugin/scenarios/spring-async-scenario/pom.xml | 97 --
.../apm/testcase/spring/async/AsyncBean.java | 40 -
.../apm/testcase/spring/async/AsyncConfig.java | 41 -
.../apm/testcase/spring/async/AsyncServlet.java | 42 -
.../apm/testcase/spring/async/CaseServlet.java | 50 -
.../testcase/spring/async/HealthCheckServlet.java | 42 -
.../apm/testcase/spring/async/HttpBean.java | 42 -
.../src/main/webapp/WEB-INF/web.xml | 51 -
.../spring-async-scenario/support-version.list | 19 -
.../bin/startup.sh | 21 -
.../config/expectedData.yaml | 105 --
.../configuration.yml | 22 -
.../spring-cloud-feign-1.1.x-scenario/pom.xml | 130 ---
.../src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/feign/Application.java | 47 -
.../testcase/feign/controller/BackController.java | 32 -
.../testcase/feign/controller/CaseController.java | 45 -
.../apm/testcase/feign/controller/RestRequest.java | 30 -
.../src/main/resources/application.yaml | 25 -
.../src/main/resources/log4j2.xml | 30 -
.../support-version.list | 17 -
.../bin/startup.sh | 21 -
.../config/expectedData.yaml | 105 --
.../configuration.yml | 22 -
.../spring-cloud-feign-1.2.x-scenario/pom.xml | 130 ---
.../src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/feign/Application.java | 47 -
.../testcase/feign/controller/BackController.java | 32 -
.../testcase/feign/controller/CaseController.java | 49 -
.../apm/testcase/feign/controller/RestRequest.java | 30 -
.../src/main/resources/application.yaml | 25 -
.../src/main/resources/log4j2.xml | 30 -
.../support-version.list | 19 -
.../spring-cloud-feign-2.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 261 -----
.../configuration.yml | 22 -
.../spring-cloud-feign-2.x-scenario/pom.xml | 127 ---
.../src/main/assembly/assembly.xml | 41 -
.../skywalking/apm/testcase/feign/Application.java | 47 -
.../testcase/feign/controller/BackController.java | 71 --
.../testcase/feign/controller/CaseController.java | 55 -
.../apm/testcase/feign/controller/RestRequest.java | 45 -
.../skywalking/apm/testcase/feign/entity/User.java | 53 -
.../src/main/resources/application.yaml | 26 -
.../src/main/resources/log4j2.xml | 30 -
.../support-version.list | 19 -
.../spring-kafka-1.3.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 111 --
.../spring-kafka-1.3.x-scenario/configuration.yml | 39 -
.../scenarios/spring-kafka-1.3.x-scenario/pom.xml | 134 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/spring/kafka/Application.java | 31 -
.../spring/kafka/controller/CaseController.java | 137 ---
.../src/main/resources/application.properties | 19 -
.../src/main/resources/log4j2.xml | 30 -
.../support-version.list | 19 -
.../spring-kafka-2.2.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 111 --
.../spring-kafka-2.2.x-scenario/configuration.yml | 39 -
.../scenarios/spring-kafka-2.2.x-scenario/pom.xml | 134 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/spring/kafka/Application.java | 31 -
.../spring/kafka/controller/CaseController.java | 136 ---
.../src/main/resources/application.properties | 19 -
.../src/main/resources/log4j2.xml | 30 -
.../support-version.list | 17 -
.../spring-kafka-2.3.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 186 ---
.../spring-kafka-2.3.x-scenario/configuration.yml | 39 -
.../scenarios/spring-kafka-2.3.x-scenario/pom.xml | 129 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/spring/kafka/Application.java | 30 -
.../spring/kafka/controller/CaseController.java | 159 ---
.../src/main/resources/application.properties | 19 -
.../src/main/resources/log4j2.xml | 30 -
.../support-version.list | 17 -
.../config/expectedData.yaml | 69 --
.../spring-scheduled-scenario/configuration.yml | 19 -
.../scenarios/spring-scheduled-scenario/pom.xml | 118 --
.../scheduled/controller/CaseController.java | 46 -
.../spring/scheduled/job/SchedulingJob.java | 48 -
.../src/main/resources/log4j2.xml | 30 -
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 38 -
.../src/main/webapp/WEB-INF/web.xml | 34 -
.../spring-scheduled-scenario/support-version.list | 25 -
.../scenarios/spring-tx-scenario/bin/startup.sh | 21 -
.../spring-tx-scenario/config/expectedData.yaml | 149 ---
.../scenarios/spring-tx-scenario/configuration.yml | 33 -
test/plugin/scenarios/spring-tx-scenario/pom.xml | 109 --
.../src/main/assembly/assembly.xml | 41 -
.../testcase/spring/transaction/Application.java | 33 -
.../spring/transaction/config/JdbcConfig.java | 49 -
.../transaction/config/TransactionConfig.java | 35 -
.../transaction/controller/CaseController.java | 64 --
.../testcase/spring/transaction/dao/DemoDao.java | 25 -
.../spring/transaction/dao/impl/DemoDaoImpl.java | 37 -
.../spring/transaction/service/DemoService.java | 25 -
.../transaction/service/impl/DemoServiceImpl.java | 39 -
.../src/main/resources/application.properties | 20 -
.../spring-tx-scenario/support-version.list | 20 -
.../bin/startup.sh | 24 -
.../config/expectedData.yaml | 103 --
.../configuration.yml | 20 -
.../springmvc-reactive-devtools-scenario/pom.xml | 124 --
.../src/main/assembly/assembly.xml | 49 -
.../testcase/sc/springmvcreactive/Application.java | 29 -
.../springmvcreactive/controller/Controller.java | 60 -
.../sc/springmvcreactive/service/TestService.java | 42 -
.../src/main/resources/application.yml | 18 -
.../support-version.list | 20 -
.../springmvc-reactive-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 103 --
.../springmvc-reactive-scenario/configuration.yml | 20 -
.../scenarios/springmvc-reactive-scenario/pom.xml | 97 --
.../src/main/assembly/assembly.xml | 41 -
.../testcase/sc/springmvcreactive/Application.java | 29 -
.../springmvcreactive/controller/Controller.java | 60 -
.../sc/springmvcreactive/service/TestService.java | 42 -
.../src/main/resources/application.yml | 18 -
.../support-version.list | 20 -
.../struts2.3-scenario/config/expectedData.yaml | 78 --
.../scenarios/struts2.3-scenario/configuration.yml | 21 -
test/plugin/scenarios/struts2.3-scenario/pom.xml | 88 --
.../apm/testcase/struts/Case1Action.java | 28 -
.../skywalking/apm/testcase/struts/CaseAction.java | 47 -
.../apm/testcase/struts/HealthCheckServlet.java | 41 -
.../src/main/resources/log4j2.xml | 30 -
.../src/main/resources/struts.xml | 32 -
.../src/main/webapp/WEB-INF/web.xml | 44 -
.../src/main/webapp/jsp/success.jsp | 25 -
.../struts2.3-scenario/support-version.list | 17 -
.../struts2.5-scenario/config/expectedData.yaml | 78 --
.../scenarios/struts2.5-scenario/configuration.yml | 21 -
test/plugin/scenarios/struts2.5-scenario/pom.xml | 87 --
.../apm/testcase/struts/Case1Action.java | 28 -
.../skywalking/apm/testcase/struts/CaseAction.java | 47 -
.../apm/testcase/struts/HealthCheckServlet.java | 41 -
.../src/main/resources/log4j2.xml | 30 -
.../src/main/resources/struts.xml | 32 -
.../src/main/webapp/WEB-INF/web.xml | 44 -
.../src/main/webapp/jsp/success.jsp | 25 -
.../struts2.5-scenario/support-version.list | 17 -
.../thrift-scenario/config/expectedData.yaml | 96 --
.../scenarios/thrift-scenario/configuration.yml | 22 -
test/plugin/scenarios/thrift-scenario/pom.xml | 80 --
.../scenarios/thrift-scenario/support-version.list | 19 -
.../thrift-scenario/thrift-client/pom.xml | 93 --
.../apm/testcase/thrift/client/Application.java | 34 -
.../thrift/client/controller/CaseController.java | 94 --
.../thrift/client/service/AsyncClient.java | 85 --
.../testcase/thrift/client/service/HttpClient.java | 50 -
.../testcase/thrift/client/service/IClient.java | 30 -
.../testcase/thrift/client/service/SyncClient.java | 51 -
.../src/main/resources/application.yaml | 23 -
.../thrift-client/src/main/resources/log4j2.xml | 30 -
.../thrift-scenario/thrift-common/pom.xml | 106 --
.../thrift-common/src/main/thrift/greeter.thrift | 24 -
.../thrift-scenario/thrift-dist/bin/startup.sh | 23 -
.../scenarios/thrift-scenario/thrift-dist/pom.xml | 54 -
.../thrift-dist/src/main/assembly/assembly.xml | 46 -
.../thrift-scenario/thrift-server/pom.xml | 87 --
.../apm/testcase/thrift/server/Application.java | 29 -
.../thrift/server/service/AsyncServer.java | 43 -
.../testcase/thrift/server/service/HttpServer.java | 54 -
.../testcase/thrift/server/service/IServer.java | 45 -
.../testcase/thrift/server/service/SyncServer.java | 45 -
.../src/main/resources/application.yaml | 23 -
.../thrift-server/src/main/resources/log4j2.xml | 30 -
.../scenarios/undertow-scenario/bin/startup.sh | 21 -
.../undertow-scenario/config/expectedData.yaml | 144 ---
.../scenarios/undertow-scenario/configuration.yml | 20 -
test/plugin/scenarios/undertow-scenario/pom.xml | 114 --
.../src/main/assembly/assembly.xml | 41 -
.../amp/testcase/undertow/Application.java | 94 --
.../undertow-scenario/support-version.list | 24 -
.../vertx-eventbus-3.x-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 215 ----
.../vertx-eventbus-3.x-scenario/configuration.yml | 20 -
.../scenarios/vertx-eventbus-3.x-scenario/pom.xml | 99 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/vertxeventbus/Application.java | 60 -
.../vertxeventbus/controller/ClusterReceiver.java | 36 -
.../vertxeventbus/controller/LocalReceiver.java | 31 -
.../controller/VertxEventbusController.java | 92 --
.../testcase/vertxeventbus/util/CustomMessage.java | 32 -
.../vertxeventbus/util/CustomMessageCodec.java | 57 -
.../src/main/resources/log4j2.xml | 30 -
.../support-version.list | 24 -
.../vertx-web-3.54minus-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 308 -----
.../vertx-web-3.54minus-scenario/configuration.yml | 20 -
.../scenarios/vertx-web-3.54minus-scenario/pom.xml | 89 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/vertxweb/Application.java | 50 -
.../vertxweb/controller/VertxWebController.java | 65 --
.../src/main/resources/log4j2.xml | 30 -
.../support-version.list | 22 -
.../vertx-web-3.6plus-scenario/bin/startup.sh | 21 -
.../config/expectedData.yaml | 308 -----
.../vertx-web-3.6plus-scenario/configuration.yml | 20 -
.../scenarios/vertx-web-3.6plus-scenario/pom.xml | 94 --
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/vertxweb/Application.java | 50 -
.../vertxweb/controller/VertxWebController.java | 70 --
.../src/main/resources/log4j2.xml | 30 -
.../support-version.list | 20 -
.../webflux-scenario/config/expectedData.yaml | 376 ------
.../scenarios/webflux-scenario/configuration.yml | 22 -
test/plugin/scenarios/webflux-scenario/pom.xml | 58 -
.../webflux-scenario/support-version.list | 21 -
.../webflux-scenario/webflux-dist/bin/startup.sh | 24 -
.../webflux-scenario/webflux-dist/pom.xml | 54 -
.../webflux-dist/src/main/assembly/assembly.xml | 46 -
.../webflux-projectA-scenario/pom.xml | 72 --
.../testcase/sc/webflux/projectA/Application.java | 29 -
.../projectA/controller/TestController.java | 79 --
.../sc/webflux/projectA/utils/HttpUtils.java | 50 -
.../src/main/resources/application.yml | 21 -
.../webflux-projectB-scenario/pom.xml | 57 -
.../testcase/sc/webflux/projectB/Application.java | 29 -
.../sc/webflux/projectB/config/CustomFilter.java | 41 -
.../controller/TestAnnotationController.java | 62 -
.../projectB/route/RoutingConfiguration.java | 35 -
.../sc/webflux/projectB/route/TestHandler.java | 37 -
.../src/main/resources/application.yml | 18 -
.../scenarios/xxl-job-2.x-scenario/bin/startup.sh | 21 -
.../xxl-job-2.x-scenario/config/expectedData.yaml | 189 ----
.../xxl-job-2.x-scenario/configuration.yml | 40 -
test/plugin/scenarios/xxl-job-2.x-scenario/pom.xml | 143 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/xxljob/Application.java | 32 -
.../skywalking/apm/testcase/xxljob/Utils.java | 33 -
.../testcase/xxljob/controller/CaseController.java | 70 --
.../apm/testcase/xxljob/job/MethodJob.java | 46 -
.../apm/testcase/xxljob/job/XXLJobConfig.java | 67 --
.../apm/testcase/xxljob/job/XXLJobInitializer.java | 56 -
.../xxljob/service/XXLJobServerControlService.java | 116 --
.../apm/testcase/xxljob/job/BeanJob.java | 42 -
.../src/main/resources/application.yaml | 35 -
.../src/main/resources/log4j2.xml | 30 -
.../src/main/resources/tables_xxl_job.sql | 133 ---
.../xxl-job-2.x-scenario/support-version.list | 17 -
.../scenarios/zookeeper-scenario/bin/startup.sh | 21 -
.../zookeeper-scenario/config/expectedData.yaml | 117 --
.../scenarios/zookeeper-scenario/configuration.yml | 30 -
test/plugin/scenarios/zookeeper-scenario/pom.xml | 148 ---
.../src/main/assembly/assembly.xml | 41 -
.../apm/testcase/zookeeper/Application.java | 34 -
.../testcase/zookeeper/controller/Zookeeper.java | 44 -
.../zookeeper/controller/ZookeeperController.java | 69 --
.../src/main/resources/application.properties | 19 -
.../src/main/resources/log4j2.xml | 30 -
.../zookeeper-scenario/support-version.list | 17 -
test/plugin/script/systeminfo.sh | 39 -
tools/coverage/report.sh | 53 -
tools/plugin/check-javaagent-plugin-list.sh | 45 -
tools/select-group.py | 60 -
3411 files changed, 53 insertions(+), 222946 deletions(-)
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
index 2552047..3d319b4 100644
--- a/.github/PULL_REQUEST_TEMPLATE
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -11,13 +11,6 @@
- [ ] Explain briefly why the bug exists and how to fix it.
==== 🐛 Remove this line WHEN AND ONLY WHEN you're fixing a bug, follow the checklist 👆 ==== -->
-<!-- ==== 🔌 Remove this line WHEN AND ONLY WHEN you're adding a new plugin, follow the checklist 👇 ====
-### Add an agent plugin to support <framework name>
-- [ ] Add a test case for the new plugin, refer to [the doc](https://github.com/apache/skywalking/blob/master/docs/en/guides/Plugin-test.md)
-- [ ] Add a component id in [the component-libraries.yml](https://github.com/apache/skywalking/blob/master/oap-server/server-bootstrap/src/main/resources/component-libraries.yml)
-- [ ] Add a logo in [the UI repo](https://github.com/apache/skywalking-rocketbot-ui/tree/master/src/views/components/topology/assets)
- ==== 🔌 Remove this line WHEN AND ONLY WHEN you're adding a new plugin, follow the checklist 👆 ==== -->
-
<!-- ==== 📈 Remove this line WHEN AND ONLY WHEN you're improving the performance, follow the checklist 👇 ====
### Improve the performance of <class or module or ...>
- [ ] Add a benchmark for the improvement, refer to [the existing ones](https://github.com/apache/skywalking/blob/master/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/LinkedArrayBenchmark.java)
diff --git a/.github/actions/e2e-test/action.yml b/.github/actions/e2e-test/action.yml
index 0e61bfc..f1ab13e 100644
--- a/.github/actions/e2e-test/action.yml
+++ b/.github/actions/e2e-test/action.yml
@@ -32,17 +32,6 @@ runs:
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- - name: Check Unintended Changes
- shell: bash
- run: |
- echo "::group::Check sw.version"
- sudo apt install -y -q xmlstarlet
- SW_VERSION=$(xmlstarlet sel -N pom=http://maven.apache.org/POM/4.0.0 -t -v "/pom:project/pom:properties/pom:sw.version" test/e2e/pom.xml)
- if [[ "$(echo $(echo $SW_VERSION))" != "" ]]; then
- echo "Please don't submit the change of sw.version in test/e2e/pom.xml"
- exit 1
- fi
- echo "::endgroup::"
- name: Check License
uses: apache/skywalking-eyes@a63f4afcc287dfb3727ecc45a4afc55a5e69c15f
- name: Build Docker Image
@@ -54,29 +43,9 @@ runs:
# Retry one more time due to frequent "maven connection reset"
(make docker || make docker) && (ES_VERSION=es7 TAG=latest-es7 make docker.oap || ES_VERSION=es7 TAG=latest-es7 make docker.oap)
echo "::endgroup::"
- - name: Copy Dist Package
- shell: bash
- run: |
- echo "::group::Copy Dist Package to test/e2e"
- cp -R dist test/e2e/
- echo "::endgroup::"
- name: Run E2E Test
shell: bash
run: |
- echo "::group::Install SNAPSHOT apm-application-toolkit"
- ./mvnw -DskipTests -N install
- ./mvnw -f apm-application-toolkit -DskipTests -am install
- echo "::endgroup::"
-
echo "::group::Run E2E Test ${{ inputs.test_class }}"
- SW_VERSION=$(./mvnw -q -DforceStdout -N org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version)
- ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false -Dsw.version=${SW_VERSION} verify -Dit.test=${{ inputs.test_class }}
- echo "::endgroup::"
- - name: Report Coverage
- shell: bash
- env:
- CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7
- run: |
- echo "::group::Uploading Code Coverage"
- bash -x tools/coverage/report.sh || true
+ ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=${{ inputs.test_class }}
echo "::endgroup::"
diff --git a/.github/actions/plugins-test/action.yml b/.github/actions/plugins-test/action.yml
deleted file mode 100644
index 08190d5..0000000
--- a/.github/actions/plugins-test/action.yml
+++ /dev/null
@@ -1,87 +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.
-#
-name: "Run Plugin Test"
-description: "Common steps when running a plugin test"
-inputs:
- test_case:
- description: "The plugin test name"
- required: true
- java_version:
- description: "The Java version under which this test case will run"
- required: false
- default: "jdk8"
-runs:
- using: "composite"
- steps:
- - name: Cache local Maven repository
- uses: actions/cache@v2
- with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-agent-
- - name: Check Unintended Changes
- shell: bash
- run: |
- echo "::group::Check sw.version"
- sudo apt install -y -q xmlstarlet
- SW_VERSION=$(xmlstarlet sel -N pom=http://maven.apache.org/POM/4.0.0 -t -v "/pom:project/pom:properties/pom:sw.version" test/e2e/pom.xml)
- if [[ "$(echo $(echo $SW_VERSION))" != "" ]]; then
- echo "Please don't submit the change of sw.version in test/e2e/pom.xml"
- exit 1
- fi
- echo "::endgroup::"
- - name: Check License
- uses: apache/skywalking-eyes@a63f4afcc287dfb3727ecc45a4afc55a5e69c15f
- - name: Add checkstyle-plugin
- shell: bash
- run: |
- echo "::group::Add checkstyle plugin to the pom.xml"
- sed -i "/<\/sourceDirectories>/i <sourceDirectory>scenarios\/""${{ inputs.test_case }}""<\/sourceDirectory>" test/plugin/pom.xml
- echo "::endgroup::"
- - name: Build SkyWalking Agent
- shell: bash
- run: |
- echo "::group::Build SkyWalking Agent"
- # Retry one more time due to frequent "maven connection reset"
- ./mvnw --batch-mode clean package -DskipTests -Pagent || \
- ./mvnw --batch-mode clean package -DskipTests -Pagent
- echo "::endgroup::"
- - name: Build Docker Image
- shell: bash
- run: |
- echo "::group::Build Docker Image"
- # Retry one more time due to frequent "maven connection reset"
- ./mvnw --batch-mode -f test/plugin/pom.xml clean package -DskipTests -P${{ inputs.java_version }} || \
- ./mvnw --batch-mode -f test/plugin/pom.xml clean package -DskipTests -P${{ inputs.java_version }}
- echo "::endgroup::"
- - name: Run Plugin Test ${{ inputs.test_case }}
- shell: bash
- run: |
- echo "::group::Run Plugin Test ${{ inputs.test_case }}"
- bash test/plugin/run.sh --image_version=${{ inputs.java_version }}-1.0.0 ${{ inputs.test_case }}
- echo "::endgroup::"
- - name: Report Coverage
- shell: bash
- env:
- CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7
- run: |
- echo "::group::Uploading Code Coverage"
- bash -x tools/coverage/report.sh
- echo "::endgroup::"
diff --git a/.github/workflows/ci-it.yaml b/.github/workflows/ci-it.yaml
index 4c2dceb..e699877 100644
--- a/.github/workflows/ci-it.yaml
+++ b/.github/workflows/ci-it.yaml
@@ -21,56 +21,58 @@ on:
schedule:
- cron: '0 18 * * *' # TimeZone: UTC 0
-env:
- MAVEN_OPTS: -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit
- CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7
-
concurrency:
group: ci-it-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
jobs:
- CI:
+ check-license:
if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking') || (github.event_name != 'schedule')
+ name: Check License Header
runs-on: ubuntu-latest
- timeout-minutes: 90
+ timeout-minutes: 10
steps:
- uses: actions/checkout@v2
with:
submodules: true
- - name: Set Skip Env Var
- uses: ./.github/actions/skip
- name: Check License Header
- if: env.SKIP_CI != 'true'
uses: apache/skywalking-eyes@9bd5feb86b5817aa6072b008f9866a2c3bbc8587
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ CI:
+ if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking') || (github.event_name != 'schedule')
+ needs: [ check-license ]
+ runs-on: ubuntu-latest
+ timeout-minutes: 90
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ submodules: true
+ - name: Set Skip Env Var
+ uses: ./.github/actions/skip
- name: Cache local Maven repository
if: env.SKIP_CI != 'true'
uses: actions/cache@v2
with:
path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-
+ key: ${{ runner.os }}-maven-ci-${{ hashFiles('**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-maven-ci-
- uses: actions/setup-java@v1
if: env.SKIP_CI != 'true'
with:
java-version: 8
- - name: 'Check Javaagent Plugin List'
- if: env.SKIP_CI != 'true'
- run: tools/plugin/check-javaagent-plugin-list.sh
- name: 'Install & Test'
if: env.SKIP_CI != 'true'
run: |
- ./mvnw -q --batch-mode -P"agent,backend,ui,dist,CI-with-IT" clean cobertura:cobertura verify install javadoc:javadoc
- bash <(curl -s https://codecov.io/bash)
+ ./mvnw -q --batch-mode -P"backend,ui,dist,CI-with-IT" clean verify install javadoc:javadoc
- name: 'Check Dependencies Licenses'
if: env.SKIP_CI != 'true'
run: tools/dependencies/check-LICENSE.sh
CI-on-JDK11:
if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking') || (github.event_name != 'schedule')
+ needs: [ check-license ]
runs-on: ubuntu-latest
timeout-minutes: 90
steps:
@@ -79,9 +81,6 @@ jobs:
submodules: true
- name: Set Skip Env Var
uses: ./.github/actions/skip
- - name: Check License Header
- if: env.SKIP_CI != 'true'
- uses: apache/skywalking-eyes@9bd5feb86b5817aa6072b008f9866a2c3bbc8587
- name: Cache local Maven repository
if: env.SKIP_CI != 'true'
uses: actions/cache@v2
@@ -96,10 +95,11 @@ jobs:
java-version: 11
- name: 'Install & Test'
if: env.SKIP_CI != 'true'
- run: ./mvnw -q --batch-mode -P"agent,backend,ui,dist" clean verify install
+ run: ./mvnw -q --batch-mode -P"backend,ui,dist" clean verify install
CI-on-Windows:
if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking') || (github.event_name != 'schedule')
+ needs: [ check-license ]
runs-on: windows-latest
timeout-minutes: 90
steps:
@@ -115,11 +115,11 @@ jobs:
- name: 'Install & Test'
if: env.SKIP_CI != 'true'
run: |
- ./mvnw -q --batch-mode -P"agent,backend,ui,dist" clean verify install
-
+ ./mvnw -q --batch-mode -P"backend,ui,dist" clean verify install
CI-on-MacOS:
if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking') || (github.event_name != 'schedule')
+ needs: [ check-license ]
runs-on: macos-latest
timeout-minutes: 90
steps:
@@ -144,5 +144,5 @@ jobs:
if: env.SKIP_CI != 'true'
run: |
# Given packaging on Mac has a high possibility to fail, we retry one more time here
- ./mvnw -q --batch-mode -P"agent,backend,ui,dist" clean verify install || \
- ./mvnw -q --batch-mode -P"agent,backend,ui,dist" clean verify install
+ ./mvnw -q --batch-mode -P"backend,ui,dist" clean verify install || \
+ ./mvnw -q --batch-mode -P"backend,ui,dist" clean verify install
diff --git a/.github/workflows/e2e.istio.yaml b/.github/workflows/e2e.istio.yaml
index c11e2ae..004db04 100644
--- a/.github/workflows/e2e.istio.yaml
+++ b/.github/workflows/e2e.istio.yaml
@@ -54,17 +54,6 @@ jobs:
with:
submodules: true
- - name: Check Unintended Changes
- run: |
- echo "::group::Check sw.version"
- sudo apt install -y -q xmlstarlet
- SW_VERSION=$(xmlstarlet sel -N pom=http://maven.apache.org/POM/4.0.0 -t -v "/pom:project/pom:properties/pom:sw.version" test/e2e/pom.xml)
- if [[ "$(echo $(echo $SW_VERSION))" != "" ]]; then
- echo "::error Please don't submit the change of sw.version in test/e2e/pom.xml"
- exit 1
- fi
- echo "::endgroup::"
-
- name: Set Skip Env Var
uses: ./.github/actions/skip
@@ -156,12 +145,7 @@ jobs:
export WEBAPP_HOST=127.0.0.1
export WEBAPP_PORT=8080
- export SW_VERSION=$(./mvnw -q -DforceStdout -N org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version)
-
- ./mvnw -q -DskipTests -N install
- ./mvnw -q -f apm-application-toolkit -DskipTests -am install
-
- ./mvnw -q --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false -Dsw.version=${SW_VERSION} verify -Dit.test=org.apache.skywalking.e2e.mesh.ALSE2E
+ ./mvnw -q --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.mesh.ALSE2E
- name: Logs
if: ${{ failure() }}
@@ -192,17 +176,6 @@ jobs:
with:
submodules: true
- - name: Check Unintended Changes
- run: |
- echo "::group::Check sw.version"
- sudo apt install -y -q xmlstarlet
- SW_VERSION=$(xmlstarlet sel -N pom=http://maven.apache.org/POM/4.0.0 -t -v "/pom:project/pom:properties/pom:sw.version" test/e2e/pom.xml)
- if [[ "$(echo $(echo $SW_VERSION))" != "" ]]; then
- echo "Please don't submit the change of sw.version in test/e2e/pom.xml"
- exit 1
- fi
- echo "::endgroup::"
-
- name: Set Skip Env Var
uses: ./.github/actions/skip
@@ -299,12 +272,7 @@ jobs:
export WEBAPP_HOST=127.0.0.1
export WEBAPP_PORT=8080
- export SW_VERSION=$(./mvnw -q -DforceStdout -N org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version)
-
- ./mvnw -q -DskipTests -N install
- ./mvnw -q -f apm-application-toolkit -DskipTests -am install
-
- ./mvnw -q --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false -Dsw.version=${SW_VERSION} verify -Dit.test=org.apache.skywalking.e2e.mesh.MetricsServiceE2E
+ ./mvnw -q --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.mesh.MetricsServiceE2E
- name: Logs
if: ${{ failure() }}
diff --git a/.github/workflows/plugins-jdk14-test.0.yaml b/.github/workflows/plugins-jdk14-test.0.yaml
deleted file mode 100644
index fba4eab..0000000
--- a/.github/workflows/plugins-jdk14-test.0.yaml
+++ /dev/null
@@ -1,61 +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.
-
-name: PluginsJDK14Test
-
-on:
- pull_request:
- paths:
- - '.github/workflows/plugins-*.yaml'
- - 'apm-application-toolkit/**'
- - 'apm-commons/**'
- - 'apm-protocol/**'
- - 'apm-sniffer/**'
- - 'test/plugin/**'
- - '**/pom.xml'
- - '!test/e2e/**'
- - '!apm-webapp/**'
- - '!apm-dist/**'
- - '!apm-dist-es7/**'
- - '!apm-docker/**'
- - '!oap-server/**'
- - '!**.md'
-
-concurrency:
- group: plugins-jdk14-${{ github.event.pull_request.number || github.ref }}
- cancel-in-progress: true
-
-jobs:
- PluginsJDK14Test:
- name: jdk14
- runs-on: ubuntu-latest
- timeout-minutes: 90
- strategy:
- matrix:
- case:
- - jdk14-with-gson-scenario
- steps:
- - uses: actions/checkout@v2
- with:
- submodules: true
- - uses: actions/setup-java@v1
- with:
- java-version: 14
- - name: Run Plugin Test
- uses: ./.github/actions/plugins-test
- with:
- test_case: ${{ matrix.case }}
- java_version: jdk14
diff --git a/.github/workflows/plugins-test.0.yaml b/.github/workflows/plugins-test.0.yaml
deleted file mode 100644
index 1d6f367..0000000
--- a/.github/workflows/plugins-test.0.yaml
+++ /dev/null
@@ -1,88 +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.
-
-name: PluginsTest
-
-on:
- pull_request:
- paths:
- - '.github/workflows/plugins-*.yaml'
- - 'apm-application-toolkit/**'
- - 'apm-commons/**'
- - 'apm-protocol/**'
- - 'apm-sniffer/**'
- - 'test/plugin/**'
- - '**/pom.xml'
- - '!test/e2e/**'
- - '!apm-webapp/**'
- - '!apm-dist/**'
- - '!apm-dist-es7/**'
- - '!apm-docker/**'
- - '!oap-server/**'
- - '!**.md'
-
-concurrency:
- group: plugins-0-${{ github.event.pull_request.number || github.ref }}
- cancel-in-progress: true
-
-jobs:
- PluginsTest:
- name: Plugin
- runs-on: ubuntu-latest
- timeout-minutes: 90
- strategy:
- matrix:
- case:
- - activemq-scenario
- - apm-toolkit-trace-scenario
- - armeria-0.96minus-scenario
- - armeria-0.96plus-scenario
- - avro-scenario
- - asynchttpclient-scenario
- - canal-scenario
- - cassandra-java-driver-3.x-scenario
- - customize-scenario
- - correlation-autotag-scenario
- - dubbo-2.5.x-scenario
- - dubbo-2.7.x-scenario
- - ehcache-2.x-scenario
- - elasticsearch-5.x-scenario
- - elasticsearch-6.x-scenario
- - elasticsearch-7.x-scenario
- - exception-checker-spring-scenario
- - exception-checker-tomcat-scenario
- - feign-scenario
- - finagle-17.10.x-scenario
- - finagle-6.44.x-scenario
- - gateway-2.1.x-scenario
- - gateway-2.0.x-scenario
- - grpc-scenario
- - gson-scenario
- - guava-cache-scenario
- - elasticjob-3.x-scenario
- - springmvc-reactive-scenario
- - springmvc-reactive-devtools-scenario
- steps:
- - uses: actions/checkout@v2
- with:
- submodules: true
- - uses: actions/setup-java@v1
- with:
- java-version: 8
- - name: Run Plugin Test
- uses: ./.github/actions/plugins-test
- with:
- test_case: ${{ matrix.case }}
diff --git a/.github/workflows/plugins-test.1.yaml b/.github/workflows/plugins-test.1.yaml
deleted file mode 100644
index 7fa9f51..0000000
--- a/.github/workflows/plugins-test.1.yaml
+++ /dev/null
@@ -1,80 +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.
-
-name: PluginsTest
-
-on:
- pull_request:
- paths:
- - '.github/workflows/plugins-*.yaml'
- - 'apm-application-toolkit/**'
- - 'apm-commons/**'
- - 'apm-protocol/**'
- - 'apm-sniffer/**'
- - 'test/plugin/**'
- - '**/pom.xml'
- - '!test/e2e/**'
- - '!apm-webapp/**'
- - '!apm-dist/**'
- - '!apm-dist-es7/**'
- - '!apm-docker/**'
- - '!oap-server/**'
- - '!**.md'
-
-concurrency:
- group: plugins-1-${{ github.event.pull_request.number || github.ref }}
- cancel-in-progress: true
-
-jobs:
- PluginsTest:
- name: Plugin
- runs-on: ubuntu-latest
- timeout-minutes: 90
- strategy:
- matrix:
- case:
- - h2-scenario
- - httpasyncclient-scenario
- - httpclient-3.x-scenario
- - httpclient-4.3.x-scenario
- - hystrix-scenario
- - sentinel-scenario
- - influxdb-scenario
- - jdk-http-scenario
- - jdk-threading-scenario
- - jedis-scenario
- - jetty-scenario
- - kafka-scenario
- - kotlin-coroutine-scenario
- - lettuce-scenario
- - mongodb-3.x-scenario
- - mongodb-4.x-scenario
- - netty-socketio-scenario
- - postgresql-above9.4.1207-scenario
- - mssql-jtds-scenario
- - mssql-jdbc-scenario
- - mybatis-3.x-scenario
- steps:
- - uses: actions/checkout@v2
- with:
- submodules: true
- - uses: actions/setup-java@v1
- with:
- java-version: 8
- - name: Run Plugin Test
- uses: ./.github/actions/plugins-test
- with:
- test_case: ${{ matrix.case }}
diff --git a/.github/workflows/plugins-test.2.yaml b/.github/workflows/plugins-test.2.yaml
deleted file mode 100644
index 39982aa..0000000
--- a/.github/workflows/plugins-test.2.yaml
+++ /dev/null
@@ -1,82 +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.
-
-name: PluginsTest
-
-on:
- pull_request:
- paths:
- - '.github/workflows/plugins-*.yaml'
- - 'apm-application-toolkit/**'
- - 'apm-commons/**'
- - 'apm-protocol/**'
- - 'apm-sniffer/**'
- - 'test/plugin/**'
- - '**/pom.xml'
- - '!test/e2e/**'
- - '!apm-webapp/**'
- - '!apm-dist/**'
- - '!apm-dist-es7/**'
- - '!apm-docker/**'
- - '!oap-server/**'
- - '!**.md'
-
-concurrency:
- group: plugins-2-${{ github.event.pull_request.number || github.ref }}
- cancel-in-progress: true
-
-jobs:
- PluginsTest:
- name: Plugin
- runs-on: ubuntu-latest
- timeout-minutes: 90
- strategy:
- matrix:
- case:
- - okhttp-scenario
- - play-scenario
- - postgresql-scenario
- - pulsar-scenario
- - rabbitmq-scenario
- - redisson-scenario
- - resttemplate-4.x-scenario
- - servicecomb-0.x-scenario
- - servicecomb-1.x-scenario
- - shardingsphere-3.x-scenario
- - shardingsphere-4.0.x-scenario
- - shardingsphere-4.x-scenario
- - shardingsphere-5.0.0-beta-scenario
- - sofarpc-scenario
- - solrj-7.x-scenario
- - spring-3.0.x-scenario
- - spring-cloud-feign-1.1.x-scenario
- - spring-cloud-feign-1.2.x-scenario
- - spring-cloud-feign-2.x-scenario
- - spring-tx-scenario
- - struts2.3-scenario
- - struts2.5-scenario
- - cxf-scenario
- steps:
- - uses: actions/checkout@v2
- with:
- submodules: true
- - uses: actions/setup-java@v1
- with:
- java-version: 8
- - name: Run Plugin Test
- uses: ./.github/actions/plugins-test
- with:
- test_case: ${{ matrix.case }}
diff --git a/.github/workflows/plugins-test.3.yaml b/.github/workflows/plugins-test.3.yaml
deleted file mode 100644
index f25a85e..0000000
--- a/.github/workflows/plugins-test.3.yaml
+++ /dev/null
@@ -1,117 +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.
-
-name: PluginsTest
-
-on:
- pull_request:
- paths:
- - '.github/workflows/plugins-*.yaml'
- - 'apm-application-toolkit/**'
- - 'apm-commons/**'
- - 'apm-protocol/**'
- - 'apm-sniffer/**'
- - 'test/plugin/**'
- - '**/pom.xml'
- - '!test/e2e/**'
- - '!apm-webapp/**'
- - '!apm-dist/**'
- - '!apm-dist-es7/**'
- - '!apm-docker/**'
- - '!oap-server/**'
- - '!**.md'
-
-concurrency:
- group: plugins-3-${{ github.event.pull_request.number || github.ref }}
- cancel-in-progress: true
-
-jobs:
- PluginsTest:
- name: Plugin
- runs-on: ubuntu-latest
- timeout-minutes: 90
- strategy:
- matrix:
- case:
- - mysql-scenario
- - undertow-scenario
- - webflux-scenario
- - zookeeper-scenario
- - spring-3.1.x-scenario
- - spring-4.1.x-scenario
- - spring-4.3.x-scenario
- - spring-async-scenario
- - vertx-eventbus-3.x-scenario
- - vertx-web-3.54minus-scenario
- - vertx-web-3.6plus-scenario
- - mariadb-scenario
- - quasar-scenario
- - baidu-brpc-scenario
- - retransform-class-scenario
- - retransform-class-tomcat-scenario
- - graphql-8.x-scenario
- - graphql-9.x-scenario
- - graphql-12.x-scenario
- - hbase-scenario
- - spring-kafka-1.3.x-scenario
- - spring-kafka-2.2.x-scenario
- - spring-kafka-2.3.x-scenario
- - spring-scheduled-scenario
- - elasticjob-2.x-scenario
- - quartz-scheduler-2.x-scenario
- - xxl-job-2.x-scenario
- - thrift-scenario
- - dbcp-2.x-scenario
- - jsonrpc4j-1.x-scenario
- - gateway-3.x-scenario
- - neo4j-4.x-scenario
- steps:
- - uses: actions/checkout@v2
- with:
- submodules: true
- - uses: actions/setup-java@v1
- with:
- java-version: 8
- - name: Run Plugin Test
- uses: ./.github/actions/plugins-test
- with:
- test_case: ${{ matrix.case }}
-
- Oracle:
- name: Oracle
- runs-on: ubuntu-latest
- timeout-minutes: 90
- steps:
- - uses: actions/checkout@v2
- with:
- submodules: true
- - uses: actions/setup-java@v1
- with:
- java-version: 8
- - name: Add checkstyle-plugin
- run: sed -i '/<\/sourceDirectories>/i <sourceDirectory>scenarios\/oracle-scenario<\/sourceDirectory>' test/plugin/pom.xml
- - name: Build SkyWalking Agent
- run: ./mvnw -q --batch-mode clean package -DskipTests -Pagent
- - name: Build Docker image
- run: ./mvnw -q --batch-mode -f test/plugin/pom.xml clean package -DskipTests
- - name: Oracle 10.2.0.4.0 (1)
- run: |
- curl -O https://skyapm.github.io/ci-assist/jars/ojdbc14-10.2.0.4.0.jar
- curl -L -o ./skywalking-agent/plugins/apm-oracle-10.x-plugin-2.0.0.jar https://github.com/SkyAPM/java-plugin-extensions/releases/download/2.0.0/apm-oracle-10.x-plugin-2.0.0.jar
- ./mvnw -q --batch-mode install:install-file -Dfile=ojdbc14-10.2.0.4.0.jar -DgroupId=com.oracle -DartifactId=ojdbc14 -Dversion=10.2.0.4.0 -Dpackaging=jar
- bash test/plugin/run.sh oracle-scenario
- - name: Report Coverage
- run: bash -x tools/coverage/report.sh
diff --git a/.gitignore b/.gitignore
index c442cb7..c583d0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@ target/
*~
packages/
**/dependency-reduced-pom.xml
-/skywalking-agent/
**/dist/
/docker/snapshot/*.gz
.mvn/wrapper/*.jar
@@ -18,9 +17,4 @@ OALLexer.tokens
.vscode
.checkstyle
.externalToolBuilders
-/test/plugin/dist
-/test/plugin/workspace
-/test/jacoco/classes
-/test/jacoco/*.exec
oap-server/oal-grammar/**/gen/
-test/jacoco
diff --git a/Makefile b/Makefile
index acbab49..c870429 100644
--- a/Makefile
+++ b/Makefile
@@ -25,14 +25,11 @@ SKIP_TEST?=false
init:
cd $(SW_ROOT) && git submodule update --init --recursive
-.PHONY: build.all build.agent build.backend build.ui build.docker
+.PHONY: build.all build.backend build.ui build.docker
build.all:
cd $(SW_ROOT) && ./mvnw --batch-mode clean package -Dmaven.test.skip=$(SKIP_TEST)
-build.agent:
- cd $(SW_ROOT) && ./mvnw --batch-mode clean package -Dmaven.test.skip=$(SKIP_TEST) -Pagent,dist
-
build.backend:
cd $(SW_ROOT) && ./mvnw --batch-mode clean package -Dmaven.test.skip=$(SKIP_TEST) -Pbackend,dist
@@ -53,7 +50,7 @@ ES_VERSION?=es6
docker: init build.all docker.all
-DOCKER_TARGETS:=docker.oap docker.ui docker.agent
+DOCKER_TARGETS:=docker.oap docker.ui
docker.all: $(DOCKER_TARGETS)
@@ -81,11 +78,6 @@ docker.ui: $(SW_ROOT)/docker/ui/docker-entrypoint.sh
docker.ui: $(SW_ROOT)/docker/ui/logback.xml
$(DOCKER_RULE)
-docker.agent: $(SW_OUT)/apache-skywalking-apm-bin.tar.gz
-docker.agent: $(SW_ROOT)/docker/agent/Dockerfile.agent
- $(DOCKER_RULE)
-
-
# $@ is the name of the target
# $^ the name of the dependencies for the target
# Rule Steps #
diff --git a/apm-application-toolkit/apm-toolkit-kafka/pom.xml b/apm-application-toolkit/apm-toolkit-kafka/pom.xml
deleted file mode 100644
index 32027e7..0000000
--- a/apm-application-toolkit/apm-toolkit-kafka/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-~ 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.
-~
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>apm-application-toolkit</artifactId>
- <groupId>org.apache.skywalking</groupId>
- <version>8.8.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>apm-toolkit-kafka</artifactId>
- <packaging>jar</packaging>
-
- <url>http://maven.apache.org</url>
-</project>
diff --git a/apm-application-toolkit/apm-toolkit-kafka/src/main/java/org/apache/skywalking/apm/toolkit/kafka/KafkaPollAndInvoke.java b/apm-application-toolkit/apm-toolkit-kafka/src/main/java/org/apache/skywalking/apm/toolkit/kafka/KafkaPollAndInvoke.java
deleted file mode 100644
index 4976b71..0000000
--- a/apm-application-toolkit/apm-toolkit-kafka/src/main/java/org/apache/skywalking/apm/toolkit/kafka/KafkaPollAndInvoke.java
+++ /dev/null
@@ -1,30 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.kafka;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface KafkaPollAndInvoke {
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml b/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml
deleted file mode 100644
index d7ad70d..0000000
--- a/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- ~
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>apm-application-toolkit</artifactId>
- <groupId>org.apache.skywalking</groupId>
- <version>8.8.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>apm-toolkit-log4j-1.x</artifactId>
-
- <properties>
- <log4j.version>1.2.17</log4j.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/SkyWalkingContextPatternConverter.java b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/SkyWalkingContextPatternConverter.java
deleted file mode 100644
index 2b9e725..0000000
--- a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/SkyWalkingContextPatternConverter.java
+++ /dev/null
@@ -1,35 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.log4j.v1.x;
-
-import org.apache.log4j.helpers.PatternConverter;
-import org.apache.log4j.spi.LoggingEvent;
-
-/**
- * Default implementation outputs "SW_CTX: N/A". But, if in SkyWalking agent active mode, output will become the real
- * SkyWalking context.
- * <p>
- */
-
-public class SkyWalkingContextPatternConverter extends PatternConverter {
- @Override
- protected String convert(LoggingEvent loggingEvent) {
- return "SW_CTX: N/A";
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java
deleted file mode 100644
index a653497..0000000
--- a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java
+++ /dev/null
@@ -1,35 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.log4j.v1.x;
-
-import org.apache.log4j.helpers.PatternConverter;
-import org.apache.log4j.spi.LoggingEvent;
-
-/**
- * Default implementation outputs "TID: N/A". But, if in SkyWalking agent active mode, output will become the real
- * ids.
- * <p>
- */
-
-public class TraceIdPatternConverter extends PatternConverter {
- @Override
- protected String convert(LoggingEvent loggingEvent) {
- return "TID: N/A";
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java
deleted file mode 100644
index 5c4e449..0000000
--- a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java
+++ /dev/null
@@ -1,33 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.log4j.v1.x;
-
-import org.apache.log4j.PatternLayout;
-import org.apache.log4j.helpers.PatternParser;
-
-/**
- * The log4j extend pattern. By using this pattern, if SkyWalking agent is also active, {@link
- * PatternParser#finalizeConverter(char)} method will be override dynamic. <p>
- */
-public class TraceIdPatternLayout extends PatternLayout {
- @Override
- protected PatternParser createPatternParser(String pattern) {
- return new TraceIdPatternParser(pattern);
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternParser.java b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternParser.java
deleted file mode 100644
index 96fc4f7..0000000
--- a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternParser.java
+++ /dev/null
@@ -1,47 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.log4j.v1.x;
-
-import org.apache.log4j.helpers.PatternParser;
-
-/**
- * Base on '%T', use {@link TraceIdPatternConverter} to convert the '%T' to traceId or '%T{SW_CTX}' to SkyWalking context.
- * <p>
- */
-public class TraceIdPatternParser extends PatternParser {
- private static final String SKYWALKING_CONTEXT_OPTION = "SW_CTX";
-
- public TraceIdPatternParser(String pattern) {
- super(pattern);
- }
-
- @Override
- protected void finalizeConverter(char c) {
- if ('T' == c) {
- String option = super.extractOption();
- if (option != null && option.equals(SKYWALKING_CONTEXT_OPTION)) {
- addConverter(new SkyWalkingContextPatternConverter());
- } else {
- addConverter(new TraceIdPatternConverter());
- }
- } else {
- super.finalizeConverter(c);
- }
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/log/GRPCLogClientAppender.java b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/log/GRPCLogClientAppender.java
deleted file mode 100644
index 8c99df4..0000000
--- a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/log/GRPCLogClientAppender.java
+++ /dev/null
@@ -1,48 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.log4j.v1.x.log;
-
-import org.apache.log4j.AppenderSkeleton;
-import org.apache.log4j.Layout;
-import org.apache.log4j.spi.LoggingEvent;
-
-public class GRPCLogClientAppender extends AppenderSkeleton {
-
- public GRPCLogClientAppender() {
- }
-
- public GRPCLogClientAppender(Layout layout) {
- this.setLayout(layout);
- }
-
- @Override
- protected void append(LoggingEvent loggingEvent) {
-
- }
-
- @Override
- public void close() {
-
- }
-
- @Override
- public boolean requiresLayout() {
- return true;
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml b/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml
deleted file mode 100644
index 3d06d06..0000000
--- a/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- ~
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>apm-application-toolkit</artifactId>
- <groupId>org.apache.skywalking</groupId>
- <version>8.8.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>apm-toolkit-log4j-2.x</artifactId>
-
- <properties>
- <log4j-core.version>2.7</log4j-core.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j-core.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java
deleted file mode 100644
index 68253c9..0000000
--- a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java
+++ /dev/null
@@ -1,31 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.log4j.v2.x;
-
-public class Log4j2OutputAppender {
- /**
- * As default, append "TID: N/A" to the output message, if SkyWalking agent in active mode, append the real traceId
- * in the recent Context, if existed, or empty String.
- *
- * @param toAppendTo origin output message.
- */
- public static void append(StringBuilder toAppendTo) {
- toAppendTo.append("TID: N/A");
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2SkyWalkingContextOutputAppender.java b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2SkyWalkingContextOutputAppender.java
deleted file mode 100644
index 64b9fea..0000000
--- a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2SkyWalkingContextOutputAppender.java
+++ /dev/null
@@ -1,31 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.log4j.v2.x;
-
-public class Log4j2SkyWalkingContextOutputAppender {
- /**
- * As default, append "SW_CTX: N/A" to the output message, if SkyWalking agent in active mode, append the real SkyWalking context
- * in the recent Context, if existed, or empty String.
- *
- * @param toAppendTo origin output message.
- */
- public static void append(StringBuilder toAppendTo) {
- toAppendTo.append("SW_CTX: N/A");
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/SkyWalkingContextConverter.java b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/SkyWalkingContextConverter.java
deleted file mode 100644
index 6912a4f..0000000
--- a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/SkyWalkingContextConverter.java
+++ /dev/null
@@ -1,53 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.log4j.v2.x;
-
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.pattern.ConverterKeys;
-import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
-
-/**
- * {@link SkyWalkingContextConverter} is a log4j2 plugin, by annotation as {@link Plugin}. It convert the pattern key: sw_ctx.
- * Use '%sw_ctx' in log4j2's config. '%sw_ctx' will output as SW_CTX:xxxx
- * <p>
- */
-@Plugin(name = "SkyWalkingContextConverter", category = "Converter")
-@ConverterKeys({"sw_ctx"})
-public class SkyWalkingContextConverter extends LogEventPatternConverter {
-
- /**
- * Constructs an instance of LoggingEventPatternConverter.
- *
- * @param name name of converter.
- * @param style CSS style for output.
- */
- protected SkyWalkingContextConverter(String name, String style) {
- super(name, style);
- }
-
- public static SkyWalkingContextConverter newInstance(String[] options) {
- return new SkyWalkingContextConverter("sw_ctx", "sw_ctx");
- }
-
- @Override
- public void format(LogEvent event, StringBuilder toAppendTo) {
- Log4j2SkyWalkingContextOutputAppender.append(toAppendTo);
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java
deleted file mode 100644
index f61c2c2..0000000
--- a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java
+++ /dev/null
@@ -1,53 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.log4j.v2.x;
-
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.pattern.ConverterKeys;
-import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
-
-/**
- * {@link TraceIdConverter} is a log4j2 plugin, by annotation as {@link Plugin}. It convert the pattern key: traceId.
- * Use '%traceId' in log4j2's config. '%traceId' will output as TID:xxxx
- * <p>
- */
-@Plugin(name = "TraceIdConverter", category = "Converter")
-@ConverterKeys({"traceId"})
-public class TraceIdConverter extends LogEventPatternConverter {
-
- /**
- * Constructs an instance of LoggingEventPatternConverter.
- *
- * @param name name of converter.
- * @param style CSS style for output.
- */
- protected TraceIdConverter(String name, String style) {
- super(name, style);
- }
-
- public static TraceIdConverter newInstance(String[] options) {
- return new TraceIdConverter("traceId", "traceId");
- }
-
- @Override
- public void format(LogEvent event, StringBuilder toAppendTo) {
- Log4j2OutputAppender.append(toAppendTo);
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/log/GRPCLogClientAppender.java b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/log/GRPCLogClientAppender.java
deleted file mode 100644
index ebe543e..0000000
--- a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/log/GRPCLogClientAppender.java
+++ /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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.log4j.v2.x.log;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Serializable;
-import org.apache.logging.log4j.core.Filter;
-import org.apache.logging.log4j.core.Layout;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.appender.AbstractOutputStreamAppender;
-import org.apache.logging.log4j.core.appender.OutputStreamManager;
-import org.apache.logging.log4j.core.config.Configuration;
-import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
-import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
-import org.apache.logging.log4j.core.config.plugins.PluginElement;
-import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-
-@Plugin(name = "GRPCLogClientAppender", category = "Core", elementType = "appender")
-public class GRPCLogClientAppender extends AbstractOutputStreamAppender<OutputStreamManager> {
- private static final OutputStream DISCARDED_STREAM = new OutputStream() {
- @Override
- public void write(final int b) throws IOException {
- // discarded
- }
- };
-
- protected GRPCLogClientAppender(final String name,
- final Layout<? extends Serializable> layout,
- final Filter filter,
- final boolean ignoreExceptions) {
- super(
- name,
- layout,
- filter,
- ignoreExceptions,
- true,
- getManager0(layout)
- );
- }
-
- @Override
- public void append(final LogEvent event) {
- }
-
- @PluginFactory
- public static GRPCLogClientAppender createAppender(@PluginAttribute("name") final String name,
- @PluginElement("Layout") final Layout<? extends Serializable> layout,
- @PluginElement("Filter") final Filter filter,
- @PluginConfiguration final Configuration config,
- @PluginAttribute("ignoreExceptions") final String ignore) {
- String appenderName = name == null ? "gRPCLogClientAppender" : name;
- final boolean ignoreExceptions = "true".equalsIgnoreCase(ignore) || !"false".equalsIgnoreCase(ignore);
- return new GRPCLogClientAppender(appenderName, layout, filter, ignoreExceptions);
- }
-
- private static OutputStreamManager getManager0(final Layout<? extends Serializable> layout) {
- return OutputStreamManager.getManager("Discard", new Object(), (s, o) -> new OutputStreamManager(DISCARDED_STREAM, "Discard", layout, false) {
- });
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml b/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml
deleted file mode 100644
index f574a0a..0000000
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- ~
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>apm-application-toolkit</artifactId>
- <groupId>org.apache.skywalking</groupId>
- <version>8.8.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>apm-toolkit-logback-1.x</artifactId>
-
- <properties>
- <logback-classic.version>1.2.3</logback-classic.version>
- <logstash.version>6.1</logstash.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback-classic.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>net.logstash.logback</groupId>
- <artifactId>logstash-logback-encoder</artifactId>
- <version>${logstash.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/LogbackPatternConverter.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/LogbackPatternConverter.java
deleted file mode 100644
index 2240a33..0000000
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/LogbackPatternConverter.java
+++ /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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.logback.v1.x;
-
-import ch.qos.logback.classic.pattern.ClassicConverter;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-
-public class LogbackPatternConverter extends ClassicConverter {
- /**
- * As default, return "TID: N/A" to the output message, if SkyWalking agent in active mode, return the real traceId
- * in the recent Context, if existed.
- *
- * @param iLoggingEvent the event
- * @return the traceId: N/A, empty String, or the real traceId.
- */
- @Override
- public String convert(ILoggingEvent iLoggingEvent) {
- return "TID: N/A";
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/LogbackSkyWalkingContextPatternConverter.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/LogbackSkyWalkingContextPatternConverter.java
deleted file mode 100644
index 998cce5..0000000
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/LogbackSkyWalkingContextPatternConverter.java
+++ /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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.logback.v1.x;
-
-import ch.qos.logback.classic.pattern.ClassicConverter;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-
-public class LogbackSkyWalkingContextPatternConverter extends ClassicConverter {
- /**
- * As default, return "SW_CTX: N/A" to the output message, if SkyWalking agent in active mode, return the real SkyWalking context
- * in the recent Context, if existed.
- *
- * @param iLoggingEvent the event
- * @return the SkyWalking context: N/A, or the real SkyWalking context.
- */
- @Override
- public String convert(ILoggingEvent iLoggingEvent) {
- return "SW_CTX: N/A";
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java
deleted file mode 100644
index e49ce2e..0000000
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java
+++ /dev/null
@@ -1,33 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.logback.v1.x;
-
-import ch.qos.logback.classic.PatternLayout;
-
-/**
- * Based on the logback-compoenent convert register mechanism, register {@link LogbackPatternConverter} as a new
- * convert, match to "tid" and "sw_ctx". You can use "%tid" or "sw_ctx" in logback config file, "Pattern" section.
- * <p>
- */
-public class TraceIdPatternLogbackLayout extends PatternLayout {
- static {
- defaultConverterMap.put("tid", LogbackPatternConverter.class.getName());
- defaultConverterMap.put("sw_ctx", LogbackSkyWalkingContextPatternConverter.class.getName());
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/log/GRPCLogClientAppender.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/log/GRPCLogClientAppender.java
deleted file mode 100644
index b5856e1..0000000
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/log/GRPCLogClientAppender.java
+++ /dev/null
@@ -1,43 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.logback.v1.x.log;
-
-import ch.qos.logback.core.OutputStreamAppender;
-import java.io.OutputStream;
-
-public class GRPCLogClientAppender<E> extends OutputStreamAppender<E> {
-
- public GRPCLogClientAppender() {
- }
-
- @Override
- public void start() {
- setOutputStream(new OutputStream() {
- @Override
- public void write(final int b) {
- // discarded
- }
- });
- super.start();
- }
-
- @Override
- protected void subAppend(final E event) {
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/SkyWalkingContextJsonProvider.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/SkyWalkingContextJsonProvider.java
deleted file mode 100644
index 32ede80..0000000
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/SkyWalkingContextJsonProvider.java
+++ /dev/null
@@ -1,50 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.logback.v1.x.logstash;
-
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import com.fasterxml.jackson.core.JsonGenerator;
-import net.logstash.logback.composite.AbstractFieldJsonProvider;
-import net.logstash.logback.composite.FieldNamesAware;
-import net.logstash.logback.composite.JsonWritingUtils;
-import net.logstash.logback.fieldnames.LogstashFieldNames;
-
-import java.io.IOException;
-import java.util.Map;
-
-public class SkyWalkingContextJsonProvider extends AbstractFieldJsonProvider<ILoggingEvent> implements FieldNamesAware<LogstashFieldNames> {
-
- public static final String SKYWALKING_CONTEXT = "SW_CTX";
-
- @Override
- public void writeTo(JsonGenerator generator, ILoggingEvent event) throws IOException {
- String skyWalkingContext = getSkyWalkingContext(event);
- JsonWritingUtils.writeStringField(generator, getFieldName(), skyWalkingContext);
- }
-
- @Override
- public void setFieldNames(LogstashFieldNames fieldNames) {
- setFieldName(SKYWALKING_CONTEXT);
- }
-
- public String getSkyWalkingContext(ILoggingEvent event) {
- Map<String, String> map = event.getLoggerContextVO().getPropertyMap();
- return map.get(SKYWALKING_CONTEXT);
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/TraceIdJsonProvider.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/TraceIdJsonProvider.java
deleted file mode 100644
index 8d805c8..0000000
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/TraceIdJsonProvider.java
+++ /dev/null
@@ -1,51 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.logback.v1.x.logstash;
-
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import com.fasterxml.jackson.core.JsonGenerator;
-import net.logstash.logback.composite.AbstractFieldJsonProvider;
-import net.logstash.logback.composite.FieldNamesAware;
-import net.logstash.logback.composite.JsonWritingUtils;
-import net.logstash.logback.fieldnames.LogstashFieldNames;
-
-import java.io.IOException;
-import java.util.Map;
-
-public class TraceIdJsonProvider extends AbstractFieldJsonProvider<ILoggingEvent> implements FieldNamesAware<LogstashFieldNames> {
-
- public static final String TRACING_ID = "TID";
-
- @Override
- public void writeTo(JsonGenerator generator, ILoggingEvent event) throws IOException {
- String tracingId = getTracingId(event);
- JsonWritingUtils.writeStringField(generator, getFieldName(), tracingId);
- }
-
- @Override
- public void setFieldNames(LogstashFieldNames fieldNames) {
- setFieldName(TRACING_ID);
- }
-
- public String getTracingId(ILoggingEvent event) {
- Map<String, String> map = event.getLoggerContextVO().getPropertyMap();
- return map.get(TRACING_ID);
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/LogbackMDCPatternConverter.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/LogbackMDCPatternConverter.java
deleted file mode 100644
index 3705bd0..0000000
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/LogbackMDCPatternConverter.java
+++ /dev/null
@@ -1,63 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc;
-
-import ch.qos.logback.classic.pattern.MDCConverter;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.util.OptionHelper;
-
-public class LogbackMDCPatternConverter extends MDCConverter {
- private static final String CONVERT_TRACE_ID_KEY = "tid";
- private static final String CONVERT_SKYWALKING_CONTEXT_KEY = "sw_ctx";
-
- private boolean convert4TID = false;
- private boolean convert4SWCTX = false;
-
- @Override
- public void start() {
- super.start();
- String[] key = OptionHelper.extractDefaultReplacement(getFirstOption());
- if (null != key && key.length > 0) {
- String variableName = key[0];
- if (CONVERT_TRACE_ID_KEY.equals(variableName)) {
- convert4TID = true;
- } else if (CONVERT_SKYWALKING_CONTEXT_KEY.equals(variableName)) {
- convert4SWCTX = true;
- }
- }
- }
-
- @Override
- public String convert(ILoggingEvent iLoggingEvent) {
- if (convert4TID) {
- return convertTID(iLoggingEvent);
- } else if (convert4SWCTX) {
- return convertSkyWalkingContext(iLoggingEvent);
- }
- return super.convert(iLoggingEvent);
- }
-
- public String convertTID(ILoggingEvent iLoggingEvent) {
- return "TID: N/A";
- }
-
- public String convertSkyWalkingContext(ILoggingEvent iLoggingEvent) {
- return "SW_CTX: N/A";
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/TraceIdMDCPatternLogbackLayout.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/TraceIdMDCPatternLogbackLayout.java
deleted file mode 100644
index 8617059..0000000
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/TraceIdMDCPatternLogbackLayout.java
+++ /dev/null
@@ -1,31 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc;
-
-import ch.qos.logback.classic.PatternLayout;
-
-/**
- * Override "X" and "mdc",SuperClass run before Subclass.
- */
-public class TraceIdMDCPatternLogbackLayout extends PatternLayout {
- static {
- defaultConverterMap.put("X", LogbackMDCPatternConverter.class.getName());
- defaultConverterMap.put("mdc", LogbackMDCPatternConverter.class.getName());
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-meter/pom.xml b/apm-application-toolkit/apm-toolkit-meter/pom.xml
deleted file mode 100644
index e561e0e..0000000
--- a/apm-application-toolkit/apm-toolkit-meter/pom.xml
+++ /dev/null
@@ -1,31 +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.
- ~
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>apm-application-toolkit</artifactId>
- <groupId>org.apache.skywalking</groupId>
- <version>8.8.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>apm-toolkit-meter</artifactId>
- <packaging>jar</packaging>
-
- <url>http://maven.apache.org</url>
-</project>
diff --git a/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/BaseBuilder.java b/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/BaseBuilder.java
deleted file mode 100644
index 29a146d..0000000
--- a/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/BaseBuilder.java
+++ /dev/null
@@ -1,80 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.meter;
-
-import java.util.Objects;
-
-/**
- * Help to build the meter
- */
-public abstract class BaseBuilder<BUILDER extends BaseBuilder, METER extends BaseMeter> {
- protected final MeterId meterId;
-
- /**
- * Build a new meter build, meter name is required
- */
- public BaseBuilder(String name) {
- if (name == null) {
- throw new IllegalArgumentException("Meter name cannot be null");
- }
- this.meterId = new MeterId(name, getType());
- }
-
- /**
- * Build a new meter build from exists meter id
- */
- public BaseBuilder(MeterId meterId) {
- if (meterId == null) {
- throw new IllegalArgumentException("Meter id cannot be null");
- }
- if (!Objects.equals(meterId.getType(), getType())) {
- throw new IllegalArgumentException("Meter id type is not matches");
- }
- this.meterId = meterId;
- }
-
- /**
- * Get supported build meter type
- */
- protected abstract MeterId.MeterType getType();
-
- /**
- * Create a meter
- */
- protected abstract METER create();
-
- /**
- * append new tags to this meter
- */
- public BUILDER tag(String name, String value) {
- meterId.getTags().add(new MeterId.Tag(name, value));
- return (BUILDER) this;
- }
-
- /**
- * Build a new meter object
- */
- public METER build() {
- // sort the tags
- this.meterId.getTags().sort(MeterId.Tag::compareTo);
- // create or get the meter
- return create();
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/BaseMeter.java b/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/BaseMeter.java
deleted file mode 100644
index 4998015..0000000
--- a/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/BaseMeter.java
+++ /dev/null
@@ -1,46 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.meter;
-
-public abstract class BaseMeter {
- public BaseMeter(MeterId meterId) {
- }
-
- /**
- * Get meter name
- */
- public String getName() {
- return "";
- }
-
- /**
- * Get tag value
- */
- public String getTag(String tagKey) {
- return "";
- }
-
- /**
- * Get meter Id
- */
- public MeterId getMeterId() {
- return null;
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/Counter.java b/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/Counter.java
deleted file mode 100644
index e794b6b..0000000
--- a/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/Counter.java
+++ /dev/null
@@ -1,89 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.meter;
-
-/**
- * A counter is a cumulative metric that represents a single monotonically increasing counter whose value can only increase.
- *
- * The source code of this class doesn't include the implementation, all logic are injected from its activation.
- */
-public class Counter extends BaseMeter {
-
- protected Counter(MeterId meterId, Mode mode) {
- super(meterId);
- }
-
- /**
- * Increase count
- */
- public void increment(double count) {
- }
-
- /**
- * Get current value
- */
- public double get() {
- return 0;
- }
-
- /**
- * Counter mode
- */
- public enum Mode {
- /**
- * Increase single value, report the real value
- */
- INCREMENT,
-
- /**
- * Rate with previous value when report
- */
- RATE
- }
-
- public static class Builder extends BaseBuilder<Builder, Counter> {
- private Counter.Mode mode = Counter.Mode.INCREMENT;
-
- public Builder(String name) {
- super(name);
- }
-
- public Builder(MeterId meterId) {
- super(meterId);
- }
-
- /**
- * Setting counter mode
- */
- public Builder mode(Mode mode) {
- this.mode = mode;
- return this;
- }
-
- @Override
- protected MeterId.MeterType getType() {
- return MeterId.MeterType.COUNTER;
- }
-
- @Override
- protected Counter create() {
- return new Counter(meterId, mode);
- }
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/Gauge.java b/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/Gauge.java
deleted file mode 100644
index 25199df..0000000
--- a/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/Gauge.java
+++ /dev/null
@@ -1,65 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.meter;
-
-import java.util.function.Supplier;
-
-/**
- * A gauge is a metric that represents a single numerical value that can arbitrarily go up and down.
- *
- * The source code of this class doesn't include the implementation, all logic are injected from its activation.
- */
-public class Gauge extends BaseMeter {
-
- protected Gauge(MeterId meterId, Supplier<Double> getter) {
- super(meterId);
- }
-
- /**
- * Get current value
- */
- public double get() {
- return 0;
- }
-
- public static class Builder extends BaseBuilder<Builder, Gauge> {
- protected Supplier<Double> getter;
-
- public Builder(String name, Supplier<Double> getter) {
- super(name);
- this.getter = getter;
- }
-
- public Builder(MeterId meterId, Supplier<Double> getter) {
- super(meterId);
- this.getter = getter;
- }
-
- @Override
- protected MeterId.MeterType getType() {
- return MeterId.MeterType.GAUGE;
- }
-
- @Override
- protected Gauge create() {
- return new Gauge(meterId, getter);
- }
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/Histogram.java b/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/Histogram.java
deleted file mode 100644
index 3915f2b..0000000
--- a/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/Histogram.java
+++ /dev/null
@@ -1,98 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.meter;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Histogram represents the distribution of data. It includes the buckets representing continuous ranges of values, with
- * the num of collected values in every specific range. The ranges could start from any value(default 0) to positive
- * infinitive. They can be set through the constructor and immutable after that.
- *
- * The source code of this class doesn't include the implementation, all logic are injected from its activation.
- */
-public class Histogram extends BaseMeter {
-
- protected Histogram(MeterId meterId, List<Double> steps) {
- super(meterId);
- }
-
- /**
- * Add value into the histogram, automatic analyze what bucket count need to be increment [step1, step2)
- */
- public void addValue(double value) {
- }
-
- public static class Builder extends BaseBuilder<Builder, Histogram> {
- private double minValue = 0;
- private List<Double> steps;
-
- public Builder(String name) {
- super(name);
- }
-
- public Builder(MeterId meterId) {
- super(meterId);
- }
-
- /**
- * Set bucket steps, the minimal values of every buckets besides the {@link #minValue}.
- */
- public Builder steps(List<Double> steps) {
- this.steps = new ArrayList<>(steps);
- return this;
- }
-
- /**
- * Set min value, default is zero
- */
- public Builder minValue(double minValue) {
- this.minValue = minValue;
- return this;
- }
-
- @Override
- protected MeterId.MeterType getType() {
- return MeterId.MeterType.HISTOGRAM;
- }
-
- @Override
- protected Histogram create() {
- if (steps == null || steps.isEmpty()) {
- throw new IllegalArgumentException("Missing steps setting");
- }
-
- // sort and distinct the steps
- steps = steps.stream().distinct().sorted().collect(Collectors.toList());
-
- // verify steps with except min value
- if (steps.get(0) < minValue) {
- throw new IllegalArgumentException("Step[0] must be bigger than min value");
- } else if (steps.get(0) != minValue) {
- // add the min value to the steps
- steps.add(0, minValue);
- }
-
- return new Histogram(meterId, steps);
- }
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/MeterCenter.java b/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/MeterCenter.java
deleted file mode 100644
index de79118..0000000
--- a/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/MeterCenter.java
+++ /dev/null
@@ -1,33 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.meter;
-
-/**
- * Management the meter. No implementation yet. As meter typically is not deleted/removed by the user codes manually, we
- * don't support this.
- */
-public class MeterCenter {
-
- /**
- * @return NULL always, no real operation.
- */
- public static BaseMeter removeMeter(MeterId id) {
- return null;
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/MeterFactory.java b/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/MeterFactory.java
deleted file mode 100644
index ae55ef9..0000000
--- a/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/MeterFactory.java
+++ /dev/null
@@ -1,67 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.meter;
-
-import java.util.function.Supplier;
-
-public class MeterFactory {
-
- /**
- * Create a counter builder by name
- */
- public static Counter.Builder counter(String name) {
- return new Counter.Builder(name);
- }
-
- /**
- * Create a counter builder by meter id
- */
- public static Counter.Builder counter(MeterId meterId) {
- return new Counter.Builder(meterId);
- }
-
- /**
- * Create a gauge builder by name and getter
- */
- public static Gauge.Builder gauge(String name, Supplier<Double> getter) {
- return new Gauge.Builder(name, getter);
- }
-
- /**
- * Create a gauge builder by meter id and getter
- */
- public static Gauge.Builder gauge(MeterId meterId, Supplier<Double> getter) {
- return new Gauge.Builder(meterId, getter);
- }
-
- /**
- * Create a histogram builder by name
- */
- public static Histogram.Builder histogram(String name) {
- return new Histogram.Builder(name);
- }
-
- /**
- * Create a histogram builder by meterId
- */
- public static Histogram.Builder histogram(MeterId meterId) {
- return new Histogram.Builder(meterId);
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/MeterId.java b/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/MeterId.java
deleted file mode 100644
index 3473c52..0000000
--- a/apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/MeterId.java
+++ /dev/null
@@ -1,128 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.meter;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Meter identity
- */
-public class MeterId {
-
- protected final String name;
- protected final MeterType type;
- protected final List<Tag> tags = new ArrayList<>();
-
- public MeterId(String name, MeterType type) {
- this.name = name;
- this.type = type;
- }
-
- public MeterId(String name, MeterType type, List<Tag> tags) {
- this.name = name;
- this.type = type;
- this.tags.addAll(tags);
- }
-
- public String getName() {
- return name;
- }
-
- public MeterType getType() {
- return type;
- }
-
- public List<Tag> getTags() {
- return tags;
- }
-
- /**
- * Simple copy to a new meter id, change the name and type
- */
- public MeterId copyTo(String name, MeterType type) {
- return new MeterId(name, type, tags);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- MeterId meterId = (MeterId) o;
- return Objects.equals(name, meterId.name) &&
- type == meterId.type &&
- Objects.equals(tags, meterId.tags);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(name, type, tags);
- }
-
- /**
- * The meter type
- */
- public enum MeterType {
- COUNTER,
- GAUGE,
- HISTOGRAM
- }
-
- /**
- * Using name/value pair as the tag, also it will {@link Comparable} when we sort all of tags
- */
- public static class Tag implements Comparable<Tag> {
- private String name;
- private String value;
-
- public Tag(String name, String value) {
- this.name = name;
- this.value = value;
- }
-
- public String getName() {
- return name;
- }
-
- public String getValue() {
- return value;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- Tag tag = (Tag) o;
- return Objects.equals(name, tag.name) &&
- Objects.equals(value, tag.value);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(name, value);
- }
-
- @Override
- public int compareTo(Tag o) {
- return this.name.compareTo(o.name);
- }
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-meter/src/test/java/org/apache/skywalking/apm/toolkit/meter/CounterTest.java b/apm-application-toolkit/apm-toolkit-meter/src/test/java/org/apache/skywalking/apm/toolkit/meter/CounterTest.java
deleted file mode 100644
index 5e911e3..0000000
--- a/apm-application-toolkit/apm-toolkit-meter/src/test/java/org/apache/skywalking/apm/toolkit/meter/CounterTest.java
+++ /dev/null
@@ -1,30 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.meter;
-
-import org.junit.Test;
-
-public class CounterTest {
-
- @Test
- public void testBuild() {
- MeterFactory.counter("test_counter").tag("k1", "v1").build();
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-meter/src/test/java/org/apache/skywalking/apm/toolkit/meter/GaugeTest.java b/apm-application-toolkit/apm-toolkit-meter/src/test/java/org/apache/skywalking/apm/toolkit/meter/GaugeTest.java
deleted file mode 100644
index 1e0e4e6..0000000
--- a/apm-application-toolkit/apm-toolkit-meter/src/test/java/org/apache/skywalking/apm/toolkit/meter/GaugeTest.java
+++ /dev/null
@@ -1,30 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.meter;
-
-import org.junit.Test;
-
-public class GaugeTest {
-
- @Test
- public void testBuild() {
- MeterFactory.gauge("test_gauge1", () -> 1d).tag("k1", "v1").build();
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-meter/src/test/java/org/apache/skywalking/apm/toolkit/meter/HistogramTest.java b/apm-application-toolkit/apm-toolkit-meter/src/test/java/org/apache/skywalking/apm/toolkit/meter/HistogramTest.java
deleted file mode 100644
index 46c2c1e..0000000
--- a/apm-application-toolkit/apm-toolkit-meter/src/test/java/org/apache/skywalking/apm/toolkit/meter/HistogramTest.java
+++ /dev/null
@@ -1,34 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.meter;
-
-import org.junit.Test;
-
-import java.util.Arrays;
-
-public class HistogramTest {
-
- @Test
- public void testBuild() {
- // normal
- MeterFactory.histogram("test_histogram1").steps(Arrays.asList(1d, 5d, 10d)).minValue(-10)
- .tag("k1", "v1").build();
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-meter/src/test/java/org/apache/skywalking/apm/toolkit/meter/MeterIdTest.java b/apm-application-toolkit/apm-toolkit-meter/src/test/java/org/apache/skywalking/apm/toolkit/meter/MeterIdTest.java
deleted file mode 100644
index 5d3c0a4..0000000
--- a/apm-application-toolkit/apm-toolkit-meter/src/test/java/org/apache/skywalking/apm/toolkit/meter/MeterIdTest.java
+++ /dev/null
@@ -1,37 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.meter;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.Arrays;
-
-public class MeterIdTest {
-
- @Test
- public void testCopyTo() {
- final MeterId meterId = new MeterId("test", MeterId.MeterType.COUNTER, Arrays.asList(new MeterId.Tag("k1", "v1")));
- final MeterId copied = meterId.copyTo("test_copied", MeterId.MeterType.GAUGE);
-
- Assert.assertEquals("test_copied", copied.getName());
- Assert.assertEquals(MeterId.MeterType.GAUGE, copied.getType());
- Assert.assertEquals(meterId.getTags(), copied.getTags());
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-micrometer-registry/pom.xml b/apm-application-toolkit/apm-toolkit-micrometer-registry/pom.xml
deleted file mode 100644
index 26e5205..0000000
--- a/apm-application-toolkit/apm-toolkit-micrometer-registry/pom.xml
+++ /dev/null
@@ -1,48 +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.
- ~
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>apm-application-toolkit</artifactId>
- <groupId>org.apache.skywalking</groupId>
- <version>8.8.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>apm-toolkit-micrometer-registry</artifactId>
- <packaging>jar</packaging>
-
- <url>http://maven.apache.org</url>
-
- <properties>
- <micrometer-core.version>1.5.0</micrometer-core.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.skywalking</groupId>
- <artifactId>apm-toolkit-meter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-core</artifactId>
- <version>${micrometer-core.version}</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/MeterBuilder.java b/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/MeterBuilder.java
deleted file mode 100644
index 609af84..0000000
--- a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/MeterBuilder.java
+++ /dev/null
@@ -1,103 +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.
- *
- */
-
-package org.apache.skywalking.apm.meter.micrometer;
-
-import io.micrometer.core.instrument.Meter;
-import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
-import io.micrometer.core.instrument.util.TimeUtils;
-import org.apache.skywalking.apm.toolkit.meter.Counter;
-import org.apache.skywalking.apm.toolkit.meter.Histogram;
-import org.apache.skywalking.apm.toolkit.meter.MeterFactory;
-import org.apache.skywalking.apm.toolkit.meter.MeterId;
-
-import java.util.List;
-import java.util.NavigableSet;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-/**
- * Help to build the meter
- */
-public class MeterBuilder {
-
- /**
- * Build the counter
- */
- public static Counter buildCounter(MeterId meterId, SkywalkingConfig config) {
- return MeterFactory.counter(meterId)
- .mode(getCounterMode(meterId, config))
- .build();
- }
-
- /**
- * Get counter mode
- */
- public static Counter.Mode getCounterMode(MeterId meterId, SkywalkingConfig config) {
- return config.isRateCounter(meterId.getName()) ? Counter.Mode.RATE : Counter.Mode.INCREMENT;
- }
-
- /**
- * Build the histogram
- * @return return histogram if support
- */
- public static Optional<Histogram> buildHistogram(MeterId meterId, boolean supportsAggregablePercentiles,
- DistributionStatisticConfig distributionStatisticConfig,
- boolean useNanoTime) {
- if (!distributionStatisticConfig.isPublishingHistogram()) {
- return Optional.empty();
- }
-
- final NavigableSet<Double> buckets = distributionStatisticConfig.getHistogramBuckets(supportsAggregablePercentiles);
- final List<Double> steps = buckets.stream().sorted(Double::compare)
- .map(t -> useNanoTime ? TimeUtils.nanosToUnit(t, TimeUnit.MILLISECONDS) : t).collect(Collectors.toList());
-
- final Histogram.Builder histogramBuilder = MeterFactory.histogram(
- meterId.copyTo(meterId.getName() + "_histogram", MeterId.MeterType.HISTOGRAM)).steps(steps);
- final Double minimumExpectedValueAsDouble = distributionStatisticConfig.getMinimumExpectedValueAsDouble();
- if (minimumExpectedValueAsDouble != null) {
- histogramBuilder.minValue(useNanoTime ?
- TimeUtils.nanosToUnit(minimumExpectedValueAsDouble, TimeUnit.MILLISECONDS) : minimumExpectedValueAsDouble);
- }
- return Optional.of(histogramBuilder.build());
- }
-
- /**
- * Convert micrometer {@link Meter.Id} to skywalking {@link MeterId}
- */
- public static MeterId convertId(Meter.Id id, String name) {
- MeterId.MeterType type;
- switch (id.getType()) {
- case COUNTER:
- type = MeterId.MeterType.COUNTER;
- break;
- case GAUGE:
- type = MeterId.MeterType.GAUGE;
- break;
- default:
- // other meter need to use multiple customize meter
- type = MeterId.MeterType.HISTOGRAM;
- break;
- }
- final List<MeterId.Tag> tags = id.getTags().stream().map(t -> new MeterId.Tag(t.getKey(), t.getValue())).collect(Collectors.toList());
- final MeterId meterId = new MeterId(name, type, tags);
- return meterId;
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingConfig.java b/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingConfig.java
deleted file mode 100644
index 1cfef19..0000000
--- a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingConfig.java
+++ /dev/null
@@ -1,58 +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.
- *
- */
-
-package org.apache.skywalking.apm.meter.micrometer;
-
-import io.micrometer.core.instrument.config.MeterRegistryConfig;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Skywalking config
- */
-public class SkywalkingConfig implements MeterRegistryConfig {
-
- public static final SkywalkingConfig DEFAULT = new SkywalkingConfig(Collections.emptyList());
-
- /**
- * Supporting rate by agent side counter names
- */
- private final List<String> rateCounterNames;
-
- public SkywalkingConfig(List<String> rateCounterNames) {
- this.rateCounterNames = rateCounterNames;
- }
-
- /**
- * Is counter need rate by agent side
- */
- public boolean isRateCounter(String name) {
- return rateCounterNames == null ? false : rateCounterNames.contains(name);
- }
-
- @Override
- public String prefix() {
- return "";
- }
-
- @Override
- public String get(String key) {
- return null;
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingCounter.java b/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingCounter.java
deleted file mode 100644
index 45563ab..0000000
--- a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingCounter.java
+++ /dev/null
@@ -1,45 +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.
- *
- */
-
-package org.apache.skywalking.apm.meter.micrometer;
-
-import io.micrometer.core.instrument.AbstractMeter;
-import org.apache.skywalking.apm.toolkit.meter.Counter;
-
-/**
- * Wrapper the {@link Counter} to {@link io.micrometer.core.instrument.Counter}
- */
-public class SkywalkingCounter extends AbstractMeter implements io.micrometer.core.instrument.Counter {
- private final Counter counter;
-
- SkywalkingCounter(Id id, Counter counter) {
- super(id);
- this.counter = counter;
- }
-
- @Override
- public void increment(double amount) {
- this.counter.increment(amount);
- }
-
- @Override
- public double count() {
- return counter.get();
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingCustomCounter.java b/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingCustomCounter.java
deleted file mode 100644
index 5a2baf6..0000000
--- a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingCustomCounter.java
+++ /dev/null
@@ -1,66 +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.
- *
- */
-
-package org.apache.skywalking.apm.meter.micrometer;
-
-import io.micrometer.core.instrument.Measurement;
-import org.apache.skywalking.apm.toolkit.meter.BaseBuilder;
-import org.apache.skywalking.apm.toolkit.meter.Counter;
-import org.apache.skywalking.apm.toolkit.meter.MeterId;
-
-/**
- * Work for custom {@link Measurement}, support the skywalking rate mode
- */
-public class SkywalkingCustomCounter extends Counter {
-
- private final Measurement measurement;
-
- protected SkywalkingCustomCounter(MeterId meterId, Measurement measurement, SkywalkingConfig config) {
- super(meterId, MeterBuilder.getCounterMode(meterId, config));
- this.measurement = measurement;
- }
-
- @Override
- public double get() {
- return measurement.getValue();
- }
-
- /**
- * Custom counter builder
- */
- public static class Builder extends BaseBuilder<Builder, Counter> {
- private final Measurement measurement;
- private final SkywalkingConfig config;
-
- public Builder(MeterId meterId, Measurement measurement, SkywalkingConfig config) {
- super(meterId);
- this.measurement = measurement;
- this.config = config;
- }
-
- @Override
- protected MeterId.MeterType getType() {
- return MeterId.MeterType.COUNTER;
- }
-
- @Override
- protected Counter create() {
- return new SkywalkingCustomCounter(meterId, measurement, config);
- }
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingDistributionSummary.java b/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingDistributionSummary.java
deleted file mode 100644
index 4c37078..0000000
--- a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingDistributionSummary.java
+++ /dev/null
@@ -1,100 +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.
- *
- */
-
-package org.apache.skywalking.apm.meter.micrometer;
-
-import io.micrometer.core.instrument.AbstractDistributionSummary;
-import io.micrometer.core.instrument.Clock;
-import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
-import org.apache.skywalking.apm.toolkit.meter.Counter;
-import org.apache.skywalking.apm.toolkit.meter.Gauge;
-import org.apache.skywalking.apm.toolkit.meter.Histogram;
-import org.apache.skywalking.apm.toolkit.meter.MeterFactory;
-import org.apache.skywalking.apm.toolkit.meter.MeterId;
-
-import java.util.Optional;
-import java.util.concurrent.atomic.DoubleAccumulator;
-
-/**
- * Combine the meters to {@link io.micrometer.core.instrument.DistributionSummary}
- */
-@SuppressWarnings("HidingField")
-public class SkywalkingDistributionSummary extends AbstractDistributionSummary {
-
- /**
- * Summary record count
- */
- private final Counter counter;
-
- /**
- * Total summary count
- */
- private final Counter sum;
-
- /**
- * Max amount in this summary
- */
- private final Gauge max;
- private final DoubleAccumulator maxAdder;
-
- /**
- * Histogram of summary
- */
- private final Optional<Histogram> histogram;
-
- protected SkywalkingDistributionSummary(Id id, MeterId meterId, SkywalkingConfig config, Clock clock,
- DistributionStatisticConfig distributionStatisticConfig, double scale,
- boolean supportsAggregablePercentiles) {
- super(id, clock, distributionStatisticConfig, scale, supportsAggregablePercentiles);
-
- // meter base name
- String baseName = meterId.getName();
-
- this.counter = MeterBuilder.buildCounter(meterId.copyTo(baseName + "_count", MeterId.MeterType.COUNTER), config);
- this.sum = MeterBuilder.buildCounter(meterId.copyTo(baseName + "_sum", MeterId.MeterType.COUNTER), config);
- this.maxAdder = new DoubleAccumulator((a, b) -> a > b ? a : b, 0.000);
- this.max = MeterFactory.gauge(meterId.copyTo(baseName + "_max", MeterId.MeterType.GAUGE),
- () -> maxAdder.doubleValue()).build();
-
- this.histogram = MeterBuilder.buildHistogram(meterId, supportsAggregablePercentiles, distributionStatisticConfig, false);
- }
-
- @Override
- protected void recordNonNegative(double amount) {
- counter.increment(1d);
- this.sum.increment(amount);
- maxAdder.accumulate(amount);
-
- histogram.ifPresent(h -> h.addValue(amount));
- }
-
- @Override
- public long count() {
- return (long) counter.get();
- }
-
- @Override
- public double totalAmount() {
- return sum.get();
- }
-
- @Override
- public double max() {
- return max.get();
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingLongTaskTimer.java b/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingLongTaskTimer.java
deleted file mode 100644
index 1ab33ff..0000000
--- a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingLongTaskTimer.java
+++ /dev/null
@@ -1,46 +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.
- *
- */
-
-package org.apache.skywalking.apm.meter.micrometer;
-
-import io.micrometer.core.instrument.Clock;
-import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
-import io.micrometer.core.instrument.internal.DefaultLongTaskTimer;
-import org.apache.skywalking.apm.toolkit.meter.MeterFactory;
-import org.apache.skywalking.apm.toolkit.meter.MeterId;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * Combine the meters to {@link io.micrometer.core.instrument.LongTaskTimer}
- */
-public class SkywalkingLongTaskTimer extends DefaultLongTaskTimer {
-
- public SkywalkingLongTaskTimer(Id id, MeterId meterId, Clock clock, TimeUnit baseTimeUnit, DistributionStatisticConfig distributionStatisticConfig, boolean supportsAggregablePercentiles) {
- super(id, clock, baseTimeUnit, distributionStatisticConfig, supportsAggregablePercentiles);
- final String baseName = meterId.getName();
-
- MeterFactory.gauge(
- meterId.copyTo(baseName + "_active_count", MeterId.MeterType.GAUGE), () -> (double) activeTasks()).build();
- MeterFactory.gauge(
- meterId.copyTo(baseName + "_duration_sum", MeterId.MeterType.GAUGE), () -> duration(TimeUnit.MILLISECONDS)).build();
- MeterFactory.gauge(
- meterId.copyTo(baseName + "_max", MeterId.MeterType.GAUGE), () -> max(TimeUnit.MILLISECONDS)).build();
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingMeterRegistry.java b/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingMeterRegistry.java
deleted file mode 100644
index 5919f67..0000000
--- a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingMeterRegistry.java
+++ /dev/null
@@ -1,189 +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.
- *
- */
-
-package org.apache.skywalking.apm.meter.micrometer;
-
-import io.micrometer.core.instrument.Clock;
-import io.micrometer.core.instrument.DistributionSummary;
-import io.micrometer.core.instrument.FunctionCounter;
-import io.micrometer.core.instrument.FunctionTimer;
-import io.micrometer.core.instrument.LongTaskTimer;
-import io.micrometer.core.instrument.Measurement;
-import io.micrometer.core.instrument.Meter;
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.Statistic;
-import io.micrometer.core.instrument.Timer;
-import io.micrometer.core.instrument.config.NamingConvention;
-import io.micrometer.core.instrument.cumulative.CumulativeFunctionCounter;
-import io.micrometer.core.instrument.cumulative.CumulativeFunctionTimer;
-import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
-import io.micrometer.core.instrument.distribution.pause.PauseDetector;
-import io.micrometer.core.instrument.internal.DefaultGauge;
-import io.micrometer.core.instrument.internal.DefaultMeter;
-import org.apache.skywalking.apm.toolkit.meter.MeterFactory;
-import org.apache.skywalking.apm.toolkit.meter.MeterCenter;
-import org.apache.skywalking.apm.toolkit.meter.MeterId;
-
-import java.util.concurrent.TimeUnit;
-import java.util.function.ToDoubleFunction;
-import java.util.function.ToLongFunction;
-
-/**
- * Skywalking adapt the micrometer registry.
- */
-public class SkywalkingMeterRegistry extends MeterRegistry {
-
- private final SkywalkingConfig config;
-
- public SkywalkingMeterRegistry() {
- this(SkywalkingConfig.DEFAULT, Clock.SYSTEM);
- }
-
- public SkywalkingMeterRegistry(SkywalkingConfig config) {
- this(config, Clock.SYSTEM);
- }
-
- public SkywalkingMeterRegistry(Clock clock) {
- this(SkywalkingConfig.DEFAULT, clock);
- }
-
- public SkywalkingMeterRegistry(SkywalkingConfig config, Clock clock) {
- super(clock);
- this.config = config;
- config().namingConvention(NamingConvention.snakeCase);
- config().onMeterRemoved(this::onMeterRemoved);
- }
-
- @Override
- protected <T> io.micrometer.core.instrument.Gauge newGauge(Meter.Id id, T obj, ToDoubleFunction<T> valueFunction) {
- final MeterId meterId = convertId(id);
- MeterFactory.gauge(meterId, () -> valueFunction.applyAsDouble(obj)).build();
- return new DefaultGauge<>(id, obj, valueFunction);
- }
-
- @Override
- protected io.micrometer.core.instrument.Counter newCounter(Meter.Id id) {
- final MeterId meterId = convertId(id);
- return new SkywalkingCounter(id, MeterBuilder.buildCounter(meterId, config));
- }
-
- @Override
- protected LongTaskTimer newLongTaskTimer(Meter.Id id, DistributionStatisticConfig distributionStatisticConfig) {
- final MeterId meterId = convertId(id);
- return new SkywalkingLongTaskTimer(id, meterId, clock, TimeUnit.MILLISECONDS, distributionStatisticConfig, true);
- }
-
- @Override
- protected Timer newTimer(Meter.Id id, DistributionStatisticConfig distributionStatisticConfig, PauseDetector pauseDetector) {
- final MeterId meterId = convertId(id);
- return new SkywalkingTimer(id, meterId, config, clock, distributionStatisticConfig, pauseDetector, TimeUnit.MILLISECONDS, true);
- }
-
- @Override
- protected DistributionSummary newDistributionSummary(Meter.Id id, DistributionStatisticConfig distributionStatisticConfig, double scale) {
- final MeterId meterId = convertId(id);
- return new SkywalkingDistributionSummary(id, meterId, config, clock, distributionStatisticConfig, scale, true);
- }
-
- @Override
- protected Meter newMeter(Meter.Id id, Meter.Type type, Iterable<Measurement> measurements) {
- final MeterId meterId = convertId(id);
- final String baseName = meterId.getName();
-
- measurements.forEach(m -> {
- String meterName = baseName;
- boolean isCounter = false;
- switch (m.getStatistic()) {
- case TOTAL:
- case TOTAL_TIME:
- meterName = baseName + "_sum";
- isCounter = true;
- break;
- case COUNT:
- isCounter = true;
- break;
- case MAX:
- meterName = baseName + "_max";
- break;
- case ACTIVE_TASKS:
- meterName = baseName + "_active_count";
- break;
- case DURATION:
- meterName = baseName + "_duration_sum";
- break;
- default:
- break;
- }
-
- if (isCounter) {
- new SkywalkingCustomCounter.Builder(meterId.copyTo(meterName, MeterId.MeterType.COUNTER), m, config).build();
- } else {
- MeterFactory.gauge(meterId.copyTo(meterName, MeterId.MeterType.GAUGE), () -> m.getValue()).build();
- }
- });
-
- return new DefaultMeter(id, type, measurements);
- }
-
- @Override
- protected <T> FunctionTimer newFunctionTimer(Meter.Id id, T obj, ToLongFunction<T> countFunction, ToDoubleFunction<T> totalTimeFunction, TimeUnit totalTimeFunctionUnit) {
- final MeterId meterId = convertId(id);
- FunctionTimer ft = new CumulativeFunctionTimer<>(id, obj, countFunction, totalTimeFunction, totalTimeFunctionUnit, getBaseTimeUnit());
- final String baseName = meterId.getName();
-
- MeterFactory.gauge(
- meterId.copyTo(baseName + "_count", MeterId.MeterType.GAUGE), () -> ft.count()).build();
- MeterFactory.gauge(
- meterId.copyTo(baseName + "_sum", MeterId.MeterType.GAUGE), () -> ft.totalTime(TimeUnit.MILLISECONDS)).build();
- return ft;
- }
-
- @Override
- protected <T> FunctionCounter newFunctionCounter(Meter.Id id, T obj, ToDoubleFunction<T> countFunction) {
- final MeterId meterId = convertId(id);
- FunctionCounter fc = new CumulativeFunctionCounter<>(id, obj, countFunction);
-
- new SkywalkingCustomCounter.Builder(meterId, new Measurement(() -> countFunction.applyAsDouble(obj), Statistic.COUNT), config).build();
- return fc;
- }
-
- @Override
- protected TimeUnit getBaseTimeUnit() {
- return TimeUnit.MILLISECONDS;
- }
-
- @Override
- protected DistributionStatisticConfig defaultHistogramConfig() {
- return DistributionStatisticConfig.DEFAULT;
- }
-
- /**
- * Notify on the meter has been removed
- */
- private void onMeterRemoved(Meter meter) {
- final MeterId meterId = convertId(meter.getId());
- MeterCenter.removeMeter(meterId);
- }
-
- /**
- * Convert the micrometer meter id to skywalking meter id
- */
- private MeterId convertId(Meter.Id id) {
- return MeterBuilder.convertId(id, getConventionName(id));
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingTimer.java b/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingTimer.java
deleted file mode 100644
index 07064b8..0000000
--- a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/main/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingTimer.java
+++ /dev/null
@@ -1,100 +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.
- *
- */
-
-package org.apache.skywalking.apm.meter.micrometer;
-
-import io.micrometer.core.instrument.AbstractTimer;
-import io.micrometer.core.instrument.Clock;
-import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
-import io.micrometer.core.instrument.distribution.pause.PauseDetector;
-import org.apache.skywalking.apm.toolkit.meter.Counter;
-import org.apache.skywalking.apm.toolkit.meter.Gauge;
-import org.apache.skywalking.apm.toolkit.meter.Histogram;
-import org.apache.skywalking.apm.toolkit.meter.MeterFactory;
-import org.apache.skywalking.apm.toolkit.meter.MeterId;
-
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.DoubleAccumulator;
-
-@SuppressWarnings("HidingField")
-public class SkywalkingTimer extends AbstractTimer {
-
- /**
- * Execute finished count
- */
- private final Counter counter;
-
- /**
- * Total execute finished duration
- */
- private final Counter sum;
-
- /**
- * Max duration of execute finished time
- */
- private final Gauge max;
- private final DoubleAccumulator maxAdder;
-
- /**
- * Histogram of execute finished duration
- */
- private final Optional<Histogram> histogram;
-
- protected SkywalkingTimer(Id id, MeterId meterId, SkywalkingConfig config, Clock clock,
- DistributionStatisticConfig distributionStatisticConfig, PauseDetector pauseDetector,
- TimeUnit baseTimeUnit, boolean supportsAggregablePercentiles) {
- super(id, clock, distributionStatisticConfig, pauseDetector, baseTimeUnit, supportsAggregablePercentiles);
-
- // meter base name
- String baseName = meterId.getName();
-
- this.counter = MeterBuilder.buildCounter(meterId.copyTo(baseName + "_count", MeterId.MeterType.COUNTER), config);
- this.sum = MeterBuilder.buildCounter(meterId.copyTo(baseName + "_sum", MeterId.MeterType.COUNTER), config);
- this.maxAdder = new DoubleAccumulator((a, b) -> a > b ? a : b, 0.000);
- this.max = MeterFactory.gauge(meterId.copyTo(baseName + "_max", MeterId.MeterType.GAUGE),
- () -> maxAdder.doubleValue()).build();
-
- this.histogram = MeterBuilder.buildHistogram(meterId, supportsAggregablePercentiles, distributionStatisticConfig, true);
- }
-
- @Override
- protected void recordNonNegative(long amount, TimeUnit unit) {
- counter.increment(1d);
- final long amountToMillisecond = TimeUnit.MILLISECONDS.convert(amount, unit);
- sum.increment(amountToMillisecond);
- maxAdder.accumulate(amountToMillisecond);
-
- histogram.ifPresent(h -> h.addValue(amountToMillisecond));
- }
-
- @Override
- public long count() {
- return (long) counter.get();
- }
-
- @Override
- public double totalTime(TimeUnit unit) {
- return unit.convert((long) sum.get(), TimeUnit.MILLISECONDS);
- }
-
- @Override
- public double max(TimeUnit unit) {
- return unit.convert((long) max.get(), TimeUnit.MILLISECONDS);
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/MeterBuilderTest.java b/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/MeterBuilderTest.java
deleted file mode 100644
index d32481e..0000000
--- a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/MeterBuilderTest.java
+++ /dev/null
@@ -1,81 +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.
- *
- */
-
-package org.apache.skywalking.apm.meter.micrometer;
-
-import io.micrometer.core.instrument.Meter;
-import io.micrometer.core.instrument.Tags;
-import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
-import org.apache.skywalking.apm.toolkit.meter.Histogram;
-import org.apache.skywalking.apm.toolkit.meter.MeterId;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
-public class MeterBuilderTest {
-
- @Test
- public void testBuildHistogram() {
- final MeterId meterId = new MeterId("test", MeterId.MeterType.COUNTER,
- Arrays.asList(new MeterId.Tag("k1", "v1")));
-
- // Build a new distribution config
- final DistributionStatisticConfig statisticConfig = DistributionStatisticConfig.builder()
- .serviceLevelObjectives(Duration.ofMillis(1).toNanos(), Duration.ofMillis(5).toNanos(), Duration.ofMillis(10).toNanos())
- .minimumExpectedValue(0d).build();
-
- // Check histogram
- final Optional<Histogram> histogramOptional = MeterBuilder.buildHistogram(meterId, true, statisticConfig, true);
- final Histogram histogram = histogramOptional.orElse(null);
- Assert.assertNotNull(histogram);
-
- // Don't need the histogram
- Assert.assertNull(MeterBuilder.buildHistogram(meterId, true, DistributionStatisticConfig.DEFAULT, true).orElse(null));
- }
-
- @Test
- public void testConvertId() {
- final List<MeterId.Tag> meterTags = Arrays.asList(new MeterId.Tag("k1", "v1"));
-
- // Counter type check
- final Meter.Id counterId = new Meter.Id("test", Tags.of("k1", "v1"), null, "test", Meter.Type.COUNTER);
- assertId(MeterBuilder.convertId(counterId, "test"), "test", MeterId.MeterType.COUNTER, meterTags);
-
- // Gauge type check
- final Meter.Id gaugeId = new Meter.Id("test", Tags.of("k1", "v1"), null, "test", Meter.Type.GAUGE);
- assertId(MeterBuilder.convertId(gaugeId, "test"), "test", MeterId.MeterType.GAUGE, meterTags);
-
- // Histogram type check
- final Meter.Id otherId = new Meter.Id("test", Tags.of("k1", "v1"), null, "test", Meter.Type.DISTRIBUTION_SUMMARY);
- assertId(MeterBuilder.convertId(otherId, "test"), "test", MeterId.MeterType.HISTOGRAM, meterTags);
- }
-
- /**
- * Assert the meter id
- */
- private void assertId(MeterId meterId, String name, MeterId.MeterType type, List<MeterId.Tag> tags) {
- Assert.assertEquals(name, meterId.getName());
- Assert.assertEquals(type, meterId.getType());
- Assert.assertEquals(tags, meterId.getTags());
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingCounterTest.java b/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingCounterTest.java
deleted file mode 100644
index e1cdaed..0000000
--- a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingCounterTest.java
+++ /dev/null
@@ -1,56 +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.
- *
- */
-
-package org.apache.skywalking.apm.meter.micrometer;
-
-import io.micrometer.core.instrument.Counter;
-import org.junit.Assert;
-import org.junit.Test;
-import org.powermock.reflect.Whitebox;
-
-import java.util.Arrays;
-
-public class SkywalkingCounterTest {
-
- @Test
- public void testCounter() {
- // Creating a simplify micrometer counter
- final SkywalkingMeterRegistry registry = new SkywalkingMeterRegistry();
- Counter counter = registry.counter("test_counter", "skywalking", "test");
-
- // Check Skywalking counter type
- Assert.assertTrue(counter instanceof SkywalkingCounter);
- final SkywalkingCounter skywalkingCounter = (SkywalkingCounter) counter;
- final org.apache.skywalking.apm.toolkit.meter.Counter realCounter =
- Whitebox.getInternalState(skywalkingCounter, "counter");
- Assert.assertNotNull(realCounter);
- }
-
- @Test
- public void testRateCounter() {
- final SkywalkingMeterRegistry registry = new SkywalkingMeterRegistry(new SkywalkingConfig(Arrays.asList("test_rate_counter")));
- final Counter counter = registry.counter("test_rate_counter", "skywalking", "test");
-
- // Check Skywalking counter type
- Assert.assertTrue(counter instanceof SkywalkingCounter);
- final SkywalkingCounter skywalkingCounter = (SkywalkingCounter) counter;
- final org.apache.skywalking.apm.toolkit.meter.Counter realCounter =
- Whitebox.getInternalState(skywalkingCounter, "counter");
- Assert.assertNotNull(realCounter);
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingCustomCounterTest.java b/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingCustomCounterTest.java
deleted file mode 100644
index 5912f15..0000000
--- a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingCustomCounterTest.java
+++ /dev/null
@@ -1,42 +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.
- *
- */
-
-package org.apache.skywalking.apm.meter.micrometer;
-
-import io.micrometer.core.instrument.Measurement;
-import io.micrometer.core.instrument.Statistic;
-import org.apache.skywalking.apm.toolkit.meter.Counter;
-import org.apache.skywalking.apm.toolkit.meter.MeterId;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class SkywalkingCustomCounterTest {
-
- @Test
- public void testBuild() {
- // Creating a custom measurement
- Measurement measurement = new Measurement(() -> 1d, Statistic.COUNT);
- final List<MeterId.Tag> tags = Arrays.asList(new MeterId.Tag("skywalking", "custom_counter"));
- final MeterId meterId = new MeterId("test_custom_conter", MeterId.MeterType.COUNTER, tags);
- final Counter counter = new SkywalkingCustomCounter.Builder(meterId, measurement, SkywalkingConfig.DEFAULT).build();
- Assert.assertNotNull(counter);
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingDistributionSummaryTest.java b/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingDistributionSummaryTest.java
deleted file mode 100644
index e87d7fe..0000000
--- a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingDistributionSummaryTest.java
+++ /dev/null
@@ -1,65 +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.
- *
- */
-
-package org.apache.skywalking.apm.meter.micrometer;
-
-import io.micrometer.core.instrument.DistributionSummary;
-import org.apache.skywalking.apm.toolkit.meter.MeterId;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class SkywalkingDistributionSummaryTest {
-
- @Test
- public void testSimple() {
- // Creating a simplify distribution summary
- final SkywalkingMeterRegistry registry = new SkywalkingMeterRegistry();
- final DistributionSummary summary = registry.summary("test_simple_distribution_summary", "skywalking", "test");
-
- // Check Skywalking type
- Assert.assertTrue(summary instanceof SkywalkingDistributionSummary);
- final List<MeterId.Tag> tags = Arrays.asList(new MeterId.Tag("skywalking", "test"));
-
- // Multiple record data
- summary.record(10d);
- summary.record(13d);
- summary.record(2d);
- }
-
- @Test
- public void testComplex() {
- // Creating a support histogram distribution summary
- final SkywalkingMeterRegistry registry = new SkywalkingMeterRegistry();
- final DistributionSummary summary = DistributionSummary.builder("test_complex_distribution_summary")
- .tags("skywalking", "test")
- .publishPercentiles(0.5, 0.95)
- .serviceLevelObjectives(10, 20)
- .minimumExpectedValue(1d)
- .register(registry);
-
- final List<MeterId.Tag> tags = Arrays.asList(new MeterId.Tag("skywalking", "test"));
-
- // Multiple record data
- summary.record(10d);
- summary.record(13d);
- summary.record(2d);
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingLongTaskTimerTest.java b/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingLongTaskTimerTest.java
deleted file mode 100644
index 5b16332..0000000
--- a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingLongTaskTimerTest.java
+++ /dev/null
@@ -1,65 +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.
- *
- */
-
-package org.apache.skywalking.apm.meter.micrometer;
-
-import io.micrometer.core.instrument.LongTaskTimer;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.concurrent.TimeUnit;
-
-public class SkywalkingLongTaskTimerTest {
-
- @Test
- public void testSimple() throws InterruptedException {
- // Creating a simplify long task timer
- final SkywalkingMeterRegistry registry = new SkywalkingMeterRegistry();
- final LongTaskTimer longTaskTimer = registry.more().longTaskTimer("test_simple_long_task_timer", "skywalking", "test");
-
- // Adding tasks
- addLongTask(longTaskTimer, 450);
- addLongTask(longTaskTimer, 20);
-
- // Make sure the second task has finished
- TimeUnit.MILLISECONDS.sleep(200);
-
- // Check Skywalking type
- Assert.assertTrue(longTaskTimer instanceof SkywalkingLongTaskTimer);
- final SkywalkingLongTaskTimer timer = (SkywalkingLongTaskTimer) longTaskTimer;
-
- // Check Original data
- Assert.assertEquals(1, timer.activeTasks());
- Assert.assertTrue(timer.duration(TimeUnit.MILLISECONDS) > 0);
- Assert.assertTrue(timer.max(TimeUnit.MILLISECONDS) > 0);
-
- }
-
- // Add long time task
- private void addLongTask(LongTaskTimer longTaskTimer, int sleepMills) {
- new Thread(() -> {
- longTaskTimer.record(() -> {
- try {
- TimeUnit.MILLISECONDS.sleep(sleepMills);
- } catch (InterruptedException e) {
- }
- });
- }).start();
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingMeterRegistryTest.java b/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingMeterRegistryTest.java
deleted file mode 100644
index 3d23780..0000000
--- a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingMeterRegistryTest.java
+++ /dev/null
@@ -1,128 +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.
- *
- */
-
-package org.apache.skywalking.apm.meter.micrometer;
-
-import io.micrometer.core.instrument.Measurement;
-import io.micrometer.core.instrument.Meter;
-import io.micrometer.core.instrument.Statistic;
-import io.micrometer.core.instrument.Tags;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Only test in build-in meters
- */
-public class SkywalkingMeterRegistryTest {
-
- @Test
- public void testGauge() {
- final SkywalkingMeterRegistry registry = new SkywalkingMeterRegistry();
- final GaugeTestBean gaugeTestBean = new GaugeTestBean(1d);
- registry.gauge("test_counter", gaugeTestBean, GaugeTestBean::getCount);
- }
-
- @Test
- public void testFunctionTimer() {
- final SkywalkingMeterRegistry registry = new SkywalkingMeterRegistry();
- final FunctionTimerBean task = new FunctionTimerBean(1, 200);
- registry.more().timer("test_function_timer", Tags.of("skywalking", "test"), task,
- FunctionTimerBean::getCount, FunctionTimerBean::getTotalTime, TimeUnit.MILLISECONDS);
- }
-
- @Test
- public void testFunctionCounter() {
- final SkywalkingMeterRegistry registry = new SkywalkingMeterRegistry();
- final FunctionTimerBean task = new FunctionTimerBean(1, 200);
- registry.more().counter("test_function_counter", Tags.of("skywalking", "test"), task,
- FunctionTimerBean::getCount);
- }
-
- @Test
- public void testNewMeterSum() {
- // sum
- testNewMeter("test_meter", Meter.Type.GAUGE, Statistic.TOTAL);
-
- // count
- testNewMeter("test_meter", Meter.Type.COUNTER, Statistic.COUNT);
-
- // max
- testNewMeter("test_meter", Meter.Type.GAUGE, Statistic.MAX);
-
- // activeCount
- testNewMeter("test_meter", Meter.Type.GAUGE, Statistic.ACTIVE_TASKS);
-
- // durationSum
- testNewMeter("test_meter", Meter.Type.GAUGE, Statistic.DURATION);
-
- // others
- testNewMeter("test_meter", Meter.Type.GAUGE, Statistic.VALUE);
- }
-
- /**
- * Check custom measurement
- */
- private void testNewMeter(String meterName, Meter.Type type, Statistic statistic) {
- final SkywalkingMeterRegistry registry = new SkywalkingMeterRegistry();
-
- // Create measurement
- Meter.builder(meterName, type, Arrays.asList(new Measurement(() -> 1d, statistic)))
- .tag("skywalking", "test")
- .register(registry);
- }
-
-
- /**
- * Working on {@link io.micrometer.core.instrument.Gauge} check
- */
- private static class GaugeTestBean {
- private final double count;
-
- public GaugeTestBean(double count) {
- this.count = count;
- }
-
- public double getCount() {
- return count;
- }
- }
-
- /**
- * Working on {@link io.micrometer.core.instrument.FunctionTimer} check
- */
- private static class FunctionTimerBean {
- private final long count;
- private final double totalTime;
-
- public FunctionTimerBean(long count, double totalTime) {
- this.count = count;
- this.totalTime = totalTime;
- }
-
- public long getCount() {
- return count;
- }
-
- public double getTotalTime() {
- return totalTime;
- }
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingTimerTest.java b/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingTimerTest.java
deleted file mode 100644
index a971dec..0000000
--- a/apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingTimerTest.java
+++ /dev/null
@@ -1,69 +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.
- *
- */
-
-package org.apache.skywalking.apm.meter.micrometer;
-
-import io.micrometer.core.instrument.Timer;
-import org.apache.skywalking.apm.toolkit.meter.MeterId;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-public class SkywalkingTimerTest {
-
- @Test
- public void testSimpleTimer() {
- // Creating a simplify timer
- final SkywalkingMeterRegistry registry = new SkywalkingMeterRegistry();
- final Timer timer = registry.timer("test_simple_timer", "skywalking", "test");
-
- // Check Skywalking type
- Assert.assertTrue(timer instanceof SkywalkingTimer);
- final List<MeterId.Tag> tags = Arrays.asList(new MeterId.Tag("skywalking", "test"));
-
- // Multiple record data
- timer.record(10, TimeUnit.MILLISECONDS);
- timer.record(20, TimeUnit.MILLISECONDS);
- timer.record(3, TimeUnit.MILLISECONDS);
- }
-
- @Test
- public void testBuilder() {
- // Creating a support histogram timer
- final SkywalkingMeterRegistry registry = new SkywalkingMeterRegistry();
- Timer timer = Timer.builder("test_complex_timer")
- .tag("skywalking", "test")
- .publishPercentiles(0.5, 0.95) // median and 95th percentile
- .serviceLevelObjectives(Duration.ofMillis(10), Duration.ofMillis(20))
- .minimumExpectedValue(Duration.ofMillis(1))
- .register(registry);
-
- // Check Skywalking type
- Assert.assertTrue(timer instanceof SkywalkingTimer);
- final List<MeterId.Tag> tags = Arrays.asList(new MeterId.Tag("skywalking", "test"));
-
- // Multiple record data
- timer.record(10, TimeUnit.MILLISECONDS);
- timer.record(22, TimeUnit.MILLISECONDS);
- timer.record(13, TimeUnit.MILLISECONDS);
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml b/apm-application-toolkit/apm-toolkit-opentracing/pom.xml
deleted file mode 100644
index 80649d8..0000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- ~
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>apm-application-toolkit</artifactId>
- <groupId>org.apache.skywalking</groupId>
- <version>8.8.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>apm-toolkit-opentracing</artifactId>
-
- <properties>
- <opentracing.version>0.30.0</opentracing.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-api</artifactId>
- <version>${opentracing.version}</version>
- </dependency>
- <dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-noop</artifactId>
- <version>${opentracing.version}</version>
- </dependency>
- </dependencies>
-
-
-</project>
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/ByteBufferContext.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/ByteBufferContext.java
deleted file mode 100644
index 401315f..0000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/ByteBufferContext.java
+++ /dev/null
@@ -1,43 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.opentracing;
-
-import io.opentracing.SpanContext;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.Map;
-
-public class ByteBufferContext implements SpanContext {
- static final Charset CHARSET = Charset.forName("UTF-8");
-
- static final byte NO_ENTRY = 0;
- static final byte ENTRY = 1;
-
- private final ByteBuffer byteBuffer;
-
- ByteBufferContext(ByteBuffer byteBuffer) {
- this.byteBuffer = byteBuffer;
- }
-
- @Override
- public Iterable<Map.Entry<String, String>> baggageItems() {
- return new HashMap<String, String>().entrySet();
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/NeedSnifferActivation.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/NeedSnifferActivation.java
deleted file mode 100644
index f030807..0000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/NeedSnifferActivation.java
+++ /dev/null
@@ -1,37 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.opentracing;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The <code>NeedSnifferActivation</code> annotation is flag for reader and maintainers, which represents this method
- * should be activated/intercepted in sniffer.
- */
-@Target({
- ElementType.METHOD,
- ElementType.CONSTRUCTOR
-})
-@Retention(RetentionPolicy.SOURCE)
-public @interface NeedSnifferActivation {
- String value() default "What should interceptor do?";
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingActiveSpan.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingActiveSpan.java
deleted file mode 100644
index fc59c8f..0000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingActiveSpan.java
+++ /dev/null
@@ -1,139 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.opentracing;
-
-import io.opentracing.ActiveSpan;
-import io.opentracing.SpanContext;
-import java.util.Map;
-
-/**
- * The <code>SkywalkingActiveSpan</code> is an extension of {@link SkywalkingSpan}, but because of Java inheritance
- * restrict, only can do with a facade mode.
- */
-public class SkywalkingActiveSpan implements ActiveSpan {
- private SkywalkingSpan span;
-
- public SkywalkingActiveSpan(SkywalkingSpan span) {
- this.span = span;
- }
-
- @Override
- public void deactivate() {
- span.finish();
- }
-
- @Override
- public void close() {
- this.deactivate();
- }
-
- @Override
- public Continuation capture() {
- return new SkywalkingContinuation();
- }
-
- @Override
- public SpanContext context() {
- return span.context();
- }
-
- @Override
- public ActiveSpan setTag(String key, String value) {
- span.setTag(key, value);
- return this;
- }
-
- @Override
- public ActiveSpan setTag(String key, boolean value) {
- span.setTag(key, value);
- return this;
- }
-
- @Override
- public ActiveSpan setTag(String key, Number value) {
- span.setTag(key, value);
- return this;
- }
-
- @Override
- public ActiveSpan log(Map<String, ?> fields) {
- span.log(fields);
- return this;
- }
-
- @Override
- public ActiveSpan log(long timestampMicroseconds, Map<String, ?> fields) {
- span.log(timestampMicroseconds, fields);
- return this;
- }
-
- @Override
- public ActiveSpan log(String event) {
- span.log(event);
- return this;
- }
-
- @Override
- public ActiveSpan log(long timestampMicroseconds, String event) {
- span.log(timestampMicroseconds, event);
- return this;
- }
-
- /**
- * Don't support baggage item.
- */
- @Override
- public ActiveSpan setBaggageItem(String key, String value) {
- return this;
- }
-
- /**
- * Don't support baggage item.
- *
- * @return null, always.
- */
- @Override
- public String getBaggageItem(String key) {
- return null;
- }
-
- @Override
- public ActiveSpan setOperationName(String operationName) {
- span.setOperationName(operationName);
- return this;
- }
-
- /**
- * Don't support logging with payload.
- */
- @Deprecated
- @Override
- public ActiveSpan log(String eventName, Object payload) {
- return this;
- }
-
- /**
- * Don't support logging with payload.
- */
- @Deprecated
- @Override
- public ActiveSpan log(long timestampMicroseconds, String eventName, Object payload) {
- return this;
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContext.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContext.java
deleted file mode 100644
index 39ff824..0000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContext.java
+++ /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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.opentracing;
-
-import io.opentracing.SpanContext;
-
-import java.util.Map;
-
-/**
- * Skywalking tracer context based on {@link ThreadLocal} auto mechanism.
- */
-public class SkywalkingContext implements SpanContext {
- public static final SkywalkingContext INSTANCE = new SkywalkingContext();
-
- public SkywalkingContext() {
- }
-
- @Override
- public Iterable<Map.Entry<String, String>> baggageItems() {
- return null;
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContinuation.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContinuation.java
deleted file mode 100644
index 9f8ef0d..0000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContinuation.java
+++ /dev/null
@@ -1,34 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.opentracing;
-
-import io.opentracing.ActiveSpan;
-
-public class SkywalkingContinuation implements ActiveSpan.Continuation {
- @NeedSnifferActivation("1. ContextManager#capture" + "2. set ContextSnapshot to the dynamic field")
- public SkywalkingContinuation() {
- }
-
- @NeedSnifferActivation("1. get ContextSnapshot from the dynamic field" + "2. ContextManager#continued")
- @Override
- public ActiveSpan activate() {
- SkywalkingSpanBuilder builder = new SkywalkingSpanBuilder("Thread/" + Thread.currentThread().getName());
- return builder.startActive();
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpan.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpan.java
deleted file mode 100644
index c6d833b..0000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpan.java
+++ /dev/null
@@ -1,138 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.opentracing;
-
-import io.opentracing.Span;
-import io.opentracing.SpanContext;
-import java.util.HashMap;
-import java.util.Map;
-
-public class SkywalkingSpan implements Span {
- @NeedSnifferActivation("1.ContextManager#createSpan (Entry,Exit,Local based on builder)." + "2.set the span reference to the dynamic field of enhanced SkywalkingSpan")
- SkywalkingSpan(SkywalkingSpanBuilder builder) {
- }
-
- /**
- * Create a shell span for {@link SkywalkingTracer#activeSpan()}
- */
- @NeedSnifferActivation("1. set the span reference to the dynamic field of enhanced SkywalkingSpan")
- public SkywalkingSpan(SkywalkingTracer tracer) {
-
- }
-
- @NeedSnifferActivation("Override span's operationName, which has been given at ")
- @Override
- public Span setOperationName(String operationName) {
- return this;
- }
-
- @NeedSnifferActivation("AbstractTracingSpan#log(long timestampMicroseconds, Map<String, ?> fields)")
- @Override
- public Span log(long timestampMicroseconds, Map<String, ?> fields) {
- return this;
- }
-
- /**
- * Stop the active span
- */
- @NeedSnifferActivation("1.ContextManager#stopSpan(AbstractSpan span)" + "2. The parameter of stop methed is from the dynamic field of enhanced SkywalkingSpan")
- @Override
- public void finish(long finishMicros) {
-
- }
-
- @Override
- public Span log(long timestampMicroseconds, String event) {
- Map<String, String> eventMap = new HashMap<String, String>(1);
- eventMap.put("event", event);
- return log(timestampMicroseconds, eventMap);
- }
-
- @Override
- public void finish() {
- this.finish(System.currentTimeMillis());
- }
-
- @Override
- public SpanContext context() {
- return SkywalkingContext.INSTANCE;
- }
-
- @NeedSnifferActivation("1. ContextManager#activeSpan()" + "2. SkywalkingSpan#setTag(String, String)")
- @Override
- public Span setTag(String key, String value) {
- return this;
- }
-
- @Override
- public Span setTag(String key, boolean value) {
- return setTag(key, String.valueOf(value));
- }
-
- @Override
- public Span setTag(String key, Number value) {
- return setTag(key, String.valueOf(value));
- }
-
- @Override
- public Span log(Map<String, ?> fields) {
- return log(System.currentTimeMillis(), fields);
- }
-
- @Override
- public Span log(String event) {
- return log(System.currentTimeMillis(), event);
- }
-
- /**
- * Don't support baggage item.
- */
- @Override
- public Span setBaggageItem(String key, String value) {
- return this;
- }
-
- /**
- * Don't support baggage item.
- *
- * @return null, always.
- */
- @Override
- public String getBaggageItem(String key) {
- return null;
- }
-
- /**
- * Don't support logging with payload.
- */
- @Deprecated
- @Override
- public Span log(String eventName, Object payload) {
- return this;
- }
-
- /**
- * Don't support logging with payload.
- */
- @Deprecated
- @Override
- public Span log(long timestampMicroseconds, String eventName, Object payload) {
- return this;
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java
deleted file mode 100644
index 3b531ff..0000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java
+++ /dev/null
@@ -1,177 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.opentracing;
-
-import io.opentracing.ActiveSpan;
-import io.opentracing.BaseSpan;
-import io.opentracing.References;
-import io.opentracing.Span;
-import io.opentracing.SpanContext;
-import io.opentracing.Tracer;
-import io.opentracing.tag.Tags;
-import java.util.ArrayList;
-import java.util.List;
-
-public class SkywalkingSpanBuilder implements Tracer.SpanBuilder {
- private List<Tag> tags = new ArrayList<Tag>();
- private String operationName;
- private boolean isEntry = false;
- private boolean isExit = false;
- private int port;
- private String peer;
- private boolean isError = false;
- private long startTime;
-
- public SkywalkingSpanBuilder(String operationName) {
- this.operationName = operationName;
- }
-
- @Override
- public Tracer.SpanBuilder asChildOf(SpanContext parent) {
- if (parent instanceof SkywalkingContext) {
- return this;
- }
- throw new IllegalArgumentException("parent must be type of SpanContext");
- }
-
- @Override
- public Tracer.SpanBuilder asChildOf(BaseSpan<?> parent) {
- if (parent instanceof SkywalkingSpan || parent instanceof SkywalkingActiveSpan) {
- return this;
- }
- throw new IllegalArgumentException("parent must be type of SkywalkingSpan");
- }
-
- /**
- * Ignore the reference type. the span always the entry or has a parent span.
- */
- @Override
- public Tracer.SpanBuilder addReference(String referenceType, SpanContext referencedContext) {
- if (References.FOLLOWS_FROM.equals(referenceType)) {
- throw new IllegalArgumentException("only support CHILD_OF reference");
- }
- return asChildOf(referencedContext);
- }
-
- @Override
- public Tracer.SpanBuilder withTag(String key, String value) {
- if (Tags.SPAN_KIND.getKey().equals(key)) {
- if (Tags.SPAN_KIND_CLIENT.equals(value) || Tags.SPAN_KIND_PRODUCER.equals(value)) {
- isEntry = false;
- isExit = true;
- } else if (Tags.SPAN_KIND_SERVER.equals(value) || Tags.SPAN_KIND_CONSUMER.equals(value)) {
- isEntry = true;
- isExit = false;
- } else {
- isEntry = false;
- isExit = false;
- }
- } else if (Tags.PEER_HOST_IPV4.getKey().equals(key) ||
- Tags.PEER_HOST_IPV6.getKey().equals(key) || Tags.PEER_HOSTNAME.getKey().equals(key)) {
- peer = value;
- } else if (Tags.PEER_SERVICE.getKey().equals(key)) {
- operationName = value;
- } else {
- tags.add(new Tag(key, value));
- }
- return this;
- }
-
- @Override
- public Tracer.SpanBuilder withTag(String key, boolean value) {
- if (Tags.ERROR.getKey().equals(key)) {
- isError = value;
- } else {
- tags.add(new Tag(key, value ? "true" : "false"));
- }
- return this;
- }
-
- @Override
- public Tracer.SpanBuilder withTag(String key, Number value) {
- if (Tags.PEER_PORT.getKey().equals(key)) {
- port = value.intValue();
- } else {
- tags.add(new Tag(key, value.toString()));
- }
- return this;
- }
-
- @Override
- public Tracer.SpanBuilder withStartTimestamp(long microseconds) {
- startTime = microseconds;
- return this;
- }
-
- @Override
- public ActiveSpan startActive() {
- return new SkywalkingActiveSpan(new SkywalkingSpan(this));
- }
-
- @Override
- public Span startManual() {
- return new SkywalkingSpan(this);
- }
-
- @Override
- @Deprecated
- public Span start() {
- return startManual();
- }
-
- /**
- * All the get methods are for accessing data from activation
- */
- public List<Tag> getTags() {
- return tags;
- }
-
- public String getOperationName() {
- return operationName;
- }
-
- public boolean isEntry() {
- return isEntry;
- }
-
- public boolean isExit() {
- return isExit;
- }
-
- public int getPort() {
- return port;
- }
-
- public String getPeer() {
- return peer;
- }
-
- public boolean isError() {
- return isError;
- }
-
- /**
- * All the following methods are needed for activation.
- */
- @Override
- @NeedSnifferActivation("Stop the active span.")
- public Tracer.SpanBuilder ignoreActiveSpan() {
- return this;
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingTracer.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingTracer.java
deleted file mode 100644
index dcdf6c0..0000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingTracer.java
+++ /dev/null
@@ -1,58 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.opentracing;
-
-import io.opentracing.ActiveSpan;
-import io.opentracing.Span;
-import io.opentracing.SpanContext;
-import io.opentracing.Tracer;
-import io.opentracing.propagation.Format;
-
-public class SkywalkingTracer implements Tracer {
-
- public SpanBuilder buildSpan(String operationName) {
- return new SkywalkingSpanBuilder(operationName);
- }
-
- @NeedSnifferActivation
- @Override
- public <C> void inject(SpanContext spanContext, Format<C> format, C carrier) {
-
- }
-
- @NeedSnifferActivation
- @Override
- public <C> SpanContext extract(Format<C> format, C carrier) {
- return new SkywalkingContext();
- }
-
- @Override
- public ActiveSpan activeSpan() {
- return new SkywalkingActiveSpan(new SkywalkingSpan(this));
- }
-
- @Override
- public ActiveSpan makeActive(Span span) {
- if (span instanceof SkywalkingSpan) {
- return new SkywalkingActiveSpan((SkywalkingSpan) span);
- } else {
- throw new IllegalArgumentException("span must be a type of SkywalkingSpan");
- }
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/Tag.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/Tag.java
deleted file mode 100644
index 04253b7..0000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/Tag.java
+++ /dev/null
@@ -1,37 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.opentracing;
-
-public class Tag {
- private String key;
- private String value;
-
- public Tag(String key, String value) {
- this.key = key;
- this.value = value;
- }
-
- public String getKey() {
- return key;
- }
-
- public String getValue() {
- return value;
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/TextMapContext.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/TextMapContext.java
deleted file mode 100644
index 9197865..0000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/TextMapContext.java
+++ /dev/null
@@ -1,33 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.opentracing;
-
-import io.opentracing.SpanContext;
-import java.util.HashMap;
-import java.util.Map;
-
-public class TextMapContext implements SpanContext {
- public TextMapContext() {
- }
-
- @Override
- public Iterable<Map.Entry<String, String>> baggageItems() {
- return new HashMap<String, String>(0).entrySet();
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/resources/META-INF.services/io.opentracing.Tracer b/apm-application-toolkit/apm-toolkit-opentracing/src/main/resources/META-INF.services/io.opentracing.Tracer
deleted file mode 100644
index 894da6a..0000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/resources/META-INF.services/io.opentracing.Tracer
+++ /dev/null
@@ -1,19 +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.
-#
-#
-
-org.apache.skywalking.apm.toolkit.opentracing.SkyWalkingTracer
diff --git a/apm-application-toolkit/apm-toolkit-trace/pom.xml b/apm-application-toolkit/apm-toolkit-trace/pom.xml
deleted file mode 100644
index 21fb61e..0000000
--- a/apm-application-toolkit/apm-toolkit-trace/pom.xml
+++ /dev/null
@@ -1,31 +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.
- ~
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>apm-application-toolkit</artifactId>
- <groupId>org.apache.skywalking</groupId>
- <version>8.8.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>apm-toolkit-trace</artifactId>
- <packaging>jar</packaging>
-
- <url>http://maven.apache.org</url>
-</project>
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/ActiveSpan.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/ActiveSpan.java
deleted file mode 100644
index 6954a40..0000000
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/ActiveSpan.java
+++ /dev/null
@@ -1,49 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.trace;
-
-/**
- * provide custom api that set tag for current active span.
- */
-public class ActiveSpan {
- /**
- * @param key tag key
- * @param value tag value
- */
- public static void tag(String key, String value) {
- }
-
- public static void error() {
- }
-
- public static void error(String errorMsg) {
- }
-
- public static void error(Throwable throwable) {
- }
-
- public static void debug(String debugMsg) {
- }
-
- public static void info(String infoMsg) {
- }
-
- public static void setOperationName(String operationName) {
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/CallableWrapper.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/CallableWrapper.java
deleted file mode 100644
index 3f5dd69..0000000
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/CallableWrapper.java
+++ /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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.trace;
-
-import java.util.concurrent.Callable;
-
-@TraceCrossThread
-public class CallableWrapper<V> implements Callable<V> {
- final Callable<V> callable;
-
- public static <V> CallableWrapper<V> of(Callable<V> r) {
- return new CallableWrapper<>(r);
- }
-
- public CallableWrapper(Callable<V> callable) {
- this.callable = callable;
- }
-
- @Override
- public V call() throws Exception {
- return callable.call();
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/IgnoredException.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/IgnoredException.java
deleted file mode 100644
index 372c250..0000000
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/IgnoredException.java
+++ /dev/null
@@ -1,35 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.trace;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * After the exception status checker activated in the agent, the span wouldn't be marked as error status if the
- * exception has this annotation.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-public @interface IgnoredException {
-}
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/RunnableWrapper.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/RunnableWrapper.java
deleted file mode 100644
index 25e204c..0000000
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/RunnableWrapper.java
+++ /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.
- */
-
-package org.apache.skywalking.apm.toolkit.trace;
-
-@TraceCrossThread
-public class RunnableWrapper implements Runnable {
- final Runnable runnable;
-
- public RunnableWrapper(Runnable runnable) {
- this.runnable = runnable;
- }
-
- public static RunnableWrapper of(Runnable r) {
- return new RunnableWrapper(r);
- }
-
- @Override
- public void run() {
- this.runnable.run();
- }
-}
\ No newline at end of file
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/SupplierWrapper.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/SupplierWrapper.java
deleted file mode 100644
index 1f8ef2f..0000000
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/SupplierWrapper.java
+++ /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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.trace;
-
-import java.util.function.Supplier;
-
-@TraceCrossThread
-public class SupplierWrapper<V> implements Supplier<V> {
- final Supplier<V> supplier;
-
- public static <V> SupplierWrapper<V> of(Supplier<V> r) {
- return new SupplierWrapper<>(r);
- }
-
- public SupplierWrapper(Supplier<V> supplier) {
- this.supplier = supplier;
- }
-
- @Override
- public V get() {
- return supplier.get();
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java
deleted file mode 100644
index 22917d4..0000000
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java
+++ /dev/null
@@ -1,47 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.trace;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Tag the current active span with key {@link #key()} and value {@link #value()}, if there is no active span, this
- * annotation takes no effect.
- *
- * @see Tags
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@Repeatable(Tags.class)
-public @interface Tag {
- /**
- * @return the key of the tag to be injected into the current active span
- */
- String key();
-
- /**
- * @return the value of the tag to be injected into the current active span, in the form of the customized
- * enhancement rules, for more information, refer to https://github.com/apache/skywalking/blob/master/docs/en/setup/service-agent/java-agent/Customize-enhance-trace.md#how-to-configure
- */
- String value();
-}
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tags.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tags.java
deleted file mode 100644
index b597071..0000000
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tags.java
+++ /dev/null
@@ -1,46 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.trace;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * A wrapper annotation for {@link Tag} that allows to apply multiple tags to a single method span,
- *
- * <pre>
- * @Tag(key = "tag1", value = "arg[0]")
- * @Tag(key = "tag2", value = "arg[1]")
- * public void test(String param1, String param2) {
- * // ...
- * }
- * </pre>
- *
- * @see Tag
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Tags {
- /**
- * @see Tag
- */
- Tag[] value();
-}
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Trace.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Trace.java
deleted file mode 100644
index a06bdab..0000000
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Trace.java
+++ /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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.trace;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The agent create local span if the method that annotation with {@link Trace}. The value of span operation name will
- * fetch by {@link #operationName()}. if the value of {@link #operationName()} is blank string. the operation name will
- * be set the class name + method name.
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Trace {
- /**
- * @return operation name, the default value is blank string.
- */
- String operationName() default "";
-}
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java
deleted file mode 100644
index dd191c1..0000000
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java
+++ /dev/null
@@ -1,76 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.trace;
-
-import java.util.Optional;
-
-/**
- * Try to access the sky-walking tracer context. The context is not existed, always. only the middleware, component, or
- * rpc-framework are supported in the current invoke stack, in the same thread, the context will be available.
- * <p>
- */
-public class TraceContext {
-
- /**
- * Try to get the traceId of current trace context.
- *
- * @return traceId, if it exists, or empty {@link String}.
- */
- public static String traceId() {
- return "";
- }
-
- /**
- * Try to get the segmentId of current trace context.
- *
- * @return segmentId, if it exists, or empty {@link String}.
- */
- public static String segmentId() {
- return "";
- }
-
- /**
- * Try to get the spanId of current trace context. The spanId is a negative number when the trace context is
- * missing.
- *
- * @return spanId, if it exists, or empty {@link String}.
- */
- public static int spanId() {
- return -1;
- }
-
- /**
- * Try to get the custom value from trace context.
- *
- * @return custom data value.
- */
- public static Optional<String> getCorrelation(String key) {
- return Optional.empty();
- }
-
- /**
- * Put the custom key/value into trace context.
- *
- * @return previous value if it exists.
- */
- public static Optional<String> putCorrelation(String key, String value) {
- return Optional.empty();
- }
-
-}
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceCrossThread.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceCrossThread.java
deleted file mode 100644
index e6049c6..0000000
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceCrossThread.java
+++ /dev/null
@@ -1,30 +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.
- *
- */
-
-package org.apache.skywalking.apm.toolkit.trace;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface TraceCrossThread {
-
-}
\ No newline at end of file
diff --git a/apm-application-toolkit/pom.xml b/apm-application-toolkit/pom.xml
deleted file mode 100644
index eef4ad5..0000000
--- a/apm-application-toolkit/pom.xml
+++ /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.
- ~
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>apm</artifactId>
- <groupId>org.apache.skywalking</groupId>
- <version>8.8.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>apm-application-toolkit</artifactId>
- <packaging>pom</packaging>
-
- <modules>
- <module>apm-toolkit-log4j-1.x</module>
- <module>apm-toolkit-log4j-2.x</module>
- <module>apm-toolkit-logback-1.x</module>
- <module>apm-toolkit-opentracing</module>
- <module>apm-toolkit-trace</module>
- <module>apm-toolkit-meter</module>
- <module>apm-toolkit-micrometer-registry</module>
- <module>apm-toolkit-kafka</module>
- </modules>
-</project>
diff --git a/apm-commons/apm-datacarrier/pom.xml b/apm-commons/apm-datacarrier/pom.xml
index fbb048f..0ff0467 100644
--- a/apm-commons/apm-datacarrier/pom.xml
+++ b/apm-commons/apm-datacarrier/pom.xml
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>apm-datacarrier</artifactId>
+ <artifactId>oap-datacarrier</artifactId>
<dependencies>
<dependency>
diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/ConfigInitializer.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/ConfigInitializer.java
deleted file mode 100644
index 4e400a0..0000000
--- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/ConfigInitializer.java
+++ /dev/null
@@ -1,207 +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.
- *
- */
-
-package org.apache.skywalking.apm.util;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Properties;
-
-/**
- * Init a class's static fields by a {@link Properties}, including static fields and static inner classes.
- * <p>
- */
-public class ConfigInitializer {
- public static void initialize(Properties properties, Class<?> rootConfigType) throws IllegalAccessException {
- initNextLevel(properties, rootConfigType, new ConfigDesc());
- }
-
- private static void initNextLevel(Properties properties, Class<?> recentConfigType,
- ConfigDesc parentDesc) throws IllegalArgumentException, IllegalAccessException {
- for (Field field : recentConfigType.getFields()) {
- if (Modifier.isPublic(field.getModifiers()) && Modifier.isStatic(field.getModifiers())) {
- String configKey = (parentDesc + "." + field.getName()).toLowerCase();
- Class<?> type = field.getType();
-
- if (type.equals(Map.class)) {
- /*
- * Map config format is, config_key[map_key]=map_value
- * Such as plugin.opgroup.resttemplate.rule[abc]=/url/path
- */
- // Deduct two generic types of the map
- ParameterizedType genericType = (ParameterizedType) field.getGenericType();
- Type[] argumentTypes = genericType.getActualTypeArguments();
-
- Type keyType = null;
- Type valueType = null;
- if (argumentTypes != null && argumentTypes.length == 2) {
- // Get key type and value type of the map
- keyType = argumentTypes[0];
- valueType = argumentTypes[1];
- }
- Map map = (Map) field.get(null);
- // Set the map from config key and properties
- setForMapType(configKey, map, properties, keyType, valueType);
- } else {
- /*
- * Others typical field type
- */
- String value = properties.getProperty(configKey);
- // Convert the value into real type
- final Length lengthDefine = field.getAnnotation(Length.class);
- if (lengthDefine != null) {
- if (value != null && value.length() > lengthDefine.value()) {
- value = value.substring(0, lengthDefine.value());
- }
- }
- Object convertedValue = convertToTypicalType(type, value);
- if (convertedValue != null) {
- field.set(null, convertedValue);
- }
- }
- }
- }
- for (Class<?> innerConfiguration : recentConfigType.getClasses()) {
- parentDesc.append(innerConfiguration.getSimpleName());
- initNextLevel(properties, innerConfiguration, parentDesc);
- parentDesc.removeLastDesc();
- }
- }
-
- /**
- * Convert string value to typical type.
- *
- * @param type type to convert
- * @param value string value to be converted
- * @return converted value or null
- */
- private static Object convertToTypicalType(Type type, String value) {
- if (value == null || type == null) {
- return null;
- }
-
- Object result = null;
- if (String.class.equals(type)) {
- result = value;
- } else if (int.class.equals(type) || Integer.class.equals(type)) {
- result = Integer.valueOf(value);
- } else if (long.class.equals(type) || Long.class.equals(type)) {
- result = Long.valueOf(value);
- } else if (boolean.class.equals(type) || Boolean.class.equals(type)) {
- result = Boolean.valueOf(value);
- } else if (float.class.equals(type) || Float.class.equals(type)) {
- result = Float.valueOf(value);
- } else if (double.class.equals(type) || Double.class.equals(type)) {
- result = Double.valueOf(value);
- } else if (List.class.equals(type)) {
- result = convert2List(value);
- } else if (type instanceof Class) {
- Class<?> clazz = (Class<?>) type;
- if (clazz.isEnum()) {
- result = Enum.valueOf((Class<Enum>) type, value.toUpperCase());
- }
- }
- return result;
- }
-
- /**
- * Set map items.
- *
- * @param configKey config key must not be null
- * @param map map to set must not be null
- * @param properties properties must not be null
- * @param keyType key type of the map
- * @param valueType value type of the map
- */
- private static void setForMapType(String configKey, Map<Object, Object> map, Properties properties,
- final Type keyType, final Type valueType) {
-
- Objects.requireNonNull(configKey);
- Objects.requireNonNull(map);
- Objects.requireNonNull(properties);
-
- String prefix = configKey + "[";
- String suffix = "]";
-
- properties.forEach((propertyKey, propertyValue) -> {
- String propertyStringKey = propertyKey.toString();
- if (propertyStringKey.startsWith(prefix) && propertyStringKey.endsWith(suffix)) {
- String itemKey = propertyStringKey.substring(
- prefix.length(), propertyStringKey.length() - suffix.length());
- Object keyObj;
- Object valueObj;
-
- keyObj = convertToTypicalType(keyType, itemKey);
- valueObj = convertToTypicalType(valueType, propertyValue.toString());
-
- if (keyObj == null) {
- keyObj = itemKey;
- }
-
- if (valueObj == null) {
- valueObj = propertyValue;
- }
-
- map.put(keyObj, valueObj);
- }
- });
- }
-
- private static List<String> convert2List(String value) {
- if (StringUtil.isEmpty(value)) {
- return Collections.emptyList();
- }
- List<String> result = new LinkedList<>();
-
- String[] segments = value.split(",");
- for (String segment : segments) {
- String trimmedSegment = segment.trim();
- if (StringUtil.isNotEmpty(trimmedSegment)) {
- result.add(trimmedSegment);
- }
- }
- return result;
- }
-
-}
-
-class ConfigDesc {
- private LinkedList<String> descs = new LinkedList<>();
-
- void append(String currentDesc) {
- if (StringUtil.isNotEmpty(currentDesc)) {
- descs.addLast(currentDesc);
- }
- }
-
- void removeLastDesc() {
- descs.removeLast();
- }
-
- @Override
- public String toString() {
- return String.join(".", descs);
- }
-}
diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/Length.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/Length.java
deleted file mode 100644
index 5d4eb47..0000000
--- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/Length.java
+++ /dev/null
@@ -1,34 +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.
- *
- */
-
-package org.apache.skywalking.apm.util;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The length rule of the target field.
- */
-@Target({ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Length {
- int value();
-}
-
diff --git a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/ConfigInitializerTest.java b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/ConfigInitializerTest.java
deleted file mode 100644
index 2dbb590..0000000
--- a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/ConfigInitializerTest.java
+++ /dev/null
@@ -1,93 +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.
- *
- */
-
-package org.apache.skywalking.apm.util;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.List;
-import java.util.Properties;
-
-public class ConfigInitializerTest {
- @Test
- public void testInitialize() throws IllegalAccessException {
- Properties properties = new Properties();
- properties.put("Level1Object.STR_ATTR".toLowerCase(), "stringValue");
- properties.put("Level1Object.Level2Object.INT_ATTR".toLowerCase(), "1000");
- properties.put("Level1Object.Level2Object.LONG_ATTR".toLowerCase(), "1000");
- properties.put("Level1Object.Level2Object.BOOLEAN_ATTR".toLowerCase(), "true");
- properties.put("Level1Object.LIST_ATTR".toLowerCase(), "1,2,3");
- properties.put("Level1Object.LIST_EMPTY_ATTR".toLowerCase(), "");
- properties.put("Level1Object.Level2Object.ENUM_ATTR".toLowerCase(), "RED");
-
- ConfigInitializer.initialize(properties, TestPropertiesObject.class);
-
- Assert.assertEquals("stringValue", TestPropertiesObject.Level1Object.STR_ATTR);
- Assert.assertEquals(1000, TestPropertiesObject.Level1Object.Level2Object.INT_ATTR);
- Assert.assertEquals(1000L, TestPropertiesObject.Level1Object.Level2Object.LONG_ATTR);
- Assert.assertEquals(true, TestPropertiesObject.Level1Object.Level2Object.BOOLEAN_ATTR);
- Assert.assertArrayEquals(new String[] {}, TestPropertiesObject.Level1Object.LIST_EMPTY_ATTR.toArray());
- Assert.assertEquals(TestColorEnum.RED, TestPropertiesObject.Level1Object.Level2Object.ENUM_ATTR);
- //make sure that when descs is empty,toString() work right;
- Assert.assertEquals(new ConfigDesc().toString(), "");
- }
-
- @Test
- public void testInitializeWithUnsupportedConfig() throws IllegalAccessException {
- Properties properties = new Properties();
- properties.put("Level1Object.noExistAttr".toLowerCase(), "stringValue");
-
- ConfigInitializer.initialize(properties, TestPropertiesObject.class);
-
- Assert.assertNull(TestPropertiesObject.Level1Object.STR_ATTR);
- }
-
- @Before
- public void clear() {
- TestPropertiesObject.Level1Object.STR_ATTR = null;
- TestPropertiesObject.Level1Object.LIST_ATTR = null;
- TestPropertiesObject.Level1Object.Level2Object.INT_ATTR = 0;
- TestPropertiesObject.Level1Object.Level2Object.LONG_ATTR = 0;
- TestPropertiesObject.Level1Object.Level2Object.BOOLEAN_ATTR = false;
- TestPropertiesObject.Level1Object.Level2Object.ENUM_ATTR = null;
- }
-
- public static class TestPropertiesObject {
- public static class Level1Object {
- public static String STR_ATTR = null;
- public static List LIST_ATTR = null;
- public static List LIST_EMPTY_ATTR = null;
-
- public static class Level2Object {
- public static int INT_ATTR = 0;
-
- public static long LONG_ATTR;
-
- public static boolean BOOLEAN_ATTR;
-
- public static TestColorEnum ENUM_ATTR;
- }
- }
- }
-
- private enum TestColorEnum {
- RED, BLACK;
- }
-}
diff --git a/apm-dist-es7/pom.xml b/apm-dist-es7/pom.xml
index a6bb905..955b1c5 100644
--- a/apm-dist-es7/pom.xml
+++ b/apm-dist-es7/pom.xml
@@ -30,19 +30,6 @@
<profiles>
<profile>
- <id>agent</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.skywalking</groupId>
- <artifactId>apm-agent</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>backend</id>
<activation>
<activeByDefault>true</activeByDefault>
diff --git a/apm-dist-es7/src/main/assembly/binary-es7.xml b/apm-dist-es7/src/main/assembly/binary-es7.xml
index 049c0ff..4f9353d 100644
--- a/apm-dist-es7/src/main/assembly/binary-es7.xml
+++ b/apm-dist-es7/src/main/assembly/binary-es7.xml
@@ -76,12 +76,6 @@
<outputDirectory>oap-libs</outputDirectory>
</fileSet>
- <!-- Agent repackage into the dist -->
- <fileSet>
- <directory>${project.basedir}/../skywalking-agent</directory>
- <outputDirectory>agent</outputDirectory>
- </fileSet>
-
<!-- Profile exporter tools -->
<fileSet>
<directory>${project.basedir}/../tools/profile-exporter</directory>
diff --git a/apm-dist/pom.xml b/apm-dist/pom.xml
index 91e882a..df285eb 100644
--- a/apm-dist/pom.xml
+++ b/apm-dist/pom.xml
@@ -30,19 +30,6 @@
<profiles>
<profile>
- <id>agent</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.skywalking</groupId>
- <artifactId>apm-agent</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>backend</id>
<activation>
<activeByDefault>true</activeByDefault>
diff --git a/apm-dist/src/main/assembly/binary.xml b/apm-dist/src/main/assembly/binary.xml
index bd8093f..731791b 100644
--- a/apm-dist/src/main/assembly/binary.xml
+++ b/apm-dist/src/main/assembly/binary.xml
@@ -76,12 +76,6 @@
<outputDirectory>oap-libs</outputDirectory>
</fileSet>
- <!-- Agent repackage into the dist -->
- <fileSet>
- <directory>${project.basedir}/../skywalking-agent</directory>
- <outputDirectory>agent</outputDirectory>
- </fileSet>
-
<!-- Profile exporter tools -->
<fileSet>
<directory>${project.basedir}/../tools/profile-exporter</directory>
diff --git a/apm-protocol/apm-network/pom.xml b/apm-protocol/apm-network/pom.xml
index 644641a..cd6fe98 100644
--- a/apm-protocol/apm-network/pom.xml
+++ b/apm-protocol/apm-network/pom.xml
@@ -19,7 +19,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>apm-protocol</artifactId>
+ <artifactId>oap-protocol</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>8.8.0-SNAPSHOT</version>
</parent>
diff --git a/apm-protocol/pom.xml b/apm-protocol/pom.xml
index d9947cb..628ea12 100644
--- a/apm-protocol/pom.xml
+++ b/apm-protocol/pom.xml
@@ -25,10 +25,10 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>apm-protocol</artifactId>
+ <artifactId>oap-protocol</artifactId>
<packaging>pom</packaging>
<modules>
<module>apm-network</module>
</modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml
deleted file mode 100644
index 71d25e7..0000000
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ /dev/null
@@ -1,270 +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.
- ~
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.skywalking</groupId>
- <artifactId>apm-sniffer</artifactId>
- <version>8.8.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>apm-agent-core</artifactId>
- <packaging>jar</packaging>
-
- <name>apm-agent-core</name>
- <url>http://maven.apache.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <guava.version>20.0</guava.version>
- <wiremock.version>2.6.0</wiremock.version>
- <netty-tcnative-boringssl-static.version>2.0.7.Final</netty-tcnative-boringssl-static.version>
- <os-maven-plugin.version>1.4.1.Final</os-maven-plugin.version>
- <shade.package>org.apache.skywalking.apm.dependencies</shade.package>
- <shade.com.google.source>com.google</shade.com.google.source>
- <shade.com.google.target>${shade.package}.${shade.com.google.source}</shade.com.google.target>
- <shade.io.grpc.source>io.grpc</shade.io.grpc.source>
- <shade.io.grpc.target>${shade.package}.${shade.io.grpc.source}</shade.io.grpc.target>
- <shade.io.netty.source>io.netty</shade.io.netty.source>
- <shade.io.netty.target>${shade.package}.${shade.io.netty.source}</shade.io.netty.target>
- <shade.io.opencensus.source>io.opencensus</shade.io.opencensus.source>
- <shade.io.opencensus.target>${shade.package}.${shade.io.opencensus.source}</shade.io.opencensus.target>
- <shade.io.perfmark.source>io.perfmark</shade.io.perfmark.source>
- <shade.io.perfmark.target>${shade.package}.${shade.io.perfmark.source}</shade.io.perfmark.target>
- <shade.org.slf4j.source>org.slf4j</shade.org.slf4j.source>
- <shade.org.slf4j.target>${shade.package}.${shade.org.slf4j.source}</shade.org.slf4j.target>
- <ststem-rules.version>1.18.0</ststem-rules.version>
- <slf4j.version>1.7.25</slf4j.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.skywalking</groupId>
- <artifactId>apm-network</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.skywalking</groupId>
- <artifactId>apm-util</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${gson.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy-agent</artifactId>
- <version>${bytebuddy.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock</artifactId>
- <version>${wiremock.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>jackson-annotations</artifactId>
- <groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jackson-core</artifactId>
- <groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jackson-databind</artifactId>
- <groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-testing</artifactId>
- <version>${grpc.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>mockito-core</artifactId>
- <groupId>org.mockito</groupId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.skywalking</groupId>
- <artifactId>apm-datacarrier</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.github.stefanbirkner</groupId>
- <artifactId>system-rules</artifactId>
- <version>${ststem-rules.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openjdk.jmh</groupId>
- <artifactId>jmh-generator-annprocess</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- </dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
- <dependency>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy</artifactId>
- <version>${bytebuddy.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- <version>${os-maven-plugin.version}</version>
- <executions>
- <execution>
- <phase>initialize</phase>
- <goals>
- <goal>detect</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <excludes>
- <exclude>net.bytebuddy:byte-buddy:jar:</exclude>
- <exclude>com.google.errorprone:error_prone_annotations:jar:</exclude>
- <exclude>com.google.code.findbugs:jsr305:jar:</exclude>
- <exclude>com.google.android:annotations:jar:</exclude>
- <exclude>com.google.api.grpc:proto-google-common-protos:jar:</exclude>
- <exclude>org.checkerframework:checker-compat-qual:jar:</exclude>
- <exclude>org.codehaus.mojo:animal-sniffer-annotations:jar:</exclude>
- </excludes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>${shade.com.google.source}</pattern>
- <shadedPattern>${shade.com.google.target}</shadedPattern>
- </relocation>
- <relocation>
- <pattern>${shade.io.grpc.source}</pattern>
- <shadedPattern>${shade.io.grpc.target}</shadedPattern>
- </relocation>
- <relocation>
- <pattern>${shade.io.netty.source}</pattern>
- <shadedPattern>${shade.io.netty.target}</shadedPattern>
- </relocation>
- <relocation>
- <pattern>${shade.io.opencensus.source}</pattern>
- <shadedPattern>${shade.io.opencensus.target}</shadedPattern>
- </relocation>
- <relocation>
- <pattern>${shade.io.perfmark.source}</pattern>
- <shadedPattern>${shade.io.perfmark.target}</shadedPattern>
- </relocation>
- <relocation>
- <pattern>${shade.org.slf4j.source}</pattern>
- <shadedPattern>${shade.org.slf4j.target}</shadedPattern>
- </relocation>
- </relocations>
- <filters>
- <filter>
- <artifact>com.google.protobuf:protobuf-java</artifact>
- <excludes>
- <exclude>google/protobuf/*.proto</exclude>
- <exclude>google/protobuf/compiler/*.proto</exclude>
- </excludes>
- </filter>
- </filters>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>prepare-package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <delete dir="${project.basedir}/../../packages" />
- </target>
- </configuration>
- </execution>
- <execution>
- <id>unpack</id>
- <phase>package</phase>
- <configuration>
- <target>
- <echo message="unjar" />
- <unzip src="${project.build.directory}/${project.artifactId}-${project.version}.jar" dest="${project.build.directory}/unpacked/" />
- <echo message="rename service providers in META-INF/services" />
- <move file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib" tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_skywalking_apm_dependencies_netty_tcnative_osx_x86_64.jnilib" />
- <move file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_linux_x86_64.so" tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_skywalking_apm_dependencies_netty_tcnative_linux_x86_64.so" />
- <move file="${project.build.directory}/unpacked/META-INF/native/netty_tcnative_windows_x86_64.dll" tofile="${project.build.directory}/unpacked/META-INF/native/org_apache_skywalking_apm_dependencies_netty_tcnative_windows_x86_64.dll" />
- <echo message="jar back" />
- <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar" basedir="${project.build.directory}/unpacked" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/ServiceInstanceGenerator.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/ServiceInstanceGenerator.java
deleted file mode 100644
index 9cec984..0000000
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/ServiceInstanceGenerator.java
+++ /dev/null
@@ -1,59 +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.
- *
- */
-
-package org.apache.skywalking.apm.agent.core;
-
-import java.util.UUID;
-import lombok.Getter;
-import org.apache.skywalking.apm.agent.core.boot.BootService;
-import org.apache.skywalking.apm.agent.core.conf.Config;
-import org.apache.skywalking.apm.agent.core.os.OSUtil;
-
-import static org.apache.skywalking.apm.util.StringUtil.isEmpty;
-
-@Getter
-public class ServiceInstanceGenerator implements BootService {
- @Override
- public void prepare() throws Throwable {
- if (!isEmpty(Config.Agent.INSTANCE_NAME)) {
- return;
- }
-
- Config.Agent.INSTANCE_NAME = UUID.randomUUID().toString().replaceAll("-", "") + "@" + OSUtil.getIPV4();
- }
-
- @Override
- public void boot() throws Throwable {
-
- }
-
- @Override
- public void onComplete() throws Throwable {
-
- }
-
- @Override
- public void shutdown() throws Throwable {
-
- }
-
- @Override
- public int priority() {
- return Integer.MAX_VALUE;
- }
-}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/base64/Base64.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/base64/Base64.java
deleted file mode 100644
index 02f3f46..0000000
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/base64/Base64.java
+++ /dev/null
@@ -1,41 +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.
- *
- */
-
-package org.apache.skywalking.apm.agent.core.base64;
-
-import java.nio.charset.StandardCharsets;
-
-/**
- * A wrapper of {@link java.util.Base64} with convenient conversion methods between {@code byte[]} and {@code String}
- */
-public final class Base64 {
- private static final java.util.Base64.Decoder DECODER = java.util.Base64.getDecoder();
- private static final java.util.Base64.Encoder ENCODER = java.util.Base64.getEncoder();
-
- private Base64() {
- }
-
- public static String decode2UTFString(String in) {
- return new String(DECODER.decode(in), StandardCharsets.UTF_8);
- }
-
- public static String encode(String text) {
- return ENCODER.encodeToString(text.getBytes(StandardCharsets.UTF_8));
- }
-
-}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackageNotFoundException.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackageNotFoundException.java
deleted file mode 100644
index b9249ba..0000000
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackageNotFoundException.java
+++ /dev/null
@@ -1,25 +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.
- *
- */
-
-package org.apache.skywalking.apm.agent.core.boot;
-
-public class AgentPackageNotFoundException extends Exception {
- public AgentPackageNotFoundException(String message) {
- super(message);
- }
-}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackagePath.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackagePath.java
deleted file mode 100644
index 611def0..0000000
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackagePath.java
+++ /dev/null
@@ -1,84 +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.
- *
- */
-
-package org.apache.skywalking.apm.agent.core.boot;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import org.apache.skywalking.apm.agent.core.logging.api.ILog;
... 237920 lines suppressed ...