19
19
20
20
import com .linecorp .armeria .client .WebClient ;
21
21
import java .util .regex .Pattern ;
22
- import org .junit .jupiter .api .Disabled ;
23
22
import org .junit .jupiter .api .Test ;
24
23
import org .slf4j .LoggerFactory ;
25
24
import org .testcontainers .containers .GenericContainer ;
29
28
import org .testcontainers .junit .jupiter .Testcontainers ;
30
29
import org .testcontainers .utility .MountableFile ;
31
30
32
- // Temporarily disable to work around chicken-egg ordering constraint in building new sample image
33
- // and using here.
34
- // Will need to fix the dependency in the future (though with opentelemetry-api in its final form
35
- // now there is
36
- // less likeliness of issues happening).
37
- @ Disabled
38
31
@ Testcontainers (disabledWithoutDocker = true )
39
32
class LogInjectionTest {
40
33
@@ -47,7 +40,7 @@ class LogInjectionTest {
47
40
@ Container
48
41
private static final GenericContainer <?> log4jApp =
49
42
new GenericContainer <>(
50
- "public.ecr.aws/aws-otel-test/aws-otel-java-spark:f8f1ee321a1dc7f306f8354aca357ecbedfe8133 " )
43
+ "public.ecr.aws/aws-otel-test/aws-otel-java-spark:ae69a3fef3274282bc4e125d12e874d9330085d4 " )
51
44
.withExposedPorts (4567 )
52
45
.withLogConsumer (new Slf4jLogConsumer (LoggerFactory .getLogger ("log4j" )))
53
46
.withLogConsumer (log4jString )
@@ -61,7 +54,7 @@ class LogInjectionTest {
61
54
@ Container
62
55
private static final GenericContainer <?> logbackApp =
63
56
new GenericContainer <>(
64
- "public.ecr.aws/aws-otel-test/aws-otel-java-springboot:f8f1ee321a1dc7f306f8354aca357ecbedfe8133 " )
57
+ "public.ecr.aws/aws-otel-test/aws-otel-java-springboot:ae69a3fef3274282bc4e125d12e874d9330085d4 " )
65
58
.withExposedPorts (8080 )
66
59
.withLogConsumer (new Slf4jLogConsumer (LoggerFactory .getLogger ("logback" )))
67
60
.withLogConsumer (logbackString )
0 commit comments