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

feat(collector): added support for @elastic/elasticsearch v8 #707

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Feb 20, 2023

Bumps @elastic/elasticsearch from 7.17.0 to 8.6.0.

Release notes

Sourced from @​elastic/elasticsearch's releases.

v8.6.0

Changelog

v8.5.0

Changelog

v8.4.0

Changelog

v8.2.1

Changelog

v8.2.0

Changelog

v8.1.0

Changelog

v8.0.0

Changelog

Changelog

Sourced from @​elastic/elasticsearch's changelog.

=== 8.6.0

[discrete] ===== Bump @​elastic/transport to 8.3.1+ elastic/elasticsearch-js#1802

The @elastic/transport dependency has been bumped to ~8.3.1 to ensure fixes to the maxResponseSize option are available in the client.

[discrete] ===== Support for Elasticsearch v8.6.0

You can find all the API changes https://www.elastic.co/guide/en/elasticsearch/reference/8.6/release-notes-8.6.0.html[here].

[discrete] === 8.5.0

[discrete] ===== Support for Elasticsearch v8.5.0

You can find all the API changes https://www.elastic.co/guide/en/elasticsearch/reference/8.5/release-notes-8.5.0.html[here].

[discrete] === 8.4.0

[discrete] ===== Support for Elasticsearch v8.4.0

You can find all the API changes https://www.elastic.co/guide/en/elasticsearch/reference/8.4/release-notes-8.4.0.html[here].

[discrete] === 8.2.1

[discrete] ==== Fixes

[discrete] ===== Support for Elasticsearch v8.2.1

You can find all the API changes https://www.elastic.co/guide/en/elasticsearch/reference/8.2/release-notes-8.2.1.html[here].

[discrete] ===== Fix ndjson APIs elastic/elasticsearch-js#1688

The previous release contained a bug that broken ndjson APIs. We have released v8.2.0-patch.1 to address this. This fix is the same as the one we have released and we strongly recommend upgrading to this version.

... (truncated)

Commits
  • 281ac00 [8.6] Add release notes for 8.6.0
  • 0f0c600 [8.6] Bump @elastic/transport to 8.3.1
  • 38e4b23 Add a changelog for 8.5.0
  • 04634af Update all docs refs to 'current' instead of 'master'
  • f79f4e8 Remove unnecessary ts-expect-error
  • 560dfd3 Fix docs URLs to use 'current' instead of 'master'
  • ebbc296 Bumps to version 8.6.0 (#1762)
  • 6ccdab5 Add changelog for 8.4.0
  • 8f9ed67 Update APIs to 8.5.0-SNAPSHOT
  • 4ebffbc Bumps to version 8.5.0
  • Additional commits viewable in compare view
Maintainer changes

This version was pushed to npm by sethmlarson, a new releaser for @​elastic/elasticsearch since your current version.


Dependabot compatibility score

You can trigger a rebase of this PR 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 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)

@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label Feb 20, 2023
@kirrg001 kirrg001 changed the title build(deps-dev): bump @elastic/elasticsearch from 7.17.0 to 8.6.0 feat(collector): added support for @elastic/elasticsearch v8 Feb 21, 2023
@kirrg001 kirrg001 force-pushed the dependabot/npm_and_yarn/main/elastic/elasticsearch-8.6.0 branch from aeffbd7 to a880e07 Compare February 21, 2023 11:41
@kirrg001 kirrg001 requested a review from a team February 21, 2023 11:50
Copy link
Contributor

@basti1302 basti1302 left a comment

Choose a reason for hiding this comment

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

LGTM! Great work and thanks for going the extra mile to stay on top of new versions.

// eslint-disable-next-line no-useless-concat
`@elastic/elasticsearch@${version}/` + `instrumentation flavor: ${instrumentationFlavor}`,
function () {
const indiceKey = version === 'latest' ? 'Indices.refresh' : 'indices.refresh';
Copy link
Contributor

Choose a reason for hiding this comment

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

teeny tiny typo nitpick: is that meant to read indicesKey? Or indexKey?

Comment on lines 219 to 225
const parsedConnectionUrl = new URL(connectionString);
span.data.elasticsearch.address = parsedConnectionUrl.hostname;
span.data.elasticsearch.port = parsedConnectionUrl.port;
Copy link
Contributor

Choose a reason for hiding this comment

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

suggestion: We could potentially shave off some CPU cycles by moving the new URL(...) into the monkey-patched es.Client = function InstanaClient() { function I think. If I am not mistaken, the way it is implemented now, we parse the URL on every request, although it is always the same connectionString value.

OTOH, users might instantiate multiple instances of es.Client, talking to different ElasticSearch clusters/servers, I guess? Could keeping only one connectionString might lead to scenarios where we record the wrong target address/port for some calls?

Copy link
Contributor

Choose a reason for hiding this comment

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

I will put the URL parsing to the patched client override for now.

OTOH, users might instantiate multiple instances of es.Client

Yes totally true. But I think there are a lot of instrumentations which ignore this use case and store data in global variables inside the instrumentations. I'd like to ignore this case.

@kirrg001 kirrg001 force-pushed the dependabot/npm_and_yarn/main/elastic/elasticsearch-8.6.0 branch from 3f37db1 to 5d255b6 Compare February 24, 2023 08:32
@kirrg001 kirrg001 merged commit dae00bb into main Feb 24, 2023
@kirrg001 kirrg001 deleted the dependabot/npm_and_yarn/main/elastic/elasticsearch-8.6.0 branch February 24, 2023 08:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants