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

Use direct peer address in client.address when X-Forwarded-For is not present #10370

Merged
merged 10 commits into from
Feb 6, 2024
Merged

Use direct peer address in client.address when X-Forwarded-For is not present #10370

merged 10 commits into from
Feb 6, 2024

Conversation

trask
Copy link
Member

@trask trask commented Jan 31, 2024

No description provided.

@trask trask requested a review from a team January 31, 2024 21:28
@heyams
Copy link
Contributor

heyams commented Feb 1, 2024

@trask can you try to rerun failed tests? locally those tests were successful though.

@trask
Copy link
Member Author

trask commented Feb 1, 2024

@trask can you try to rerun failed tests? locally those tests were successful though.

it looks like ./gradlew :instrumentation:spark-2.3:javaagent:test is failing

@@ -98,6 +98,7 @@ abstract class AbstractRatpackRoutesTest extends InstrumentationSpecification {
"$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1"
"$SemanticAttributes.SERVER_ADDRESS" { it == "localhost" || it == null }
"$SemanticAttributes.SERVER_PORT" { it == app.bindPort || it == null }
"$SemanticAttributes.CLIENT_ADDRESS" { it == "127.0.0.1" || it == null }
Copy link
Contributor

Choose a reason for hiding this comment

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

perhaps this should also be just "127.0.0.1"

Copy link
Contributor

Choose a reason for hiding this comment

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

no, sometimes it will be null. similar to line 102.

@trask trask merged commit d4435c9 into open-telemetry:main Feb 6, 2024
47 checks passed
@trask trask deleted the client-address2 branch February 6, 2024 03:09
@trask
Copy link
Member Author

trask commented Feb 6, 2024

thx @heyams!

steverao pushed a commit to steverao/opentelemetry-java-instrumentation that referenced this pull request Feb 16, 2024
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