springcoderlm
diff --git a/‎zipkin-server/src/test/java/zipkin/server/ZipkinServerCORSTest.java
Lines changed: 1 addition & 5 deletions b/‎zipkin-server/src/test/java/zipkin/server/ZipkinServerCORSTest.java
Lines changed: 1 addition & 5 deletions
diff --git a/‎zipkin-server/src/test/java/zipkin/server/ZipkinServerConfigurationTest.java
Lines changed: 0 additions & 7 deletions b/‎zipkin-server/src/test/java/zipkin/server/ZipkinServerConfigurationTest.java
Lines changed: 0 additions & 7 deletions
diff --git a/‎zipkin-server/src/test/java/zipkin/server/ZipkinServerHttpCollectorDisabledTest.java
Lines changed: 0 additions & 7 deletions b/‎zipkin-server/src/test/java/zipkin/server/ZipkinServerHttpCollectorDisabledTest.java
Lines changed: 0 additions & 7 deletions
diff --git a/‎zipkin-server/src/test/java/zipkin/server/ZipkinServerIntegrationTest.java
Lines changed: 0 additions & 3 deletions b/‎zipkin-server/src/test/java/zipkin/server/ZipkinServerIntegrationTest.java
Lines changed: 0 additions & 3 deletions
diff --git a/‎zipkin-server/src/test/java/zipkin/server/ZipkinServerQueryDisabledTest.java
Lines changed: 0 additions & 7 deletions b/‎zipkin-server/src/test/java/zipkin/server/ZipkinServerQueryDisabledTest.java
Lines changed: 0 additions & 7 deletions
@@ -13,13 +13,11 @@
  */
 package zipkin.server;
 
-import io.prometheus.client.CollectorRegistry;
 import java.io.IOException;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.context.embedded.LocalServerPort;
@@ -49,9 +47,7 @@ public class ZipkinServerCORSTest {
   @LocalServerPort int zipkinPort;
   OkHttpClient client = new OkHttpClient.Builder().followRedirects(false).build();
 
-  @Before public void init() throws IOException {
-    // prevent "brian's bomb" https://github.com/openzipkin/zipkin/issues/1811
-    CollectorRegistry.defaultRegistry.clear();
+  @Test public void shouldAllowConfiguredOrigin() throws IOException {
     shouldAllowConfiguredOrigin(getTracesFromOrigin(ALLOWED_ORIGIN));
     shouldAllowConfiguredOrigin(postSpansFromOrigin(ALLOWED_ORIGIN));
   }
 
@@ -14,9 +14,7 @@
 package zipkin.server;
 
 import com.github.kristofa.brave.Brave;
-import io.prometheus.client.CollectorRegistry;
 import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.boot.actuate.health.HealthAggregator;
@@ -39,11 +37,6 @@
 public class ZipkinServerConfigurationTest {
   AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 
-  @Before public void init() {
-    // prevent "brian's bomb" https://github.com/openzipkin/zipkin/issues/1811
-    CollectorRegistry.defaultRegistry.clear();
-  }
-
   @After public void close() {
     context.close();
   }
 
@@ -13,12 +13,10 @@
  */
 package zipkin.server;
 
-import io.prometheus.client.CollectorRegistry;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.context.embedded.LocalServerPort;
@@ -45,11 +43,6 @@ public class ZipkinServerHttpCollectorDisabledTest {
   @LocalServerPort int zipkinPort;
   OkHttpClient client = new OkHttpClient.Builder().followRedirects(false).build();
 
-  @Before public void init() {
-    // prevent "brian's bomb" https://github.com/openzipkin/zipkin/issues/1811
-    CollectorRegistry.defaultRegistry.clear();
-  }
-
   @Test public void httpCollectorEndpointReturns405() throws Exception {
     Response response = client.newCall(new Request.Builder()
       .url("http://localhost:" + zipkinPort + "/api/v2/spans")
 
@@ -14,7 +14,6 @@
 package zipkin.server;
 
 import com.jayway.jsonpath.JsonPath;
-import io.prometheus.client.CollectorRegistry;
 import java.io.IOException;
 import java.util.List;
 import okhttp3.MediaType;
@@ -64,8 +63,6 @@ public class ZipkinServerIntegrationTest {
   OkHttpClient client = new OkHttpClient.Builder().followRedirects(false).build();
 
   @Before public void init() {
-    // prevent "brian's bomb" https://github.com/openzipkin/zipkin/issues/1811
-    CollectorRegistry.defaultRegistry.clear();
     storage.clear();
     metrics.forTransport("http").reset();
   }
 
@@ -13,12 +13,10 @@
  */
 package zipkin.server;
 
-import io.prometheus.client.CollectorRegistry;
 import java.io.IOException;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.context.embedded.LocalServerPort;
@@ -45,11 +43,6 @@ public class ZipkinServerQueryDisabledTest {
   @LocalServerPort int zipkinPort;
   OkHttpClient client = new OkHttpClient.Builder().followRedirects(false).build();
 
-  @Before public void init() {
-    // prevent "brian's bomb" https://github.com/openzipkin/zipkin/issues/1811
-    CollectorRegistry.defaultRegistry.clear();
-  }
-
   @Test public void queryRelatedEndpoints404() throws Exception {
     assertThat(get("/api/v1/traces").code()).isEqualTo(404);
     assertThat(get("/api/v2/traces").code()).isEqualTo(404);