Skip to content

fix(deps): bump org.springframework.boot:spring-boot-dependencies from 3.3.2 to 3.3.3 #769

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 3 commits into from
Aug 23, 2024
Merged

fix(deps): bump org.springframework.boot:spring-boot-dependencies from 3.3.2 to 3.3.3 #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
375ad78
fix(deps): bump org.springframework.boot:spring-boot-dependencies
dependabot[bot] Aug 23, 2024
9435d40
fix(kafka): replace deprecated method call
JoergSiebahn Aug 23, 2024
1545074
fix(logging): accept some non-json Logs before app start
JoergSiebahn Aug 23, 2024
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
2 changes: 1 addition & 1 deletion sda-commons-dependencies/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ext {
awaitalityVersion = '4.2.0'
bouncycastleVersion = '1.78.1'
logbackContribVersion = '0.1.5'
springBootVersion = '3.3.2'
springBootVersion = '3.3.3'
springCloudVersion = '2023.0.3'
scalaVersion = '2.13.14'
swaggerCoreVersion = '2.2.22'
Expand Down
2 changes: 1 addition & 1 deletion ...afka/src/main/java/org/sdase/commons/spring/boot/kafka/SdaKafkaConsumerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ private ExponentialBackOffWithMaxRetries createDefaultRetryBackOff() {
ConcurrentKafkaListenerContainerFactory<String, ?> factory =
new ConcurrentKafkaListenerContainerFactory<>();
factory.setConsumerFactory(
new DefaultKafkaConsumerFactory<>(kafkaProperties.buildConsumerProperties()));
new DefaultKafkaConsumerFactory<>(kafkaProperties.buildConsumerProperties(null)));
factory.setRecordMessageConverter(new ByteArrayJsonMessageConverter(objectMapper));
factory.getContainerProperties().setAckMode(AckMode.RECORD);
// Please note that ConversionExceptions like mapping exception won't be retried and directly
Expand Down
26 changes: 25 additions & 1 deletion ...-starter-web/src/test/java/org/sdase/commons/spring/boot/web/logging/JsonLoggingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down Expand Up @@ -69,7 +70,7 @@ void shouldLogJsonUsingDifferentTimeStampFormat(CapturedOutput output)
assertThat(output).asString().contains("Started JsonLoggingTest.LoggingTestApp");
for (String json : jsonLines(output)) {
Map<String, Object> jsonObjectMap =
new ObjectMapper().readValue(json, new TypeReference<Map<String, Object>>() {});
new ObjectMapper().readValue(json, new TypeReference<>() {});
assertThat(jsonObjectMap).containsKeys("level", "logger", "timestamp", "message");

assertThat(jsonObjectMap.get("timestamp"))
Expand All @@ -92,8 +93,31 @@ private List<String> jsonLines(CapturedOutput capturedOutput) {
}

private List<String> onlyConfigurableLogLines(List<String> logLines) {

// intentional in Spring Boot "to aid problem diagnosis", see
// https://github.com/spring-projects/spring-boot/issues/42006#issuecomment-2306512921
var intentionalSpringLogs =
Set.of(
"INFO in ch.qos.logback.core.joran",
"INFO in ch.qos.logback.core.model.processor.ConversionRuleModelHandler",
"INFO in ch.qos.logback.core.model.processor.ModelInterpretationContext",
"INFO in ch.qos.logback.classic.model.processor.LoggerModelHandler",
"INFO in ch.qos.logback.classic.jul.LevelChangePropagator",
"INFO in ch.qos.logback.core.model.processor.AppenderModelHandler",
"INFO in ch.qos.logback.classic.model.processor.RootLoggerModelHandler",
"INFO in ch.qos.logback.core.model.processor.AppenderRefModelHandler",
"INFO in ch.qos.logback.core.model.processor.DefaultProcessor",
"INFO in org.springframework.boot.logging.logback.SpringBootJoranConfigurator");

return logLines.stream()
// Logs that are written before any configuration is possible may be filtered here.
.filter(l -> intentionalSpringLogs.stream().noneMatch(l::contains))
// fixed in Spring Boot, not released yet, see
// https://github.com/spring-projects/spring-boot/commit/aea45b5013298dd6c970be3b7149d4390317baee
// this should be removed some day
.filter(l -> !l.contains("WARN in ch.qos.logback.core.joran.action.ConversionRuleAction"))
// logs before configuration end with a blank line
.filter(l -> !l.isEmpty())
.toList();
}

Expand Down
Loading