Skip to content

Commit 6ae9fdc

Browse files
author
Yuriy Bezsonov
committed
refactor(java25): remove CDS dockerfile and optional OTEL configuration
1 parent ff87ac5 commit 6ae9fdc

File tree

9 files changed

+2
-467
lines changed

9 files changed

+2
-467
lines changed

apps/java25/dockerfiles/Dockerfile_07_AOT

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ ENV MAIN_CLASS="com.unicorn.store.StoreApplication"
2121
ENV TRAINING_OPTS="-Dspring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration -Dspring.main.lazy-initialization=true"
2222

2323
# Record AOT configuration
24-
RUN java -XX:AOTMode=record -XX:AOTConfiguration=/app.aotconf \
24+
RUN java -XX:+UseCompactObjectHeaders -XX:AOTMode=record -XX:AOTConfiguration=/app.aotconf \
2525
-cp "$APP_CP" -Dspring.context.exit=onRefresh $TRAINING_OPTS $MAIN_CLASS || true && \
2626
test -s /app.aotconf
2727

2828
# Create AOT cache
29-
RUN java -XX:AOTMode=create -XX:AOTConfiguration=/app.aotconf \
29+
RUN java -XX:+UseCompactObjectHeaders -XX:AOTMode=create -XX:AOTConfiguration=/app.aotconf \
3030
-XX:AOTCache=/opt/app/app.aot \
3131
-cp "$APP_CP" $TRAINING_OPTS $MAIN_CLASS || true && \
3232
test -s /opt/app/app.aot

apps/java25/dockerfiles/Dockerfile_08_CDS

Lines changed: 0 additions & 31 deletions
This file was deleted.

apps/java25/unicorn-store-spring/pom.xml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -179,30 +179,6 @@
179179
</build>
180180

181181
<profiles>
182-
<profile>
183-
<id>otel-manual</id>
184-
<dependencies>
185-
<dependency>
186-
<groupId>io.opentelemetry.contrib</groupId>
187-
<artifactId>opentelemetry-aws-xray</artifactId>
188-
<version>1.52.0</version>
189-
</dependency>
190-
<dependency>
191-
<groupId>io.opentelemetry.contrib</groupId>
192-
<artifactId>opentelemetry-aws-xray-propagator</artifactId>
193-
<version>1.52.0-alpha</version>
194-
</dependency>
195-
<dependency>
196-
<groupId>io.opentelemetry.instrumentation</groupId>
197-
<artifactId>opentelemetry-aws-sdk-2.2</artifactId>
198-
<version>2.22.0-alpha</version>
199-
</dependency>
200-
<dependency>
201-
<groupId>io.opentelemetry.instrumentation</groupId>
202-
<artifactId>opentelemetry-spring-boot-starter</artifactId>
203-
</dependency>
204-
</dependencies>
205-
</profile>
206182
<profile>
207183
<id>native</id>
208184
<build>

apps/java25/unicorn-store-spring/src/main/java/com/unicorn/store/config/WebConfig.java.opt

Lines changed: 0 additions & 174 deletions
This file was deleted.

apps/java25/unicorn-store-spring/src/main/java/com/unicorn/store/otel/ApplicationFilter.java.opt

Lines changed: 0 additions & 40 deletions
This file was deleted.

apps/java25/unicorn-store-spring/src/main/java/com/unicorn/store/otel/MetricEmitter.java.opt

Lines changed: 0 additions & 98 deletions
This file was deleted.

0 commit comments

Comments
 (0)