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 formatting

This commit is contained in:
jean-philippe bempel 2020-04-06 13:26:55 +02:00
parent ce26d0532e
commit 658544fb38
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ControllerFactory.java
View File

@ -49,8 +49,8 @@ public final class ControllerFactory {
| InstantiationException
| IllegalAccessException
| InvocationTargetException e) {
String exMsg = "The JFR controller could not find a supported JFR API"
+ getFixProposalMessage();
String exMsg =
"The JFR controller could not find a supported JFR API" + getFixProposalMessage();
throw new UnsupportedEnvironmentException(exMsg, e);
}
}

20
dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ControllerFactoryTest.java
View File

@ -20,17 +20,17 @@ public class ControllerFactoryTest {
@Test
@EnabledOnJre({JAVA_8})
public void testCreateControllerJava8() {
System.out.println("Java Version: " + System.getProperty("java.version") + " " + System.getProperty("java.vendor"));
UnsupportedEnvironmentException unsupportedEnvironmentException = assertThrows(
UnsupportedEnvironmentException.class,
() -> {
ControllerFactory.createController(config);
});
System.out.println(unsupportedEnvironmentException.getMessage());
System.out.println(System.getProperty("java.vendor"));
String expected = "The JFR controller could not find a supported JFR API, use OpenJDK 11+ or Azul zulu version 1.8.0_212+";
UnsupportedEnvironmentException unsupportedEnvironmentException =
assertThrows(
UnsupportedEnvironmentException.class,
() -> {
ControllerFactory.createController(config);
});
String expected =
"The JFR controller could not find a supported JFR API, use OpenJDK 11+ or Azul zulu version 1.8.0_212+";
if ("Azul Systems, Inc.".equals(System.getProperty("java.vendor"))) {
expected = "The JFR controller could not find a supported JFR API, use Azul zulu version 1.8.0_212+";
expected =
"The JFR controller could not find a supported JFR API, use Azul zulu version 1.8.0_212+";
}
assertEquals(expected, unsupportedEnvironmentException.getMessage());
}