From 74ee062d6d2251ee7e6a6ff50bee4c182d5d7a6f Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 13 Aug 2015 09:04:45 +0100 Subject: [PATCH] Remove unused filter (endpoint is generated in listener now) --- .../cloud/sleuth/zipkin/web/ZipkinFilter.java | 77 ------------------- .../web/ZipkinWebAutoConfiguration.java | 52 ------------- .../main/resources/META-INF/spring.factories | 3 +- 3 files changed, 1 insertion(+), 131 deletions(-) delete mode 100644 spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/web/ZipkinFilter.java delete mode 100644 spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/web/ZipkinWebAutoConfiguration.java diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/web/ZipkinFilter.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/web/ZipkinFilter.java deleted file mode 100644 index c24a283fb..000000000 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/web/ZipkinFilter.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 2013-2015 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.sleuth.zipkin.web; - -import java.io.IOException; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.Ordered; -import org.springframework.core.annotation.Order; - -import com.github.kristofa.brave.EndPointSubmitter; - -/** - * @author Spencer Gibb - */ -@Order(Ordered.HIGHEST_PRECEDENCE + 2) -public class ZipkinFilter implements Filter { - - @Value("${spring.application.name:application}") - private String serviceName; - - private EndPointSubmitter endPointSubmitter; - - public void setServiceName(String serviceName) { - this.serviceName = serviceName; - } - - public ZipkinFilter(EndPointSubmitter endPointSubmitter) { - this.endPointSubmitter = endPointSubmitter; - } - - @Override - public void init(FilterConfig filterConfig) throws ServletException { - // NOOP - } - - @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - if (!this.endPointSubmitter.endPointSubmitted()) { - final String localAddr = request.getLocalAddr(); - final int localPort = request.getLocalPort(); - final String contextPath = this.serviceName - + ((request instanceof HttpServletRequest) ? ((HttpServletRequest) request) - .getContextPath() : ""); - this.endPointSubmitter.submit(localAddr, localPort, contextPath); - } - chain.doFilter(request, response); - } - - @Override - public void destroy() { - // NOOP - } -} diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/web/ZipkinWebAutoConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/web/ZipkinWebAutoConfiguration.java deleted file mode 100644 index a744e6edb..000000000 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/web/ZipkinWebAutoConfiguration.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2013-2015 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.sleuth.zipkin.web; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.AutoConfigureBefore; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration; -import org.springframework.cloud.sleuth.zipkin.ZipkinAutoConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import com.github.kristofa.brave.EndPointSubmitter; -import com.github.kristofa.brave.ServerTracerConfig; - -/** - * @author Spencer Gibb - */ -@Configuration -@ConditionalOnClass(ServerTracerConfig.class) -@ConditionalOnWebApplication -@ConditionalOnProperty(value = "spring.sleuth.zipkin.enabled", matchIfMissing = true) -@AutoConfigureAfter(ZipkinAutoConfiguration.class) -@AutoConfigureBefore(TraceAutoConfiguration.class) -public class ZipkinWebAutoConfiguration { - - @Autowired - private EndPointSubmitter endPointSubmitter; - - @Bean - public ZipkinFilter zipkinFilter() { - return new ZipkinFilter(this.endPointSubmitter); - } - -} diff --git a/spring-cloud-sleuth-zipkin/src/main/resources/META-INF/spring.factories b/spring-cloud-sleuth-zipkin/src/main/resources/META-INF/spring.factories index ef706534a..6fa651654 100644 --- a/spring-cloud-sleuth-zipkin/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-sleuth-zipkin/src/main/resources/META-INF/spring.factories @@ -1,4 +1,3 @@ # Auto Configuration org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.sleuth.zipkin.ZipkinAutoConfiguration,\ -org.springframework.cloud.sleuth.zipkin.web.ZipkinWebAutoConfiguration +org.springframework.cloud.sleuth.zipkin.ZipkinAutoConfiguration \ No newline at end of file