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

chore: add default ports to context.service.target.name for exit HTTP spans #3590

Merged
merged 2 commits into from
Aug 30, 2023

Conversation

david-luna
Copy link
Member

@david-luna david-luna commented Aug 25, 2023

This PR is conform with the agreements of the discussion in elastic/apm#700 which in summary says that default ports should be explicit in serviceTarget.name property of the span.

Updatecli workflows are failing because of that and JSON specs cannot be updated #3589

Checklist

  • Implement code
  • Add tests
  • Update TypeScript typings
  • Update documentation
  • Add CHANGELOG.asciidoc entry
  • Commit message follows commit guidelines

@david-luna david-luna requested a review from trentm August 25, 2023 09:59
@github-actions github-actions bot added the agent-nodejs Make available for APM Agents project planning. label Aug 25, 2023
@david-luna david-luna changed the title fix: add default ports to serviceTarget.name chore: add default ports to context.service.target.name for exit HTTP spans Aug 25, 2023
Copy link
Member Author

@david-luna david-luna left a comment

Choose a reason for hiding this comment

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

/test tav

Comment on lines +54 to +56
// UPDATE: there is a PR fixing it https://github.com/elastic/apm-agent-nodejs/pull/3589
// making this test fail so for a short period we need to accept both cases
// before removing this tweak.
Copy link
Member

Choose a reason for hiding this comment

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

I'm a little confused. Should we take #3589 first and then this fix? Or perhaps add the lib/instrumentation/span.js changes as part of #3589? Then the shared test file change, and the APM agent changes to match it are in the same commit.

If you prefer to do them separately (this one first), then that's cool too.

Copy link
Member Author

Choose a reason for hiding this comment

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

What I had in mind is 1st to add the default port and then let updatecli to update the JSON spec file in #3589
With this change in the conditional the test accepts both formats in the spec file (URL as object or as string) so the steps I had planned are:

I'll check if I can do the last stem on #3589 so we avoid an extra PR

@david-luna david-luna merged commit 5f4e37c into main Aug 30, 2023
@david-luna david-luna deleted the dluna/chore-update-service-resource-inference-tests branch August 30, 2023 07:53
PeterEinberger pushed a commit to fpm-git/apm-agent-nodejs that referenced this pull request Aug 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
agent-nodejs Make available for APM Agents project planning.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants