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(tags): http #827

Merged
merged 5 commits into from Jul 30, 2020
Merged

Conversation

FrankSpitulski
Copy link
Contributor

flavour, user agent, client ip

I had to make a new type of tracer method that takes both the request and the connection because netty has the flavour on the request while armeria has the flavour on the connection. Also, I needed a fallback for the client ip which relies on the connection.

Closes #776

@FrankSpitulski
Copy link
Contributor Author

fixing tests, but I figured I'd put it up here for people to review

Copy link
Member

@trask trask left a comment

Choose a reason for hiding this comment

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

Yay, more semantic conventions covered!

@FrankSpitulski FrankSpitulski force-pushed the feat/tags/http branch 2 times, most recently from 44e5261 to f4a7fc9 Compare July 29, 2020 01:40
@FrankSpitulski
Copy link
Contributor Author

@trask I think this may be a sporadic test failure, works on my machine and it's a timeout error 🤷

https://app.circleci.com/pipelines/github/open-telemetry/opentelemetry-java-instrumentation/2264/workflows/139f7258-b674-4f8f-abfc-87311eecdd25/jobs/14878/tests

flavour, user agent, client ip
return peerHostIP(connection);
}

private static String extractForwardedFor(String forwarded) {
Copy link
Member

Choose a reason for hiding this comment

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

Can you add unit test for this method (to mitigate against the extra complexity we asked for 😄)?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

added tests, caught an edge case

Copy link
Contributor Author

Choose a reason for hiding this comment

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

getting another issue with latestDepTest though.

./gradlew :instrumentation:grpc-1.5:latestDepTest fails
./gradlew :instrumentation:grpc-1.5:test works

Copy link
Contributor

@anuraaga anuraaga left a comment

Choose a reason for hiding this comment

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

Thanks!

Copy link
Member

@trask trask left a comment

Choose a reason for hiding this comment

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

Thanks @FrankSpitulski! I'll look into the latestDepTest issue and let you know once that's resolved in master.

@trask trask merged commit adab0ef into open-telemetry:master Jul 30, 2020
@trask
Copy link
Member

trask commented Jul 30, 2020

I forgot that I can merge master into your branch 😄

@FrankSpitulski FrankSpitulski deleted the feat/tags/http branch August 18, 2020 19:46
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.

HttpServlet Tag Enhancements
3 participants