This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push: new 508945f Upgrade Armeria to 1.12, upgrade OpenSearch test version to 1.1.0 (#7866) 508945f is described below commit 508945f552611ccd45da0bc22e6f08e218a553c2 Author: kezhenxu94 <kezhenx...@apache.org> AuthorDate: Fri Oct 8 19:45:33 2021 +0800 Upgrade Armeria to 1.12, upgrade OpenSearch test version to 1.1.0 (#7866) --- CHANGES.md | 1 + dist-material/release-docs/LICENSE | 4 ++-- oap-server-bom/pom.xml | 2 +- .../skywalking/library/elasticsearch/ElasticSearchBuilder.java | 6 +----- test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml | 2 +- tools/dependencies/known-oap-backend-dependencies.txt | 4 ++-- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 59fdffc..fc3d4e0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,7 @@ Release Notes. #### OAP Server * Add component definition for `Jackson`. * Fix that zipkin-receiver plugin is not packaged into dist. +* Upgrade Armeria to 1.12, upgrade OpenSearch test version to 1.1.0. #### UI diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index c8e6594..15cdb91 100755 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -324,9 +324,9 @@ The text of each license is the standard Apache 2.0 license. simpleclient_httpserver 0.11 from prometheus https://github.com/prometheus/client_java Apache 2.0 jetcd 0.5.3, https://github.com/etcd-io/jetcd, Apache 2.0 failasfe 2.3.4, https://github.com/jhalterman/failsafe, Apache 2.0 - Armeria 1.11.0, http://github.com/line/armeria, Apache 2.0 + Armeria 1.12.0, http://github.com/line/armeria, Apache 2.0 Brotli4j 1.6.0, https://github.com/hyperxpro/Brotli4j, Apache 2.0 - micrometer 1.7.3, https://github.com/micrometer-metrics/micrometer, Apache 2.0 + micrometer 1.7.4, https://github.com/micrometer-metrics/micrometer, Apache 2.0 ======================================================================== MIT licenses diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml index 4051dfe..a0c51cf 100644 --- a/oap-server-bom/pom.xml +++ b/oap-server-bom/pom.xml @@ -73,7 +73,7 @@ <postgresql.version>42.2.18</postgresql.version> <jetcd.version>0.5.3</jetcd.version> <testcontainers.version>1.15.3</testcontainers.version> - <armeria.version>1.11.0</armeria.version> + <armeria.version>1.12.0</armeria.version> <awaitility.version>3.0.0</awaitility.version> <httpcore.version>4.4.13</httpcore.version> <commons-compress.version>1.21</commons-compress.version> diff --git a/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchBuilder.java b/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchBuilder.java index 06975df..28dc0e2 100644 --- a/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchBuilder.java +++ b/oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchBuilder.java @@ -18,7 +18,6 @@ package org.apache.skywalking.library.elasticsearch; import com.google.common.collect.ImmutableList; -import com.google.common.net.HttpHeaders; import com.linecorp.armeria.client.ClientFactory; import com.linecorp.armeria.client.ClientFactoryBuilder; import com.linecorp.armeria.client.Endpoint; @@ -179,10 +178,7 @@ public final class ElasticSearchBuilder { return options; }); if (StringUtil.isNotBlank(username) && StringUtil.isNotBlank(password)) { - endpointGroupBuilder.withClientOptions(it -> it.setHeader( - HttpHeaders.AUTHORIZATION, - BasicToken.of(username, password).asHeaderValue() - )); + endpointGroupBuilder.auth(BasicToken.of(username, password)); } final HealthCheckedEndpointGroup endpointGroup = endpointGroupBuilder.build(); diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml b/test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml index 0d9b855..c05e8a4 100644 --- a/test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml +++ b/test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml @@ -17,7 +17,7 @@ version: '2.1' services: es: - image: opensearchproject/opensearch:1.0.0 + image: opensearchproject/opensearch:1.1.0 expose: - 9200 networks: diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt index 1d65e91..03e2366 100755 --- a/tools/dependencies/known-oap-backend-dependencies.txt +++ b/tools/dependencies/known-oap-backend-dependencies.txt @@ -7,7 +7,7 @@ antlr4-runtime-4.7.1.jar aopalliance-1.0.jar apollo-client-1.8.0.jar apollo-core-1.8.0.jar -armeria-1.11.0.jar +armeria-1.12.0.jar audience-annotations-0.5.0.jar bcpkix-jdk15on-1.69.jar bcprov-ext-jdk15on-1.69.jar @@ -96,7 +96,7 @@ log4j-over-slf4j-1.7.30.jar log4j-slf4j-impl-2.14.1.jar logging-interceptor-3.13.1.jar lz4-java-1.6.0.jar -micrometer-core-1.7.3.jar +micrometer-core-1.7.4.jar moshi-1.5.0.jar msgpack-core-0.8.16.jar mvel2-2.4.8.Final.jar