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 OSGi bootstrap delegation property

This commit is contained in:
Laplie Anderson 2019-10-07 18:40:05 +02:00
parent 654e09ee7f
commit 584f181abb
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dd-java-agent/instrumentation/osgi-classloading/src/main/java/datadog/trace/instrumentation/osgi/OSGIClassloadingInstrumentation.java
View File

@ -92,12 +92,12 @@ public final class OSGIClassloadingInstrumentation extends Instrumenter.Default
} }
public static String getNewValue(final String existingValue) { public static String getNewValue(final String existingValue) {
if (null != existingValue if (existingValue == null || "".equals(existingValue)) {
&& !"".equals(existingValue) return PROPERTY_VALUE;
&& !existingValue.contains(PROPERTY_VALUE)) { } else if (!existingValue.contains(PROPERTY_VALUE)) {
return existingValue + "," + PROPERTY_VALUE; return existingValue + "," + PROPERTY_VALUE;
} else { } else {
return PROPERTY_VALUE; return existingValue;
} }
} }
} }

22
dd-java-agent/instrumentation/osgi-classloading/src/test/groovy/OSGIClassloadingTest.groovy
View File

@ -1,4 +1,5 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.instrumentation.osgi.OSGIClassloadingInstrumentation
import org.eclipse.osgi.launch.EquinoxFactory import org.eclipse.osgi.launch.EquinoxFactory
import org.junit.Rule import org.junit.Rule
import org.junit.contrib.java.lang.system.RestoreSystemProperties import org.junit.contrib.java.lang.system.RestoreSystemProperties
@ -9,12 +10,14 @@ class OSGIClassloadingTest extends AgentTestRunner {
@Rule @Rule
public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties() public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties()
static final String BOOT_DELEGATION_ADDITION = "datadog.slf4j.*,datadog.slf4j,datadog.trace.agent.TracingAgent.*,datadog.trace.agent.TracingAgent,datadog.trace.api.*,datadog.trace.api,datadog.trace.bootstrap.*,datadog.trace.bootstrap,datadog.trace.context.*,datadog.trace.context,io.opentracing.*,io.opentracing"
def "delegation property set on module load"() { def "delegation property set on module load"() {
when: when:
org.osgi.framework.Bundle.getName() org.osgi.framework.Bundle.getName()
then: then:
System.getProperty("org.osgi.framework.bootdelegation") == "datadog.slf4j.*,datadog.slf4j,datadog.trace.agent.TracingAgent.*,datadog.trace.agent.TracingAgent,datadog.trace.api.*,datadog.trace.api,datadog.trace.bootstrap.*,datadog.trace.bootstrap,datadog.trace.context.*,datadog.trace.context,io.opentracing.*,io.opentracing" System.getProperty("org.osgi.framework.bootdelegation") == BOOT_DELEGATION_ADDITION
} }
def "test OSGi framework factory"() { def "test OSGi framework factory"() {
@ -32,4 +35,21 @@ class OSGIClassloadingTest extends AgentTestRunner {
new EquinoxFactory() | _ new EquinoxFactory() | _
new org.apache.felix.framework.FrameworkFactory() | _ new org.apache.felix.framework.FrameworkFactory() | _
} }
def "test property transformations"() {
when:
def newValue = OSGIClassloadingInstrumentation.Helper.getNewValue(existingValue)
then:
newValue == expectedNewValue
where:
existingValue | expectedNewValue
null | BOOT_DELEGATION_ADDITION
"" | BOOT_DELEGATION_ADDITION
BOOT_DELEGATION_ADDITION | BOOT_DELEGATION_ADDITION
"foo.*" | "foo.*," + BOOT_DELEGATION_ADDITION
"foo.*," + BOOT_DELEGATION_ADDITION + ",bar.*" | "foo.*," + BOOT_DELEGATION_ADDITION + ",bar.*"
}
} }