Skip to content

fix(tests): Re-enable Metrics integration test by renaming #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Nov 16, 2020
Merged

fix(tests): Re-enable Metrics integration test by renaming #118

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
47aaef6
fix(tests): Re-enable Metrics integration test by renaming
Nov 11, 2020
eb30a3e
Multiple fixes for the metrics auto-config and sample
meltsufin Nov 12, 2020
6f802db
checkstyle
meltsufin Nov 12, 2020
36b1332
remove note about metrics in migration guide
meltsufin Nov 12, 2020
a8bcabe
checkstyle again
meltsufin Nov 12, 2020
f9ef070
add actuator back in
Nov 13, 2020
d2016dc
move actuator to starter
meltsufin Nov 13, 2020
78884ba
undo changes unrelated to fixing test
meltsufin Nov 13, 2020
7dd13bb
Merge branch 'master' into metrics-fix
Nov 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...xample/MetricsSampleApplicationTests.java → ...icsSampleApplicationIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.junit.runner.RunWith;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.actuate.metrics.AutoConfigureMetrics;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.web.server.LocalServerPort;
Expand All @@ -47,7 +48,8 @@
*/
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = MetricsApplication.class)
public class MetricsSampleApplicationTests {
@AutoConfigureMetrics // needed to enable metrics export in Spring Boot tests
public class MetricsSampleApplicationIntegrationTests {

@Autowired
private GcpProjectIdProvider projectIdProvider;
Expand Down