This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch tidb_provider in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 6f832a0197bace1f968187b996d1e963e302f905 Merge: 546416e edf0bce Author: JaredTan95 <jian....@daocloud.io> AuthorDate: Sat Nov 14 11:26:56 2020 +0800 Merge branch 'master' into dev-fix-tdb # Conflicts: # CHANGES.md CHANGES.md | 4 +- docs/en/setup/service-agent/java-agent/README.md | 13 +++ .../core/analysis/manual/segment/SpanTag.java | 10 ++- .../avg/AvgHistogramPercentileFunction.java | 40 +++++---- .../group/EndpointNameGroupingRuleWatcher.java | 3 +- .../avg/AvgHistogramPercentileFunctionTest.java | 98 +++++++++++++++++++--- .../envoy/als/LogEntry2MetricsAdapter.java | 12 ++- .../receiver/envoy/als/k8s/K8SServiceRegistry.java | 38 ++++----- .../als/k8s/K8sALSServiceMeshHTTPAnalysis.java | 3 +- .../envoy/als/k8s/ServiceNameFormatter.java | 6 +- .../server/receiver/envoy/als/mx/FieldsHelper.java | 29 ++++--- .../envoy/als/mx/MetaExchangeALSHTTPAnalyzer.java | 20 +++-- .../receiver/envoy/als/mx/FieldsHelperTest.java | 2 +- 13 files changed, 198 insertions(+), 80 deletions(-) diff --cc CHANGES.md index ba662f1,da53a49..87a19fb --- a/CHANGES.md +++ b/CHANGES.md @@@ -39,8 -39,8 +39,9 @@@ Release Notes * Fix CVE in the uninstrumented gateways configs, when activating the dynamic configuration feature. * Fix CVE in the Apdex threshold configs, when activating the dynamic configuration feature. * Make the codes and doc consistent in sharding server and core server. - * Fix that chunked string is incorrect while the tag contains colon + * Fix that chunked string is incorrect while the tag contains colon. + * Fix the incorrect dynamic configuration key bug of `endpoint-name-grouping`. +* Fix "transaction too large error" when use TiDB as storage. #### UI * Fix incorrect label in radial chart in topology.