add a dependency of the hildr-utilities project to the hildr-node.

optimism-java · Aug 2, 2023 · ce8528c · ce8528c
1 parent 96d6a12
commit ce8528c
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 251 deletions.
diff --git a/hildr-node/build.gradle b/hildr-node/build.gradle
@@ -61,6 +61,7 @@ tasks.withType(JavaExec).configureEach {
 }
 
 dependencies {
+	implementation project(':hildr-utilities')
 	// This dependency is used by the application.
 	implementation 'com.google.guava:guava:31.1-jre'
 	implementation 'com.github.rholder:guava-retrying:2.0.0'
@@ -377,6 +378,7 @@ javadoc {
 }
 
 jar {
+	dependsOn(configurations.runtimeClasspath)
 	manifest {
 		attributes "Main-Class": "io.optimism.Hildr"
 	}

diff --git a/hildr-node/src/main/java/io/optimism/cli/Cli.java b/hildr-node/src/main/java/io/optimism/cli/Cli.java
@@ -23,6 +23,7 @@
 import io.optimism.runner.Runner;
 import io.optimism.telemetry.InnerMetrics;
 import io.optimism.telemetry.Logging;
+import io.optimism.utilities.telemetry.TracerTaskWrapper;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import org.slf4j.Logger;
@@ -95,6 +96,7 @@ public Cli() {}
 
   @Override
   public void run() {
+    TracerTaskWrapper.setTracerSupplier(Logging.INSTANCE::getTracer);
     InnerMetrics.start(9200);
     Signal.handle(new Signal("INT"), sig -> System.exit(0));
     Signal.handle(new Signal("TERM"), sig -> System.exit(0));

diff --git a/hildr-node/src/main/java/io/optimism/driver/Driver.java b/hildr-node/src/main/java/io/optimism/driver/Driver.java
@@ -35,7 +35,7 @@
 import io.optimism.l1.ChainWatcher;
 import io.optimism.rpc.RpcServer;
 import io.optimism.telemetry.InnerMetrics;
-import io.optimism.telemetry.TracerTaskWrapper;
+import io.optimism.utilities.telemetry.TracerTaskWrapper;
 import java.math.BigInteger;
 import java.time.Duration;
 import java.util.List;

diff --git a/hildr-node/src/main/java/io/optimism/driver/EngineDriver.java b/hildr-node/src/main/java/io/optimism/driver/EngineDriver.java
@@ -30,7 +30,7 @@
 import io.optimism.engine.OpEthExecutionPayload;
 import io.optimism.engine.OpEthForkChoiceUpdate;
 import io.optimism.engine.OpEthPayloadStatus;
-import io.optimism.telemetry.TracerTaskWrapper;
+import io.optimism.utilities.telemetry.TracerTaskWrapper;
 import java.math.BigInteger;
 import java.util.List;
 import java.util.concurrent.ExecutionException;

diff --git a/hildr-node/src/main/java/io/optimism/l1/InnerWatcher.java b/hildr-node/src/main/java/io/optimism/l1/InnerWatcher.java
@@ -28,7 +28,7 @@
 import io.optimism.derive.stages.Attributes.UserDeposited;
 import io.optimism.driver.L1AttributesDepositedTxNotFoundException;
 import io.optimism.l1.BlockUpdate.FinalityUpdate;
-import io.optimism.rpc.provider.Web3jProvider;
+import io.optimism.utilities.rpc.Web3jProvider;
 import io.optimism.telemetry.Logging;
 import java.math.BigInteger;
 import java.time.Duration;

diff --git a/hildr-node/src/main/java/io/optimism/rpc/methods/OutputAtBlock.java b/hildr-node/src/main/java/io/optimism/rpc/methods/OutputAtBlock.java
@@ -23,8 +23,8 @@
 import io.optimism.rpc.internal.response.JsonRpcSuccessResponse;
 import io.optimism.rpc.internal.result.EthGetProof;
 import io.optimism.rpc.internal.result.OutputRootResult;
-import io.optimism.rpc.provider.Web3jProvider;
-import io.optimism.telemetry.TracerTaskWrapper;
+import io.optimism.utilities.rpc.Web3jProvider;
+import io.optimism.utilities.telemetry.TracerTaskWrapper;
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Collections;

diff --git a/hildr-node/src/main/java/io/optimism/rpc/provider/RetryRateLimitInterceptor.java b/hildr-node/src/main/java/io/optimism/rpc/provider/RetryRateLimitInterceptor.java
diff --git a/hildr-node/src/main/java/io/optimism/rpc/provider/Web3jProvider.java b/hildr-node/src/main/java/io/optimism/rpc/provider/Web3jProvider.java
diff --git a/hildr-node/src/main/java/io/optimism/runner/Runner.java b/hildr-node/src/main/java/io/optimism/runner/Runner.java
@@ -30,7 +30,7 @@
 import io.optimism.engine.ForkChoiceUpdate.ForkchoiceState;
 import io.optimism.engine.OpEthForkChoiceUpdate;
 import io.optimism.engine.OpEthPayloadStatus;
-import io.optimism.telemetry.TracerTaskWrapper;
+import io.optimism.utilities.telemetry.TracerTaskWrapper;
 import java.math.BigInteger;
 import java.time.Duration;
 import java.util.Arrays;

diff --git a/hildr-node/src/main/java/io/optimism/telemetry/TracerTaskWrapper.java b/hildr-node/src/main/java/io/optimism/telemetry/TracerTaskWrapper.java
diff --git a/hildr-node/src/test/java/io/optimism/rpc/RpcServerTest.java b/hildr-node/src/test/java/io/optimism/rpc/RpcServerTest.java
@@ -27,7 +27,7 @@
 import io.optimism.rpc.internal.JsonRpcRequest;
 import io.optimism.rpc.internal.JsonRpcRequestId;
 import io.optimism.rpc.internal.result.OutputRootResult;
-import io.optimism.telemetry.TracerTaskWrapper;
+import io.optimism.utilities.telemetry.TracerTaskWrapper;
 import java.time.Duration;
 import java.util.Map;
 import java.util.concurrent.Future;