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

Revert "Revert "Added Host and amazon trace id"" #28

Merged
merged 3 commits into from
Mar 19, 2018

Conversation

taylorshaulis
Copy link
Collaborator

Going to try this again

Reverts #27

@coveralls
Copy link

coveralls commented Mar 19, 2018

Coverage Status

Coverage decreased (-0.3%) to 95.933% when pulling 02cc525 on revert-27-revert-26-tracing into 0d5ec41 on master.

Copy link
Collaborator Author

@taylorshaulis taylorshaulis left a comment

Choose a reason for hiding this comment

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

This was to fix the host so it would be hostname without http://

"""Just extracts the host from the url."""
return self._host or self._get_host(url)

def _get_host(self, url):
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This part is what I changed from the original PR

We want host to only be hostname so I removed the http://

@taylorshaulis
Copy link
Collaborator Author

Ok this should be the same as #26 except for the def _get_host(self, url): function in solr/view.py has been modified so that it only returns the hostname and not http://hostname

I have tested this in Dev and both host and x-amzn-trace-id work now

2018-03-19 17:21:05.580 INFO (qtp97730845-15) [ x:collection1] o.a.s.c.S.Request [collection1] webapp=/solr path=/select params={q=references(bibcode:2012A%26A...544A..53G)&x-amzn-trace-id=Root%3D1-5aaff180-44e85d08b6342f489b5c4e8a&fl=title,bibcode,author,keyword,pub,aff,volume,year,links_data,[citations],property,pubdate,abstract&start=0&sort=first_author+asc&rows=25&wt=json} hits=21 status=0 QTime=168

@romanchyla
Copy link
Contributor

updated the failing test, the port is still there - hope that's OK with kubernetes

@romanchyla romanchyla merged commit fdbcbf6 into master Mar 19, 2018
@romanchyla romanchyla deleted the revert-27-revert-26-tracing branch March 19, 2018 17:35
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.

None yet

3 participants