Introduce ConnectorContextModule

core/trino-main/src/main/java/io/trino/testing/TestingConnectorContext.java

@@ -33,15 +33,26 @@
 
 import static io.trino.spi.connector.MetadataProvider.NOOP_METADATA_PROVIDER;
 import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
+import static java.util.Objects.requireNonNull;
 
 public final class TestingConnectorContext
         implements ConnectorContext
 {
-    private final NodeManager nodeManager = TestingNodeManager.create();
+    private final NodeManager nodeManager;
     private final VersionEmbedder versionEmbedder = new EmbedVersion(NodeVersion.UNKNOWN);
     private final PageSorter pageSorter = new PagesIndexPageSorter(new PagesIndex.TestingFactory(false));
     private final PageIndexerFactory pageIndexerFactory = new GroupByHashPageIndexerFactory(new FlatHashStrategyCompiler(new TypeOperators()));
 
+    public TestingConnectorContext()
+    {
+        this(TestingNodeManager.create());
+    }
+
+    public TestingConnectorContext(NodeManager nodeManager)
+    {
+        this.nodeManager = requireNonNull(nodeManager, "nodeManager is null");
+    }
+
     @Override
     public OpenTelemetry getOpenTelemetry()
     {

plugin/trino-hive/src/main/java/io/trino/plugin/hive/NodeVersion.java → core/trino-spi/src/main/java/io/trino/spi/NodeVersion.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.hive;
+package io.trino.spi;
 
 import static java.util.Objects.requireNonNull;
 

lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/FileSystemModule.java

@@ -20,7 +20,6 @@
 import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.airlift.configuration.ConfigPropertyMetadata;
-import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.Tracer;
 import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystemFactory;
@@ -46,6 +45,7 @@
 import io.trino.filesystem.switching.SwitchingFileSystemFactory;
 import io.trino.filesystem.tracing.TracingFileSystemFactory;
 import io.trino.filesystem.tracking.TrackingFileSystemFactory;
+import io.trino.spi.connector.ConnectorContext;
 
 import java.util.Map;
 import java.util.Optional;
@@ -60,15 +60,15 @@ public class FileSystemModule
         extends AbstractConfigurationAwareModule
 {
     private final String catalogName;
+    private final ConnectorContext context;
     private final boolean isCoordinator;
-    private final OpenTelemetry openTelemetry;
     private final boolean coordinatorFileCaching;
 
-    public FileSystemModule(String catalogName, boolean isCoordinator, OpenTelemetry openTelemetry, boolean coordinatorFileCaching)
+    public FileSystemModule(String catalogName, ConnectorContext context, boolean coordinatorFileCaching)
     {
         this.catalogName = requireNonNull(catalogName, "catalogName is null");
-        this.isCoordinator = isCoordinator;
-        this.openTelemetry = requireNonNull(openTelemetry, "openTelemetry is null");
+        this.context = requireNonNull(context, "context is null");
+        this.isCoordinator = context.getCurrentNode().isCoordinator();
         this.coordinatorFileCaching = coordinatorFileCaching;
     }
 
@@ -86,7 +86,7 @@ protected void setup(Binder binder)
                     !config.isNativeGcsEnabled(),
                     !config.isNativeS3Enabled(),
                     catalogName,
-                    openTelemetry);
+                    context);
 
             loader.configure().forEach((name, securitySensitive) ->
                     consumeProperty(new ConfigPropertyMetadata(name, securitySensitive)));

lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/HdfsFileSystemLoader.java

@@ -13,10 +13,10 @@
  */
 package io.trino.filesystem.manager;
 
-import io.opentelemetry.api.OpenTelemetry;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.spi.Plugin;
 import io.trino.spi.classloader.ThreadContextClassLoader;
+import io.trino.spi.connector.ConnectorContext;
 import jakarta.annotation.PreDestroy;
 
 import java.io.File;
@@ -45,7 +45,7 @@ public HdfsFileSystemLoader(
             boolean gcsEnabled,
             boolean s3Enabled,
             String catalogName,
-            OpenTelemetry openTelemetry)
+            ConnectorContext context)
     {
         Class<?> clazz = tryLoadExistingHdfsManager();
 
@@ -73,8 +73,8 @@ public HdfsFileSystemLoader(
         }
 
         try (var _ = new ThreadContextClassLoader(classLoader)) {
-            manager = clazz.getConstructor(Map.class, boolean.class, boolean.class, boolean.class, String.class, OpenTelemetry.class)
-                    .newInstance(config, azureEnabled, gcsEnabled, s3Enabled, catalogName, openTelemetry);
+            manager = clazz.getConstructor(Map.class, boolean.class, boolean.class, boolean.class, String.class, ConnectorContext.class)
+                    .newInstance(config, azureEnabled, gcsEnabled, s3Enabled, catalogName, context);
         }
         catch (ReflectiveOperationException e) {
             throw new RuntimeException(e);

lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileSystemManager.java

@@ -18,17 +18,17 @@
 import io.airlift.bootstrap.Bootstrap;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.airlift.configuration.ConfigPropertyMetadata;
-import io.opentelemetry.api.OpenTelemetry;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.hdfs.HdfsModule;
 import io.trino.hdfs.authentication.HdfsAuthenticationModule;
 import io.trino.hdfs.azure.HiveAzureModule;
 import io.trino.hdfs.cos.HiveCosModule;
 import io.trino.hdfs.gcs.HiveGcsModule;
 import io.trino.hdfs.s3.HiveS3Module;
+import io.trino.plugin.base.ConnectorContextModule;
 import io.trino.plugin.base.jmx.ConnectorObjectNameGeneratorModule;
 import io.trino.plugin.base.jmx.MBeanServerModule;
-import io.trino.spi.catalog.CatalogName;
+import io.trino.spi.connector.ConnectorContext;
 import org.weakref.jmx.guice.MBeanModule;
 
 import java.util.ArrayList;
@@ -49,7 +49,7 @@ public HdfsFileSystemManager(
             boolean gcsEnabled,
             boolean s3Enabled,
             String catalogName,
-            OpenTelemetry openTelemetry)
+            ConnectorContext context)
     {
         List<Module> modules = new ArrayList<>();
 
@@ -61,10 +61,7 @@ public HdfsFileSystemManager(
         modules.add(new HdfsModule());
         modules.add(new HdfsAuthenticationModule());
         modules.add(new HiveCosModule());
-        modules.add(binder -> {
-            binder.bind(OpenTelemetry.class).toInstance(openTelemetry);
-            binder.bind(CatalogName.class).toInstance(new CatalogName(catalogName));
-        });
+        modules.add(new ConnectorContextModule(catalogName, context));
 
         if (azureEnabled) {
             modules.add(new HiveAzureModule());

lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystemManager.java

@@ -14,11 +14,11 @@
 package io.trino.filesystem.hdfs;
 
 import com.google.common.collect.ImmutableMap;
-import io.opentelemetry.api.OpenTelemetry;
 import io.trino.filesystem.Location;
 import io.trino.filesystem.TrinoFileSystem;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.spi.security.ConnectorIdentity;
+import io.trino.testing.TestingConnectorContext;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -42,7 +42,7 @@ void testManager()
                 true,
                 true,
                 "test",
-                OpenTelemetry.noop());
+                new TestingConnectorContext());
 
         assertThat(manager.configure().keySet()).containsExactly("hive.dfs.verify-checksum", "hive.s3.region");
 

lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/ConnectorContextModule.java

@@ -0,0 +1,61 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.trino.plugin.base;
+
+import com.google.inject.Binder;
+import com.google.inject.Module;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
+import io.trino.spi.Node;
+import io.trino.spi.NodeManager;
+import io.trino.spi.NodeVersion;
+import io.trino.spi.PageIndexerFactory;
+import io.trino.spi.PageSorter;
+import io.trino.spi.VersionEmbedder;
+import io.trino.spi.catalog.CatalogName;
+import io.trino.spi.connector.ConnectorContext;
+import io.trino.spi.connector.MetadataProvider;
+import io.trino.spi.type.TypeManager;
+
+import static java.util.Objects.requireNonNull;
+
+public class ConnectorContextModule
+        implements Module
+{
+    private final String catalogName;
+    private final ConnectorContext context;
+
+    public ConnectorContextModule(String catalogName, ConnectorContext context)
+    {
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
+        this.context = requireNonNull(context, "context is null");
+    }
+
+    @Override
+    public void configure(Binder binder)
+    {
+        binder.bind(CatalogName.class).toInstance(new CatalogName(catalogName));
+
+        binder.bind(OpenTelemetry.class).toInstance(context.getOpenTelemetry());
+        binder.bind(Tracer.class).toInstance(context.getTracer());
+        binder.bind(Node.class).toInstance(context.getCurrentNode());
+        binder.bind(NodeVersion.class).toInstance(new NodeVersion(context.getCurrentNode().getVersion()));
+        binder.bind(NodeManager.class).toInstance(context.getNodeManager());
+        binder.bind(VersionEmbedder.class).toInstance(context.getVersionEmbedder());
+        binder.bind(TypeManager.class).toInstance(context.getTypeManager());
+        binder.bind(MetadataProvider.class).toInstance(context.getMetadataProvider());
+        binder.bind(PageSorter.class).toInstance(context.getPageSorter());
+        binder.bind(PageIndexerFactory.class).toInstance(context.getPageIndexerFactory());
+    }
+}

lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/TypeDeserializerModule.java

@@ -16,25 +16,15 @@
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import io.trino.spi.type.Type;
-import io.trino.spi.type.TypeManager;
 
 import static io.airlift.json.JsonBinder.jsonBinder;
-import static java.util.Objects.requireNonNull;
 
 public class TypeDeserializerModule
         implements Module
 {
-    private final TypeManager typeManager;
-
-    public TypeDeserializerModule(TypeManager typeManager)
-    {
-        this.typeManager = requireNonNull(typeManager, "typeManager is null");
-    }
-
     @Override
     public void configure(Binder binder)
     {
-        binder.bind(TypeManager.class).toInstance(typeManager);
         jsonBinder(binder).addDeserializerBinding(Type.class).to(TypeDeserializer.class);
     }
 }

lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/security/BaseFileBasedConnectorAccessControlTest.java

@@ -18,8 +18,8 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Injector;
 import io.airlift.bootstrap.Bootstrap;
-import io.trino.plugin.base.CatalogNameModule;
 import io.trino.spi.QueryId;
+import io.trino.spi.catalog.CatalogName;
 import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSecurityContext;
 import io.trino.spi.connector.ConnectorTransactionHandle;
@@ -855,7 +855,7 @@ public void testRefreshing(@TempDir Path tempDir)
 
     protected ConnectorAccessControl createAccessControl(Map<String, String> configProperties)
     {
-        Bootstrap bootstrap = new Bootstrap(new CatalogNameModule("test_catalog"), new FileBasedAccessControlModule());
+        Bootstrap bootstrap = new Bootstrap(binder -> binder.bind(CatalogName.class).toInstance(new CatalogName("test_catalog")), new FileBasedAccessControlModule());
 
         Injector injector = bootstrap
                 .doNotInitializeLogging()

plugin/trino-ai-functions/src/main/java/io/trino/plugin/ai/functions/AiConnectorFactory.java

@@ -15,8 +15,7 @@
 
 import com.google.inject.Injector;
 import io.airlift.bootstrap.Bootstrap;
-import io.opentelemetry.api.trace.Tracer;
-import io.trino.spi.catalog.CatalogName;
+import io.trino.plugin.base.ConnectorContextModule;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorContext;
 import io.trino.spi.connector.ConnectorFactory;
@@ -42,10 +41,7 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
         Bootstrap app = new Bootstrap(
                 "io.trino.bootstrap.catalog." + catalogName,
                 new AiModule(),
-                binder -> {
-                    binder.bind(Tracer.class).toInstance(context.getTracer());
-                    binder.bind(CatalogName.class).toInstance(new CatalogName(catalogName));
-                });
+                new ConnectorContextModule(catalogName, context));
 
         Injector injector = app
                 .doNotInitializeLogging()

plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcConnectorFactory.java

@@ -16,14 +16,10 @@
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import io.airlift.bootstrap.Bootstrap;
-import io.opentelemetry.api.OpenTelemetry;
-import io.trino.spi.Node;
-import io.trino.spi.VersionEmbedder;
-import io.trino.spi.catalog.CatalogName;
+import io.trino.plugin.base.ConnectorContextModule;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorContext;
 import io.trino.spi.connector.ConnectorFactory;
-import io.trino.spi.type.TypeManager;
 
 import java.util.Map;
 import java.util.function.Supplier;
@@ -60,11 +56,7 @@ public Connector create(String catalogName, Map<String, String> requiredConfig,
 
         Bootstrap app = new Bootstrap(
                 "io.trino.bootstrap.catalog." + catalogName,
-                binder -> binder.bind(TypeManager.class).toInstance(context.getTypeManager()),
-                binder -> binder.bind(Node.class).toInstance(context.getCurrentNode()),
-                binder -> binder.bind(VersionEmbedder.class).toInstance(context.getVersionEmbedder()),
-                binder -> binder.bind(OpenTelemetry.class).toInstance(context.getOpenTelemetry()),
-                binder -> binder.bind(CatalogName.class).toInstance(new CatalogName(catalogName)),
+                new ConnectorContextModule(catalogName, context),
                 new JdbcModule(),
                 module.get());