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

Add context.http.url to spans. #1037

Merged
merged 2 commits into from
Jun 28, 2018
Merged

Conversation

simitt
Copy link
Contributor

@simitt simitt commented Jun 27, 2018

implements #777

This PR defines span.context.http.url and stores it in ES, without indexing the field.

cc @jahtalab

@simitt simitt force-pushed the adapt-span-context branch from 9658a6e to 1d492eb Compare June 27, 2018 16:01
@@ -24,16 +24,18 @@
"unloadEventEnd": 32,
"unloadEventStart": 32
},
"http": {
"url": {
"location": "http://localhost:8000/test/e2e/general-usecase/"
Copy link
Contributor

Choose a reason for hiding this comment

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

@simitt , This is part of transaction context but the change was about span.context!

"location": "http://localhost:8000/test/e2e/general-usecase/"
"http": {
"url": {
"location": "http://localhost:8000/test/e2e/general-usecase/"
Copy link
Contributor

Choose a reason for hiding this comment

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

@simitt , This is also part of transaction context!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes sorry, got the wrong one here, will change this, which automatically changes the approved test case.

@simitt simitt force-pushed the adapt-span-context branch from 1d492eb to 6935453 Compare June 28, 2018 07:44
@simitt
Copy link
Contributor Author

simitt commented Jun 28, 2018

There has been merge conflicts with master in the mean time, so I had to rebase to master, sorry for inconveniences.

@simitt
Copy link
Contributor Author

simitt commented Jun 28, 2018

jenkins, retest this please.

@simitt simitt merged commit 2665a0d into elastic:master Jun 28, 2018
@simitt simitt deleted the adapt-span-context branch June 28, 2018 11:21
simitt added a commit to simitt/apm-server that referenced this pull request Jul 4, 2018
* Add context.http.url to spans.

implements elastic#777
@simitt simitt mentioned this pull request Jul 4, 2018
simitt added a commit to simitt/apm-server that referenced this pull request Jul 4, 2018
* Add context.http.url to spans.

implements elastic#777
simitt added a commit that referenced this pull request Jul 4, 2018
* Add context.http.url to spans.

implements #777
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants