Skip to content

Commit b055e7e

Browse files
Copilottrask
andcommitted
Fix build failures in reference application
Co-authored-by: trask <[email protected]>
1 parent a756f00 commit b055e7e

File tree

4 files changed

+395
-397
lines changed

4 files changed

+395
-397
lines changed

reference-application/build.gradle.kts

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,6 @@ dependencies {
3131
// Testing
3232
testImplementation("org.springframework.boot:spring-boot-starter-test")
3333
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
34-
35-
// Telemetry testing dependencies
36-
testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
37-
testImplementation("org.mockserver:mockserver-netty:5.15.0")
38-
testImplementation("org.awaitility:awaitility:4.3.0")
39-
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")
40-
testImplementation("org.assertj:assertj-core:3.27.6")
4134
}
4235

4336
val copyAgent = tasks.register<Copy>("copyAgent") {
@@ -53,18 +46,9 @@ tasks.named<BootJar>("bootJar") {
5346

5447
tasks.withType<Test> {
5548
useJUnitPlatform()
56-
57-
// Add OpenTelemetry Java Agent for telemetry testing
58-
dependsOn(copyAgent)
59-
jvmArgs = listOf(
60-
"-javaagent:${layout.buildDirectory.dir("agent").file("opentelemetry-javaagent.jar").get().asFile.absolutePath}",
61-
"-Dotel.metric.export.interval=5000",
62-
"-Dotel.exporter.otlp.protocol=http/protobuf",
63-
"-Dmockserver.logLevel=off"
64-
)
6549
}
6650

67-
task("e2eTest", Exec::class) {
51+
tasks.register<Exec>("e2eTest") {
6852
group = "verification"
6953
description = "Run end-to-end test using docker-compose"
7054
commandLine("./test-e2e.sh")

reference-application/src/test/java/io/opentelemetry/example/ReferenceApplicationTests.java

Lines changed: 72 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -4,87 +4,85 @@
44
import static org.junit.jupiter.api.Assertions.assertNotNull;
55
import static org.junit.jupiter.api.Assertions.assertTrue;
66

7+
import com.fasterxml.jackson.databind.JsonNode;
8+
import com.fasterxml.jackson.databind.ObjectMapper;
79
import org.junit.jupiter.api.Test;
810
import org.springframework.beans.factory.annotation.Autowired;
911
import org.springframework.boot.test.context.SpringBootTest;
1012
import org.springframework.boot.test.web.client.TestRestTemplate;
1113
import org.springframework.boot.test.web.server.LocalServerPort;
1214
import org.springframework.http.ResponseEntity;
1315

14-
import com.fasterxml.jackson.databind.JsonNode;
15-
import com.fasterxml.jackson.databind.ObjectMapper;
16-
1716
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
1817
class ReferenceApplicationTests {
1918

20-
@LocalServerPort
21-
private int port;
22-
23-
@Autowired
24-
private TestRestTemplate restTemplate;
25-
26-
private final ObjectMapper objectMapper = new ObjectMapper();
27-
28-
@Test
29-
void testRollDice() throws Exception {
30-
ResponseEntity<String> response = restTemplate.getForEntity(
31-
"http://localhost:" + port + "/rolldice", String.class);
32-
33-
assertEquals(200, response.getStatusCode().value());
34-
35-
JsonNode json = objectMapper.readTree(response.getBody());
36-
assertNotNull(json.get("result"));
37-
assertNotNull(json.get("player"));
38-
39-
int result = json.get("result").asInt();
40-
assertTrue(result >= 1 && result <= 6);
41-
}
42-
43-
@Test
44-
void testRollDiceWithPlayer() throws Exception {
45-
ResponseEntity<String> response = restTemplate.getForEntity(
46-
"http://localhost:" + port + "/rolldice?player=testplayer", String.class);
47-
48-
assertEquals(200, response.getStatusCode().value());
49-
50-
JsonNode json = objectMapper.readTree(response.getBody());
51-
assertEquals("testplayer", json.get("player").asText());
52-
}
53-
54-
@Test
55-
void testRollMultipleDice() throws Exception {
56-
ResponseEntity<String> response = restTemplate.getForEntity(
57-
"http://localhost:" + port + "/rolldice?rolls=3", String.class);
58-
59-
assertEquals(200, response.getStatusCode().value());
60-
61-
JsonNode json = objectMapper.readTree(response.getBody());
62-
assertNotNull(json.get("results"));
63-
assertNotNull(json.get("sum"));
64-
assertEquals(3, json.get("results").size());
65-
}
66-
67-
@Test
68-
void testFibonacci() throws Exception {
69-
ResponseEntity<String> response = restTemplate.getForEntity(
70-
"http://localhost:" + port + "/fibonacci?n=10", String.class);
71-
72-
assertEquals(200, response.getStatusCode().value());
73-
74-
JsonNode json = objectMapper.readTree(response.getBody());
75-
assertEquals(10, json.get("n").asInt());
76-
assertEquals("55", json.get("result").asText());
77-
}
78-
79-
@Test
80-
void testHealth() throws Exception {
81-
ResponseEntity<String> response = restTemplate.getForEntity(
82-
"http://localhost:" + port + "/health", String.class);
83-
84-
assertEquals(200, response.getStatusCode().value());
85-
86-
JsonNode json = objectMapper.readTree(response.getBody());
87-
assertEquals("UP", json.get("status").asText());
88-
assertEquals("dice-server", json.get("service").asText());
89-
}
90-
}
19+
@LocalServerPort private int port;
20+
21+
@Autowired private TestRestTemplate restTemplate;
22+
23+
private final ObjectMapper objectMapper = new ObjectMapper();
24+
25+
@Test
26+
void testRollDice() throws Exception {
27+
ResponseEntity<String> response =
28+
restTemplate.getForEntity("http://localhost:" + port + "/rolldice", String.class);
29+
30+
assertEquals(200, response.getStatusCode().value());
31+
32+
JsonNode json = objectMapper.readTree(response.getBody());
33+
assertNotNull(json.get("result"));
34+
assertNotNull(json.get("player"));
35+
36+
int result = json.get("result").asInt();
37+
assertTrue(result >= 1 && result <= 6);
38+
}
39+
40+
@Test
41+
void testRollDiceWithPlayer() throws Exception {
42+
ResponseEntity<String> response =
43+
restTemplate.getForEntity(
44+
"http://localhost:" + port + "/rolldice?player=testplayer", String.class);
45+
46+
assertEquals(200, response.getStatusCode().value());
47+
48+
JsonNode json = objectMapper.readTree(response.getBody());
49+
assertEquals("testplayer", json.get("player").asText());
50+
}
51+
52+
@Test
53+
void testRollMultipleDice() throws Exception {
54+
ResponseEntity<String> response =
55+
restTemplate.getForEntity("http://localhost:" + port + "/rolldice?rolls=3", String.class);
56+
57+
assertEquals(200, response.getStatusCode().value());
58+
59+
JsonNode json = objectMapper.readTree(response.getBody());
60+
assertNotNull(json.get("results"));
61+
assertNotNull(json.get("sum"));
62+
assertEquals(3, json.get("results").size());
63+
}
64+
65+
@Test
66+
void testFibonacci() throws Exception {
67+
ResponseEntity<String> response =
68+
restTemplate.getForEntity("http://localhost:" + port + "/fibonacci?n=10", String.class);
69+
70+
assertEquals(200, response.getStatusCode().value());
71+
72+
JsonNode json = objectMapper.readTree(response.getBody());
73+
assertEquals(10, json.get("n").asInt());
74+
assertEquals("55", json.get("result").asText());
75+
}
76+
77+
@Test
78+
void testHealth() throws Exception {
79+
ResponseEntity<String> response =
80+
restTemplate.getForEntity("http://localhost:" + port + "/health", String.class);
81+
82+
assertEquals(200, response.getStatusCode().value());
83+
84+
JsonNode json = objectMapper.readTree(response.getBody());
85+
assertEquals("UP", json.get("status").asText());
86+
assertEquals("dice-server", json.get("service").asText());
87+
}
88+
}

0 commit comments

Comments
 (0)