Fix merge conflict (#10172)
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
This commit is contained in:
parent
f6176919e4
commit
8d8de3a4fd
|
@ -19,6 +19,9 @@
|
|||
},
|
||||
{
|
||||
"pattern": "^https://micrometer\\.io"
|
||||
},
|
||||
{
|
||||
"pattern": "^https://central\\.sonatype\\.com"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
@ -51,4 +51,6 @@ tasks.withType<Test>().configureEach {
|
|||
|
||||
// TODO run tests both with and without experimental span attributes
|
||||
jvmArgs("-Dotel.instrumentation.jsp.experimental-span-attributes=true")
|
||||
|
||||
jvmArgs("-Dotel.instrumentation.common.experimental.view-telemetry.enabled=true")
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue