Skip to content

Commit

Permalink
Add tracer to Transport (#3463)
Browse files Browse the repository at this point in the history
### 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 <[email protected]>
Co-authored-by: Gagan Juneja <[email protected]>
  • Loading branch information
Gaganjuneja and Gagan Juneja authored Oct 5, 2023
1 parent 8752074 commit bfba97a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,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>>();

Expand All @@ -835,7 +836,8 @@ public Map<String, Supplier<Transport>> getTransports(
pageCacheRecycler,
circuitBreakerService,
namedWriteableRegistry,
networkService
networkService,
tracer
);
}

Expand All @@ -853,7 +855,8 @@ public Map<String, Supplier<Transport>> getTransports(
sks,
evaluateSslExceptionHandler(),
sharedGroupFactory,
SSLConfig
SSLConfig,
tracer
)
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>>();
Expand All @@ -333,7 +334,8 @@ public Map<String, Supplier<Transport>> getTransports(
sks,
NOOP_SSL_EXCEPTION_HANDLER,
sharedGroupFactory,
SSLConfig
SSLConfig,
tracer
)
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand All @@ -92,7 +94,8 @@ public SecuritySSLNettyTransport(
pageCacheRecycler,
namedWriteableRegistry,
circuitBreakerService,
sharedGroupFactory
sharedGroupFactory,
tracer
);

this.ossks = ossks;
Expand Down

0 comments on commit bfba97a

Please sign in to comment.