Expose `MeterRegistry` to HTTP transport (#130808)

Today the HTTP transport can expose to APM traces but not metrics. We'd
like to be able to capture both, so in this commit we plumb in a whole
`TelemetryProvider` instead of just a `Tracer`.

Relates ES-12223

modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java

@@ -57,7 +57,7 @@ import org.elasticsearch.http.HttpServerTransport;
 import org.elasticsearch.http.netty4.internal.HttpHeadersAuthenticatorUtils;
 import org.elasticsearch.http.netty4.internal.HttpValidator;
 import org.elasticsearch.rest.ChunkedZipResponse;
-import org.elasticsearch.telemetry.tracing.Tracer;
+import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.netty4.AcceptChannelHandler;
 import org.elasticsearch.transport.netty4.NetUtils;
@@ -115,7 +115,7 @@ public class Netty4HttpServerTransport extends AbstractHttpServerTransport {
         Dispatcher dispatcher,
         ClusterSettings clusterSettings,
         SharedGroupFactory sharedGroupFactory,
-        Tracer tracer,
+        TelemetryProvider telemetryProvider,
         TLSConfig tlsConfig,
         @Nullable AcceptChannelHandler.AcceptPredicate acceptChannelPredicate,
         @Nullable HttpValidator httpValidator
@@ -128,7 +128,7 @@ public class Netty4HttpServerTransport extends AbstractHttpServerTransport {
             xContentRegistry,
             dispatcher,
             clusterSettings,
-            tracer
+            telemetryProvider
         );
         Netty4Utils.setAvailableProcessors(EsExecutors.allocatedProcessors(settings));
         NettyAllocator.logAllocatorDescriptionIfNeeded();

modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Plugin.java

@@ -30,7 +30,7 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.plugins.NetworkPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.telemetry.tracing.Tracer;
+import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.Transport;
 import org.elasticsearch.xcontent.NamedXContentRegistry;
@@ -184,7 +184,7 @@ public class Netty4Plugin extends Plugin implements NetworkPlugin {
         HttpServerTransport.Dispatcher dispatcher,
         BiConsumer<HttpPreRequest, ThreadContext> perRequestThreadContext,
         ClusterSettings clusterSettings,
-        Tracer tracer
+        TelemetryProvider telemetryProvider
     ) {
         return Collections.singletonMap(
             NETTY_HTTP_TRANSPORT_NAME,
@@ -196,7 +196,7 @@ public class Netty4Plugin extends Plugin implements NetworkPlugin {
                 dispatcher,
                 clusterSettings,
                 getSharedGroupFactory(settings),
-                tracer,
+                telemetryProvider,
                 TLSConfig.noTLS(),
                 null,
                 null

modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4BadRequestTests.java

@@ -24,7 +24,7 @@ import org.elasticsearch.rest.RestChannel;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.RestResponse;
 import org.elasticsearch.rest.RestStatus;
-import org.elasticsearch.telemetry.tracing.Tracer;
+import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.threadpool.TestThreadPool;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -86,7 +86,7 @@ public class Netty4BadRequestTests extends ESTestCase {
                 dispatcher,
                 new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
                 new SharedGroupFactory(Settings.EMPTY),
-                Tracer.NOOP,
+                TelemetryProvider.NOOP,
                 TLSConfig.noTLS(),
                 null,
                 randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)

modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpPipeliningHandlerTests.java

@@ -46,7 +46,7 @@ import org.elasticsearch.http.AggregatingDispatcher;
 import org.elasticsearch.http.HttpResponse;
 import org.elasticsearch.rest.ChunkedRestResponseBodyPart;
 import org.elasticsearch.rest.RestStatus;
-import org.elasticsearch.telemetry.tracing.Tracer;
+import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.threadpool.TestThreadPool;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -158,7 +158,7 @@ public class Netty4HttpPipeliningHandlerTests extends ESTestCase {
             new AggregatingDispatcher(),
             ClusterSettings.createBuiltInClusterSettings(),
             new SharedGroupFactory(Settings.EMPTY),
-            Tracer.NOOP,
+            TelemetryProvider.NOOP,
             TLSConfig.noTLS(),
             null,
             null

modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpServerPipeliningTests.java

@@ -26,7 +26,7 @@ import org.elasticsearch.http.HttpRequest;
 import org.elasticsearch.http.HttpResponse;
 import org.elasticsearch.http.HttpServerTransport;
 import org.elasticsearch.rest.RestStatus;
-import org.elasticsearch.telemetry.tracing.Tracer;
+import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.threadpool.TestThreadPool;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -106,7 +106,7 @@ public class Netty4HttpServerPipeliningTests extends ESTestCase {
                 new AggregatingDispatcher(),
                 new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
                 new SharedGroupFactory(settings),
-                Tracer.NOOP,
+                TelemetryProvider.NOOP,
                 TLSConfig.noTLS(),
                 null,
                 randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)

modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpServerTransportTests.java

@@ -79,7 +79,7 @@ import org.elasticsearch.rest.ChunkedRestResponseBodyPart;
 import org.elasticsearch.rest.RestChannel;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.RestResponse;
-import org.elasticsearch.telemetry.tracing.Tracer;
+import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.test.rest.FakeRestRequest;
 import org.elasticsearch.threadpool.TestThreadPool;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -213,7 +213,7 @@ public class Netty4HttpServerTransportTests extends AbstractHttpServerTransportT
                 dispatcher,
                 clusterSettings,
                 new SharedGroupFactory(settings),
-                Tracer.NOOP,
+                TelemetryProvider.NOOP,
                 TLSConfig.noTLS(),
                 null,
                 randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)
@@ -265,7 +265,7 @@ public class Netty4HttpServerTransportTests extends AbstractHttpServerTransportT
                 new AggregatingDispatcher(),
                 clusterSettings,
                 new SharedGroupFactory(Settings.EMPTY),
-                Tracer.NOOP,
+                TelemetryProvider.NOOP,
                 TLSConfig.noTLS(),
                 null,
                 randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)
@@ -286,7 +286,7 @@ public class Netty4HttpServerTransportTests extends AbstractHttpServerTransportT
                     new AggregatingDispatcher(),
                     clusterSettings,
                     new SharedGroupFactory(settings),
-                    Tracer.NOOP,
+                    TelemetryProvider.NOOP,
                     TLSConfig.noTLS(),
                     null,
                     randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)
@@ -341,7 +341,7 @@ public class Netty4HttpServerTransportTests extends AbstractHttpServerTransportT
                 dispatcher,
                 clusterSettings,
                 new SharedGroupFactory(settings),
-                Tracer.NOOP,
+                TelemetryProvider.NOOP,
                 TLSConfig.noTLS(),
                 null,
                 randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)
@@ -412,7 +412,7 @@ public class Netty4HttpServerTransportTests extends AbstractHttpServerTransportT
                 dispatcher,
                 clusterSettings,
                 new SharedGroupFactory(Settings.EMPTY),
-                Tracer.NOOP,
+                TelemetryProvider.NOOP,
                 TLSConfig.noTLS(),
                 null,
                 randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)
@@ -518,7 +518,7 @@ public class Netty4HttpServerTransportTests extends AbstractHttpServerTransportT
                 dispatcher,
                 randomClusterSettings(),
                 new SharedGroupFactory(settings),
-                Tracer.NOOP,
+                TelemetryProvider.NOOP,
                 TLSConfig.noTLS(),
                 null,
                 randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)
@@ -587,7 +587,7 @@ public class Netty4HttpServerTransportTests extends AbstractHttpServerTransportT
                 dispatcher,
                 randomClusterSettings(),
                 new SharedGroupFactory(settings),
-                Tracer.NOOP,
+                TelemetryProvider.NOOP,
                 TLSConfig.noTLS(),
                 new AcceptChannelHandler.AcceptPredicate() {
                     @Override
@@ -658,7 +658,7 @@ public class Netty4HttpServerTransportTests extends AbstractHttpServerTransportT
                 dispatcher,
                 randomClusterSettings(),
                 new SharedGroupFactory(settings),
-                Tracer.NOOP,
+                TelemetryProvider.NOOP,
                 TLSConfig.noTLS(),
                 null,
                 randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)
@@ -724,7 +724,7 @@ public class Netty4HttpServerTransportTests extends AbstractHttpServerTransportT
                 dispatcher,
                 clusterSettings,
                 new SharedGroupFactory(settings),
-                Tracer.NOOP,
+                TelemetryProvider.NOOP,
                 TLSConfig.noTLS(),
                 null,
                 randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)
@@ -1079,7 +1079,7 @@ public class Netty4HttpServerTransportTests extends AbstractHttpServerTransportT
                 dispatcher,
                 clusterSettings,
                 new SharedGroupFactory(Settings.EMPTY),
-                Tracer.NOOP,
+                TelemetryProvider.NOOP,
                 TLSConfig.noTLS(),
                 null,
                 randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)
@@ -1132,7 +1132,7 @@ public class Netty4HttpServerTransportTests extends AbstractHttpServerTransportT
             dispatcher,
             clusterSettings,
             new SharedGroupFactory(settings),
-            Tracer.NOOP,
+            TelemetryProvider.NOOP,
             TLSConfig.noTLS(),
             null,
             httpValidator

qa/smoke-test-http/src/internalClusterTest/java/org/elasticsearch/http/ClusterInfoRestCancellationIT.java

@@ -27,7 +27,7 @@ import org.elasticsearch.http.netty4.internal.HttpValidator;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.plugins.NetworkPlugin;
 import org.elasticsearch.plugins.Plugin;
-import org.elasticsearch.telemetry.tracing.Tracer;
+import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.netty4.AcceptChannelHandler;
 import org.elasticsearch.transport.netty4.SharedGroupFactory;
@@ -109,7 +109,7 @@ public class ClusterInfoRestCancellationIT extends HttpSmokeTestCase {
             HttpServerTransport.Dispatcher dispatcher,
             BiConsumer<HttpPreRequest, ThreadContext> perRequestThreadContext,
             ClusterSettings clusterSettings,
-            Tracer tracer
+            TelemetryProvider telemetryProvider
         ) {
             return Map.of(
                 FakeHttpTransport.NAME,
@@ -121,7 +121,7 @@ public class ClusterInfoRestCancellationIT extends HttpSmokeTestCase {
                     dispatcher,
                     clusterSettings,
                     new SharedGroupFactory(settings),
-                    tracer,
+                    telemetryProvider,
                     TLSConfig.noTLS(),
                     null,
                     null
@@ -143,7 +143,7 @@ public class ClusterInfoRestCancellationIT extends HttpSmokeTestCase {
             Dispatcher dispatcher,
             ClusterSettings clusterSettings,
             SharedGroupFactory sharedGroupFactory,
-            Tracer tracer,
+            TelemetryProvider telemetryProvider,
             TLSConfig tlsConfig,
             AcceptChannelHandler.AcceptPredicate acceptChannelPredicate,
             HttpValidator httpValidator
@@ -156,7 +156,7 @@ public class ClusterInfoRestCancellationIT extends HttpSmokeTestCase {
                 dispatcher,
                 clusterSettings,
                 sharedGroupFactory,
-                tracer,
+                telemetryProvider,
                 tlsConfig,
                 acceptChannelPredicate,
                 httpValidator

server/src/main/java/org/elasticsearch/common/network/NetworkModule.java

@@ -33,7 +33,7 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.plugins.NetworkPlugin;
 import org.elasticsearch.tasks.RawTaskStatus;
 import org.elasticsearch.tasks.Task;
-import org.elasticsearch.telemetry.tracing.Tracer;
+import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.Transport;
 import org.elasticsearch.transport.TransportInterceptor;
@@ -130,7 +130,7 @@ public final class NetworkModule {
         HttpServerTransport.Dispatcher dispatcher,
         BiConsumer<HttpPreRequest, ThreadContext> perRequestThreadContext,
         ClusterSettings clusterSettings,
-        Tracer tracer
+        TelemetryProvider telemetryProvider
     ) {
         this.settings = settings;
         for (NetworkPlugin plugin : plugins) {
@@ -145,7 +145,7 @@ public final class NetworkModule {
                 dispatcher,
                 perRequestThreadContext,
                 clusterSettings,
-                tracer
+                telemetryProvider
             );
             for (Map.Entry<String, Supplier<HttpServerTransport>> entry : httpTransportFactory.entrySet()) {
                 registerHttpTransport(entry.getKey(), entry.getValue());

server/src/main/java/org/elasticsearch/http/AbstractHttpServerTransport.java

@@ -40,6 +40,7 @@ import org.elasticsearch.core.RefCounted;
 import org.elasticsearch.rest.RestChannel;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.tasks.Task;
+import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.telemetry.tracing.Tracer;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.BindTransportException;
@@ -115,7 +116,7 @@ public abstract class AbstractHttpServerTransport extends AbstractLifecycleCompo
         NamedXContentRegistry xContentRegistry,
         Dispatcher dispatcher,
         ClusterSettings clusterSettings,
-        Tracer tracer
+        TelemetryProvider telemetryProvider
     ) {
         this.settings = settings;
         this.networkService = networkService;
@@ -140,7 +141,7 @@ public abstract class AbstractHttpServerTransport extends AbstractLifecycleCompo
         this.port = SETTING_HTTP_PORT.get(settings);
 
         this.maxContentLength = SETTING_HTTP_MAX_CONTENT_LENGTH.get(settings);
-        this.tracer = tracer;
+        this.tracer = telemetryProvider.getTracer();
         this.httpLogger = new HttpTracer(settings, clusterSettings);
         clusterSettings.addSettingsUpdateConsumer(
             TransportSettings.SLOW_OPERATION_THRESHOLD_SETTING,

server/src/main/java/org/elasticsearch/node/NodeConstruction.java

@@ -1067,7 +1067,7 @@ class NodeConstruction {
             actionModule.getRestController(),
             actionModule::copyRequestHeadersToThreadContext,
             clusterService.getClusterSettings(),
-            telemetryProvider.getTracer()
+            telemetryProvider
         );
 
         var indexTemplateMetadataUpgraders = pluginsService.map(Plugin::getIndexTemplateMetadataUpgrader).toList();

server/src/main/java/org/elasticsearch/plugins/NetworkPlugin.java

@@ -18,7 +18,7 @@ import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.http.HttpPreRequest;
 import org.elasticsearch.http.HttpServerTransport;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
-import org.elasticsearch.telemetry.tracing.Tracer;
+import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.Transport;
 import org.elasticsearch.transport.TransportInterceptor;
@@ -81,7 +81,7 @@ public interface NetworkPlugin {
         HttpServerTransport.Dispatcher dispatcher,
         BiConsumer<HttpPreRequest, ThreadContext> perRequestThreadContext,
         ClusterSettings clusterSettings,
-        Tracer tracer
+        TelemetryProvider telemetryProvider
     ) {
         return Collections.emptyMap();
     }

server/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java

@@ -24,7 +24,7 @@ import org.elasticsearch.http.HttpServerTransport;
 import org.elasticsearch.http.HttpStats;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.plugins.NetworkPlugin;
-import org.elasticsearch.telemetry.tracing.Tracer;
+import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.threadpool.TestThreadPool;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -126,7 +126,7 @@ public class NetworkModuleTests extends ESTestCase {
                 HttpServerTransport.Dispatcher requestDispatcher,
                 BiConsumer<HttpPreRequest, ThreadContext> perRequestThreadContext,
                 ClusterSettings clusterSettings,
-                Tracer tracer
+                TelemetryProvider telemetryProvider
             ) {
                 return Collections.singletonMap("custom", custom);
             }
@@ -173,7 +173,7 @@ public class NetworkModuleTests extends ESTestCase {
                 HttpServerTransport.Dispatcher requestDispatcher,
                 BiConsumer<HttpPreRequest, ThreadContext> perRequestThreadContext,
                 ClusterSettings clusterSettings,
-                Tracer tracer
+                TelemetryProvider telemetryProvider
             ) {
                 Map<String, Supplier<HttpServerTransport>> supplierMap = new HashMap<>();
                 supplierMap.put("custom", custom);
@@ -218,7 +218,7 @@ public class NetworkModuleTests extends ESTestCase {
                 HttpServerTransport.Dispatcher requestDispatcher,
                 BiConsumer<HttpPreRequest, ThreadContext> perRequestThreadContext,
                 ClusterSettings clusterSettings,
-                Tracer tracer
+                TelemetryProvider telemetryProvider
             ) {
                 Map<String, Supplier<HttpServerTransport>> supplierMap = new HashMap<>();
                 supplierMap.put("custom", custom);
@@ -302,7 +302,7 @@ public class NetworkModuleTests extends ESTestCase {
             new AggregatingDispatcher(),
             (preRequest, threadContext) -> {},
             new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-            Tracer.NOOP
+            TelemetryProvider.NOOP
         );
     }
 }

server/src/test/java/org/elasticsearch/http/AbstractHttpServerTransportTests.java

@@ -44,7 +44,6 @@ import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.tasks.Task;
 import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.telemetry.metric.MeterRegistry;
-import org.elasticsearch.telemetry.tracing.Tracer;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.test.MockLog;
 import org.elasticsearch.test.junit.annotations.TestLogging;
@@ -202,7 +201,7 @@ public class AbstractHttpServerTransportTests extends ESTestCase {
                 xContentRegistry(),
                 dispatcher,
                 new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-                Tracer.NOOP
+                TelemetryProvider.NOOP
             ) {
 
                 @Override
@@ -282,7 +281,7 @@ public class AbstractHttpServerTransportTests extends ESTestCase {
                 xContentRegistry(),
                 dispatcher,
                 new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-                Tracer.NOOP
+                TelemetryProvider.NOOP
             ) {
 
                 @Override
@@ -368,7 +367,7 @@ public class AbstractHttpServerTransportTests extends ESTestCase {
                 xContentRegistry(),
                 dispatcher,
                 new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-                Tracer.NOOP
+                TelemetryProvider.NOOP
             ) {
 
                 @Override
@@ -500,7 +499,7 @@ public class AbstractHttpServerTransportTests extends ESTestCase {
                 }
             },
             clusterSettings,
-            Tracer.NOOP
+            TelemetryProvider.NOOP
         ) {
             @Override
             protected HttpServerChannel bind(InetSocketAddress hostAddress) {
@@ -551,7 +550,7 @@ public class AbstractHttpServerTransportTests extends ESTestCase {
                     }
                 },
                 clusterSettings,
-                Tracer.NOOP
+                TelemetryProvider.NOOP
             ) {
                 @Override
                 protected HttpServerChannel bind(InetSocketAddress hostAddress) {
@@ -692,7 +691,7 @@ public class AbstractHttpServerTransportTests extends ESTestCase {
                     }
                 },
                 clusterSettings,
-                Tracer.NOOP
+                TelemetryProvider.NOOP
             ) {
                 @Override
                 protected HttpServerChannel bind(InetSocketAddress hostAddress) {
@@ -751,7 +750,7 @@ public class AbstractHttpServerTransportTests extends ESTestCase {
                     }
                 },
                 new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-                Tracer.NOOP
+                TelemetryProvider.NOOP
             ) {
 
                 @Override
@@ -833,7 +832,7 @@ public class AbstractHttpServerTransportTests extends ESTestCase {
                     }
                 },
                 clusterSettings,
-                Tracer.NOOP
+                TelemetryProvider.NOOP
             ) {
 
                 @Override
@@ -1186,7 +1185,7 @@ public class AbstractHttpServerTransportTests extends ESTestCase {
                 xContentRegistry(),
                 dispatcher,
                 new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-                Tracer.NOOP
+                TelemetryProvider.NOOP
             );
             bindServer();
         }

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/LocalStateCompositeXPackPlugin.java

@@ -88,7 +88,7 @@ import org.elasticsearch.rest.RestInterceptor;
 import org.elasticsearch.script.ScriptContext;
 import org.elasticsearch.search.internal.ShardSearchRequest;
 import org.elasticsearch.snapshots.Snapshot;
-import org.elasticsearch.telemetry.tracing.Tracer;
+import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.threadpool.ExecutorBuilder;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.Transport;
@@ -365,7 +365,7 @@ public class LocalStateCompositeXPackPlugin extends XPackPlugin
         HttpServerTransport.Dispatcher dispatcher,
         BiConsumer<HttpPreRequest, ThreadContext> perRequestThreadContext,
         ClusterSettings clusterSettings,
-        Tracer tracer
+        TelemetryProvider telemetryProvider
     ) {
         Map<String, Supplier<HttpServerTransport>> transports = new HashMap<>();
         filterPlugins(NetworkPlugin.class).forEach(
@@ -381,7 +381,7 @@ public class LocalStateCompositeXPackPlugin extends XPackPlugin
                     dispatcher,
                     perRequestThreadContext,
                     clusterSettings,
-                    tracer
+                    telemetryProvider
                 )
             )
         );

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java

@@ -109,7 +109,6 @@ import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.search.internal.ShardSearchRequest;
 import org.elasticsearch.telemetry.TelemetryProvider;
-import org.elasticsearch.telemetry.tracing.Tracer;
 import org.elasticsearch.threadpool.ExecutorBuilder;
 import org.elasticsearch.threadpool.FixedExecutorBuilder;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -2092,7 +2091,7 @@ public class Security extends Plugin
         HttpServerTransport.Dispatcher dispatcher,
         BiConsumer<HttpPreRequest, ThreadContext> perRequestThreadContext,
         ClusterSettings clusterSettings,
-        Tracer tracer
+        TelemetryProvider telemetryProvider
     ) {
         if (enabled == false) { // don't register anything if we are not enabled
             return Collections.emptyMap();
@@ -2144,7 +2143,7 @@ public class Security extends Plugin
                 dispatcher,
                 clusterSettings,
                 getNettySharedGroupFactory(settings),
-                tracer,
+                telemetryProvider,
                 new TLSConfig(sslConfiguration, sslService::createSSLEngine),
                 acceptPredicate,
                 (httpRequest, channel, listener) -> {
@@ -2182,7 +2181,7 @@ public class Security extends Plugin
         HttpServerTransport.Dispatcher dispatcher,
         ClusterSettings clusterSettings,
         SharedGroupFactory sharedGroupFactory,
-        Tracer tracer,
+        TelemetryProvider telemetryProvider,
         TLSConfig tlsConfig,
         @Nullable AcceptChannelHandler.AcceptPredicate acceptPredicate,
         HttpValidator httpValidator,
@@ -2196,7 +2195,7 @@ public class Security extends Plugin
             dispatcher,
             clusterSettings,
             sharedGroupFactory,
-            tracer,
+            telemetryProvider,
             tlsConfig,
             acceptPredicate,
             (httpRequest, channel, listener) -> {
@@ -2228,7 +2227,7 @@ public class Security extends Plugin
         HttpServerTransport.Dispatcher dispatcher,
         ClusterSettings clusterSettings,
         SharedGroupFactory sharedGroupFactory,
-        Tracer tracer,
+        TelemetryProvider telemetryProvider,
         TLSConfig tlsConfig,
         @Nullable AcceptChannelHandler.AcceptPredicate acceptPredicate,
         HttpValidator httpValidator
@@ -2241,7 +2240,7 @@ public class Security extends Plugin
             dispatcher,
             clusterSettings,
             sharedGroupFactory,
-            tracer,
+            telemetryProvider,
             tlsConfig,
             acceptPredicate,
             Objects.requireNonNull(httpValidator)

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransportCloseNotifyTests.java

@@ -38,7 +38,7 @@ import org.elasticsearch.rest.RestChannel;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.RestResponse;
 import org.elasticsearch.rest.RestStatus;
-import org.elasticsearch.telemetry.tracing.Tracer;
+import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.threadpool.TestThreadPool;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.netty4.SharedGroupFactory;
@@ -107,7 +107,7 @@ public class SecurityNetty4HttpServerTransportCloseNotifyTests extends AbstractH
             dispatcher,
             randomClusterSettings(),
             new SharedGroupFactory(settings),
-            Tracer.NOOP,
+            TelemetryProvider.NOOP,
             new TLSConfig(sslService.getHttpTransportSSLConfiguration(), sslService::createSSLEngine),
             null,
             randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransportTests.java

@@ -44,7 +44,7 @@ import org.elasticsearch.rest.RestChannel;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.RestResponse;
 import org.elasticsearch.rest.RestStatus;
-import org.elasticsearch.telemetry.tracing.Tracer;
+import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.test.rest.FakeRestRequest;
 import org.elasticsearch.threadpool.TestThreadPool;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -114,7 +114,7 @@ public class SecurityNetty4HttpServerTransportTests extends AbstractHttpServerTr
             new AggregatingDispatcher(),
             randomClusterSettings(),
             new SharedGroupFactory(settings),
-            Tracer.NOOP,
+            TelemetryProvider.NOOP,
             new TLSConfig(sslService.getHttpTransportSSLConfiguration(), sslService::createSSLEngine),
             null,
             randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)
@@ -141,7 +141,7 @@ public class SecurityNetty4HttpServerTransportTests extends AbstractHttpServerTr
             new AggregatingDispatcher(),
             randomClusterSettings(),
             new SharedGroupFactory(settings),
-            Tracer.NOOP,
+            TelemetryProvider.NOOP,
             new TLSConfig(sslService.getHttpTransportSSLConfiguration(), sslService::createSSLEngine),
             null,
             randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)
@@ -168,7 +168,7 @@ public class SecurityNetty4HttpServerTransportTests extends AbstractHttpServerTr
             new AggregatingDispatcher(),
             randomClusterSettings(),
             new SharedGroupFactory(settings),
-            Tracer.NOOP,
+            TelemetryProvider.NOOP,
             new TLSConfig(sslService.getHttpTransportSSLConfiguration(), sslService::createSSLEngine),
             null,
             randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)
@@ -195,7 +195,7 @@ public class SecurityNetty4HttpServerTransportTests extends AbstractHttpServerTr
             new AggregatingDispatcher(),
             randomClusterSettings(),
             new SharedGroupFactory(settings),
-            Tracer.NOOP,
+            TelemetryProvider.NOOP,
             new TLSConfig(sslService.getHttpTransportSSLConfiguration(), sslService::createSSLEngine),
             null,
             randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)
@@ -217,7 +217,7 @@ public class SecurityNetty4HttpServerTransportTests extends AbstractHttpServerTr
             new AggregatingDispatcher(),
             randomClusterSettings(),
             new SharedGroupFactory(settings),
-            Tracer.NOOP,
+            TelemetryProvider.NOOP,
             new TLSConfig(sslService.getHttpTransportSSLConfiguration(), sslService::createSSLEngine),
             null,
             randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)
@@ -240,7 +240,7 @@ public class SecurityNetty4HttpServerTransportTests extends AbstractHttpServerTr
             new AggregatingDispatcher(),
             randomClusterSettings(),
             new SharedGroupFactory(settings),
-            Tracer.NOOP,
+            TelemetryProvider.NOOP,
             new TLSConfig(sslService.getHttpTransportSSLConfiguration(), sslService::createSSLEngine),
             null,
             randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)
@@ -272,7 +272,7 @@ public class SecurityNetty4HttpServerTransportTests extends AbstractHttpServerTr
             new AggregatingDispatcher(),
             randomClusterSettings(),
             new SharedGroupFactory(settings),
-            Tracer.NOOP,
+            TelemetryProvider.NOOP,
             new TLSConfig(sslService.getHttpTransportSSLConfiguration(), sslService::createSSLEngine),
             null,
             randomFrom((httpPreRequest, channel, listener) -> listener.onResponse(null), null)
@@ -312,7 +312,7 @@ public class SecurityNetty4HttpServerTransportTests extends AbstractHttpServerTr
                 dispatcher,
                 randomClusterSettings(),
                 new SharedGroupFactory(settings),
-                Tracer.NOOP,
+                TelemetryProvider.NOOP,
                 TLSConfig.noTLS(),
                 null,
                 (httpPreRequest, channel, listener) -> {
@@ -387,7 +387,7 @@ public class SecurityNetty4HttpServerTransportTests extends AbstractHttpServerTr
                 },
                 randomClusterSettings(),
                 new SharedGroupFactory(settings),
-                Tracer.NOOP,
+                TelemetryProvider.NOOP,
                 TLSConfig.noTLS(),
                 null,
                 (httpPreRequest, channel, listener) -> listener.onResponse(null)
@@ -486,7 +486,7 @@ public class SecurityNetty4HttpServerTransportTests extends AbstractHttpServerTr
                 dispatcher,
                 randomClusterSettings(),
                 new SharedGroupFactory(settings),
-                Tracer.NOOP,
+                TelemetryProvider.NOOP,
                 TLSConfig.noTLS(),
                 null,
                 (httpPreRequest, channel, listener) -> listener.onResponse(null)
@@ -569,7 +569,7 @@ public class SecurityNetty4HttpServerTransportTests extends AbstractHttpServerTr
                 dispatcher,
                 randomClusterSettings(),
                 new SharedGroupFactory(settings),
-                Tracer.NOOP,
+                TelemetryProvider.NOOP,
                 TLSConfig.noTLS(),
                 null,
                 (httpPreRequest, channel, listener) -> {
@@ -699,7 +699,7 @@ public class SecurityNetty4HttpServerTransportTests extends AbstractHttpServerTr
                 dispatcher,
                 randomClusterSettings(),
                 new SharedGroupFactory(settings),
-                Tracer.NOOP,
+                TelemetryProvider.NOOP,
                 TLSConfig.noTLS(),
                 null,
                 (httpPreRequest, channel, listener) -> {