@@ -59,9 +59,6 @@ class ZipkinConfigurations {
5959 @ Configuration (proxyBeanMethods = false )
6060 @ Import ({
6161 HttpClientSenderConfiguration .class
62- // UrlConnectionSenderConfiguration.class,
63- // WebClientSenderConfiguration.class,
64- // RestTemplateSenderConfiguration.class,
6562 })
6663 static class SenderConfiguration {
6764
@@ -133,97 +130,4 @@ ZipkinSpanExporter zipkinSpanExporter(BytesMessageSender sender, BytesEncoder<Sp
133130
134131 }
135132
136- /*
137- @Configuration(proxyBeanMethods = false)
138- @ConditionalOnClass(URLConnectionSender.class)
139- @EnableConfigurationProperties(ZipkinProperties.class)
140- static class UrlConnectionSenderConfiguration {
141-
142- @Bean
143- @ConditionalOnMissingBean(BytesMessageSender.class)
144- URLConnectionSender urlConnectionSender(ZipkinProperties properties, Encoding encoding,
145- ObjectProvider<ZipkinConnectionDetails> connectionDetailsProvider,
146- ObjectProvider<HttpEndpointSupplier.Factory> endpointSupplierFactoryProvider) {
147- ZipkinConnectionDetails connectionDetails = connectionDetailsProvider
148- .getIfAvailable(() -> new PropertiesZipkinConnectionDetails(properties));
149- HttpEndpointSupplier.Factory endpointSupplierFactory = endpointSupplierFactoryProvider
150- .getIfAvailable(HttpEndpointSuppliers::constantFactory);
151- URLConnectionSender.Builder builder = URLConnectionSender.newBuilder();
152- builder.connectTimeout((int) properties.getConnectTimeout().toMillis());
153- builder.readTimeout((int) properties.getReadTimeout().toMillis());
154- builder.endpointSupplierFactory(endpointSupplierFactory);
155- builder.endpoint(connectionDetails.getSpanEndpoint());
156- builder.encoding(encoding);
157- return builder.build();
158- }
159-
160- }
161- */
162-
163- /*
164- @Configuration(proxyBeanMethods = false)
165- @ConditionalOnClass(RestTemplate.class)
166- @EnableConfigurationProperties(ZipkinProperties.class)
167- static class RestTemplateSenderConfiguration {
168-
169- @Bean
170- @ConditionalOnMissingBean(BytesMessageSender.class)
171- @SuppressWarnings({ "deprecation", "removal" })
172- ZipkinRestTemplateSender restTemplateSender(ZipkinProperties properties, Encoding encoding,
173- ObjectProvider<ZipkinRestTemplateBuilderCustomizer> customizers,
174- ObjectProvider<ZipkinConnectionDetails> connectionDetailsProvider,
175- ObjectProvider<HttpEndpointSupplier.Factory> endpointSupplierFactoryProvider) {
176- ZipkinConnectionDetails connectionDetails = connectionDetailsProvider
177- .getIfAvailable(() -> new PropertiesZipkinConnectionDetails(properties));
178- HttpEndpointSupplier.Factory endpointSupplierFactory = endpointSupplierFactoryProvider
179- .getIfAvailable(HttpEndpointSuppliers::constantFactory);
180- RestTemplateBuilder restTemplateBuilder = new RestTemplateBuilder()
181- .setConnectTimeout(properties.getConnectTimeout())
182- .setReadTimeout(properties.getReadTimeout());
183- restTemplateBuilder = applyCustomizers(restTemplateBuilder, customizers);
184- return new ZipkinRestTemplateSender(encoding, endpointSupplierFactory, connectionDetails.getSpanEndpoint(),
185- restTemplateBuilder.build());
186- }
187-
188- @SuppressWarnings({ "deprecation", "removal" })
189- private RestTemplateBuilder applyCustomizers(RestTemplateBuilder restTemplateBuilder,
190- ObjectProvider<ZipkinRestTemplateBuilderCustomizer> customizers) {
191- Iterable<ZipkinRestTemplateBuilderCustomizer> orderedCustomizers = () -> customizers.orderedStream()
192- .iterator();
193- RestTemplateBuilder currentBuilder = restTemplateBuilder;
194- for (ZipkinRestTemplateBuilderCustomizer customizer : orderedCustomizers) {
195- currentBuilder = customizer.customize(currentBuilder);
196- }
197- return currentBuilder;
198- }
199-
200- }
201- */
202-
203- /*
204- @Configuration(proxyBeanMethods = false)
205- @ConditionalOnClass(WebClient.class)
206- @EnableConfigurationProperties(ZipkinProperties.class)
207- static class WebClientSenderConfiguration {
208-
209- @Bean
210- @ConditionalOnMissingBean(BytesMessageSender.class)
211- @SuppressWarnings({ "deprecation", "removal" })
212- ZipkinWebClientSender webClientSender(ZipkinProperties properties, Encoding encoding,
213- ObjectProvider<ZipkinWebClientBuilderCustomizer> customizers,
214- ObjectProvider<ZipkinConnectionDetails> connectionDetailsProvider,
215- ObjectProvider<HttpEndpointSupplier.Factory> endpointSupplierFactoryProvider) {
216- ZipkinConnectionDetails connectionDetails = connectionDetailsProvider
217- .getIfAvailable(() -> new PropertiesZipkinConnectionDetails(properties));
218- HttpEndpointSupplier.Factory endpointSupplierFactory = endpointSupplierFactoryProvider
219- .getIfAvailable(HttpEndpointSuppliers::constantFactory);
220- WebClient.Builder builder = WebClient.builder();
221- customizers.orderedStream().forEach((customizer) -> customizer.customize(builder));
222- return new ZipkinWebClientSender(encoding, endpointSupplierFactory, connectionDetails.getSpanEndpoint(),
223- builder.build(), properties.getConnectTimeout().plus(properties.getReadTimeout()));
224- }
225-
226- }
227- */
228-
229133}
0 commit comments