cleanup

Signed-off-by: Adrian Cole <adrian@tetrate.io>
openzipkin · Jan 24, 2024 · 012e3f3 · 012e3f3
1 parent e312675
commit 012e3f3
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 82 deletions.
diff --git a/cassandra3/src/test/resources/log4j2.properties b/cassandra3/src/test/resources/log4j2.properties
@@ -4,34 +4,24 @@ appender.console.type=Console
 appender.console.name=STDOUT
 appender.console.layout.type=PatternLayout
 appender.console.layout.pattern=%d{ABSOLUTE} %-5p [%t] %C{2} (%F:%L) - %m%n
-rootLogger.level=info
+rootLogger.level=warn
 rootLogger.appenderRefs=stdout
 rootLogger.appenderRef.stdout.ref=STDOUT
 
-# Settings to quiet third party logs that are too verbose
-logger.jetty.name=org.spark-project.jetty
-logger.jetty.level=warn
-logger.AbstractLifeCycle.name=org.spark-project.jetty.util.component.AbstractLifeCycle
-logger.AbstractLifeCycle.level=error
-logger.exprTyper.name=org.apache.spark.repl.SparkIMain$exprTyper
-logger.exprTyper.level=info
-logger.SparkILoopInterpreter.name=org.apache.spark.repl.SparkILoop$SparkILoopInterpreter
-logger.SparkILoopInterpreter.level=info
-logger.FunctionRegistry.name=org.apache.hadoop.hive.ql.exec.FunctionRegistry
-logger.FunctionRegistry.level=error
+# hush warning about loading native code
+logger.util.name=org.apache.hadoop.util
+logger.util.level=error
 
+# set to debug to see storage details
 logger.zipkin.name=zipkin2
-logger.zipkin.level=warn
+logger.zipkin.level=debug
+
+# set to debug to see configuration and when the job starts and completes
 logger.zipkin-cassandra3.name=zipkin2.dependencies.cassandra3
-logger.zipkin-cassandra3.level=debug
+logger.zipkin-cassandra3.level=warn
 
+# set to info to see feedback about starting the container
 logger.testcontainers.name=org.testcontainers
-logger.testcontainers.level=info
+logger.testcontainers.level=warn
 
-logger.http.name=org.apache.http
-logger.http.level=warn
-logger.docker.name=com.github.dockerjava
-logger.docker.level=warn
-logger.exec.name=org.zeroturnaround
-logger.exec.level=warn
 
diff --git a/...search/src/main/java/zipkin2/dependencies/elasticsearch/ElasticsearchDependenciesJob.java b/...search/src/main/java/zipkin2/dependencies/elasticsearch/ElasticsearchDependenciesJob.java
@@ -135,7 +135,7 @@ public Builder conf(Map<String, String> conf) {
       return this;
     }
 
-    /** Ensures that logging is setup. Particularly important when in cluster mode. */
+    /** Ensures that logging is set up. Particularly important when in cluster mode. */
     public Builder logInitializer(Runnable logInitializer) {
       this.logInitializer = checkNotNull(logInitializer, "logInitializer");
       return this;

diff --git a/elasticsearch/src/test/java/zipkin2/elasticsearch/ElasticsearchContainer.java b/elasticsearch/src/test/java/zipkin2/elasticsearch/ElasticsearchContainer.java
@@ -67,7 +67,7 @@ ElasticsearchStorage.Builder newStorageBuilder() {
       .factory(ClientFactory.builder().useHttp2Preface(false).build());
     builder.decorator((delegate, ctx, req) -> {
       final HttpResponse response = delegate.execute(ctx, req);
-      return HttpResponse.from(response.aggregate().thenApply(r -> {
+      return HttpResponse.of(response.aggregate().thenApply(r -> {
         // ES will return a 'warning' response header when using deprecated api, detect this and
         // fail early, so we can do something about it.
         // Example usage: https://github.com/elastic/elasticsearch/blob/3049e55f093487bb582a7e49ad624961415ba31c/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/IndexPrivilegeIntegTests.java#L559
@@ -126,15 +126,7 @@ void processDependencies(ElasticsearchStorage storage, List<Span> spans) throws
 
     // process the job for each day of links.
     for (long day : days) {
-      ElasticsearchDependenciesJob.builder()
-        .hosts(hostPort())
-        .day(day)
-        .conf(Map.of(
-          ES_NODES_DISCOVERY, "false",
-          ES_NODES_WAN_ONLY, "true",
-          ES_HTTP_TIMEOUT, "5m" // default is 1m, allow longer in CI
-        ))
-        .build().run();
+      ElasticsearchDependenciesJob.builder().hosts(hostPort()).day(day).build().run();
     }
   }
 }
diff --git a/elasticsearch/src/test/resources/log4j2.properties b/elasticsearch/src/test/resources/log4j2.properties
@@ -4,40 +4,25 @@ appender.console.type=Console
 appender.console.name=STDOUT
 appender.console.layout.type=PatternLayout
 appender.console.layout.pattern=%d{ABSOLUTE} %-5p [%t] %C{2} (%F:%L) - %m%n
-rootLogger.level=info
+rootLogger.level=warn
 rootLogger.appenderRefs=stdout
 rootLogger.appenderRef.stdout.ref=STDOUT
 
-# Settings to quiet third party logs that are too verbose
-logger.jetty.name=org.spark-project.jetty
-logger.jetty.level=warn
-logger.AbstractLifeCycle.name=org.spark-project.jetty.util.component.AbstractLifeCycle
-logger.AbstractLifeCycle.level=error
-logger.exprTyper.name=org.apache.spark.repl.SparkIMain$exprTyper
-logger.exprTyper.level=info
-logger.SparkILoopInterpreter.name=org.apache.spark.repl.SparkILoop$SparkILoopInterpreter
-logger.SparkILoopInterpreter.level=info
-logger.FunctionRegistry.name=org.apache.hadoop.hive.ql.exec.FunctionRegistry
-logger.FunctionRegistry.level=error
+# hush warning about loading native code
+logger.util.name=org.apache.hadoop.util
+logger.util.level=error
 
+# set to debug to see storage details
 logger.zipkin.name=zipkin2
-logger.zipkin.level=warn
-logger.zipkin-elasticsearch.name=zipkin2.dependencies.elasticsearch
-logger.zipkin-elasticsearch.level=debug
+logger.zipkin.level=debug
 
-# Set to DEBUG to see http traffic to elasticsearch from the spark job
-logger.wire.name=httpclient.wire
-logger.wire.level=info
+# set to debug to see configuration and when the job starts and completes
+logger.zipkin-cassandra3.name=zipkin2.dependencies.elasticsearch
+logger.zipkin-cassandra3.level=warn
 
+# set to info to see feedback about starting the container
 logger.testcontainers.name=org.testcontainers
-logger.testcontainers.level=info
-
-logger.http.name=org.apache.http
-logger.http.level=warn
-logger.docker.name=com.github.dockerjava
-logger.docker.level=warn
-logger.exec.name=org.zeroturnaround
-logger.exec.level=warn
+logger.testcontainers.level=warn
 
 # uncomment to see outbound client connections (useful in Elasticsearch troubleshooting)
 #logger.client.name=com.linecorp.armeria.client

diff --git a/mysql/src/test/resources/log4j2.properties b/mysql/src/test/resources/log4j2.properties
@@ -4,34 +4,22 @@ appender.console.type=Console
 appender.console.name=STDOUT
 appender.console.layout.type=PatternLayout
 appender.console.layout.pattern=%d{ABSOLUTE} %-5p [%t] %C{2} (%F:%L) - %m%n
-rootLogger.level=info
+rootLogger.level=warn
 rootLogger.appenderRefs=stdout
 rootLogger.appenderRef.stdout.ref=STDOUT
 
-# Settings to quiet third party logs that are too verbose
-logger.jetty.name=org.spark-project.jetty
-logger.jetty.level=warn
-logger.AbstractLifeCycle.name=org.spark-project.jetty.util.component.AbstractLifeCycle
-logger.AbstractLifeCycle.level=error
-logger.exprTyper.name=org.apache.spark.repl.SparkIMain$exprTyper
-logger.exprTyper.level=info
-logger.SparkILoopInterpreter.name=org.apache.spark.repl.SparkILoop$SparkILoopInterpreter
-logger.SparkILoopInterpreter.level=info
-logger.FunctionRegistry.name=org.apache.hadoop.hive.ql.exec.FunctionRegistry
-logger.FunctionRegistry.level=error
+# hush warning about loading native code
+logger.util.name=org.apache.hadoop.util
+logger.util.level=error
 
+# set to debug to see storage details
 logger.zipkin.name=zipkin2
-logger.zipkin.level=warn
-logger.zipkin-mysql.name=zipkin2.dependencies.mysql
-logger.zipkin-mysql.level=debug
+logger.zipkin.level=debug
 
-logger.testcontainers.name=org.testcontainers
-logger.testcontainers.level=info
-
-logger.http.name=org.apache.http
-logger.http.level=warn
-logger.docker.name=com.github.dockerjava
-logger.docker.level=warn
-logger.exec.name=org.zeroturnaround
-logger.exec.level=warn
+# set to debug to see configuration and when the job starts and completes
+logger.zipkin-cassandra3.name=zipkin2.dependencies.mysql
+logger.zipkin-cassandra3.level=warn
 
+# set to info to see feedback about starting the container
+logger.testcontainers.name=org.testcontainers
+logger.testcontainers.level=warn