Skip to content

Commit 2b4f807

Browse files
aabmasspsx95
andauthored
Use logstash-logback-encoder version that works with spring boot 2 (#285)
This is a port over of GoogleCloudPlatform/java-docs-samples#8984 to this repo. Co-authored-by: Pranav Sharma <sharmapranav@google.com>
1 parent b62568e commit 2b4f807

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

examples/instrumentation-quickstart/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@
8282
<dependency>
8383
<groupId>net.logstash.logback</groupId>
8484
<artifactId>logstash-logback-encoder</artifactId>
85-
<version>7.4</version>
85+
<!-- Cannot be updated until logback is updated to 1.3+, probably in the next
86+
Spring Boot major version -->
87+
<version>7.3</version>
8688
<scope>runtime</scope>
8789
</dependency>
8890

examples/instrumentation-quickstart/src/test/java/com/example/demo/DockerComposeTestsIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.util.Arrays;
2727
import java.util.regex.Pattern;
2828
import org.junit.ClassRule;
29-
import org.junit.Ignore;
3029
import org.junit.Test;
3130
import org.springframework.web.reactive.function.client.WebClient;
3231
import org.testcontainers.containers.ComposeContainer;
@@ -47,7 +46,6 @@ public class DockerComposeTestsIT {
4746
.withBuild(true);
4847

4948
@Test
50-
@Ignore("TODO: Remove after fixing https://github.com/GoogleCloudPlatform/java-docs-samples/issues/8979")
5149
public void testApp() throws InterruptedException, IOException, URISyntaxException {
5250
// Let the docker compose app run until some spans/logs/metrics are sent to
5351
// GCP

0 commit comments

Comments
 (0)