Skip to content

Polish #45036

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

Closed
wants to merge 1 commit into from
Closed

Polish #45036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 9 additions & 15 deletions ...gframework/boot/actuate/autoconfigure/logging/otlp/OtlpLoggingAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@

import io.opentelemetry.api.metrics.MeterProvider;
import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter;
import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporterBuilder;
import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporter;
import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporterBuilder;
import io.opentelemetry.sdk.logs.export.LogRecordExporter;
import okhttp3.HttpUrl;
import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
Expand All @@ -35,7 +34,6 @@
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.util.ReflectionTestUtils;

import static org.assertj.core.api.Assertions.assertThat;

Expand Down Expand Up @@ -162,33 +160,29 @@ void shouldUseGrpcExporterIfTransportIsSetToGrpc() {
}

@Test
@SuppressWarnings("unchecked")
void httpShouldUseMeterProviderIfSet() {
this.contextRunner.withUserConfiguration(MeterProviderConfiguration.class)
.withPropertyValues("management.otlp.logging.endpoint=http://localhost:4318/v1/logs")
.run((context) -> {
OtlpHttpLogRecordExporter otlpHttpLogRecordExporter = context.getBean(OtlpHttpLogRecordExporter.class);
OtlpHttpLogRecordExporterBuilder builder = otlpHttpLogRecordExporter.toBuilder();
Supplier<MeterProvider> meterProviderSupplier = (Supplier<MeterProvider>) ReflectionTestUtils
.getField(ReflectionTestUtils.getField(builder, "delegate"), "meterProviderSupplier");
assertThat(meterProviderSupplier).isNotNull();
assertThat(meterProviderSupplier.get()).isSameAs(MeterProviderConfiguration.meterProvider);
assertThat(otlpHttpLogRecordExporter.toBuilder())
.extracting("delegate.meterProviderSupplier", InstanceOfAssertFactories.type(Supplier.class))
.satisfies((meterProviderSupplier) -> assertThat(meterProviderSupplier.get())
.isSameAs(MeterProviderConfiguration.meterProvider));
});
}

@Test
@SuppressWarnings("unchecked")
void grpcShouldUseMeterProviderIfSet() {
this.contextRunner.withUserConfiguration(MeterProviderConfiguration.class)
.withPropertyValues("management.otlp.logging.endpoint=http://localhost:4318/v1/logs",
"management.otlp.logging.transport=grpc")
.run((context) -> {
OtlpGrpcLogRecordExporter otlpGrpcLogRecordExporter = context.getBean(OtlpGrpcLogRecordExporter.class);
OtlpGrpcLogRecordExporterBuilder builder = otlpGrpcLogRecordExporter.toBuilder();
Supplier<MeterProvider> meterProviderSupplier = (Supplier<MeterProvider>) ReflectionTestUtils
.getField(ReflectionTestUtils.getField(builder, "delegate"), "meterProviderSupplier");
assertThat(meterProviderSupplier).isNotNull();
assertThat(meterProviderSupplier.get()).isSameAs(MeterProviderConfiguration.meterProvider);
assertThat(otlpGrpcLogRecordExporter.toBuilder())
.extracting("delegate.meterProviderSupplier", InstanceOfAssertFactories.type(Supplier.class))
.satisfies((meterProviderSupplier) -> assertThat(meterProviderSupplier.get())
.isSameAs(MeterProviderConfiguration.meterProvider));
});
}

Expand Down
23 changes: 8 additions & 15 deletions ...gframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
import io.opentelemetry.api.metrics.MeterProvider;
import io.opentelemetry.exporter.internal.compression.GzipCompressor;
import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter;
import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder;
import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder;
import io.opentelemetry.sdk.trace.export.SpanExporter;
import okhttp3.HttpUrl;
import org.assertj.core.api.InstanceOfAssertFactories;
Expand All @@ -37,7 +35,6 @@
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.util.ReflectionTestUtils;

import static org.assertj.core.api.Assertions.assertThat;

Expand Down Expand Up @@ -201,33 +198,29 @@ void testConnectionFactoryWithOverridesWhenUsingCustomConnectionDetails() {
}

@Test
@SuppressWarnings("unchecked")
void httpShouldUseMeterProviderIfSet() {
this.contextRunner.withUserConfiguration(MeterProviderConfiguration.class)
.withPropertyValues("management.otlp.tracing.endpoint=http://localhost:4318/v1/traces")
.run((context) -> {
OtlpHttpSpanExporter otlpHttpSpanExporter = context.getBean(OtlpHttpSpanExporter.class);
OtlpHttpSpanExporterBuilder builder = otlpHttpSpanExporter.toBuilder();
Supplier<MeterProvider> meterProviderSupplier = (Supplier<MeterProvider>) ReflectionTestUtils
.getField(ReflectionTestUtils.getField(builder, "delegate"), "meterProviderSupplier");
assertThat(meterProviderSupplier).isNotNull();
assertThat(meterProviderSupplier.get()).isSameAs(MeterProviderConfiguration.meterProvider);
assertThat(otlpHttpSpanExporter.toBuilder())
.extracting("delegate.meterProviderSupplier", InstanceOfAssertFactories.type(Supplier.class))
.satisfies((meterProviderSupplier) -> assertThat(meterProviderSupplier.get())
.isSameAs(MeterProviderConfiguration.meterProvider));
});
}

@Test
@SuppressWarnings("unchecked")
void grpcShouldUseMeterProviderIfSet() {
this.contextRunner.withUserConfiguration(MeterProviderConfiguration.class)
.withPropertyValues("management.otlp.tracing.endpoint=http://localhost:4318/v1/traces",
"management.otlp.tracing.transport=grpc")
.run((context) -> {
OtlpGrpcSpanExporter otlpGrpcSpanExporter = context.getBean(OtlpGrpcSpanExporter.class);
OtlpGrpcSpanExporterBuilder builder = otlpGrpcSpanExporter.toBuilder();
Supplier<MeterProvider> meterProviderSupplier = (Supplier<MeterProvider>) ReflectionTestUtils
.getField(ReflectionTestUtils.getField(builder, "delegate"), "meterProviderSupplier");
assertThat(meterProviderSupplier).isNotNull();
assertThat(meterProviderSupplier.get()).isSameAs(MeterProviderConfiguration.meterProvider);
assertThat(otlpGrpcSpanExporter.toBuilder())
.extracting("delegate.meterProviderSupplier", InstanceOfAssertFactories.type(Supplier.class))
.satisfies((meterProviderSupplier) -> assertThat(meterProviderSupplier.get())
.isSameAs(MeterProviderConfiguration.meterProvider));
});
}

Expand Down
2 changes: 2 additions & 0 deletions ...toconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ public void setIgnoreSizeLimitExceededException(Boolean ignoreSizeLimitExceededE

/**
* Define the methods to handle referrals.
*
* @since 3.5.0
*/
public enum Referral {

Expand Down
2 changes: 1 addition & 1 deletion ...springframework/boot/autoconfigure/security/oauth2/client/ClientsConfiguredCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* @author Madhura Bhave
* @since 2.1.0
* @deprecated since 3.5.0 for removal in 4.0.0 in favor of
* {@link ConditionalOnOAuth2ClientRegistrationProperties @ConditionalOnOAuth2ClientRegistrationConfigured}
* {@link ConditionalOnOAuth2ClientRegistrationProperties @ConditionalOnOAuth2ClientRegistrationProperties}
*/
@Deprecated(since = "3.5.0", forRemoval = true)
public class ClientsConfiguredCondition extends SpringBootCondition {
Expand Down
3 changes: 2 additions & 1 deletion ...ringframework/boot/context/embedded/EmbeddedServerContainerInvocationContextProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ private AbstractApplicationLauncher getAbstractApplicationLauncher(Application a
return launcher;
}
catch (NoSuchMethodException ex) {
throw new IllegalStateException("Launcher class %s does not have an (Application, File) constructor");
throw new IllegalStateException(String
.format("Launcher class %s does not have an (Application, File) constructor", launcherClass.getName()));
}
}

Expand Down