Skip to content

Commit bfba97a

Browse files
GaganjunejaGagan Juneja
andauthored
Add tracer to Transport (#3463)
### Description Add tracer to fix the breaking issue. ### Issues Resolved - #3462 ### Check List - [ ] New functionality includes testing - [ ] New functionality has been documented - [x] Commits are signed per the DCO using --signoff By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. For more information on following Developer Certificate of Origin and signing off your commits, please check [here](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin). --------- Signed-off-by: Gagan Juneja <gjjuneja@amazon.com> Co-authored-by: Gagan Juneja <gjjuneja@amazon.com>
1 parent 8752074 commit bfba97a

3 files changed

Lines changed: 15 additions & 7 deletions

File tree

src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,8 @@ public Map<String, Supplier<Transport>> getTransports(
824824
PageCacheRecycler pageCacheRecycler,
825825
CircuitBreakerService circuitBreakerService,
826826
NamedWriteableRegistry namedWriteableRegistry,
827-
NetworkService networkService
827+
NetworkService networkService,
828+
Tracer tracer
828829
) {
829830
Map<String, Supplier<Transport>> transports = new HashMap<String, Supplier<Transport>>();
830831

@@ -835,7 +836,8 @@ public Map<String, Supplier<Transport>> getTransports(
835836
pageCacheRecycler,
836837
circuitBreakerService,
837838
namedWriteableRegistry,
838-
networkService
839+
networkService,
840+
tracer
839841
);
840842
}
841843

@@ -853,7 +855,8 @@ public Map<String, Supplier<Transport>> getTransports(
853855
sks,
854856
evaluateSslExceptionHandler(),
855857
sharedGroupFactory,
856-
SSLConfig
858+
SSLConfig,
859+
tracer
857860
)
858861
);
859862
}

src/main/java/org/opensearch/security/ssl/OpenSearchSecuritySSLPlugin.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,8 @@ public Map<String, Supplier<Transport>> getTransports(
315315
PageCacheRecycler pageCacheRecycler,
316316
CircuitBreakerService circuitBreakerService,
317317
NamedWriteableRegistry namedWriteableRegistry,
318-
NetworkService networkService
318+
NetworkService networkService,
319+
Tracer tracer
319320
) {
320321

321322
Map<String, Supplier<Transport>> transports = new HashMap<String, Supplier<Transport>>();
@@ -333,7 +334,8 @@ public Map<String, Supplier<Transport>> getTransports(
333334
sks,
334335
NOOP_SSL_EXCEPTION_HANDLER,
335336
sharedGroupFactory,
336-
SSLConfig
337+
SSLConfig,
338+
tracer
337339
)
338340
);
339341

src/main/java/org/opensearch/security/ssl/transport/SecuritySSLNettyTransport.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
import org.opensearch.security.ssl.util.SSLConfigConstants;
6060
import org.opensearch.security.ssl.util.SSLConnectionTestResult;
6161
import org.opensearch.security.ssl.util.SSLConnectionTestUtil;
62+
import org.opensearch.telemetry.tracing.Tracer;
6263
import org.opensearch.threadpool.ThreadPool;
6364
import org.opensearch.transport.SharedGroupFactory;
6465
import org.opensearch.transport.TcpChannel;
@@ -82,7 +83,8 @@ public SecuritySSLNettyTransport(
8283
final SecurityKeyStore ossks,
8384
final SslExceptionHandler errorHandler,
8485
SharedGroupFactory sharedGroupFactory,
85-
final SSLConfig SSLConfig
86+
final SSLConfig SSLConfig,
87+
final Tracer tracer
8688
) {
8789
super(
8890
settings,
@@ -92,7 +94,8 @@ public SecuritySSLNettyTransport(
9294
pageCacheRecycler,
9395
namedWriteableRegistry,
9496
circuitBreakerService,
95-
sharedGroupFactory
97+
sharedGroupFactory,
98+
tracer
9699
);
97100

98101
this.ossks = ossks;

0 commit comments

Comments
 (0)