From e99b83d9e08f5273d6f37a6e267771bf9ee82e21 Mon Sep 17 00:00:00 2001
From: Dain Sundstrom <dain@iq80.com>
Date: Sun, 20 Jan 2019 15:29:26 -0800
Subject: [PATCH 1/3] Improve error message when connector factory not found

---
 .../src/main/java/io/prestosql/connector/ConnectorManager.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/presto-main/src/main/java/io/prestosql/connector/ConnectorManager.java b/presto-main/src/main/java/io/prestosql/connector/ConnectorManager.java
index 29e7bdc7c12b..628dbf231bd7 100644
--- a/presto-main/src/main/java/io/prestosql/connector/ConnectorManager.java
+++ b/presto-main/src/main/java/io/prestosql/connector/ConnectorManager.java
@@ -169,7 +169,7 @@ public synchronized ConnectorId createConnection(String catalogName, String conn
     {
         requireNonNull(connectorName, "connectorName is null");
         ConnectorFactory connectorFactory = connectorFactories.get(connectorName);
-        checkArgument(connectorFactory != null, "No factory for connector %s", connectorName);
+        checkArgument(connectorFactory != null, "No factory for connector [%s].  Available factories: %s", connectorName, connectorFactories.keySet());
         return createConnection(catalogName, connectorFactory, properties);
     }
 

From ea2d4214fbed38e3c84e9820ca6c014674d9d4b5 Mon Sep 17 00:00:00 2001
From: Dain Sundstrom <dain@iq80.com>
Date: Mon, 21 Jan 2019 13:03:07 -0800
Subject: [PATCH 2/3] Add thrift catalog development config

---
 presto-main/etc/catalog/thrift.properties | 9 +++++++++
 presto-main/etc/config.properties         | 1 +
 2 files changed, 10 insertions(+)
 create mode 100644 presto-main/etc/catalog/thrift.properties

diff --git a/presto-main/etc/catalog/thrift.properties b/presto-main/etc/catalog/thrift.properties
new file mode 100644
index 000000000000..15bc4e93da5b
--- /dev/null
+++ b/presto-main/etc/catalog/thrift.properties
@@ -0,0 +1,9 @@
+#
+# WARNING
+# ^^^^^^^
+# This configuration file is for development only and should NOT be used be
+# used in production. For example configuration, see the Presto documentation.
+#
+
+connector.name=presto-thrift
+presto.thrift.client.addresses=127.0.0.1:1234
diff --git a/presto-main/etc/config.properties b/presto-main/etc/config.properties
index 96d4d17d2337..c4a43cee1771 100644
--- a/presto-main/etc/config.properties
+++ b/presto-main/etc/config.properties
@@ -39,6 +39,7 @@ plugin.bundles=\
   ../presto-mysql/pom.xml,\
   ../presto-sqlserver/pom.xml, \
   ../presto-postgresql/pom.xml, \
+  ../presto-thrift/pom.xml, \
   ../presto-tpcds/pom.xml
 
 presto.version=testversion

From fd34a3cf458a8722d4cfc6dce97e2356d90670a3 Mon Sep 17 00:00:00 2001
From: Dain Sundstrom <dain@iq80.com>
Date: Sun, 20 Jan 2019 15:45:25 -0800
Subject: [PATCH 3/3] Add configuration option to control the JMX base name

---
 pom.xml                                       |   1 +
 .../ConnectorObjectNameGeneratorModule.java   | 117 ++++++++++++++++++
 .../plugin/hive/HiveClientModule.java         |  11 +-
 .../plugin/hive/HiveConnectorFactory.java     |   5 +-
 .../hive/metastore/HiveMetastoreModule.java   |  10 +-
 .../metastore/file/FileMetastoreModule.java   |  11 +-
 .../metastore/glue/GlueMetastoreModule.java   |  11 +-
 .../thrift/ThriftMetastoreModule.java         |  16 +--
 .../plugin/hive/s3/HiveS3Module.java          |  12 +-
 .../InternalResourceGroupManager.java         |   6 +-
 .../scheduler/NodeSchedulerExporter.java      |  19 ++-
 .../memory/ClusterMemoryManager.java          |   2 +-
 .../memory/LocalMemoryManagerExporter.java    |   3 +-
 .../prestosql/server/CoordinatorModule.java   |   4 +-
 .../io/prestosql/server/JmxNamingConfig.java  |  33 +++++
 .../PrefixObjectNameGeneratorModule.java      |  77 ++++++++++++
 .../io/prestosql/server/PrestoServer.java     |   1 +
 .../sql/planner/OptimizerStatsRecorder.java   |  25 +++-
 .../sql/planner/RuleStatsRecorder.java        |  36 +++---
 .../prestosql/server/TestJmxNamingConfig.java |  46 +++++++
 .../ConnectorObjectNameGeneratorModule.java   | 117 ++++++++++++++++++
 .../raptor/legacy/RaptorConnectorFactory.java |   3 +-
 .../raptor/legacy/backup/BackupModule.java    |   3 +-
 .../raptor/legacy/storage/StorageModule.java  |  27 ++--
 ...ourceGroupConfigurationManagerFactory.java |   1 +
 .../db/PrefixObjectNameGeneratorModule.java   |  93 ++++++++++++++
 .../ConnectorObjectNameGeneratorModule.java   | 117 ++++++++++++++++++
 .../plugin/thrift/ThriftConnectorFactory.java |   3 +-
 .../prestosql/plugin/thrift/ThriftModule.java |  12 +-
 29 files changed, 693 insertions(+), 129 deletions(-)
 create mode 100644 presto-hive/src/main/java/io/prestosql/plugin/hive/ConnectorObjectNameGeneratorModule.java
 create mode 100644 presto-main/src/main/java/io/prestosql/server/JmxNamingConfig.java
 create mode 100644 presto-main/src/main/java/io/prestosql/server/PrefixObjectNameGeneratorModule.java
 create mode 100644 presto-main/src/test/java/io/prestosql/server/TestJmxNamingConfig.java
 create mode 100644 presto-raptor-legacy/src/main/java/io/prestosql/plugin/raptor/legacy/ConnectorObjectNameGeneratorModule.java
 create mode 100644 presto-resource-group-managers/src/main/java/io/prestosql/plugin/resourcegroups/db/PrefixObjectNameGeneratorModule.java
 create mode 100644 presto-thrift/src/main/java/io/prestosql/plugin/thrift/ConnectorObjectNameGeneratorModule.java

diff --git a/pom.xml b/pom.xml
index 0b0c0c9e89ab..199d3e10f54e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@
         <dep.testng.version>6.10</dep.testng.version>
         <dep.assertj-core.version>3.8.0</dep.assertj-core.version>
         <dep.logback.version>1.2.3</dep.logback.version>
+        <dep.jmxutils.version>1.20</dep.jmxutils.version>
 
         <!--
           America/Bahia_Banderas has:
diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/ConnectorObjectNameGeneratorModule.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/ConnectorObjectNameGeneratorModule.java
new file mode 100644
index 000000000000..f4701c45ad81
--- /dev/null
+++ b/presto-hive/src/main/java/io/prestosql/plugin/hive/ConnectorObjectNameGeneratorModule.java
@@ -0,0 +1,117 @@
+/*
+ * 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.prestosql.plugin.hive;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.inject.Binder;
+import com.google.inject.Module;
+import com.google.inject.Provides;
+import io.airlift.configuration.Config;
+import org.weakref.jmx.ObjectNameBuilder;
+import org.weakref.jmx.ObjectNameGenerator;
+
+import java.util.Map;
+
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static io.airlift.configuration.ConfigBinder.configBinder;
+import static java.util.Objects.requireNonNull;
+
+// Note: There are multiple copies of this class in the codebase.  If you change one you, should change them all.
+public class ConnectorObjectNameGeneratorModule
+        implements Module
+{
+    private static final String CONNECTOR_PACKAGE_NAME = "io.prestosql.plugin.hive";
+    private static final String DEFAULT_DOMAIN_BASE = "presto.plugin.hive";
+
+    private final String catalogName;
+
+    public ConnectorObjectNameGeneratorModule(String catalogName)
+    {
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
+    }
+
+    @Override
+    public void configure(Binder binder)
+    {
+        configBinder(binder).bindConfig(ConnectorObjectNameGeneratorConfig.class);
+    }
+
+    @Provides
+    ObjectNameGenerator createPrefixObjectNameGenerator(ConnectorObjectNameGeneratorConfig config)
+    {
+        String domainBase = firstNonNull(config.getDomainBase(), DEFAULT_DOMAIN_BASE);
+        return new ConnectorObjectNameGenerator(domainBase, catalogName);
+    }
+
+    public static class ConnectorObjectNameGeneratorConfig
+    {
+        private String domainBase;
+
+        public String getDomainBase()
+        {
+            return domainBase;
+        }
+
+        @Config("jmx.base-name")
+        public ConnectorObjectNameGeneratorConfig setDomainBase(String domainBase)
+        {
+            this.domainBase = domainBase;
+            return this;
+        }
+    }
+
+    public static final class ConnectorObjectNameGenerator
+            implements ObjectNameGenerator
+    {
+        private final String domainBase;
+        private final String catalogName;
+
+        public ConnectorObjectNameGenerator(String domainBase, String catalogName)
+        {
+            this.domainBase = domainBase;
+            this.catalogName = catalogName;
+        }
+
+        @Override
+        public String generatedNameOf(Class<?> type)
+        {
+            return new ObjectNameBuilder(toDomain(type))
+                    .withProperties(ImmutableMap.<String, String>builder()
+                    .put("type", type.getSimpleName())
+                    .put("name", catalogName)
+                    .build())
+                    .build();
+        }
+
+        @Override
+        public String generatedNameOf(Class<?> type, Map<String, String> properties)
+        {
+            return new ObjectNameBuilder(toDomain(type))
+                    .withProperties(ImmutableMap.<String, String>builder()
+                    .putAll(properties)
+                    .put("catalog", catalogName)
+                    .build())
+                    .build();
+        }
+
+        private String toDomain(Class<?> type)
+        {
+            String domain = type.getPackage().getName();
+            if (domain.startsWith(CONNECTOR_PACKAGE_NAME)) {
+                domain = domainBase + domain.substring(CONNECTOR_PACKAGE_NAME.length());
+            }
+            return domain;
+        }
+    }
+}
diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveClientModule.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveClientModule.java
index ec37b916c0a2..1e9d8a231df8 100644
--- a/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveClientModule.java
+++ b/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveClientModule.java
@@ -43,7 +43,6 @@
 import static io.airlift.json.JsonCodecBinder.jsonCodecBinder;
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static java.util.concurrent.Executors.newFixedThreadPool;
-import static org.weakref.jmx.ObjectNames.generatedNameOf;
 import static org.weakref.jmx.guice.ExportBinder.newExporter;
 
 public class HiveClientModule
@@ -73,7 +72,7 @@ public void configure(Binder binder)
         binder.bind(HiveTableProperties.class).in(Scopes.SINGLETON);
 
         binder.bind(NamenodeStats.class).in(Scopes.SINGLETON);
-        newExporter(binder).export(NamenodeStats.class).as(generatedNameOf(NamenodeStats.class, connectorId));
+        newExporter(binder).export(NamenodeStats.class).withGeneratedName();
 
         binder.bind(PrestoS3ClientFactory.class).in(Scopes.SINGLETON);
 
@@ -82,7 +81,7 @@ public void configure(Binder binder)
         recordCursorProviderBinder.addBinding().to(GenericHiveRecordCursorProvider.class).in(Scopes.SINGLETON);
 
         binder.bind(HiveWriterStats.class).in(Scopes.SINGLETON);
-        newExporter(binder).export(HiveWriterStats.class).as(generatedNameOf(HiveWriterStats.class, connectorId));
+        newExporter(binder).export(HiveWriterStats.class).withGeneratedName();
 
         newSetBinder(binder, EventClient.class).addBinding().to(HiveEventClient.class).in(Scopes.SINGLETON);
         binder.bind(HivePartitionManager.class).in(Scopes.SINGLETON);
@@ -92,7 +91,7 @@ public void configure(Binder binder)
         binder.bind(new TypeLiteral<Supplier<TransactionalMetadata>>() {}).to(HiveMetadataFactory.class).in(Scopes.SINGLETON);
         binder.bind(HiveTransactionManager.class).in(Scopes.SINGLETON);
         binder.bind(ConnectorSplitManager.class).to(HiveSplitManager.class).in(Scopes.SINGLETON);
-        newExporter(binder).export(ConnectorSplitManager.class).as(generatedNameOf(HiveSplitManager.class, connectorId));
+        newExporter(binder).export(ConnectorSplitManager.class).as(generator -> generator.generatedNameOf(HiveSplitManager.class));
         binder.bind(ConnectorPageSourceProvider.class).to(HivePageSourceProvider.class).in(Scopes.SINGLETON);
         binder.bind(ConnectorPageSinkProvider.class).to(HivePageSinkProvider.class).in(Scopes.SINGLETON);
         binder.bind(ConnectorNodePartitioningProvider.class).to(HiveNodePartitioningProvider.class).in(Scopes.SINGLETON);
@@ -100,7 +99,7 @@ public void configure(Binder binder)
         jsonCodecBinder(binder).bindJsonCodec(PartitionUpdate.class);
 
         binder.bind(FileFormatDataSourceStats.class).in(Scopes.SINGLETON);
-        newExporter(binder).export(FileFormatDataSourceStats.class).as(generatedNameOf(FileFormatDataSourceStats.class, connectorId));
+        newExporter(binder).export(FileFormatDataSourceStats.class).withGeneratedName();
 
         Multibinder<HivePageSourceFactory> pageSourceFactoryBinder = newSetBinder(binder, HivePageSourceFactory.class);
         pageSourceFactoryBinder.addBinding().to(OrcPageSourceFactory.class).in(Scopes.SINGLETON);
@@ -110,7 +109,7 @@ public void configure(Binder binder)
 
         Multibinder<HiveFileWriterFactory> fileWriterFactoryBinder = newSetBinder(binder, HiveFileWriterFactory.class);
         binder.bind(OrcFileWriterFactory.class).in(Scopes.SINGLETON);
-        newExporter(binder).export(OrcFileWriterFactory.class).as(generatedNameOf(OrcFileWriterFactory.class, connectorId));
+        newExporter(binder).export(OrcFileWriterFactory.class).withGeneratedName();
         configBinder(binder).bindConfig(OrcFileWriterConfig.class);
         fileWriterFactoryBinder.addBinding().to(OrcFileWriterFactory.class).in(Scopes.SINGLETON);
         fileWriterFactoryBinder.addBinding().to(RcFileFileWriterFactory.class).in(Scopes.SINGLETON);
diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveConnectorFactory.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveConnectorFactory.java
index 97c0e207da31..d24abfa3eadd 100644
--- a/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveConnectorFactory.java
+++ b/presto-hive/src/main/java/io/prestosql/plugin/hive/HiveConnectorFactory.java
@@ -96,10 +96,11 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
             Bootstrap app = new Bootstrap(
                     new EventModule(),
                     new MBeanModule(),
+                    new ConnectorObjectNameGeneratorModule(catalogName),
                     new JsonModule(),
                     new HiveClientModule(catalogName),
-                    new HiveS3Module(catalogName),
-                    new HiveMetastoreModule(catalogName, metastore),
+                    new HiveS3Module(),
+                    new HiveMetastoreModule(metastore),
                     new HiveSecurityModule(),
                     new HiveAuthenticationModule(),
                     new HiveProcedureModule(),
diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/HiveMetastoreModule.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/HiveMetastoreModule.java
index 42be5b24766c..b1abe460ce6c 100644
--- a/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/HiveMetastoreModule.java
+++ b/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/HiveMetastoreModule.java
@@ -27,12 +27,10 @@
 public class HiveMetastoreModule
         extends AbstractConfigurationAwareModule
 {
-    private final String connectorId;
     private final Optional<ExtendedHiveMetastore> metastore;
 
-    public HiveMetastoreModule(String connectorId, Optional<ExtendedHiveMetastore> metastore)
+    public HiveMetastoreModule(Optional<ExtendedHiveMetastore> metastore)
     {
-        this.connectorId = connectorId;
         this.metastore = metastore;
     }
 
@@ -43,9 +41,9 @@ protected void setup(Binder binder)
             binder.bind(ExtendedHiveMetastore.class).toInstance(metastore.get());
         }
         else {
-            bindMetastoreModule("thrift", new ThriftMetastoreModule(connectorId));
-            bindMetastoreModule("file", new FileMetastoreModule(connectorId));
-            bindMetastoreModule("glue", new GlueMetastoreModule(connectorId));
+            bindMetastoreModule("thrift", new ThriftMetastoreModule());
+            bindMetastoreModule("file", new FileMetastoreModule());
+            bindMetastoreModule("glue", new GlueMetastoreModule());
         }
     }
 
diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/file/FileMetastoreModule.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/file/FileMetastoreModule.java
index 24635fe20b7e..b77f04b0c1d9 100644
--- a/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/file/FileMetastoreModule.java
+++ b/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/file/FileMetastoreModule.java
@@ -21,20 +21,11 @@
 import io.prestosql.plugin.hive.metastore.ExtendedHiveMetastore;
 
 import static io.airlift.configuration.ConfigBinder.configBinder;
-import static java.util.Objects.requireNonNull;
-import static org.weakref.jmx.ObjectNames.generatedNameOf;
 import static org.weakref.jmx.guice.ExportBinder.newExporter;
 
 public class FileMetastoreModule
         implements Module
 {
-    private final String connectorId;
-
-    public FileMetastoreModule(String connectorId)
-    {
-        this.connectorId = requireNonNull(connectorId, "connectorId is null");
-    }
-
     @Override
     public void configure(Binder binder)
     {
@@ -42,6 +33,6 @@ public void configure(Binder binder)
         binder.bind(ExtendedHiveMetastore.class).annotatedWith(ForCachingHiveMetastore.class).to(FileHiveMetastore.class).in(Scopes.SINGLETON);
         binder.bind(ExtendedHiveMetastore.class).to(CachingHiveMetastore.class).in(Scopes.SINGLETON);
         newExporter(binder).export(ExtendedHiveMetastore.class)
-                .as(generatedNameOf(CachingHiveMetastore.class, connectorId));
+                .as(generator -> generator.generatedNameOf(CachingHiveMetastore.class));
     }
 }
diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/glue/GlueMetastoreModule.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/glue/GlueMetastoreModule.java
index 34f5aed21a27..8cadd40ae580 100644
--- a/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/glue/GlueMetastoreModule.java
+++ b/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/glue/GlueMetastoreModule.java
@@ -19,26 +19,17 @@
 import io.prestosql.plugin.hive.metastore.ExtendedHiveMetastore;
 
 import static io.airlift.configuration.ConfigBinder.configBinder;
-import static java.util.Objects.requireNonNull;
-import static org.weakref.jmx.ObjectNames.generatedNameOf;
 import static org.weakref.jmx.guice.ExportBinder.newExporter;
 
 public class GlueMetastoreModule
         implements Module
 {
-    private final String connectorId;
-
-    public GlueMetastoreModule(String connectorId)
-    {
-        this.connectorId = requireNonNull(connectorId, "connectorId is null");
-    }
-
     @Override
     public void configure(Binder binder)
     {
         configBinder(binder).bindConfig(GlueHiveMetastoreConfig.class);
         binder.bind(ExtendedHiveMetastore.class).to(GlueHiveMetastore.class).in(Scopes.SINGLETON);
         newExporter(binder).export(ExtendedHiveMetastore.class)
-                .as(generatedNameOf(GlueHiveMetastore.class, connectorId));
+                .as(generator -> generator.generatedNameOf(GlueHiveMetastore.class));
     }
 }
diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/thrift/ThriftMetastoreModule.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/thrift/ThriftMetastoreModule.java
index 44edcc7fcef2..16a106c3ab90 100644
--- a/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/thrift/ThriftMetastoreModule.java
+++ b/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/thrift/ThriftMetastoreModule.java
@@ -24,20 +24,11 @@
 import io.prestosql.plugin.hive.metastore.RecordingHiveMetastore;
 
 import static io.airlift.configuration.ConfigBinder.configBinder;
-import static java.util.Objects.requireNonNull;
-import static org.weakref.jmx.ObjectNames.generatedNameOf;
 import static org.weakref.jmx.guice.ExportBinder.newExporter;
 
 public class ThriftMetastoreModule
         extends AbstractConfigurationAwareModule
 {
-    private final String connectorId;
-
-    public ThriftMetastoreModule(String connectorId)
-    {
-        this.connectorId = requireNonNull(connectorId, "connectorId is null");
-    }
-
     @Override
     protected void setup(Binder binder)
     {
@@ -57,8 +48,7 @@ protected void setup(Binder binder)
                     .to(RecordingHiveMetastore.class)
                     .in(Scopes.SINGLETON);
             binder.bind(RecordingHiveMetastore.class).in(Scopes.SINGLETON);
-            newExporter(binder).export(RecordingHiveMetastore.class)
-                    .as(generatedNameOf(RecordingHiveMetastore.class, connectorId));
+            newExporter(binder).export(RecordingHiveMetastore.class);
         }
         else {
             binder.bind(ExtendedHiveMetastore.class)
@@ -69,8 +59,8 @@ protected void setup(Binder binder)
 
         binder.bind(ExtendedHiveMetastore.class).to(CachingHiveMetastore.class).in(Scopes.SINGLETON);
         newExporter(binder).export(HiveMetastore.class)
-                .as(generatedNameOf(ThriftHiveMetastore.class, connectorId));
+                .as(generator -> generator.generatedNameOf(ThriftHiveMetastore.class));
         newExporter(binder).export(ExtendedHiveMetastore.class)
-                .as(generatedNameOf(CachingHiveMetastore.class, connectorId));
+                .as(generator -> generator.generatedNameOf(CachingHiveMetastore.class));
     }
 }
diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/s3/HiveS3Module.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/s3/HiveS3Module.java
index 186c23079338..9da85ceca868 100644
--- a/presto-hive/src/main/java/io/prestosql/plugin/hive/s3/HiveS3Module.java
+++ b/presto-hive/src/main/java/io/prestosql/plugin/hive/s3/HiveS3Module.java
@@ -21,8 +21,6 @@
 import org.apache.hadoop.hive.common.JavaUtils;
 
 import static io.airlift.configuration.ConfigBinder.configBinder;
-import static java.util.Objects.requireNonNull;
-import static org.weakref.jmx.ObjectNames.generatedNameOf;
 import static org.weakref.jmx.guice.ExportBinder.newExporter;
 
 public class HiveS3Module
@@ -30,13 +28,6 @@ public class HiveS3Module
 {
     private static final String EMR_FS_CLASS_NAME = "com.amazon.ws.emr.hadoop.fs.EmrFileSystem";
 
-    private final String connectorId;
-
-    public HiveS3Module(String connectorId)
-    {
-        this.connectorId = requireNonNull(connectorId, "connectorId is null");
-    }
-
     @Override
     protected void setup(Binder binder)
     {
@@ -46,7 +37,8 @@ protected void setup(Binder binder)
             configBinder(binder).bindConfig(HiveS3Config.class);
 
             binder.bind(PrestoS3FileSystemStats.class).toInstance(PrestoS3FileSystem.getFileSystemStats());
-            newExporter(binder).export(PrestoS3FileSystemStats.class).as(generatedNameOf(PrestoS3FileSystem.class, connectorId));
+            newExporter(binder).export(PrestoS3FileSystemStats.class)
+                    .as(generator -> generator.generatedNameOf(PrestoS3FileSystem.class));
         }
         else if (type == S3FileSystemType.EMRFS) {
             validateEmrFsClass();
diff --git a/presto-main/src/main/java/io/prestosql/execution/resourceGroups/InternalResourceGroupManager.java b/presto-main/src/main/java/io/prestosql/execution/resourceGroups/InternalResourceGroupManager.java
index c8f269811722..2dce7efa6a46 100644
--- a/presto-main/src/main/java/io/prestosql/execution/resourceGroups/InternalResourceGroupManager.java
+++ b/presto-main/src/main/java/io/prestosql/execution/resourceGroups/InternalResourceGroupManager.java
@@ -32,7 +32,6 @@
 import org.weakref.jmx.JmxException;
 import org.weakref.jmx.MBeanExporter;
 import org.weakref.jmx.Managed;
-import org.weakref.jmx.ObjectNames;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -237,13 +236,12 @@ private synchronized void createGroupIfNecessary(SelectionContext<C> context, Ex
 
     private void exportGroup(InternalResourceGroup group, Boolean export)
     {
-        String objectName = ObjectNames.builder(InternalResourceGroup.class, group.getId().toString()).build();
         try {
             if (export) {
-                exporter.export(objectName, group);
+                exporter.exportWithGeneratedName(group, InternalResourceGroup.class, group.getId().toString());
             }
             else {
-                exporter.unexport(objectName);
+                exporter.unexportWithGeneratedName(InternalResourceGroup.class, group.getId().toString());
             }
         }
         catch (JmxException e) {
diff --git a/presto-main/src/main/java/io/prestosql/execution/scheduler/NodeSchedulerExporter.java b/presto-main/src/main/java/io/prestosql/execution/scheduler/NodeSchedulerExporter.java
index f8496060cf5c..d0cfe3b56109 100644
--- a/presto-main/src/main/java/io/prestosql/execution/scheduler/NodeSchedulerExporter.java
+++ b/presto-main/src/main/java/io/prestosql/execution/scheduler/NodeSchedulerExporter.java
@@ -13,10 +13,11 @@
  */
 package io.prestosql.execution.scheduler;
 
+import com.google.common.collect.ImmutableMap;
 import io.airlift.stats.CounterStat;
 import org.weakref.jmx.JmxException;
+import org.weakref.jmx.MBeanExport;
 import org.weakref.jmx.MBeanExporter;
-import org.weakref.jmx.ObjectNames;
 
 import javax.annotation.PreDestroy;
 import javax.annotation.concurrent.GuardedBy;
@@ -30,20 +31,18 @@
 
 public final class NodeSchedulerExporter
 {
-    private final MBeanExporter exporter;
     @GuardedBy("this")
-    private final List<String> objectNames = new ArrayList<>();
+    private final List<MBeanExport> mbeanExports = new ArrayList<>();
 
     @Inject
     public NodeSchedulerExporter(NodeScheduler nodeScheduler, MBeanExporter exporter)
     {
-        this.exporter = requireNonNull(exporter, "exporter is null");
+        requireNonNull(nodeScheduler, "nodeScheduler is null");
+        requireNonNull(exporter, "exporter is null");
         Map<String, CounterStat> topologicalSplitCounters = nodeScheduler.getTopologicalSplitCounters();
         for (Map.Entry<String, CounterStat> entry : topologicalSplitCounters.entrySet()) {
             try {
-                String objectName = ObjectNames.builder(NodeScheduler.class).withProperty("segment", entry.getKey()).build();
-                this.exporter.export(objectName, entry.getValue());
-                objectNames.add(objectName);
+                mbeanExports.add(exporter.exportWithGeneratedName(entry.getValue(), NodeScheduler.class, ImmutableMap.of("segment", entry.getKey())));
             }
             catch (JmxException e) {
                 // ignored
@@ -54,14 +53,14 @@ public NodeSchedulerExporter(NodeScheduler nodeScheduler, MBeanExporter exporter
     @PreDestroy
     public synchronized void destroy()
     {
-        for (String objectName : objectNames) {
+        for (MBeanExport mbeanExport : mbeanExports) {
             try {
-                exporter.unexport(objectName);
+                mbeanExport.unexport();
             }
             catch (JmxException e) {
                 // ignored
             }
         }
-        objectNames.clear();
+        mbeanExports.clear();
     }
 }
diff --git a/presto-main/src/main/java/io/prestosql/memory/ClusterMemoryManager.java b/presto-main/src/main/java/io/prestosql/memory/ClusterMemoryManager.java
index 2698a2a7e04d..b9fe086ce1c3 100644
--- a/presto-main/src/main/java/io/prestosql/memory/ClusterMemoryManager.java
+++ b/presto-main/src/main/java/io/prestosql/memory/ClusterMemoryManager.java
@@ -186,7 +186,7 @@ private Map<MemoryPoolId, ClusterMemoryPool> createClusterMemoryPools(boolean sy
             ClusterMemoryPool pool = new ClusterMemoryPool(poolId);
             builder.put(poolId, pool);
             try {
-                exporter.export(generatedNameOf(ClusterMemoryPool.class, poolId.toString()), pool);
+                exporter.exportWithGeneratedName(pool, ClusterMemoryPool.class, poolId.toString());
             }
             catch (JmxException e) {
                 log.error(e, "Error exporting memory pool %s", poolId);
diff --git a/presto-main/src/main/java/io/prestosql/memory/LocalMemoryManagerExporter.java b/presto-main/src/main/java/io/prestosql/memory/LocalMemoryManagerExporter.java
index e02e2e531f4f..e90391832745 100644
--- a/presto-main/src/main/java/io/prestosql/memory/LocalMemoryManagerExporter.java
+++ b/presto-main/src/main/java/io/prestosql/memory/LocalMemoryManagerExporter.java
@@ -44,8 +44,7 @@ public LocalMemoryManagerExporter(LocalMemoryManager memoryManager, MBeanExporte
     private synchronized void addPool(MemoryPool pool)
     {
         try {
-            String objectName = ObjectNames.builder(MemoryPool.class, pool.getId().toString()).build();
-            exporter.export(objectName, pool);
+            exporter.exportWithGeneratedName(pool, MemoryPool.class, pool.getId().toString());
             pools.add(pool);
         }
         catch (JmxException e) {
diff --git a/presto-main/src/main/java/io/prestosql/server/CoordinatorModule.java b/presto-main/src/main/java/io/prestosql/server/CoordinatorModule.java
index df03bb12f387..bfbc57218ff9 100644
--- a/presto-main/src/main/java/io/prestosql/server/CoordinatorModule.java
+++ b/presto-main/src/main/java/io/prestosql/server/CoordinatorModule.java
@@ -152,7 +152,6 @@
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.weakref.jmx.ObjectNames.generatedNameOf;
 import static org.weakref.jmx.guice.ExportBinder.newExporter;
 
 public class CoordinatorModule
@@ -268,7 +267,8 @@ protected void setup(Binder binder)
         binder.bind(ExecutorService.class).annotatedWith(ForQueryExecution.class)
                 .toInstance(newCachedThreadPool(threadsNamed("query-execution-%s")));
         binder.bind(QueryExecutionMBean.class).in(Scopes.SINGLETON);
-        newExporter(binder).export(QueryExecutionMBean.class).as(generatedNameOf(QueryExecution.class));
+        newExporter(binder).export(QueryExecutionMBean.class)
+                .as(generator -> generator.generatedNameOf(QueryExecution.class));
 
         MapBinder<Class<? extends Statement>, QueryExecutionFactory<?>> executionBinder = newMapBinder(binder,
                 new TypeLiteral<Class<? extends Statement>>() {}, new TypeLiteral<QueryExecutionFactory<?>>() {});
diff --git a/presto-main/src/main/java/io/prestosql/server/JmxNamingConfig.java b/presto-main/src/main/java/io/prestosql/server/JmxNamingConfig.java
new file mode 100644
index 000000000000..102be8f3f3a4
--- /dev/null
+++ b/presto-main/src/main/java/io/prestosql/server/JmxNamingConfig.java
@@ -0,0 +1,33 @@
+/*
+ * 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.prestosql.server;
+
+import io.airlift.configuration.Config;
+
+public class JmxNamingConfig
+{
+    private String domainBase = "presto";
+
+    public String getDomainBase()
+    {
+        return domainBase;
+    }
+
+    @Config("jmx.base-name")
+    public JmxNamingConfig setDomainBase(String domainBase)
+    {
+        this.domainBase = domainBase;
+        return this;
+    }
+}
diff --git a/presto-main/src/main/java/io/prestosql/server/PrefixObjectNameGeneratorModule.java b/presto-main/src/main/java/io/prestosql/server/PrefixObjectNameGeneratorModule.java
new file mode 100644
index 000000000000..3ef6d607e62f
--- /dev/null
+++ b/presto-main/src/main/java/io/prestosql/server/PrefixObjectNameGeneratorModule.java
@@ -0,0 +1,77 @@
+/*
+ * 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.prestosql.server;
+
+import com.google.inject.Binder;
+import com.google.inject.Module;
+import com.google.inject.Provides;
+import org.weakref.jmx.ObjectNameBuilder;
+import org.weakref.jmx.ObjectNameGenerator;
+
+import java.util.Map;
+
+import static io.airlift.configuration.ConfigBinder.configBinder;
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Replaces the prefix given by {@code packagePrefix} with the domain base provided via configuration.
+ */
+public class PrefixObjectNameGeneratorModule
+        implements Module
+{
+    private final String packagePrefix;
+
+    public PrefixObjectNameGeneratorModule(String packagePrefix)
+    {
+        this.packagePrefix = requireNonNull(packagePrefix, "packagePrefix is null");
+    }
+
+    @Override
+    public void configure(Binder binder)
+    {
+        configBinder(binder).bindConfig(JmxNamingConfig.class);
+    }
+
+    @Provides
+    ObjectNameGenerator createPrefixObjectNameGenerator(JmxNamingConfig jmxNamingConfig)
+    {
+        return new PrefixObjectNameGenerator(packagePrefix, jmxNamingConfig.getDomainBase());
+    }
+
+    public static final class PrefixObjectNameGenerator
+            implements ObjectNameGenerator
+    {
+        private final String packagePrefix;
+        private final String replacement;
+
+        public PrefixObjectNameGenerator(String packagePrefix, String replacement)
+        {
+            this.packagePrefix = packagePrefix;
+            this.replacement = replacement;
+        }
+
+        @Override
+        public String generatedNameOf(Class<?> type, Map<String, String> properties)
+        {
+            String domain = type.getPackage().getName();
+            if (domain.startsWith(packagePrefix)) {
+                domain = replacement + domain.substring(packagePrefix.length());
+            }
+
+            return new ObjectNameBuilder(domain)
+                    .withProperties(properties)
+                    .build();
+        }
+    }
+}
diff --git a/presto-main/src/main/java/io/prestosql/server/PrestoServer.java b/presto-main/src/main/java/io/prestosql/server/PrestoServer.java
index df16157b902d..4d48b4a33d01 100644
--- a/presto-main/src/main/java/io/prestosql/server/PrestoServer.java
+++ b/presto-main/src/main/java/io/prestosql/server/PrestoServer.java
@@ -96,6 +96,7 @@ public void run()
                 new JsonModule(),
                 new JaxrsModule(true),
                 new MBeanModule(),
+                new PrefixObjectNameGeneratorModule("io.prestosql"),
                 new JmxModule(),
                 new JmxHttpModule(),
                 new LogJmxModule(),
diff --git a/presto-main/src/main/java/io/prestosql/sql/planner/OptimizerStatsRecorder.java b/presto-main/src/main/java/io/prestosql/sql/planner/OptimizerStatsRecorder.java
index 8d4377919008..e1e517584c9e 100644
--- a/presto-main/src/main/java/io/prestosql/sql/planner/OptimizerStatsRecorder.java
+++ b/presto-main/src/main/java/io/prestosql/sql/planner/OptimizerStatsRecorder.java
@@ -13,15 +13,22 @@
  */
 package io.prestosql.sql.planner;
 
+import com.google.common.collect.ImmutableMap;
 import io.prestosql.sql.planner.optimizations.OptimizerStats;
 import io.prestosql.sql.planner.optimizations.PlanOptimizer;
+import org.weakref.jmx.MBeanExport;
 import org.weakref.jmx.MBeanExporter;
 import org.weakref.jmx.ObjectNames;
 
+import javax.annotation.concurrent.GuardedBy;
+
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
@@ -30,6 +37,9 @@ public class OptimizerStatsRecorder
 {
     private final Map<Class<?>, OptimizerStats> stats = new HashMap<>();
 
+    @GuardedBy("this")
+    private final List<MBeanExport> mbeanExports = new ArrayList<>();
+
     public void register(PlanOptimizer optimizer)
     {
         requireNonNull(optimizer, "optimizer is null");
@@ -51,12 +61,16 @@ public void recordFailure(PlanOptimizer optimizer)
         optimizerStats.recordFailure();
     }
 
-    void export(MBeanExporter exporter)
+    synchronized void export(MBeanExporter exporter)
     {
+        checkState(mbeanExports.isEmpty(), "MBeans already exported");
         for (Map.Entry<Class<?>, OptimizerStats> entry : stats.entrySet()) {
             verify(!entry.getKey().getSimpleName().isEmpty());
             try {
-                exporter.export(getName(entry.getKey()), entry.getValue());
+                mbeanExports.add(exporter.exportWithGeneratedName(entry.getValue(), PlanOptimizer.class, ImmutableMap.<String, String>builder()
+                        .put("name", PlanOptimizer.class.getSimpleName())
+                        .put("optimizer", entry.getKey().getSimpleName())
+                        .build()));
             }
             catch (RuntimeException e) {
                 throw new RuntimeException(format("Failed to export MBean with name '%s'", getName(entry.getKey())), e);
@@ -64,11 +78,12 @@ void export(MBeanExporter exporter)
         }
     }
 
-    void unexport(MBeanExporter exporter)
+    synchronized void unexport(MBeanExporter exporter)
     {
-        for (Class<?> rule : stats.keySet()) {
-            exporter.unexport(getName(rule));
+        for (MBeanExport mbeanExport : mbeanExports) {
+            mbeanExport.unexport();
         }
+        mbeanExports.clear();
     }
 
     private String getName(Class<?> key)
diff --git a/presto-main/src/main/java/io/prestosql/sql/planner/RuleStatsRecorder.java b/presto-main/src/main/java/io/prestosql/sql/planner/RuleStatsRecorder.java
index 084ac7032d29..e6984ff26f48 100644
--- a/presto-main/src/main/java/io/prestosql/sql/planner/RuleStatsRecorder.java
+++ b/presto-main/src/main/java/io/prestosql/sql/planner/RuleStatsRecorder.java
@@ -13,17 +13,23 @@
  */
 package io.prestosql.sql.planner;
 
+import com.google.common.collect.ImmutableMap;
 import io.prestosql.sql.planner.iterative.IterativeOptimizer;
 import io.prestosql.sql.planner.iterative.Rule;
 import io.prestosql.sql.planner.iterative.RuleStats;
+import org.weakref.jmx.MBeanExport;
 import org.weakref.jmx.MBeanExporter;
-import org.weakref.jmx.ObjectNames;
 
+import javax.annotation.concurrent.GuardedBy;
+
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
 import static java.lang.String.format;
 
@@ -31,6 +37,9 @@ public class RuleStatsRecorder
 {
     private final Map<Class<?>, RuleStats> stats = new HashMap<>();
 
+    @GuardedBy("this")
+    private final List<MBeanExport> mbeanExports = new ArrayList<>();
+
     public void registerAll(Collection<Rule<?>> rules)
     {
         for (Rule<?> rule : rules) {
@@ -49,31 +58,28 @@ public void recordFailure(Rule<?> rule)
         stats.get(rule.getClass()).recordFailure();
     }
 
-    void export(MBeanExporter exporter)
+    synchronized void export(MBeanExporter exporter)
     {
+        checkState(mbeanExports.isEmpty(), "MBeans already exported");
         for (Map.Entry<Class<?>, RuleStats> entry : stats.entrySet()) {
             verify(!entry.getKey().getSimpleName().isEmpty());
-            String name = ObjectNames.builder(IterativeOptimizer.class)
-                    .withProperty("rule", entry.getKey().getSimpleName())
-                    .build();
-
             try {
-                exporter.export(name, entry.getValue());
+                mbeanExports.add(exporter.exportWithGeneratedName(entry.getValue(), IterativeOptimizer.class, ImmutableMap.<String, String>builder()
+                        .put("name", IterativeOptimizer.class.getSimpleName())
+                        .put("rule", entry.getKey().getSimpleName())
+                        .build()));
             }
             catch (RuntimeException e) {
-                throw new RuntimeException(format("Failed to export MBean with name '%s'", name), e);
+                throw new RuntimeException(format("Failed to export MBean with for rule '%s'", entry.getKey().getSimpleName()), e);
             }
         }
     }
 
-    void unexport(MBeanExporter exporter)
+    synchronized void unexport(MBeanExporter exporter)
     {
-        for (Class<?> rule : stats.keySet()) {
-            String name = ObjectNames.builder(IterativeOptimizer.class)
-                    .withProperty("rule", rule.getSimpleName())
-                    .build();
-
-            exporter.unexport(name);
+        for (MBeanExport mbeanExport : mbeanExports) {
+            mbeanExport.unexport();
         }
+        mbeanExports.clear();
     }
 }
diff --git a/presto-main/src/test/java/io/prestosql/server/TestJmxNamingConfig.java b/presto-main/src/test/java/io/prestosql/server/TestJmxNamingConfig.java
new file mode 100644
index 000000000000..d5e57ab03dc5
--- /dev/null
+++ b/presto-main/src/test/java/io/prestosql/server/TestJmxNamingConfig.java
@@ -0,0 +1,46 @@
+/*
+ * 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.prestosql.server;
+
+import com.google.common.collect.ImmutableMap;
+import org.testng.annotations.Test;
+
+import java.util.Map;
+
+import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
+import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
+import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
+
+public class TestJmxNamingConfig
+{
+    @Test
+    public void testDefaults()
+    {
+        assertRecordedDefaults(recordDefaults(JmxNamingConfig.class)
+                .setDomainBase("presto"));
+    }
+
+    @Test
+    public void testExplicitPropertyMappings()
+    {
+        Map<String, String> properties = new ImmutableMap.Builder<String, String>()
+                .put("jmx.base-name", "my.stuff")
+                .build();
+
+        JmxNamingConfig expected = new JmxNamingConfig()
+                .setDomainBase("my.stuff");
+
+        assertFullMapping(properties, expected);
+    }
+}
diff --git a/presto-raptor-legacy/src/main/java/io/prestosql/plugin/raptor/legacy/ConnectorObjectNameGeneratorModule.java b/presto-raptor-legacy/src/main/java/io/prestosql/plugin/raptor/legacy/ConnectorObjectNameGeneratorModule.java
new file mode 100644
index 000000000000..f469b6228cf6
--- /dev/null
+++ b/presto-raptor-legacy/src/main/java/io/prestosql/plugin/raptor/legacy/ConnectorObjectNameGeneratorModule.java
@@ -0,0 +1,117 @@
+/*
+ * 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.prestosql.plugin.raptor.legacy;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.inject.Binder;
+import com.google.inject.Module;
+import com.google.inject.Provides;
+import io.airlift.configuration.Config;
+import org.weakref.jmx.ObjectNameBuilder;
+import org.weakref.jmx.ObjectNameGenerator;
+
+import java.util.Map;
+
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static io.airlift.configuration.ConfigBinder.configBinder;
+import static java.util.Objects.requireNonNull;
+
+// Note: There are multiple copies of this class in the codebase.  If you change one you, should change them all.
+public class ConnectorObjectNameGeneratorModule
+        implements Module
+{
+    private static final String CONNECTOR_PACKAGE_NAME = "io.prestosql.plugin.raptor.legacy";
+    private static final String DEFAULT_DOMAIN_BASE = "presto.plugin.raptor.legacy";
+
+    private final String catalogName;
+
+    public ConnectorObjectNameGeneratorModule(String catalogName)
+    {
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
+    }
+
+    @Override
+    public void configure(Binder binder)
+    {
+        configBinder(binder).bindConfig(ConnectorObjectNameGeneratorConfig.class);
+    }
+
+    @Provides
+    ObjectNameGenerator createPrefixObjectNameGenerator(ConnectorObjectNameGeneratorConfig config)
+    {
+        String domainBase = firstNonNull(config.getDomainBase(), DEFAULT_DOMAIN_BASE);
+        return new ConnectorObjectNameGenerator(domainBase, catalogName);
+    }
+
+    public static class ConnectorObjectNameGeneratorConfig
+    {
+        private String domainBase;
+
+        public String getDomainBase()
+        {
+            return domainBase;
+        }
+
+        @Config("jmx.base-name")
+        public ConnectorObjectNameGeneratorConfig setDomainBase(String domainBase)
+        {
+            this.domainBase = domainBase;
+            return this;
+        }
+    }
+
+    public static final class ConnectorObjectNameGenerator
+            implements ObjectNameGenerator
+    {
+        private final String domainBase;
+        private final String catalogName;
+
+        public ConnectorObjectNameGenerator(String domainBase, String catalogName)
+        {
+            this.domainBase = domainBase;
+            this.catalogName = catalogName;
+        }
+
+        @Override
+        public String generatedNameOf(Class<?> type)
+        {
+            return new ObjectNameBuilder(toDomain(type))
+                    .withProperties(ImmutableMap.<String, String>builder()
+                    .put("type", type.getSimpleName())
+                    .put("name", catalogName)
+                    .build())
+                    .build();
+        }
+
+        @Override
+        public String generatedNameOf(Class<?> type, Map<String, String> properties)
+        {
+            return new ObjectNameBuilder(toDomain(type))
+                    .withProperties(ImmutableMap.<String, String>builder()
+                    .putAll(properties)
+                    .put("catalog", catalogName)
+                    .build())
+                    .build();
+        }
+
+        private String toDomain(Class<?> type)
+        {
+            String domain = type.getPackage().getName();
+            if (domain.startsWith(CONNECTOR_PACKAGE_NAME)) {
+                domain = domainBase + domain.substring(CONNECTOR_PACKAGE_NAME.length());
+            }
+            return domain;
+        }
+    }
+}
diff --git a/presto-raptor-legacy/src/main/java/io/prestosql/plugin/raptor/legacy/RaptorConnectorFactory.java b/presto-raptor-legacy/src/main/java/io/prestosql/plugin/raptor/legacy/RaptorConnectorFactory.java
index 28515d1b9d75..67711659483a 100644
--- a/presto-raptor-legacy/src/main/java/io/prestosql/plugin/raptor/legacy/RaptorConnectorFactory.java
+++ b/presto-raptor-legacy/src/main/java/io/prestosql/plugin/raptor/legacy/RaptorConnectorFactory.java
@@ -76,6 +76,7 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
             Bootstrap app = new Bootstrap(
                     new JsonModule(),
                     new MBeanModule(),
+                    new ConnectorObjectNameGeneratorModule(catalogName),
                     binder -> {
                         MBeanServer mbeanServer = new RebindSafeMBeanServer(getPlatformMBeanServer());
                         binder.bind(MBeanServer.class).toInstance(mbeanServer);
@@ -85,7 +86,7 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
                     },
                     metadataModule,
                     new BackupModule(backupProviders),
-                    new StorageModule(catalogName),
+                    new StorageModule(),
                     new RaptorModule(catalogName),
                     new RaptorSecurityModule());
 
diff --git a/presto-raptor-legacy/src/main/java/io/prestosql/plugin/raptor/legacy/backup/BackupModule.java b/presto-raptor-legacy/src/main/java/io/prestosql/plugin/raptor/legacy/backup/BackupModule.java
index eb725b2b370f..36afe3d24e58 100644
--- a/presto-raptor-legacy/src/main/java/io/prestosql/plugin/raptor/legacy/backup/BackupModule.java
+++ b/presto-raptor-legacy/src/main/java/io/prestosql/plugin/raptor/legacy/backup/BackupModule.java
@@ -32,7 +32,6 @@
 import java.util.Optional;
 
 import static io.airlift.configuration.ConfigBinder.configBinder;
-import static org.weakref.jmx.ObjectNames.generatedNameOf;
 
 public class BackupModule
         extends AbstractConfigurationAwareModule
@@ -95,7 +94,7 @@ private static Optional<BackupStore> createBackupStore(
         lifeCycleManager.addInstance(proxy);
 
         BackupStore managed = new ManagedBackupStore(proxy);
-        exporter.export(generatedNameOf(BackupStore.class, connectorId.toString()), managed);
+        exporter.exportWithGeneratedName(managed, BackupStore.class, connectorId.toString());
 
         return Optional.of(managed);
     }
diff --git a/presto-raptor-legacy/src/main/java/io/prestosql/plugin/raptor/legacy/storage/StorageModule.java b/presto-raptor-legacy/src/main/java/io/prestosql/plugin/raptor/legacy/storage/StorageModule.java
index 0e3f79a4e7e5..75f599a6b530 100644
--- a/presto-raptor-legacy/src/main/java/io/prestosql/plugin/raptor/legacy/storage/StorageModule.java
+++ b/presto-raptor-legacy/src/main/java/io/prestosql/plugin/raptor/legacy/storage/StorageModule.java
@@ -35,20 +35,11 @@
 import io.prestosql.plugin.raptor.legacy.storage.organization.TemporalFunction;
 
 import static io.airlift.configuration.ConfigBinder.configBinder;
-import static java.util.Objects.requireNonNull;
-import static org.weakref.jmx.ObjectNames.generatedNameOf;
 import static org.weakref.jmx.guice.ExportBinder.newExporter;
 
 public class StorageModule
         implements Module
 {
-    private final String connectorId;
-
-    public StorageModule(String connectorId)
-    {
-        this.connectorId = requireNonNull(connectorId, "connectorId is null");
-    }
-
     @Override
     public void configure(Binder binder)
     {
@@ -79,15 +70,15 @@ public void configure(Binder binder)
         binder.bind(AssignmentLimiter.class).in(Scopes.SINGLETON);
         binder.bind(TemporalFunction.class).in(Scopes.SINGLETON);
 
-        newExporter(binder).export(ShardRecoveryManager.class).as(generatedNameOf(ShardRecoveryManager.class, connectorId));
-        newExporter(binder).export(BackupManager.class).as(generatedNameOf(BackupManager.class, connectorId));
-        newExporter(binder).export(StorageManager.class).as(generatedNameOf(OrcStorageManager.class, connectorId));
-        newExporter(binder).export(ShardCompactionManager.class).as(generatedNameOf(ShardCompactionManager.class, connectorId));
-        newExporter(binder).export(ShardOrganizer.class).as(generatedNameOf(ShardOrganizer.class, connectorId));
-        newExporter(binder).export(ShardCompactor.class).as(generatedNameOf(ShardCompactor.class, connectorId));
-        newExporter(binder).export(ShardEjector.class).as(generatedNameOf(ShardEjector.class, connectorId));
-        newExporter(binder).export(ShardCleaner.class).as(generatedNameOf(ShardCleaner.class, connectorId));
-        newExporter(binder).export(BucketBalancer.class).as(generatedNameOf(BucketBalancer.class, connectorId));
+        newExporter(binder).export(ShardRecoveryManager.class).withGeneratedName();
+        newExporter(binder).export(BackupManager.class).withGeneratedName();
+        newExporter(binder).export(StorageManager.class).as(generator -> generator.generatedNameOf(OrcStorageManager.class));
+        newExporter(binder).export(ShardCompactionManager.class).withGeneratedName();
+        newExporter(binder).export(ShardOrganizer.class).withGeneratedName();
+        newExporter(binder).export(ShardCompactor.class).withGeneratedName();
+        newExporter(binder).export(ShardEjector.class).withGeneratedName();
+        newExporter(binder).export(ShardCleaner.class).withGeneratedName();
+        newExporter(binder).export(BucketBalancer.class).withGeneratedName();
         newExporter(binder).export(JobFactory.class).withGeneratedName();
     }
 }
diff --git a/presto-resource-group-managers/src/main/java/io/prestosql/plugin/resourcegroups/db/DbResourceGroupConfigurationManagerFactory.java b/presto-resource-group-managers/src/main/java/io/prestosql/plugin/resourcegroups/db/DbResourceGroupConfigurationManagerFactory.java
index 36bc088adce9..1c449a6c9d07 100644
--- a/presto-resource-group-managers/src/main/java/io/prestosql/plugin/resourcegroups/db/DbResourceGroupConfigurationManagerFactory.java
+++ b/presto-resource-group-managers/src/main/java/io/prestosql/plugin/resourcegroups/db/DbResourceGroupConfigurationManagerFactory.java
@@ -42,6 +42,7 @@ public ResourceGroupConfigurationManager<VariableMap> create(Map<String, String>
             Bootstrap app = new Bootstrap(
                     new JsonModule(),
                     new DbResourceGroupsModule(),
+                    new PrefixObjectNameGeneratorModule(),
                     binder -> binder.bind(String.class).annotatedWith(ForEnvironment.class).toInstance(context.getEnvironment()),
                     binder -> binder.bind(ClusterMemoryPoolManager.class).toInstance(context.getMemoryPoolManager()));
 
diff --git a/presto-resource-group-managers/src/main/java/io/prestosql/plugin/resourcegroups/db/PrefixObjectNameGeneratorModule.java b/presto-resource-group-managers/src/main/java/io/prestosql/plugin/resourcegroups/db/PrefixObjectNameGeneratorModule.java
new file mode 100644
index 000000000000..7ec4971f0c62
--- /dev/null
+++ b/presto-resource-group-managers/src/main/java/io/prestosql/plugin/resourcegroups/db/PrefixObjectNameGeneratorModule.java
@@ -0,0 +1,93 @@
+/*
+ * 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.prestosql.plugin.resourcegroups.db;
+
+import com.google.inject.Binder;
+import com.google.inject.Module;
+import com.google.inject.Provides;
+import io.airlift.configuration.Config;
+import org.weakref.jmx.ObjectNameBuilder;
+import org.weakref.jmx.ObjectNameGenerator;
+
+import java.util.Map;
+
+import static io.airlift.configuration.ConfigBinder.configBinder;
+
+public class PrefixObjectNameGeneratorModule
+        implements Module
+{
+    private static final String CONNECTOR_PACKAGE_NAME = "io.prestosql.plugin.resourcegroups.db";
+    private static final String DEFAULT_DOMAIN_BASE = "presto.plugin.resourcegroups.db";
+
+    @Override
+    public void configure(Binder binder)
+    {
+        configBinder(binder).bindConfig(PrefixObjectNameGeneratorConfig.class);
+    }
+
+    @Provides
+    ObjectNameGenerator createPrefixObjectNameGenerator(PrefixObjectNameGeneratorConfig config)
+    {
+        String domainBase = DEFAULT_DOMAIN_BASE;
+        if (config.getDomainBase() != null) {
+            domainBase = config.getDomainBase();
+        }
+        return new PrefixObjectNameGenerator(domainBase);
+    }
+
+    public static class PrefixObjectNameGeneratorConfig
+    {
+        private String domainBase;
+
+        public String getDomainBase()
+        {
+            return domainBase;
+        }
+
+        @Config("jmx.base-name")
+        public PrefixObjectNameGeneratorConfig setDomainBase(String domainBase)
+        {
+            this.domainBase = domainBase;
+            return this;
+        }
+    }
+
+    public static final class PrefixObjectNameGenerator
+            implements ObjectNameGenerator
+    {
+        private final String domainBase;
+
+        public PrefixObjectNameGenerator(String domainBase)
+        {
+            this.domainBase = domainBase;
+        }
+
+        @Override
+        public String generatedNameOf(Class<?> type, Map<String, String> properties)
+        {
+            return new ObjectNameBuilder(toDomain(type))
+                    .withProperties(properties)
+                    .build();
+        }
+
+        private String toDomain(Class<?> type)
+        {
+            String domain = type.getPackage().getName();
+            if (domain.startsWith(CONNECTOR_PACKAGE_NAME)) {
+                domain = domainBase + domain.substring(CONNECTOR_PACKAGE_NAME.length());
+            }
+            return domain;
+        }
+    }
+}
diff --git a/presto-thrift/src/main/java/io/prestosql/plugin/thrift/ConnectorObjectNameGeneratorModule.java b/presto-thrift/src/main/java/io/prestosql/plugin/thrift/ConnectorObjectNameGeneratorModule.java
new file mode 100644
index 000000000000..4ad3ac333594
--- /dev/null
+++ b/presto-thrift/src/main/java/io/prestosql/plugin/thrift/ConnectorObjectNameGeneratorModule.java
@@ -0,0 +1,117 @@
+/*
+ * 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.prestosql.plugin.thrift;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.inject.Binder;
+import com.google.inject.Module;
+import com.google.inject.Provides;
+import io.airlift.configuration.Config;
+import org.weakref.jmx.ObjectNameBuilder;
+import org.weakref.jmx.ObjectNameGenerator;
+
+import java.util.Map;
+
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static io.airlift.configuration.ConfigBinder.configBinder;
+import static java.util.Objects.requireNonNull;
+
+// Note: There are multiple copies of this class in the codebase.  If you change one you, should change them all.
+public class ConnectorObjectNameGeneratorModule
+        implements Module
+{
+    private static final String CONNECTOR_PACKAGE_NAME = "io.prestosql.plugin.thrift";
+    private static final String DEFAULT_DOMAIN_BASE = "presto.plugin.thrift";
+
+    private final String catalogName;
+
+    public ConnectorObjectNameGeneratorModule(String catalogName)
+    {
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
+    }
+
+    @Override
+    public void configure(Binder binder)
+    {
+        configBinder(binder).bindConfig(ConnectorObjectNameGeneratorConfig.class);
+    }
+
+    @Provides
+    ObjectNameGenerator createPrefixObjectNameGenerator(ConnectorObjectNameGeneratorConfig config)
+    {
+        String domainBase = firstNonNull(config.getDomainBase(), DEFAULT_DOMAIN_BASE);
+        return new ConnectorObjectNameGenerator(domainBase, catalogName);
+    }
+
+    public static class ConnectorObjectNameGeneratorConfig
+    {
+        private String domainBase;
+
+        public String getDomainBase()
+        {
+            return domainBase;
+        }
+
+        @Config("jmx.base-name")
+        public ConnectorObjectNameGeneratorConfig setDomainBase(String domainBase)
+        {
+            this.domainBase = domainBase;
+            return this;
+        }
+    }
+
+    public static final class ConnectorObjectNameGenerator
+            implements ObjectNameGenerator
+    {
+        private final String domainBase;
+        private final String catalogName;
+
+        public ConnectorObjectNameGenerator(String domainBase, String catalogName)
+        {
+            this.domainBase = domainBase;
+            this.catalogName = catalogName;
+        }
+
+        @Override
+        public String generatedNameOf(Class<?> type)
+        {
+            return new ObjectNameBuilder(toDomain(type))
+                    .withProperties(ImmutableMap.<String, String>builder()
+                    .put("type", type.getSimpleName())
+                    .put("name", catalogName)
+                    .build())
+                    .build();
+        }
+
+        @Override
+        public String generatedNameOf(Class<?> type, Map<String, String> properties)
+        {
+            return new ObjectNameBuilder(toDomain(type))
+                    .withProperties(ImmutableMap.<String, String>builder()
+                    .putAll(properties)
+                    .put("catalog", catalogName)
+                    .build())
+                    .build();
+        }
+
+        private String toDomain(Class<?> type)
+        {
+            String domain = type.getPackage().getName();
+            if (domain.startsWith(CONNECTOR_PACKAGE_NAME)) {
+                domain = domainBase + domain.substring(CONNECTOR_PACKAGE_NAME.length());
+            }
+            return domain;
+        }
+    }
+}
diff --git a/presto-thrift/src/main/java/io/prestosql/plugin/thrift/ThriftConnectorFactory.java b/presto-thrift/src/main/java/io/prestosql/plugin/thrift/ThriftConnectorFactory.java
index c3dde832156b..274990638d15 100644
--- a/presto-thrift/src/main/java/io/prestosql/plugin/thrift/ThriftConnectorFactory.java
+++ b/presto-thrift/src/main/java/io/prestosql/plugin/thrift/ThriftConnectorFactory.java
@@ -63,13 +63,14 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
         try {
             Bootstrap app = new Bootstrap(
                     new MBeanModule(),
+                    new ConnectorObjectNameGeneratorModule(catalogName),
                     new DriftNettyClientModule(),
                     binder -> {
                         binder.bind(MBeanServer.class).toInstance(new RebindSafeMBeanServer(getPlatformMBeanServer()));
                         binder.bind(TypeManager.class).toInstance(context.getTypeManager());
                     },
                     locationModule,
-                    new ThriftModule(catalogName));
+                    new ThriftModule());
 
             Injector injector = app
                     .strictConfig()
diff --git a/presto-thrift/src/main/java/io/prestosql/plugin/thrift/ThriftModule.java b/presto-thrift/src/main/java/io/prestosql/plugin/thrift/ThriftModule.java
index 6dd0b4b11aee..8359034d44c8 100644
--- a/presto-thrift/src/main/java/io/prestosql/plugin/thrift/ThriftModule.java
+++ b/presto-thrift/src/main/java/io/prestosql/plugin/thrift/ThriftModule.java
@@ -32,21 +32,12 @@
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static io.airlift.drift.client.ExceptionClassification.NORMAL_EXCEPTION;
 import static io.airlift.drift.client.guice.DriftClientBinder.driftClientBinder;
-import static java.util.Objects.requireNonNull;
 import static java.util.concurrent.Executors.newFixedThreadPool;
-import static org.weakref.jmx.ObjectNames.generatedNameOf;
 import static org.weakref.jmx.guice.ExportBinder.newExporter;
 
 public class ThriftModule
         implements Module
 {
-    private final String connectorId;
-
-    public ThriftModule(String connectorId)
-    {
-        this.connectorId = requireNonNull(connectorId, "connectorId is null");
-    }
-
     @Override
     public void configure(Binder binder)
     {
@@ -68,8 +59,7 @@ public void configure(Binder binder)
         binder.bind(ThriftSessionProperties.class).in(Scopes.SINGLETON);
         binder.bind(ThriftIndexProvider.class).in(Scopes.SINGLETON);
         binder.bind(ThriftConnectorStats.class).in(Scopes.SINGLETON);
-        newExporter(binder).export(ThriftConnectorStats.class)
-                .as(generatedNameOf(ThriftConnectorStats.class, connectorId));
+        newExporter(binder).export(ThriftConnectorStats.class).withGeneratedName();
     }
 
     @Provides