functional model init

Signed-off-by: Atharva Sharma <[email protected]>
opensearch-project · Apr 22, 2024 · 48ef808 · 48ef808
1 parent b899a27
commit 48ef808
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 15 deletions.
diff --git a/modules/transport-netty4/src/main/java/org/opensearch/transport/Netty4ModulePlugin.java b/modules/transport-netty4/src/main/java/org/opensearch/transport/Netty4ModulePlugin.java
@@ -51,6 +51,7 @@
 import org.opensearch.plugins.Plugin;
 import org.opensearch.plugins.SecureHttpTransportSettingsProvider;
 import org.opensearch.plugins.SecureTransportSettingsProvider;
+import org.opensearch.telemetry.metrics.MetricsRegistry;
 import org.opensearch.telemetry.tracing.Tracer;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.netty4.Netty4Transport;
@@ -103,8 +104,8 @@ public Map<String, Supplier<Transport>> getTransports(
         CircuitBreakerService circuitBreakerService,
         NamedWriteableRegistry namedWriteableRegistry,
         NetworkService networkService,
-        Tracer tracer
-    ) {
+        Tracer tracer,
+        MetricsRegistry metricsRegistry) {
         return Collections.singletonMap(
             NETTY_TRANSPORT_NAME,
             () -> new Netty4Transport(

diff --git a/plugins/transport-nio/src/main/java/org/opensearch/transport/nio/NioTransportPlugin.java b/plugins/transport-nio/src/main/java/org/opensearch/transport/nio/NioTransportPlugin.java
@@ -50,6 +50,7 @@
 import org.opensearch.http.nio.NioHttpServerTransport;
 import org.opensearch.plugins.NetworkPlugin;
 import org.opensearch.plugins.Plugin;
+import org.opensearch.telemetry.metrics.MetricsRegistry;
 import org.opensearch.telemetry.tracing.Tracer;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.Transport;
@@ -92,8 +93,8 @@ public Map<String, Supplier<Transport>> getTransports(
         CircuitBreakerService circuitBreakerService,
         NamedWriteableRegistry namedWriteableRegistry,
         NetworkService networkService,
-        Tracer tracer
-    ) {
+        Tracer tracer,
+        MetricsRegistry metricsRegistry) {
         return Collections.singletonMap(
             NIO_TRANSPORT_NAME,
             () -> new NioTransport(

diff --git a/server/src/main/java/org/opensearch/common/network/NetworkModule.java b/server/src/main/java/org/opensearch/common/network/NetworkModule.java
@@ -61,6 +61,7 @@
 import org.opensearch.ratelimitting.admissioncontrol.enums.AdmissionControlActionType;
 import org.opensearch.tasks.RawTaskStatus;
 import org.opensearch.tasks.Task;
+import org.opensearch.telemetry.metrics.MetricsRegistry;
 import org.opensearch.telemetry.tracing.Tracer;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.Transport;
@@ -176,6 +177,7 @@ public NetworkModule(
         HttpServerTransport.Dispatcher dispatcher,
         ClusterSettings clusterSettings,
         Tracer tracer,
+        MetricsRegistry metricsRegistry,
         List<TransportInterceptor> transportInterceptors,
         Collection<SecureSettingsFactory> secureSettingsFactories
     ) {
@@ -229,7 +231,8 @@ public NetworkModule(
                 circuitBreakerService,
                 namedWriteableRegistry,
                 networkService,
-                tracer
+                tracer,
+                metricsRegistry
             );
             for (Map.Entry<String, Supplier<Transport>> entry : transportFactory.entrySet()) {
                 registerTransport(entry.getKey(), entry.getValue());

diff --git a/server/src/main/java/org/opensearch/node/Node.java b/server/src/main/java/org/opensearch/node/Node.java
@@ -971,6 +971,7 @@ protected Node(
                 restController,
                 clusterService.getClusterSettings(),
                 tracer,
+                metricsRegistry,
                 transportInterceptors,
                 secureSettingsFactories
             );

diff --git a/server/src/main/java/org/opensearch/plugins/NetworkPlugin.java b/server/src/main/java/org/opensearch/plugins/NetworkPlugin.java
@@ -41,6 +41,7 @@
 import org.opensearch.core.indices.breaker.CircuitBreakerService;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.http.HttpServerTransport;
+import org.opensearch.telemetry.metrics.MetricsRegistry;
 import org.opensearch.telemetry.tracing.Tracer;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.Transport;
@@ -84,8 +85,8 @@ default Map<String, Supplier<Transport>> getTransports(
         CircuitBreakerService circuitBreakerService,
         NamedWriteableRegistry namedWriteableRegistry,
         NetworkService networkService,
-        Tracer tracer
-    ) {
+        Tracer tracer,
+        MetricsRegistry metricsRegistry) {
         return Collections.emptyMap();
     }
 

diff --git a/server/src/test/java/org/opensearch/common/network/NetworkModuleTests.java b/server/src/test/java/org/opensearch/common/network/NetworkModuleTests.java
@@ -51,6 +51,7 @@
 import org.opensearch.plugins.SecureSettingsFactory;
 import org.opensearch.plugins.SecureTransportSettingsProvider;
 import org.opensearch.plugins.TransportExceptionHandler;
+import org.opensearch.telemetry.metrics.MetricsRegistry;
 import org.opensearch.telemetry.tracing.Tracer;
 import org.opensearch.telemetry.tracing.noop.NoopTracer;
 import org.opensearch.test.OpenSearchTestCase;
@@ -177,8 +178,8 @@ public Map<String, Supplier<Transport>> getTransports(
                 CircuitBreakerService circuitBreakerService,
                 NamedWriteableRegistry namedWriteableRegistry,
                 NetworkService networkService,
-                Tracer tracer
-            ) {
+                Tracer tracer,
+                MetricsRegistry metricsRegistry) {
                 return Collections.singletonMap("custom", custom);
             }
         };
@@ -286,8 +287,8 @@ public Map<String, Supplier<Transport>> getTransports(
                 CircuitBreakerService circuitBreakerService,
                 NamedWriteableRegistry namedWriteableRegistry,
                 NetworkService networkService,
-                Tracer tracer
-            ) {
+                Tracer tracer,
+                MetricsRegistry metricsRegistry) {
                 return Collections.singletonMap("default_custom", customTransport);
             }
 
@@ -331,8 +332,8 @@ public Map<String, Supplier<Transport>> getTransports(
                 CircuitBreakerService circuitBreakerService,
                 NamedWriteableRegistry namedWriteableRegistry,
                 NetworkService networkService,
-                Tracer tracer
-            ) {
+                Tracer tracer,
+                MetricsRegistry metricsRegistry) {
                 return Collections.singletonMap("default_custom", customTransport);
             }
 

diff --git a/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransportPlugin.java b/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransportPlugin.java
@@ -39,6 +39,7 @@
 import org.opensearch.core.indices.breaker.CircuitBreakerService;
 import org.opensearch.plugins.NetworkPlugin;
 import org.opensearch.plugins.Plugin;
+import org.opensearch.telemetry.metrics.MetricsRegistry;
 import org.opensearch.telemetry.tracing.Tracer;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.Transport;
@@ -59,8 +60,8 @@ public Map<String, Supplier<Transport>> getTransports(
         CircuitBreakerService circuitBreakerService,
         NamedWriteableRegistry namedWriteableRegistry,
         NetworkService networkService,
-        Tracer tracer
-    ) {
+        Tracer tracer,
+        MetricsRegistry metricsRegistry) {
         return Collections.singletonMap(
             MOCK_NIO_TRANSPORT_NAME,
             () -> new MockNioTransport(