[Backport 2.11] Add tracer to Transport (#3469)

Backport bfba97a from #3463. Signed-off-by: Gagan Juneja <gjjuneja@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Gagan Juneja <gjjuneja@amazon.com>
opensearch-project · Oct 5, 2023 · 8b6f2d7 · 8b6f2d7
1 parent fc2b875
commit 8b6f2d7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java b/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
@@ -808,7 +808,8 @@ public Map<String, Supplier<Transport>> getTransports(
         PageCacheRecycler pageCacheRecycler,
         CircuitBreakerService circuitBreakerService,
         NamedWriteableRegistry namedWriteableRegistry,
-        NetworkService networkService
+        NetworkService networkService,
+        Tracer tracer
     ) {
         Map<String, Supplier<Transport>> transports = new HashMap<String, Supplier<Transport>>();
 
@@ -819,7 +820,8 @@ public Map<String, Supplier<Transport>> getTransports(
                 pageCacheRecycler,
                 circuitBreakerService,
                 namedWriteableRegistry,
-                networkService
+                networkService,
+                tracer
             );
         }
 
@@ -837,7 +839,8 @@ public Map<String, Supplier<Transport>> getTransports(
                     sks,
                     evaluateSslExceptionHandler(),
                     sharedGroupFactory,
-                    SSLConfig
+                    SSLConfig,
+                    tracer
                 )
             );
         }

diff --git a/src/main/java/org/opensearch/security/ssl/OpenSearchSecuritySSLPlugin.java b/src/main/java/org/opensearch/security/ssl/OpenSearchSecuritySSLPlugin.java
@@ -315,7 +315,8 @@ public Map<String, Supplier<Transport>> getTransports(
         PageCacheRecycler pageCacheRecycler,
         CircuitBreakerService circuitBreakerService,
         NamedWriteableRegistry namedWriteableRegistry,
-        NetworkService networkService
+        NetworkService networkService,
+        Tracer tracer
     ) {
 
         Map<String, Supplier<Transport>> transports = new HashMap<String, Supplier<Transport>>();
@@ -333,7 +334,8 @@ public Map<String, Supplier<Transport>> getTransports(
                     sks,
                     NOOP_SSL_EXCEPTION_HANDLER,
                     sharedGroupFactory,
-                    SSLConfig
+                    SSLConfig,
+                    tracer
                 )
             );
 

diff --git a/src/main/java/org/opensearch/security/ssl/transport/SecuritySSLNettyTransport.java b/src/main/java/org/opensearch/security/ssl/transport/SecuritySSLNettyTransport.java
@@ -59,6 +59,7 @@
 import org.opensearch.security.ssl.util.SSLConfigConstants;
 import org.opensearch.security.ssl.util.SSLConnectionTestResult;
 import org.opensearch.security.ssl.util.SSLConnectionTestUtil;
+import org.opensearch.telemetry.tracing.Tracer;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.SharedGroupFactory;
 import org.opensearch.transport.TcpChannel;
@@ -82,7 +83,8 @@ public SecuritySSLNettyTransport(
         final SecurityKeyStore ossks,
         final SslExceptionHandler errorHandler,
         SharedGroupFactory sharedGroupFactory,
-        final SSLConfig SSLConfig
+        final SSLConfig SSLConfig,
+        final Tracer tracer
     ) {
         super(
             settings,
@@ -92,7 +94,8 @@ public SecuritySSLNettyTransport(
             pageCacheRecycler,
             namedWriteableRegistry,
             circuitBreakerService,
-            sharedGroupFactory
+            sharedGroupFactory,
+            tracer
         );
 
         this.ossks = ossks;