open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict (#10172) 

Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
This commit is contained in:
Trask Stalnaker 2024-01-05 00:49:28 -08:00 committed by GitHub
parent f6176919e4
commit 8d8de3a4fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/scripts/markdown-link-check-config.json vendored
View File

@ -19,6 +19,9 @@
}, },
{ {
"pattern": "^https://micrometer\\.io" "pattern": "^https://micrometer\\.io"
},
{
"pattern": "^https://central\\.sonatype\\.com"
} }
] ]
} }

2
instrumentation/jsp-2.3/javaagent/build.gradle.kts
View File

@ -51,4 +51,6 @@ tasks.withType<Test>().configureEach {
// TODO run tests both with and without experimental span attributes // TODO run tests both with and without experimental span attributes
jvmArgs("-Dotel.instrumentation.jsp.experimental-span-attributes=true") jvmArgs("-Dotel.instrumentation.jsp.experimental-span-attributes=true")
jvmArgs("-Dotel.instrumentation.common.experimental.view-telemetry.enabled=true")
} }