-
Notifications
You must be signed in to change notification settings - Fork 791
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
JavaScript Snippet Injection #7650
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/easycla |
trask
reviewed
Feb 14, 2023
...test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/InjectionTest.java
Outdated
Show resolved
Hide resolved
trask
reviewed
Feb 16, 2023
...test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/InjectionTest.java
Outdated
Show resolved
Hide resolved
trask
reviewed
Feb 16, 2023
instrumentation/servlet/servlet-3.0/javaagent-unit-tests/build.gradle.kts
Outdated
Show resolved
Hide resolved
trask
reviewed
Feb 16, 2023
...test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/InjectionTest.java
Outdated
Show resolved
Hide resolved
trask
reviewed
Feb 16, 2023
...etry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapperTest.java
Outdated
Show resolved
Hide resolved
...etry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapperTest.java
Outdated
Show resolved
Hide resolved
...etry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapperTest.java
Outdated
Show resolved
Hide resolved
...entelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteBytesAdvice.java
Outdated
Show resolved
Hide resolved
...elemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java
Outdated
Show resolved
Hide resolved
instrumentation/servlet/servlet-3.0/javaagent/src/test/java/RequestDispatcherServlet.java
Outdated
Show resolved
Hide resolved
instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TestServlet3.groovy
Show resolved
Hide resolved
instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TestServlet3.groovy
Show resolved
Hide resolved
...common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/ServerEndpoint.java
Outdated
Show resolved
Hide resolved
...common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/ServerEndpoint.java
Outdated
Show resolved
Hide resolved
…/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
…/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
…/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
…/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
siyuniu-ms
commented
Feb 18, 2023
instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy
Outdated
Show resolved
Hide resolved
…/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
…/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
…/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
…/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
trask
approved these changes
Feb 28, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🥳
.../src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/TestUtil.java
Outdated
Show resolved
Hide resolved
...metry/javaagent/instrumentation/servlet/v3_0/snippet/OutputStreamSnippetInjectionHelper.java
Outdated
Show resolved
Hide resolved
...pentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingPrintWriter.java
Show resolved
Hide resolved
...pentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingPrintWriter.java
Show resolved
Hide resolved
...elemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java
Outdated
Show resolved
Hide resolved
...common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/ServerEndpoint.java
Outdated
Show resolved
Hide resolved
...nt/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Advice.java
Show resolved
Hide resolved
...rc/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Singletons.java
Show resolved
Hide resolved
...elemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java
Outdated
Show resolved
Hide resolved
...elemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java
Outdated
Show resolved
Hide resolved
...metry/javaagent/instrumentation/servlet/v3_0/snippet/OutputStreamSnippetInjectionHelper.java
Outdated
Show resolved
Hide resolved
.../src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/TestUtil.java
Outdated
Show resolved
Hide resolved
...ain/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/InjectionState.java
Show resolved
Hide resolved
...ain/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/InjectionState.java
Outdated
Show resolved
Hide resolved
instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TestServlet3.groovy
Outdated
Show resolved
Hide resolved
...ap/src/main/java/io/opentelemetry/javaagent/bootstrap/servlet/ExperimentalSnippetHolder.java
Outdated
Show resolved
Hide resolved
trask
reviewed
Apr 18, 2023
...ap/src/main/java/io/opentelemetry/javaagent/bootstrap/servlet/ExperimentalSnippetHolder.java
Outdated
Show resolved
Hide resolved
|
|
mateuszrzeszutek
approved these changes
Apr 21, 2023
...ap/src/main/java/io/opentelemetry/javaagent/bootstrap/servlet/ExperimentalSnippetHolder.java
Show resolved
Hide resolved
thx @siyuniu-ms 💯 |
This was referenced Jun 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Open Questions
1. Character encoding
<head>
tag characters is split across two bytes in some character encoding?<h
and we think it looks like the beginning of a head tag?2. What if ServletOutputStream delegates to another ServletOutputStream?
Currently the instrumentation may inject the snippet twice.
Thoughts: Could use ThreadLocal to suppress duplicate injection?
Future Work
1. Support Servlet 5
2. Content Type set after calling getOutputStream or getWriter
Currently, injection is not performed in this case.
Cases: static html and JSP Possible solution: as soon as the content type is being set, create injection state and connect the state to servlet out put stream and print writer
3. Support head attributes, for example,
4. Support Netty
5. Handle spaces in tag ex:< head >
6. Add tests for multibyte character encodings, e.g. Chinese
7. Send back trace Id for the server request to the browser, so that you can associate the page to the original request
Doc