From 0b854bfee1484415bf034020904144478b35e0d6 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Sat, 16 Nov 2024 23:17:08 +0900 Subject: [PATCH] Replace "structure logging" with "structured logging" See gh-43203 --- .../reference/pages/features/logging.adoc | 2 +- ...sticCommonSchemaStructuredLogFormatter.java | 4 ++-- ...xtendedLogFormatStructuredLogFormatter.java | 4 ++-- .../log4j2/LogstashStructuredLogFormatter.java | 4 ++-- .../logging/log4j2/StructuredLogLayout.java | 14 +++++++------- ...sticCommonSchemaStructuredLogFormatter.java | 4 ++-- ...xtendedLogFormatStructuredLogFormatter.java | 4 ++-- .../LogstashStructuredLogFormatter.java | 4 ++-- .../logging/logback/StructuredLogEncoder.java | 14 +++++++------- .../JsonWriterStructuredLogFormatter.java | 8 ++++---- .../structured/StructuredLogFormatter.java | 2 +- .../StructuredLogFormatterFactory.java | 18 +++++++++--------- ...tructuredLoggingJsonMembersCustomizer.java} | 2 +- .../StructuredLoggingJsonProperties.java | 6 +++--- ...ingJsonPropertiesJsonMembersCustomizer.java | 11 ++++++----- ...ditional-spring-configuration-metadata.json | 2 +- .../log4j2/AbstractStructuredLoggingTests.java | 4 ++-- .../AbstractStructuredLoggingTests.java | 4 ++-- .../StructuredLogFormatterFactoryTests.java | 4 ++-- ...onPropertiesJsonMembersCustomizerTests.java | 6 +++--- .../StructuredLoggingJsonPropertiesTests.java | 2 +- .../build.gradle | 2 +- .../log4j2/CustomStructuredLogFormatter.java | 0 ...mpleLog4j2StructuredLoggingApplication.java | 0 .../src/main/resources/application.properties | 0 ...og4j2StructuredLoggingApplicationTests.java | 0 .../build.gradle | 2 +- .../CustomStructuredLogFormatter.java | 0 .../SampleJsonMembersCustomizer.java | 4 ++-- .../SampleStructuredLoggingApplication.java | 0 .../src/main/resources/application.properties | 0 ...ampleStructuredLoggingApplicationTests.java | 0 32 files changed, 66 insertions(+), 65 deletions(-) rename spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/{StructureLoggingJsonMembersCustomizer.java => StructuredLoggingJsonMembersCustomizer.java} (95%) rename spring-boot-tests/spring-boot-smoke-tests/{spring-boot-smoke-test-structure-logging-log4j2 => spring-boot-smoke-test-structured-logging-log4j2}/build.gradle (86%) rename spring-boot-tests/spring-boot-smoke-tests/{spring-boot-smoke-test-structure-logging-log4j2 => spring-boot-smoke-test-structured-logging-log4j2}/src/main/java/smoketest/structuredlogging/log4j2/CustomStructuredLogFormatter.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/{spring-boot-smoke-test-structure-logging-log4j2 => spring-boot-smoke-test-structured-logging-log4j2}/src/main/java/smoketest/structuredlogging/log4j2/SampleLog4j2StructuredLoggingApplication.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/{spring-boot-smoke-test-structure-logging-log4j2 => spring-boot-smoke-test-structured-logging-log4j2}/src/main/resources/application.properties (100%) rename spring-boot-tests/spring-boot-smoke-tests/{spring-boot-smoke-test-structure-logging-log4j2 => spring-boot-smoke-test-structured-logging-log4j2}/src/test/java/smoketest/structuredlogging/log4j2/SampleLog4j2StructuredLoggingApplicationTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/{spring-boot-smoke-test-structure-logging => spring-boot-smoke-test-structured-logging}/build.gradle (80%) rename spring-boot-tests/spring-boot-smoke-tests/{spring-boot-smoke-test-structure-logging => spring-boot-smoke-test-structured-logging}/src/main/java/smoketest/structuredlogging/CustomStructuredLogFormatter.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/{spring-boot-smoke-test-structure-logging => spring-boot-smoke-test-structured-logging}/src/main/java/smoketest/structuredlogging/SampleJsonMembersCustomizer.java (83%) rename spring-boot-tests/spring-boot-smoke-tests/{spring-boot-smoke-test-structure-logging => spring-boot-smoke-test-structured-logging}/src/main/java/smoketest/structuredlogging/SampleStructuredLoggingApplication.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/{spring-boot-smoke-test-structure-logging => spring-boot-smoke-test-structured-logging}/src/main/resources/application.properties (100%) rename spring-boot-tests/spring-boot-smoke-tests/{spring-boot-smoke-test-structure-logging => spring-boot-smoke-test-structured-logging}/src/test/java/smoketest/structuredlogging/SampleStructuredLoggingApplicationTests.java (100%) diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/logging.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/logging.adoc index ab67c4777e18..53a93d900139 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/logging.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/logging.adoc @@ -609,7 +609,7 @@ logging: corpname: mycorp ---- -TIP: For more advanced customizations, you can write your own class that implements the javadoc:org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer[] interface and declare it using the configprop:logging.structured.json.customizer[] property. +TIP: For more advanced customizations, you can write your own class that implements the javadoc:org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer[] interface and declare it using the configprop:logging.structured.json.customizer[] property. You can also declare implementations by listing them in a `META-INF/spring.factories` file. diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ElasticCommonSchemaStructuredLogFormatter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ElasticCommonSchemaStructuredLogFormatter.java index 1d3f11915952..bac717700d0e 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ElasticCommonSchemaStructuredLogFormatter.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ElasticCommonSchemaStructuredLogFormatter.java @@ -28,8 +28,8 @@ import org.springframework.boot.logging.structured.CommonStructuredLogFormat; import org.springframework.boot.logging.structured.ElasticCommonSchemaProperties; import org.springframework.boot.logging.structured.JsonWriterStructuredLogFormatter; -import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer; import org.springframework.boot.logging.structured.StructuredLogFormatter; +import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer; import org.springframework.core.env.Environment; import org.springframework.util.ObjectUtils; @@ -43,7 +43,7 @@ class ElasticCommonSchemaStructuredLogFormatter extends JsonWriterStructuredLogFormatter { ElasticCommonSchemaStructuredLogFormatter(Environment environment, - StructureLoggingJsonMembersCustomizer customizer) { + StructuredLoggingJsonMembersCustomizer customizer) { super((members) -> jsonMembers(environment, members), customizer); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/GraylogExtendedLogFormatStructuredLogFormatter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/GraylogExtendedLogFormatStructuredLogFormatter.java index 1da4e8115c31..a8b0bec19222 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/GraylogExtendedLogFormatStructuredLogFormatter.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/GraylogExtendedLogFormatStructuredLogFormatter.java @@ -37,8 +37,8 @@ import org.springframework.boot.logging.structured.CommonStructuredLogFormat; import org.springframework.boot.logging.structured.GraylogExtendedLogFormatProperties; import org.springframework.boot.logging.structured.JsonWriterStructuredLogFormatter; -import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer; import org.springframework.boot.logging.structured.StructuredLogFormatter; +import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer; import org.springframework.core.env.Environment; import org.springframework.core.log.LogMessage; import org.springframework.util.Assert; @@ -70,7 +70,7 @@ class GraylogExtendedLogFormatStructuredLogFormatter extends JsonWriterStructure private static final Set ADDITIONAL_FIELD_ILLEGAL_KEYS = Set.of("id", "_id"); GraylogExtendedLogFormatStructuredLogFormatter(Environment environment, - StructureLoggingJsonMembersCustomizer customizer) { + StructuredLoggingJsonMembersCustomizer customizer) { super((members) -> jsonMembers(environment, members), customizer); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/LogstashStructuredLogFormatter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/LogstashStructuredLogFormatter.java index 2e7a34b930e4..92967b1d4422 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/LogstashStructuredLogFormatter.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/LogstashStructuredLogFormatter.java @@ -32,8 +32,8 @@ import org.springframework.boot.json.JsonWriter; import org.springframework.boot.logging.structured.CommonStructuredLogFormat; import org.springframework.boot.logging.structured.JsonWriterStructuredLogFormatter; -import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer; import org.springframework.boot.logging.structured.StructuredLogFormatter; +import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer; import org.springframework.util.CollectionUtils; /** @@ -44,7 +44,7 @@ */ class LogstashStructuredLogFormatter extends JsonWriterStructuredLogFormatter { - LogstashStructuredLogFormatter(StructureLoggingJsonMembersCustomizer customizer) { + LogstashStructuredLogFormatter(StructuredLoggingJsonMembersCustomizer customizer) { super(LogstashStructuredLogFormatter::jsonMembers, customizer); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/StructuredLogLayout.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/StructuredLogLayout.java index 25c8558aa796..03fa13413546 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/StructuredLogLayout.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/StructuredLogLayout.java @@ -30,10 +30,10 @@ import org.apache.logging.log4j.core.layout.AbstractStringLayout; import org.springframework.boot.logging.structured.CommonStructuredLogFormat; -import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer; import org.springframework.boot.logging.structured.StructuredLogFormatter; import org.springframework.boot.logging.structured.StructuredLogFormatterFactory; import org.springframework.boot.logging.structured.StructuredLogFormatterFactory.CommonFormatters; +import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer; import org.springframework.boot.util.Instantiator; import org.springframework.core.env.Environment; import org.springframework.util.Assert; @@ -111,21 +111,21 @@ private void addCommonFormatters(CommonFormatters commonFormatters) { private ElasticCommonSchemaStructuredLogFormatter createEcsFormatter(Instantiator instantiator) { Environment environment = instantiator.getArg(Environment.class); - StructureLoggingJsonMembersCustomizer jsonMembersCustomizer = instantiator - .getArg(StructureLoggingJsonMembersCustomizer.class); + StructuredLoggingJsonMembersCustomizer jsonMembersCustomizer = instantiator + .getArg(StructuredLoggingJsonMembersCustomizer.class); return new ElasticCommonSchemaStructuredLogFormatter(environment, jsonMembersCustomizer); } private GraylogExtendedLogFormatStructuredLogFormatter createGraylogFormatter(Instantiator instantiator) { Environment environment = instantiator.getArg(Environment.class); - StructureLoggingJsonMembersCustomizer jsonMembersCustomizer = instantiator - .getArg(StructureLoggingJsonMembersCustomizer.class); + StructuredLoggingJsonMembersCustomizer jsonMembersCustomizer = instantiator + .getArg(StructuredLoggingJsonMembersCustomizer.class); return new GraylogExtendedLogFormatStructuredLogFormatter(environment, jsonMembersCustomizer); } private LogstashStructuredLogFormatter createLogstashFormatter(Instantiator instantiator) { - StructureLoggingJsonMembersCustomizer jsonMembersCustomizer = instantiator - .getArg(StructureLoggingJsonMembersCustomizer.class); + StructuredLoggingJsonMembersCustomizer jsonMembersCustomizer = instantiator + .getArg(StructuredLoggingJsonMembersCustomizer.class); return new LogstashStructuredLogFormatter(jsonMembersCustomizer); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/ElasticCommonSchemaStructuredLogFormatter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/ElasticCommonSchemaStructuredLogFormatter.java index 58b7e5758e70..ef8511d831b7 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/ElasticCommonSchemaStructuredLogFormatter.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/ElasticCommonSchemaStructuredLogFormatter.java @@ -28,8 +28,8 @@ import org.springframework.boot.logging.structured.CommonStructuredLogFormat; import org.springframework.boot.logging.structured.ElasticCommonSchemaProperties; import org.springframework.boot.logging.structured.JsonWriterStructuredLogFormatter; -import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer; import org.springframework.boot.logging.structured.StructuredLogFormatter; +import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer; import org.springframework.core.env.Environment; /** @@ -45,7 +45,7 @@ class ElasticCommonSchemaStructuredLogFormatter extends JsonWriterStructuredLogF (pair) -> pair.value); ElasticCommonSchemaStructuredLogFormatter(Environment environment, ThrowableProxyConverter throwableProxyConverter, - StructureLoggingJsonMembersCustomizer customizer) { + StructuredLoggingJsonMembersCustomizer customizer) { super((members) -> jsonMembers(environment, throwableProxyConverter, members), customizer); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/GraylogExtendedLogFormatStructuredLogFormatter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/GraylogExtendedLogFormatStructuredLogFormatter.java index 3273fc75a5d3..cd5abd284814 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/GraylogExtendedLogFormatStructuredLogFormatter.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/GraylogExtendedLogFormatStructuredLogFormatter.java @@ -37,8 +37,8 @@ import org.springframework.boot.logging.structured.CommonStructuredLogFormat; import org.springframework.boot.logging.structured.GraylogExtendedLogFormatProperties; import org.springframework.boot.logging.structured.JsonWriterStructuredLogFormatter; -import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer; import org.springframework.boot.logging.structured.StructuredLogFormatter; +import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer; import org.springframework.core.env.Environment; import org.springframework.core.log.LogMessage; import org.springframework.util.Assert; @@ -70,7 +70,7 @@ class GraylogExtendedLogFormatStructuredLogFormatter extends JsonWriterStructure private static final Set ADDITIONAL_FIELD_ILLEGAL_KEYS = Set.of("id", "_id"); GraylogExtendedLogFormatStructuredLogFormatter(Environment environment, - ThrowableProxyConverter throwableProxyConverter, StructureLoggingJsonMembersCustomizer customizer) { + ThrowableProxyConverter throwableProxyConverter, StructuredLoggingJsonMembersCustomizer customizer) { super((members) -> jsonMembers(environment, throwableProxyConverter, members), customizer); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogstashStructuredLogFormatter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogstashStructuredLogFormatter.java index fe2a2cb39d16..9008cb693490 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogstashStructuredLogFormatter.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogstashStructuredLogFormatter.java @@ -35,8 +35,8 @@ import org.springframework.boot.json.JsonWriter.PairExtractor; import org.springframework.boot.logging.structured.CommonStructuredLogFormat; import org.springframework.boot.logging.structured.JsonWriterStructuredLogFormatter; -import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer; import org.springframework.boot.logging.structured.StructuredLogFormatter; +import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer; /** * Logback {@link StructuredLogFormatter} for {@link CommonStructuredLogFormat#LOGSTASH}. @@ -50,7 +50,7 @@ class LogstashStructuredLogFormatter extends JsonWriterStructuredLogFormatter pair.value); LogstashStructuredLogFormatter(ThrowableProxyConverter throwableProxyConverter, - StructureLoggingJsonMembersCustomizer customizer) { + StructuredLoggingJsonMembersCustomizer customizer) { super((members) -> jsonMembers(throwableProxyConverter, members), customizer); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/StructuredLogEncoder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/StructuredLogEncoder.java index f61d78a5bf1f..bcc3bbd12dd8 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/StructuredLogEncoder.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/StructuredLogEncoder.java @@ -25,10 +25,10 @@ import ch.qos.logback.core.encoder.EncoderBase; import org.springframework.boot.logging.structured.CommonStructuredLogFormat; -import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer; import org.springframework.boot.logging.structured.StructuredLogFormatter; import org.springframework.boot.logging.structured.StructuredLogFormatterFactory; import org.springframework.boot.logging.structured.StructuredLogFormatterFactory.CommonFormatters; +import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer; import org.springframework.boot.util.Instantiator; import org.springframework.boot.util.Instantiator.AvailableParameters; import org.springframework.core.env.Environment; @@ -89,8 +89,8 @@ private void addCommonFormatters(CommonFormatters commonFormatter private StructuredLogFormatter createEcsFormatter(Instantiator instantiator) { Environment environment = instantiator.getArg(Environment.class); ThrowableProxyConverter throwableProxyConverter = instantiator.getArg(ThrowableProxyConverter.class); - StructureLoggingJsonMembersCustomizer jsonMembersCustomizer = instantiator - .getArg(StructureLoggingJsonMembersCustomizer.class); + StructuredLoggingJsonMembersCustomizer jsonMembersCustomizer = instantiator + .getArg(StructuredLoggingJsonMembersCustomizer.class); return new ElasticCommonSchemaStructuredLogFormatter(environment, throwableProxyConverter, jsonMembersCustomizer); } @@ -98,16 +98,16 @@ private StructuredLogFormatter createEcsFormatter(Instantiator private StructuredLogFormatter createGraylogFormatter(Instantiator instantiator) { Environment environment = instantiator.getArg(Environment.class); ThrowableProxyConverter throwableProxyConverter = instantiator.getArg(ThrowableProxyConverter.class); - StructureLoggingJsonMembersCustomizer jsonMembersCustomizer = instantiator - .getArg(StructureLoggingJsonMembersCustomizer.class); + StructuredLoggingJsonMembersCustomizer jsonMembersCustomizer = instantiator + .getArg(StructuredLoggingJsonMembersCustomizer.class); return new GraylogExtendedLogFormatStructuredLogFormatter(environment, throwableProxyConverter, jsonMembersCustomizer); } private StructuredLogFormatter createLogstashFormatter(Instantiator instantiator) { ThrowableProxyConverter throwableProxyConverter = instantiator.getArg(ThrowableProxyConverter.class); - StructureLoggingJsonMembersCustomizer jsonMembersCustomizer = instantiator - .getArg(StructureLoggingJsonMembersCustomizer.class); + StructuredLoggingJsonMembersCustomizer jsonMembersCustomizer = instantiator + .getArg(StructuredLoggingJsonMembersCustomizer.class); return new LogstashStructuredLogFormatter(throwableProxyConverter, jsonMembersCustomizer); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/JsonWriterStructuredLogFormatter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/JsonWriterStructuredLogFormatter.java index 1eb9e7a986fd..5f41a0ef8d8f 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/JsonWriterStructuredLogFormatter.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/JsonWriterStructuredLogFormatter.java @@ -42,18 +42,18 @@ public abstract class JsonWriterStructuredLogFormatter implements StructuredL * @param customizer an optional customizer to apply */ protected JsonWriterStructuredLogFormatter(Consumer> members, - StructureLoggingJsonMembersCustomizer customizer) { + StructuredLoggingJsonMembersCustomizer customizer) { this(JsonWriter.of(customized(members, customizer)).withNewLineAtEnd()); } private static Consumer> customized(Consumer> members, - StructureLoggingJsonMembersCustomizer customizer) { + StructuredLoggingJsonMembersCustomizer customizer) { return (customizer != null) ? members.andThen(customizeWith(customizer)) : members; } @SuppressWarnings("unchecked") - private static Consumer> customizeWith(StructureLoggingJsonMembersCustomizer customizer) { - return (members) -> LambdaSafe.callback(StructureLoggingJsonMembersCustomizer.class, customizer, members) + private static Consumer> customizeWith(StructuredLoggingJsonMembersCustomizer customizer) { + return (members) -> LambdaSafe.callback(StructuredLoggingJsonMembersCustomizer.class, customizer, members) .invoke((instance) -> instance.customize(members)); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLogFormatter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLogFormatter.java index 0bcd26e35f8b..c7546324893d 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLogFormatter.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLogFormatter.java @@ -28,7 +28,7 @@ * Implementing classes can declare the following parameter types in the constructor: *
    *
  • {@link Environment}
    • - *
  • {@link StructureLoggingJsonMembersCustomizer}
    • + *
  • {@link StructuredLoggingJsonMembersCustomizer}
    • *
* When using Logback, implementing classes can also use the following parameter types in * the constructor: diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLogFormatterFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLogFormatterFactory.java index d58c881e93e3..e5fc4c3218d2 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLogFormatterFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLogFormatterFactory.java @@ -82,8 +82,8 @@ public StructuredLogFormatterFactory(Class logEventType, Environment environm this.logEventType = logEventType; this.instantiator = new Instantiator<>(Object.class, (allAvailableParameters) -> { allAvailableParameters.add(Environment.class, environment); - allAvailableParameters.add(StructureLoggingJsonMembersCustomizer.class, - (type) -> getStructureLoggingJsonMembersCustomizer(environment)); + allAvailableParameters.add(StructuredLoggingJsonMembersCustomizer.class, + (type) -> getStructuredLoggingJsonMembersCustomizer(environment)); if (availableParameters != null) { availableParameters.accept(allAvailableParameters); } @@ -92,26 +92,26 @@ public StructuredLogFormatterFactory(Class logEventType, Environment environm commonFormatters.accept(this.commonFormatters); } - StructureLoggingJsonMembersCustomizer getStructureLoggingJsonMembersCustomizer(Environment environment) { - List> customizers = new ArrayList<>(); + StructuredLoggingJsonMembersCustomizer getStructuredLoggingJsonMembersCustomizer(Environment environment) { + List> customizers = new ArrayList<>(); StructuredLoggingJsonProperties properties = StructuredLoggingJsonProperties.get(environment); if (properties != null) { customizers.add(new StructuredLoggingJsonPropertiesJsonMembersCustomizer(this.instantiator, properties)); } - customizers.addAll(loadStructureLoggingJsonMembersCustomizers()); + customizers.addAll(loadStructuredLoggingJsonMembersCustomizers()); return (members) -> invokeCustomizers(customizers, members); } @SuppressWarnings({ "unchecked", "rawtypes" }) - private List> loadStructureLoggingJsonMembersCustomizers() { - return (List) this.factoriesLoader.load(StructureLoggingJsonMembersCustomizer.class, + private List> loadStructuredLoggingJsonMembersCustomizers() { + return (List) this.factoriesLoader.load(StructuredLoggingJsonMembersCustomizer.class, ArgumentResolver.from(this.instantiator::getArg)); } @SuppressWarnings("unchecked") - private void invokeCustomizers(List> customizers, + private void invokeCustomizers(List> customizers, Members members) { - LambdaSafe.callbacks(StructureLoggingJsonMembersCustomizer.class, customizers, members) + LambdaSafe.callbacks(StructuredLoggingJsonMembersCustomizer.class, customizers, members) .invoke((customizer) -> customizer.customize(members)); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructureLoggingJsonMembersCustomizer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonMembersCustomizer.java similarity index 95% rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructureLoggingJsonMembersCustomizer.java rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonMembersCustomizer.java index bc1744580ea5..67040b39149a 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructureLoggingJsonMembersCustomizer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonMembersCustomizer.java @@ -32,7 +32,7 @@ * @see JsonWriterStructuredLogFormatter */ @FunctionalInterface -public interface StructureLoggingJsonMembersCustomizer { +public interface StructuredLoggingJsonMembersCustomizer { /** * Customize the given {@link Members} instance. diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonProperties.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonProperties.java index 85be94a7cb0f..cf34cb1a7d10 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonProperties.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonProperties.java @@ -28,13 +28,13 @@ * @param include the paths that should be included. An empty set includes all names * @param exclude the paths that should be excluded. An empty set excludes nothing * @param rename a map of path to replacement names - * @param add a map of additional elements {@link StructureLoggingJsonMembersCustomizer} + * @param add a map of additional elements {@link StructuredLoggingJsonMembersCustomizer} * @param customizer the fully qualified name of a - * {@link StructureLoggingJsonMembersCustomizer} + * {@link StructuredLoggingJsonMembersCustomizer} * @author Phillip Webb */ record StructuredLoggingJsonProperties(Set include, Set exclude, Map rename, - Map add, Class> customizer) { + Map add, Class> customizer) { static StructuredLoggingJsonProperties get(Environment environment) { return Binder.get(environment) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesJsonMembersCustomizer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesJsonMembersCustomizer.java index 7bf1514e0199..a33f2ff9df6c 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesJsonMembersCustomizer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesJsonMembersCustomizer.java @@ -24,12 +24,12 @@ import org.springframework.util.CollectionUtils; /** - * {@link StructureLoggingJsonMembersCustomizer} to apply + * {@link StructuredLoggingJsonMembersCustomizer} to apply * {@link StructuredLoggingJsonProperties}. * * @author Phillip Webb */ -class StructuredLoggingJsonPropertiesJsonMembersCustomizer implements StructureLoggingJsonMembersCustomizer { +class StructuredLoggingJsonPropertiesJsonMembersCustomizer implements StructuredLoggingJsonMembersCustomizer { private final Instantiator instantiator; @@ -49,7 +49,7 @@ public void customize(Members members) { if (!CollectionUtils.isEmpty(add)) { add.forEach(members::add); } - Class> customizer = this.properties.customizer(); + Class> customizer = this.properties.customizer(); if (customizer != null) { createAndApplyCustomizer(members, customizer); } @@ -71,8 +71,9 @@ boolean filterPath(MemberPath path) { @SuppressWarnings({ "unchecked", "rawtypes" }) private void createAndApplyCustomizer(Members members, - Class> customizerClass) { - ((StructureLoggingJsonMembersCustomizer) this.instantiator.instantiateType(customizerClass)).customize(members); + Class> customizerClass) { + ((StructuredLoggingJsonMembersCustomizer) this.instantiator.instantiateType(customizerClass)) + .customize(members); } } diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json index d08800519da3..e23d4760d4e9 100644 --- a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -269,7 +269,7 @@ { "name": "logging.structured.json.customizer", "type": "java.lang.String", - "description": "The fully qualified class name of a StructureLoggingJsonMembersCustomizer" + "description": "The fully qualified class name of a StructuredLoggingJsonMembersCustomizer" }, { "name": "logging.structured.json.exclude", diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/AbstractStructuredLoggingTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/AbstractStructuredLoggingTests.java index 354afe6f0a0e..633a74314634 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/AbstractStructuredLoggingTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/AbstractStructuredLoggingTests.java @@ -31,7 +31,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer; +import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer; import static org.assertj.core.api.Assertions.assertThat; @@ -48,7 +48,7 @@ abstract class AbstractStructuredLoggingTests { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); @Mock - StructureLoggingJsonMembersCustomizer customizer; + StructuredLoggingJsonMembersCustomizer customizer; protected Map map(Object... values) { assertThat(values.length).isEven(); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/AbstractStructuredLoggingTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/AbstractStructuredLoggingTests.java index 84d29ab1b3da..1d4bece61b73 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/AbstractStructuredLoggingTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/AbstractStructuredLoggingTests.java @@ -38,7 +38,7 @@ import org.slf4j.event.KeyValuePair; import org.slf4j.helpers.BasicMarkerFactory; -import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer; +import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer; import static org.assertj.core.api.Assertions.assertThat; @@ -59,7 +59,7 @@ abstract class AbstractStructuredLoggingTests { private BasicMarkerFactory markerFactory; @Mock - StructureLoggingJsonMembersCustomizer customizer; + StructuredLoggingJsonMembersCustomizer customizer; @BeforeEach void setUp() { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLogFormatterFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLogFormatterFactoryTests.java index 5493f02b7ebf..c91a75f0acd3 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLogFormatterFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLogFormatterFactoryTests.java @@ -107,7 +107,7 @@ void getUsingClassNameInjectsCustomParameter() { void getInjectCustomizers() { this.environment.setProperty("logging.structured.json.rename.spring", "test"); SpringFactoriesLoader factoriesLoader = mock(SpringFactoriesLoader.class); - StructureLoggingJsonMembersCustomizer customizer = (members) -> members + StructuredLoggingJsonMembersCustomizer customizer = (members) -> members .applyingValueProcessor(ValueProcessor.of(String.class, String::toUpperCase)); given(factoriesLoader.load(any(), any(ArgumentResolver.class))).willReturn(List.of(customizer)); StructuredLogFormatterFactory factory = new StructuredLogFormatterFactory<>(factoriesLoader, @@ -169,7 +169,7 @@ public String format(DifferentLogEvent event) { static class CutomizedFormatter extends JsonWriterStructuredLogFormatter { - CutomizedFormatter(StructureLoggingJsonMembersCustomizer customizer) { + CutomizedFormatter(StructuredLoggingJsonMembersCustomizer customizer) { super((members) -> members.add("spring", "boot"), customizer); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesJsonMembersCustomizerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesJsonMembersCustomizerTests.java index 4bc994b1fae5..9ba25407f16f 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesJsonMembersCustomizerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesJsonMembersCustomizerTests.java @@ -98,7 +98,7 @@ void customizeWhenHasAddAddsMemeber() { @Test @SuppressWarnings({ "rawtypes", "unchecked" }) void customizeWhenHasCustomizerCustomizesMember() { - StructureLoggingJsonMembersCustomizer uppercaseCustomizer = (members) -> members + StructuredLoggingJsonMembersCustomizer uppercaseCustomizer = (members) -> members .applyingNameProcessor(NameProcessor.of(String::toUpperCase)); given(((Instantiator) this.instantiator).instantiateType(TestCustomizer.class)).willReturn(uppercaseCustomizer); StructuredLoggingJsonProperties properties = new StructuredLoggingJsonProperties(Collections.emptySet(), @@ -109,7 +109,7 @@ void customizeWhenHasCustomizerCustomizesMember() { } @SuppressWarnings({ "rawtypes", "unchecked" }) - private String writeSampleJson(StructureLoggingJsonMembersCustomizer customizer) { + private String writeSampleJson(StructuredLoggingJsonMembersCustomizer customizer) { return JsonWriter.of((members) -> { members.add("a", "a"); members.add("b", "b"); @@ -118,7 +118,7 @@ private String writeSampleJson(StructureLoggingJsonMembersCustomizer customizer) }).writeToString(new Object()); } - static class TestCustomizer implements StructureLoggingJsonMembersCustomizer { + static class TestCustomizer implements StructuredLoggingJsonMembersCustomizer { @Override public void customize(Members members) { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesTests.java index 49edff591c4f..43b1510317ea 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesTests.java @@ -52,7 +52,7 @@ void getWhenNoBoundPropertiesReturnsNull() { StructuredLoggingJsonProperties.get(environment); } - static class TestCustomizer implements StructureLoggingJsonMembersCustomizer { + static class TestCustomizer implements StructuredLoggingJsonMembersCustomizer { @Override public void customize(Members members) { diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging-log4j2/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging-log4j2/build.gradle similarity index 86% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging-log4j2/build.gradle rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging-log4j2/build.gradle index 9c5a7349f70c..0505812cdeea 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging-log4j2/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging-log4j2/build.gradle @@ -2,7 +2,7 @@ plugins { id "java" } -description = "Spring Boot structure logging Log4j2 smoke test" +description = "Spring Boot structured logging Log4j2 smoke test" configurations.all { exclude module: "spring-boot-starter-logging" diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging-log4j2/src/main/java/smoketest/structuredlogging/log4j2/CustomStructuredLogFormatter.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging-log4j2/src/main/java/smoketest/structuredlogging/log4j2/CustomStructuredLogFormatter.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging-log4j2/src/main/java/smoketest/structuredlogging/log4j2/CustomStructuredLogFormatter.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging-log4j2/src/main/java/smoketest/structuredlogging/log4j2/CustomStructuredLogFormatter.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging-log4j2/src/main/java/smoketest/structuredlogging/log4j2/SampleLog4j2StructuredLoggingApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging-log4j2/src/main/java/smoketest/structuredlogging/log4j2/SampleLog4j2StructuredLoggingApplication.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging-log4j2/src/main/java/smoketest/structuredlogging/log4j2/SampleLog4j2StructuredLoggingApplication.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging-log4j2/src/main/java/smoketest/structuredlogging/log4j2/SampleLog4j2StructuredLoggingApplication.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging-log4j2/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging-log4j2/src/main/resources/application.properties similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging-log4j2/src/main/resources/application.properties rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging-log4j2/src/main/resources/application.properties diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging-log4j2/src/test/java/smoketest/structuredlogging/log4j2/SampleLog4j2StructuredLoggingApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging-log4j2/src/test/java/smoketest/structuredlogging/log4j2/SampleLog4j2StructuredLoggingApplicationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging-log4j2/src/test/java/smoketest/structuredlogging/log4j2/SampleLog4j2StructuredLoggingApplicationTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging-log4j2/src/test/java/smoketest/structuredlogging/log4j2/SampleLog4j2StructuredLoggingApplicationTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging/build.gradle similarity index 80% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging/build.gradle rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging/build.gradle index c0303a665b79..b6aae6211bf0 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging/build.gradle @@ -2,7 +2,7 @@ plugins { id "java" } -description = "Spring Boot structure logging smoke test" +description = "Spring Boot structured logging smoke test" dependencies { implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter")) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging/src/main/java/smoketest/structuredlogging/CustomStructuredLogFormatter.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging/src/main/java/smoketest/structuredlogging/CustomStructuredLogFormatter.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging/src/main/java/smoketest/structuredlogging/CustomStructuredLogFormatter.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging/src/main/java/smoketest/structuredlogging/CustomStructuredLogFormatter.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging/src/main/java/smoketest/structuredlogging/SampleJsonMembersCustomizer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging/src/main/java/smoketest/structuredlogging/SampleJsonMembersCustomizer.java similarity index 83% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging/src/main/java/smoketest/structuredlogging/SampleJsonMembersCustomizer.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging/src/main/java/smoketest/structuredlogging/SampleJsonMembersCustomizer.java index 25f42b1bc8d3..341efe9d8d17 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging/src/main/java/smoketest/structuredlogging/SampleJsonMembersCustomizer.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging/src/main/java/smoketest/structuredlogging/SampleJsonMembersCustomizer.java @@ -18,9 +18,9 @@ import org.springframework.boot.json.JsonWriter.Members; import org.springframework.boot.json.JsonWriter.ValueProcessor; -import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer; +import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer; -public class SampleJsonMembersCustomizer implements StructureLoggingJsonMembersCustomizer { +public class SampleJsonMembersCustomizer implements StructuredLoggingJsonMembersCustomizer { @Override public void customize(Members members) { diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging/src/main/java/smoketest/structuredlogging/SampleStructuredLoggingApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging/src/main/java/smoketest/structuredlogging/SampleStructuredLoggingApplication.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging/src/main/java/smoketest/structuredlogging/SampleStructuredLoggingApplication.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging/src/main/java/smoketest/structuredlogging/SampleStructuredLoggingApplication.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging/src/main/resources/application.properties b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging/src/main/resources/application.properties similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging/src/main/resources/application.properties rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging/src/main/resources/application.properties diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging/src/test/java/smoketest/structuredlogging/SampleStructuredLoggingApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging/src/test/java/smoketest/structuredlogging/SampleStructuredLoggingApplicationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging/src/test/java/smoketest/structuredlogging/SampleStructuredLoggingApplicationTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging/src/test/java/smoketest/structuredlogging/SampleStructuredLoggingApplicationTests.java