-
Notifications
You must be signed in to change notification settings - Fork 6.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rebuilt ElasticSearch client on top of their REST API #7634
Conversation
d49df7f
to
9df20c3
Compare
...nt/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchClientBuilder.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Wait for others' review.
I tested locally, all looks great to me except 2021-09-06 11:14:10,020 org.apache.skywalking.library.elasticsearch.ElasticSearch 149 [armeria-eventloop-nio-4-2] DEBUG [] - [creqId=3fe1891d, preqId=8179d41f][http://UNKNOWN/#GET] Request: {startTime=2021-09-06T03:14:10.010Z(1630898050010987), length=0B, duration=4538µs(4538520ns), cause=com.linecorp.armeria.client.UnprocessedRequestException: com.linecorp.armeria.client.endpoint.EmptyEndpointGroupException, scheme=none+http, name=GET, headers=[:method=GET, :path=/, :scheme=http, :authority=UNKNOWN]}
2021-09-06 11:14:10,021 org.apache.skywalking.library.elasticsearch.ElasticSearch 186 [armeria-eventloop-nio-4-2] WARN [] - [creqId=3fe1891d, preqId=8179d41f][http://UNKNOWN/#GET] Response: {startTime=2021-09-06T03:14:10.020Z(1630898050020718), length=0B, duration=0ns, totalDuration=9749µs(9749393ns), cause=com.linecorp.armeria.client.UnprocessedRequestException: com.linecorp.armeria.client.endpoint.EmptyEndpointGroupException, headers=[:status=0]}
com.linecorp.armeria.client.UnprocessedRequestException: com.linecorp.armeria.client.endpoint.EmptyEndpointGroupException I think |
There is warning / error message before what you posted, also, it has health check registered .
|
cd78e72
to
e8c0f04
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Thank you @wu-sheng @JaredTan95 for reviewing and checking, I'm going to merge this |
@wankai123 is confirming too. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
docker/oap/Dockerfile.oap
will be fixed in follow-up PRs?
ignore this |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some nits:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
some nits regarding docker/.env
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
ccdb69d
secretsManagementFile
hot reloading doesn't work as expected #7655.CHANGES
log.