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.

Sign up for GitHub

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

Jump to bottom

Snippet Injection Smoke Test #8655

Merged
merged 9 commits into from
Jun 7, 2023
Merged

Snippet Injection Smoke Test #8655

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c3b812
add environment
siyuniu-ms Jun 5, 2023
db97d54
Update ExperimentalSnippetHolder.java
siyuniu-ms Jun 5, 2023
943f712
Update AppServerTest.groovy
siyuniu-ms Jun 6, 2023
d4ea6b7
Merge remote-tracking branch 'upstream/main' into SnippetInjectionSmo…
siyuniu-ms Jun 6, 2023
b958f01
Update ExperimentalSnippetHolder.java
siyuniu-ms Jun 6, 2023
3f05f8e
Update ExperimentalSnippetHolder.java
siyuniu-ms Jun 6, 2023
07fe2d3
add corner case for tomcat 7
siyuniu-ms Jun 7, 2023
29812d3
codeNarc update
siyuniu-ms Jun 7, 2023
41b0abb
Update instrumentation/servlet/servlet-common/bootstrap/src/main/java…
siyuniu-ms Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update ExperimentalSnippetHolder.java
  • Loading branch information
@siyuniu-ms
siyuniu-ms committed Jun 6, 2023
commit 3f05f8e8b41cf4eeee2e0bf65043923f60cc0e83
15 changes: 10 additions & 5 deletions ...src/main/java/io/opentelemetry/javaagent/bootstrap/servlet/ExperimentalSnippetHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@

public class ExperimentalSnippetHolder {

private static final AtomicReference<String> snippet =
new AtomicReference<>(
ConfigPropertiesUtil.getString("otel.experimental.javascript-snippet") == null
? ""
: ConfigPropertiesUtil.getString("otel.experimental.javascript-snippet"));
private static final AtomicReference<String> snippet = new AtomicReference<>(getSnippetSetting());

private static String getSnippetSetting() {
String result = ConfigPropertiesUtil.getString("otel.experimental.javascript-snippet");
if (result == null) {
return "";
} else {
return result;
}
siyuniu-ms marked this conversation as resolved.
Show resolved Hide resolved
}

public static void setSnippet(String newValue) {
snippet.compareAndSet("", newValue);
Expand Down
Loading