Skip to content

Add tracer to Transport #3463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reta merged 2 commits into from
Oct 5, 2023
Merged

Add tracer to Transport #3463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efc0d44
Add tracer
Oct 5, 2023
b483119
Fix spotless
Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
View file
Open in desktop
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
6 changes: 4 additions & 2 deletions src/main/java/org/opensearch/security/ssl/OpenSearchSecuritySSLPlugin.java
View file
Open in desktop
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
7 changes: 5 additions & 2 deletions src/main/java/org/opensearch/security/ssl/transport/SecuritySSLNettyTransport.java
View file
Open in desktop
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