[skywalking] 01/01: Merge branch 'master' of https://github.com/apache/skywalking into fix

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch fix
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit e9e112b078b0b0c0223ea8329f945652864b8890
Merge: 41e6ef08f3 1da72b6af9
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Nov 25 21:22:06 2022 +0800

    Merge branch 'master' of https://github.com/apache/skywalking into fix
    
    # Conflicts:
    #       docs/en/changes/changes.md

 docs/en/changes/changes.md                                         | 7 ++++---
 .../server/library/client/elasticsearch/ElasticSearchClient.java   | 2 +-
 .../skywalking/library/elasticsearch/client/DocumentClient.java    | 2 +-
 .../elasticsearch/requests/factory/v7plus/V7DocumentFactory.java   | 5 ++---
 .../skywalking/library/elasticsearch/ITElasticSearchTest.java      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --cc docs/en/changes/changes.md
index cf832bc4d9,daa3d1bda6..69e73f3293
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@@ -131,8 -131,7 +131,9 @@@
    For SQL-Database: add new column `timestamp` for tables `profile_task_log/top_n_database_statement`,
    requires altering this column or removing these tables before OAP starts, if bump up from previous releases.
  * Fix Elasticsearch storage: In `No-Sharding Mode`, add specific analyzer to the template before index creation to avoid update index error.
+ * Internal API: remove undocumented ElasticSearch API usage and use documented one.
 +* Fix `BanyanDB.ShardingKey` annotation missed in the generated OAL metrics classes.
- * Don't accept no sharding key in the Measure(BanyanDB) definition. 
++* Don't accept no sharding key in the Measure(BanyanDB) definition.
  
  #### UI