Skip to content

Commit bcc2288

Browse files
rafalpsciukKrzysztofSajko
rafalpsciuk
and
KrzysztofSajko
authored
Add error log to OrderController (#50)
* Add error log to OrderController * fix missing stack trace and update logback version * Use JAVA_TOOL_OPTIONS env variable for specyfing JVM option * Squashed commit of the following: commit 5d294bc4718f8c5dc9a07723b1a7432972e4705f Author: Krzysztof Sajko <[email protected]> Date: Wed Apr 9 11:59:24 2025 +0200 chore: update version commit 79080b329294357fa4ed576f60d27746437a037f Author: Krzysztof Sajko <[email protected]> Date: Wed Apr 9 11:54:11 2025 +0200 chore: update go version and dependencies commit 03dc0e9 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue Apr 1 16:00:05 2025 +0200 chore(deps): bump tar-fs from 3.0.6 to 3.0.8 in /src/loadgen (#48) Bumps [tar-fs](https://github.com/mafintosh/tar-fs) from 3.0.6 to 3.0.8. - [Commits](mafintosh/tar-fs@v3.0.6...v3.0.8) --- updated-dependencies: - dependency-name: tar-fs dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 8b7d3ef Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue Apr 1 15:57:37 2025 +0200 chore(deps-dev): bump vite from 6.2.3 to 6.2.4 in /src/frontend (#49) Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.2.3 to 6.2.4. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v6.2.4/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v6.2.4/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Co-authored-by: Krzysztof Sajko <[email protected]>
1 parent 03dc0e9 commit bcc2288

File tree

15 files changed

+207
-146
lines changed

15 files changed

+207
-146
lines changed

‎compose.dev.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ services:
196196
<<: *feature-flag-service-env
197197
WORK_DELAY: 30
198198
WORK_RATE: 30
199+
JAVA_TOOL_OPTIONS: "-XX:-OmitStackTraceInFastThrow"
199200

200201
third-party-service:
201202
<<: *default-service

‎compose.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ services:
182182
<<: *feature-flag-service-env
183183
WORK_DELAY: 300
184184
WORK_RATE: 900
185+
JAVA_TOOL_OPTIONS: "-XX:-OmitStackTraceInFastThrow"
185186

186187
third-party-service:
187188
<<: *default-service

‎kubernetes-manifests/base/credit-card-order-service.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ spec:
3333
configMapKeyRef:
3434
name: connection-strings
3535
key: JAVA_CONNECTION_STRING
36+
- name: JAVA_TOOL_OPTIONS
37+
value: "-XX:-OmitStackTraceInFastThrow"
3638
resources:
3739
requests:
3840
cpu: 20m

‎src/aggregator-service/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23.4-alpine3.20@sha256:6a84ccdb73e005d0ee7bfff6066f230612ca9dff3e88e31bfc752523c3a271f8 AS build
1+
FROM golang:1.24.2-alpine3.21@sha256:7772cb5322baa875edd74705556d08f0eeca7b9c4b5367754ce3f2f00041ccee AS build
22

33
RUN apk add --no-cache gcc libc-dev
44

@@ -13,7 +13,7 @@ COPY [".", "."]
1313
RUN go test ./... \
1414
&& go build -ldflags="-linkmode=external" -o aggregator-service
1515

16-
FROM alpine:3.20.3@sha256:1e42bbe2508154c9126d48c2b8a75420c3544343bf86fd041fb7527e017a4b4a
16+
FROM alpine:3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
1717

1818
RUN apk upgrade --no-cache \
1919
&& addgroup --system --gid 3369 easytrade \

‎src/aggregator-service/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
module dynatrace.com/easytrade/aggregator-service
22

3-
go 1.23.4
3+
go 1.24.2
44

55
require (
6-
github.com/go-faker/faker/v4 v4.5.0
6+
github.com/go-faker/faker/v4 v4.6.0
77
go.uber.org/zap v1.27.0
8-
golang.org/x/term v0.28.0
8+
golang.org/x/term v0.31.0
99
gopkg.in/yaml.v3 v3.0.1
1010
)
1111

1212
require (
1313
go.uber.org/multierr v1.11.0 // indirect
14-
golang.org/x/sys v0.29.0 // indirect
15-
golang.org/x/text v0.21.0 // indirect
14+
golang.org/x/sys v0.32.0 // indirect
15+
golang.org/x/text v0.24.0 // indirect
1616
)

‎src/aggregator-service/go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
22
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3-
github.com/go-faker/faker/v4 v4.5.0 h1:ARzAY2XoOL9tOUK+KSecUQzyXQsUaZHefjyF8x6YFHc=
4-
github.com/go-faker/faker/v4 v4.5.0/go.mod h1:p3oq1GRjG2PZ7yqeFFfQI20Xm61DoBDlCA8RiSyZ48M=
3+
github.com/go-faker/faker/v4 v4.6.0 h1:6aOPzNptRiDwD14HuAnEtlTa+D1IfFuEHO8+vEFwjTs=
4+
github.com/go-faker/faker/v4 v4.6.0/go.mod h1:ZmrHuVtTTm2Em9e0Du6CJ9CADaLEzGXW62z1YqFH0m0=
55
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
66
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
77
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
@@ -12,12 +12,12 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
1212
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
1313
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
1414
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
15-
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
16-
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
17-
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
18-
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
19-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
20-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
15+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
16+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
17+
golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
18+
golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
19+
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
20+
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
2121
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
2222
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2323
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

‎src/credit-card-order-service/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ dependencies {
4242
implementation 'dev.openfeature:sdk:1.14.0'
4343

4444
// Fix vulnerable dependencies
45-
implementation 'ch.qos.logback:logback-core:1.5.16'
46-
implementation 'ch.qos.logback:logback-classic:1.5.16'
45+
implementation 'ch.qos.logback:logback-core:1.5.18'
46+
implementation 'ch.qos.logback:logback-classic:1.5.18'
4747
}
4848

4949
test {

‎src/credit-card-order-service/src/main/java/com/dynatrace/easytrade/creditcardorderservice/OrderController.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,19 +109,22 @@ public ResponseEntity<StandardResponse> getStatusHistory(@PathVariable Integer a
109109
public ResponseEntity<StandardResponse> getLatestStatus(@PathVariable Integer accountId) {
110110
logger.info("Getting latest status for accountId: " + accountId);
111111

112-
final Client client = openFeatureAPI.getClient();
113-
if (client.getBooleanValue("credit_card_meltdown", false)) {
114-
CountSequenceTotal(5, 2, 14);
115-
}
116-
117112
try (Connection conn = dbHelper.getConnection()) {
113+
final Client client = openFeatureAPI.getClient();
114+
if (client.getBooleanValue("credit_card_meltdown", false)) {
115+
CountSequenceTotal(5, 2, 14);
116+
}
117+
118118
Optional<CreditCardOrderStatus> status = dbHelper.getLastOrderStatusForAccountId(conn, accountId);
119119
return status
120120
.map(s -> buildResponseEntity(HttpStatus.OK, "Status found successfully.", status))
121121
.orElse(buildResponseEntity(HttpStatus.NOT_FOUND,
122122
"Status for the given account id does not exist!"));
123123
} catch (SQLException e) {
124124
return handleSQLException(e);
125+
} catch (Exception e) {
126+
logger.error("Excepiton occured", e);
127+
throw e;
125128
}
126129
}
127130

‎src/credit-card-order-service/src/main/resources/application.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ server.port=8080
33

44
build.version={{BUILD_VERSION}}
55
build.date={{BUILD_DATE}}
6-
build.commit={{BUILD_COMMIT}}
6+
build.commit={{BUILD_COMMIT}}
7+
8+
logging.level.org.apache.catalina.core.ContainerBase=OFF

‎src/pricing-service/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23.4-alpine3.20@sha256:6a84ccdb73e005d0ee7bfff6066f230612ca9dff3e88e31bfc752523c3a271f8 AS build
1+
FROM golang:1.24.2-alpine3.21@sha256:7772cb5322baa875edd74705556d08f0eeca7b9c4b5367754ce3f2f00041ccee AS build
22

33
RUN apk add --no-cache gcc libc-dev git
44

@@ -16,7 +16,7 @@ RUN go test ./... \
1616
&& swag init \
1717
&& go build -ldflags '-linkmode=external' -o pricing-service
1818

19-
FROM alpine:3.20.3@sha256:1e42bbe2508154c9126d48c2b8a75420c3544343bf86fd041fb7527e017a4b4a
19+
FROM alpine:3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
2020

2121
RUN apk upgrade --no-cache \
2222
&& addgroup --system --gid 3369 easytrade \

0 commit comments

Comments
 (0)