PR for v1.5.9 #387
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| /* | ||
| * Copyright 2025 Karlsruhe Institute of Technology. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package edu.kit.datamanager.repo.test.integration; | ||
|
|
||
| import org.hamcrest.Matchers; | ||
| import org.junit.Before; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.boot.autoconfigure.domain.EntityScan; | ||
| import org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability; | ||
| import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; | ||
| import org.springframework.boot.test.context.SpringBootTest; | ||
| import org.springframework.context.annotation.ComponentScan; | ||
| import org.springframework.data.jpa.repository.config.EnableJpaRepositories; | ||
| import org.springframework.restdocs.JUnitRestDocumentation; | ||
| import org.springframework.security.test.context.support.WithSecurityContextTestExecutionListener; | ||
| import org.springframework.test.annotation.DirtiesContext; | ||
| import org.springframework.test.context.ActiveProfiles; | ||
| import org.springframework.test.context.TestExecutionListeners; | ||
| import org.springframework.test.context.TestPropertySource; | ||
| import org.springframework.test.context.junit4.SpringRunner; | ||
| import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; | ||
| import org.springframework.test.context.support.DirtiesContextTestExecutionListener; | ||
| import org.springframework.test.context.transaction.TransactionalTestExecutionListener; | ||
| import org.springframework.test.context.web.ServletTestExecutionListener; | ||
| import org.springframework.test.web.servlet.MockMvc; | ||
| import org.springframework.test.web.servlet.setup.MockMvcBuilders; | ||
| import org.springframework.web.context.WebApplicationContext; | ||
|
|
||
| import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; | ||
| import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; | ||
|
|
||
| /** | ||
| * Test for the Prometheus actuator endpoint. | ||
| * This test checks that the Prometheus endpoint is correctly exposed and that it contains the expected metrics. | ||
| * Also checks that other actuator endpoints are not exposed. | ||
| */ | ||
| @RunWith(SpringRunner.class) | ||
| @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) | ||
| @EntityScan("edu.kit.datamanager") | ||
| @EnableJpaRepositories("edu.kit.datamanager") | ||
| @ComponentScan({"edu.kit.datamanager"}) | ||
| @AutoConfigureMockMvc | ||
|
Comment on lines
+56
to
+61
There was a problem hiding this comment. 🧩 Analysis chainJUnit 4 runner in a Spring Boot 3.x stack — confirm Vintage engine presence or plan Jupiter migration You’re using JUnit 4 (SpringRunner, @before, @rule). Ensure the build includes junit-vintage-engine, or migrate tests to JUnit Jupiter to align with modern Spring Test support. Based on learnings. Run to confirm dependencies and usage: 🏁 Script executed: #!/bin/bash
# Find explicit JUnit dependencies and engines
rg -nP -C2 '(junit-?vintage|junit-?jupiter|org\.junit\.jupiter|org\.junit\.vintage|junit[:"]\s*4\.)' \
-g '!**/build/**' -g '!**/out/**'
# Spot JUnit4 annotations in tests
rg -nP -C2 'org\.junit\.(Test|Before|Rule)|@RunWith\(SpringRunner\.class\)' src/testLength of output: 10993 🏁 Script executed: #!/bin/bash
# Search for JUnit dependencies in Maven pom.xml
rg -nP '<artifactId>junit' -C1 -g 'pom.xml'
rg -nP 'org\.junit\.vintage|org\.junit\.jupiter' -g 'pom.xml'
# If Gradle build script present, search for junit dependencies
rg -nP 'junit' -g 'build.gradle' -g 'build.gradle.kts'Length of output: 358 Add JUnit Vintage engine or migrate tests to JUnit Jupiter testRuntimeOnly "org.junit.vintage:junit-vintage-engine"or migrate your tests to JUnit Jupiter. 🤖 Prompt for AI Agents |
||
| @TestExecutionListeners(listeners = {ServletTestExecutionListener.class, | ||
| DependencyInjectionTestExecutionListener.class, | ||
| DirtiesContextTestExecutionListener.class, | ||
| TransactionalTestExecutionListener.class, | ||
| WithSecurityContextTestExecutionListener.class}) | ||
| @ActiveProfiles("test") | ||
| @TestPropertySource(properties = {"spring.datasource.url=jdbc:h2:mem:db_prometheus;DB_CLOSE_DELAY=-1;MODE=LEGACY;NON_KEYWORDS=VALUE"}) | ||
| @TestPropertySource(properties = {"spring.jpa.database-platform=org.hibernate.dialect.H2Dialect"}) | ||
| @TestPropertySource(properties = {"spring.jpa.defer-datasource-initialization=true"}) | ||
| @TestPropertySource(properties = {"repo.monitoring.enabled=true"}) | ||
| @TestPropertySource(properties = {"repo.monitoring.serviceName=base_repo_test"}) | ||
| @TestPropertySource(properties = {"management.endpoints.web.exposure.include=prometheus"}) | ||
| @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) | ||
| @AutoConfigureObservability | ||
| public class ActuatorPrometheusTest { | ||
|
|
||
| @Rule | ||
| public JUnitRestDocumentation restDocumentation = new JUnitRestDocumentation(); | ||
| private MockMvc mockMvc; | ||
| @Autowired | ||
| private WebApplicationContext context; | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
|
|
||
| // setup mockMvc | ||
| this.mockMvc = MockMvcBuilders.webAppContextSetup(this.context) | ||
| .apply(springSecurity()) | ||
| .build(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testForNotExposedActuators() throws Exception { | ||
| // Check that all other endpoints are not exposed | ||
| this.mockMvc.perform(get("/actuator/beans")).andDo(print()).andExpect(status().isNotFound()); | ||
| this.mockMvc.perform(get("/actuator/caches")).andDo(print()).andExpect(status().isNotFound()); | ||
| this.mockMvc.perform(get("/actuator/conditions")).andDo(print()).andExpect(status().isNotFound()); | ||
| this.mockMvc.perform(get("/actuator/configprops")).andDo(print()).andExpect(status().isNotFound()); | ||
| this.mockMvc.perform(get("/actuator/env")).andDo(print()).andExpect(status().isNotFound()); | ||
| this.mockMvc.perform(get("/actuator/loggers")).andDo(print()).andExpect(status().isNotFound()); | ||
| this.mockMvc.perform(get("/actuator/heapdump")).andDo(print()).andExpect(status().isNotFound()); | ||
| this.mockMvc.perform(get("/actuator/threaddump")).andDo(print()).andExpect(status().isNotFound()); | ||
| this.mockMvc.perform(get("/actuator/metrics")).andDo(print()).andExpect(status().isNotFound()); | ||
| this.mockMvc.perform(get("/actuator/scheduledtasks")).andDo(print()).andExpect(status().isNotFound()); | ||
| this.mockMvc.perform(get("/actuator/mappings")).andDo(print()).andExpect(status().isNotFound()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testActuator() throws Exception { | ||
| // /actuator/prometheus | ||
| this.mockMvc.perform(get("/actuator/prometheus")).andDo(print()).andExpect(status().isOk()) | ||
| .andExpect(content().string(Matchers.containsString("# TYPE base_repo_test_requests_served_total"))) | ||
| .andExpect(content().string(Matchers.containsString("# TYPE base_repo_test_unique_users"))) | ||
| .andExpect(content().string(Matchers.containsString("# TYPE base_repo_test_registered_users"))) | ||
| .andReturn(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update
springBootVersionproperty to match the pluginThe build now applies
org.springframework.boot3.5.6, but thespringBootVersionproperty still advertises 3.2.1. Downstream modules or dependency management imports that consume this property will continue pulling the 3.2.x BOM, creating a version split from the Gradle plugin and the managed dependencies you just upgraded. Please bump the property to 3.5.6 (or remove it if truly unused) so all consumers stay aligned.📝 Committable suggestion
🤖 Prompt for AI Agents