Skip to content
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

Bump co.elastic.clients:elasticsearch-java from 8.8.1 to 8.9.0 #3283

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Aug 9, 2023

Bumps co.elastic.clients:elasticsearch-java from 8.8.1 to 8.9.0.

Commits
  • a98c9d6 [codegen] Update to latest 8.9 API spec
  • 3d2cb30 [DOCS] Changes getting started button link on landing page. (#626) (#628)
  • 7dc7491 [DOCS] Temporarily redirect getting started button link on landing page. (#62...
  • ac905b3 [DOCS] Adds getting started content based on the template (#617) (#622)
  • bf459ff [codegen] Bump version
  • c8fdfca [codegen] Update to latest API spec
  • 25e61a5 Fix spurious JSON event emitted by JsonpUtils.copy() (#597)
  • 4c3a13b Refactor RestClientTransport to allow using other http client libraries (#584)
  • 38ec037 Add pipeline setup to index and create operations (#587)
  • 9246eab Throw a TransportException when an error response cannot be parsed (#579)
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [co.elastic.clients:elasticsearch-java](https://github.com/elastic/elasticsearch-java) from 8.8.1 to 8.9.0.
- [Release notes](https://github.com/elastic/elasticsearch-java/releases)
- [Changelog](https://github.com/elastic/elasticsearch-java/blob/main/CHANGELOG.md)
- [Commits](elastic/elasticsearch-java@v8.8.1...v8.9.0)

---
updated-dependencies:
- dependency-name: co.elastic.clients:elasticsearch-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label Aug 9, 2023
@dependabot dependabot bot requested a review from a team August 9, 2023 14:27
@elastic-apm-tech elastic-apm-tech added this to In Progress in APM-Agents (OLD) Aug 9, 2023
@SylvainJuge SylvainJuge enabled auto-merge (squash) August 9, 2023 14:30
map.put(endpointId, endpointDef);

// duplicate entries for allocation-free lookup with 'es/' prefix.
map.put("es/" + endpointId, endpointDef);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[for reviewer] this allows to make the lookup allocation free (endpoint ID was modified before lookup in inregisterEndpointId).

@@ -61,10 +61,14 @@ public static class RestClientTransportAdvice {

private static final ElasticsearchRestClientInstrumentationHelper helper = ElasticsearchRestClientInstrumentationHelper.get();

@Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[for reviewer] instead of keeping track of the request object (which is wrapped/replaced at least twice in the new implementation), we just use a thread-local value to store the endpoint ID for the duration of the performRequest* method execution, which is enough to create the span with the correct attributes.

@@ -38,7 +38,7 @@ public interface DetachedThreadLocal<T> {
@Nullable
T getAndRemove();

void set(T value);
void set(@Nullable T value);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[for reviewer] this annotation was already present in interface implementation.

Copy link
Contributor

@JonasKunz JonasKunz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work!
We'll however need to do the same changes for the opentelemetry es instrumentation

@SylvainJuge SylvainJuge enabled auto-merge (squash) August 11, 2023 14:19
@SylvainJuge SylvainJuge merged commit 3abc70a into main Aug 11, 2023
13 checks passed
@SylvainJuge SylvainJuge deleted the dependabot/maven/co.elastic.clients-elasticsearch-java-8.9.0 branch August 11, 2023 14:23
APM-Agents (OLD) automation moved this from In Progress to Done Aug 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
agent-java dependencies Pull requests that update a dependency file
Projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants