You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gobblin.apache.org by ab...@apache.org on 2017/07/31 07:52:38 UTC

[20/77] [abbrv] incubator-gobblin git commit: Updated package names, imports and shell scripts

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/DatabaseJobHistoryStore.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/DatabaseJobHistoryStore.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/DatabaseJobHistoryStore.java
index 914ab42..986cd90 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/DatabaseJobHistoryStore.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/DatabaseJobHistoryStore.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
 import javax.annotation.Nullable;
 import javax.sql.DataSource;
@@ -40,10 +40,10 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
 
-import gobblin.metastore.database.SupportedDatabaseVersion;
-import gobblin.metastore.database.VersionedDatabaseJobHistoryStore;
-import gobblin.rest.JobExecutionInfo;
-import gobblin.rest.JobExecutionQuery;
+import org.apache.gobblin.metastore.database.SupportedDatabaseVersion;
+import org.apache.gobblin.metastore.database.VersionedDatabaseJobHistoryStore;
+import org.apache.gobblin.rest.JobExecutionInfo;
+import org.apache.gobblin.rest.JobExecutionQuery;
 
 import org.reflections.util.ClasspathHelper;
 import org.reflections.util.ConfigurationBuilder;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/DatasetStateStore.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/DatasetStateStore.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/DatasetStateStore.java
index 3334354..16b3442 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/DatasetStateStore.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/DatasetStateStore.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -23,7 +23,7 @@ import java.util.Map;
 
 import com.typesafe.config.Config;
 
-import gobblin.configuration.State;
+import org.apache.gobblin.configuration.State;
 
 public interface DatasetStateStore<T extends State> extends StateStore<T> {
   String DATASET_STATE_STORE_TABLE_SUFFIX = ".jst";

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/FsStateStore.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/FsStateStore.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/FsStateStore.java
index 835db66..96c3e51 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/FsStateStore.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/FsStateStore.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
-import static gobblin.util.HadoopUtils.FS_SCHEMES_NON_ATOMIC;
+import static org.apache.gobblin.util.HadoopUtils.FS_SCHEMES_NON_ATOMIC;
 
 import com.google.common.base.Predicate;
-import gobblin.util.HadoopUtils;
+import org.apache.gobblin.util.HadoopUtils;
 import java.io.IOException;
 import java.net.URI;
 import java.util.Collection;
@@ -39,8 +39,8 @@ import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.io.Closer;
 
-import gobblin.configuration.State;
-import gobblin.util.WritableShimSerialization;
+import org.apache.gobblin.configuration.State;
+import org.apache.gobblin.util.WritableShimSerialization;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/FsStateStoreFactory.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/FsStateStoreFactory.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/FsStateStoreFactory.java
index 5ce44f2..1331362 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/FsStateStoreFactory.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/FsStateStoreFactory.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigValue;
-import gobblin.annotation.Alias;
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.configuration.State;
-import gobblin.util.ConfigUtils;
+import org.apache.gobblin.annotation.Alias;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.configuration.State;
+import org.apache.gobblin.util.ConfigUtils;
 import java.io.IOException;
 import java.net.URI;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/JobHistoryDataSourceProvider.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/JobHistoryDataSourceProvider.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/JobHistoryDataSourceProvider.java
index 79e56fd..13a398f 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/JobHistoryDataSourceProvider.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/JobHistoryDataSourceProvider.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
 import java.util.Properties;
 
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.password.PasswordManager;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.password.PasswordManager;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/JobHistoryStore.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/JobHistoryStore.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/JobHistoryStore.java
index 3833897..3e05daf 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/JobHistoryStore.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/JobHistoryStore.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.List;
 
-import gobblin.rest.JobExecutionInfo;
-import gobblin.rest.JobExecutionQuery;
+import org.apache.gobblin.rest.JobExecutionInfo;
+import org.apache.gobblin.rest.JobExecutionQuery;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/MetaStoreModule.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/MetaStoreModule.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/MetaStoreModule.java
index 6363aa0..3b0d77f 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/MetaStoreModule.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/MetaStoreModule.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
 import java.util.Properties;
 import javax.sql.DataSource;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/MysqlStateStore.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/MysqlStateStore.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/MysqlStateStore.java
index 1d3a133..3e2b928 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/MysqlStateStore.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/MysqlStateStore.java
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.typesafe.config.Config;
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.configuration.State;
-import gobblin.password.PasswordManager;
-import gobblin.util.ConfigUtils;
-import gobblin.util.io.StreamUtils;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.configuration.State;
+import org.apache.gobblin.password.PasswordManager;
+import org.apache.gobblin.util.ConfigUtils;
+import org.apache.gobblin.util.io.StreamUtils;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/MysqlStateStoreFactory.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/MysqlStateStoreFactory.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/MysqlStateStoreFactory.java
index 44103d0..aad441a 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/MysqlStateStoreFactory.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/MysqlStateStoreFactory.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
 import com.typesafe.config.Config;
-import gobblin.annotation.Alias;
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.configuration.State;
-import gobblin.util.ConfigUtils;
+import org.apache.gobblin.annotation.Alias;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.configuration.State;
+import org.apache.gobblin.util.ConfigUtils;
 import java.util.Properties;
 import org.apache.commons.dbcp.BasicDataSource;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/StateStore.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/StateStore.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/StateStore.java
index 65f11c4..578c94a 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/StateStore.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/StateStore.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
 import com.google.common.base.Predicate;
 import com.typesafe.config.Config;
@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 
-import gobblin.configuration.State;
+import org.apache.gobblin.configuration.State;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/DatabaseJobHistoryStoreV100.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/DatabaseJobHistoryStoreV100.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/DatabaseJobHistoryStoreV100.java
index 38cd464..4bbae5a 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/DatabaseJobHistoryStoreV100.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/DatabaseJobHistoryStoreV100.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.database;
+package org.apache.gobblin.metastore.database;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -48,22 +48,22 @@ import com.google.common.collect.Maps;
 
 import com.linkedin.data.template.StringMap;
 
-import gobblin.metastore.DatabaseJobHistoryStore;
-import gobblin.metastore.JobHistoryStore;
-import gobblin.rest.JobExecutionInfo;
-import gobblin.rest.JobExecutionQuery;
-import gobblin.rest.JobStateEnum;
-import gobblin.rest.LauncherTypeEnum;
-import gobblin.rest.Metric;
-import gobblin.rest.MetricArray;
-import gobblin.rest.MetricTypeEnum;
-import gobblin.rest.QueryListType;
-import gobblin.rest.Table;
-import gobblin.rest.TableTypeEnum;
-import gobblin.rest.TaskExecutionInfo;
-import gobblin.rest.TaskExecutionInfoArray;
-import gobblin.rest.TaskStateEnum;
-import gobblin.rest.TimeRange;
+import org.apache.gobblin.metastore.DatabaseJobHistoryStore;
+import org.apache.gobblin.metastore.JobHistoryStore;
+import org.apache.gobblin.rest.JobExecutionInfo;
+import org.apache.gobblin.rest.JobExecutionQuery;
+import org.apache.gobblin.rest.JobStateEnum;
+import org.apache.gobblin.rest.LauncherTypeEnum;
+import org.apache.gobblin.rest.Metric;
+import org.apache.gobblin.rest.MetricArray;
+import org.apache.gobblin.rest.MetricTypeEnum;
+import org.apache.gobblin.rest.QueryListType;
+import org.apache.gobblin.rest.Table;
+import org.apache.gobblin.rest.TableTypeEnum;
+import org.apache.gobblin.rest.TaskExecutionInfo;
+import org.apache.gobblin.rest.TaskExecutionInfoArray;
+import org.apache.gobblin.rest.TaskStateEnum;
+import org.apache.gobblin.rest.TimeRange;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/DatabaseJobHistoryStoreV101.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/DatabaseJobHistoryStoreV101.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/DatabaseJobHistoryStoreV101.java
index e24bc31..88e5cfa 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/DatabaseJobHistoryStoreV101.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/DatabaseJobHistoryStoreV101.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.database;
+package org.apache.gobblin.metastore.database;
 
 import javax.sql.DataSource;
 import java.io.IOException;
@@ -51,21 +51,21 @@ import com.google.common.collect.Sets;
 import com.linkedin.data.template.GetMode;
 import com.linkedin.data.template.StringMap;
 
-import gobblin.metastore.JobHistoryStore;
-import gobblin.rest.JobExecutionInfo;
-import gobblin.rest.JobExecutionQuery;
-import gobblin.rest.JobStateEnum;
-import gobblin.rest.LauncherTypeEnum;
-import gobblin.rest.Metric;
-import gobblin.rest.MetricArray;
-import gobblin.rest.MetricTypeEnum;
-import gobblin.rest.QueryListType;
-import gobblin.rest.Table;
-import gobblin.rest.TableTypeEnum;
-import gobblin.rest.TaskExecutionInfo;
-import gobblin.rest.TaskExecutionInfoArray;
-import gobblin.rest.TaskStateEnum;
-import gobblin.rest.TimeRange;
+import org.apache.gobblin.metastore.JobHistoryStore;
+import org.apache.gobblin.rest.JobExecutionInfo;
+import org.apache.gobblin.rest.JobExecutionQuery;
+import org.apache.gobblin.rest.JobStateEnum;
+import org.apache.gobblin.rest.LauncherTypeEnum;
+import org.apache.gobblin.rest.Metric;
+import org.apache.gobblin.rest.MetricArray;
+import org.apache.gobblin.rest.MetricTypeEnum;
+import org.apache.gobblin.rest.QueryListType;
+import org.apache.gobblin.rest.Table;
+import org.apache.gobblin.rest.TableTypeEnum;
+import org.apache.gobblin.rest.TaskExecutionInfo;
+import org.apache.gobblin.rest.TaskExecutionInfoArray;
+import org.apache.gobblin.rest.TaskStateEnum;
+import org.apache.gobblin.rest.TimeRange;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/DatabaseJobHistoryStoreV102.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/DatabaseJobHistoryStoreV102.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/DatabaseJobHistoryStoreV102.java
index f59bf78..1c951b5 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/DatabaseJobHistoryStoreV102.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/DatabaseJobHistoryStoreV102.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.database;
+package org.apache.gobblin.metastore.database;
 
-import gobblin.metastore.JobHistoryStore;
+import org.apache.gobblin.metastore.JobHistoryStore;
 
 import java.io.IOException;
 
-import gobblin.rest.JobExecutionInfo;
+import org.apache.gobblin.rest.JobExecutionInfo;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/Filter.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/Filter.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/Filter.java
index 8a62b2e..3bfbfb5 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/Filter.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/Filter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.database;
+package org.apache.gobblin.metastore.database;
 
 import com.google.common.base.Preconditions;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/SupportedDatabaseVersion.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/SupportedDatabaseVersion.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/SupportedDatabaseVersion.java
index d6bc456..1fb7285 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/SupportedDatabaseVersion.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/SupportedDatabaseVersion.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.database;
+package org.apache.gobblin.metastore.database;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/VersionedDatabaseJobHistoryStore.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/VersionedDatabaseJobHistoryStore.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/VersionedDatabaseJobHistoryStore.java
index dd432d0..8651f8f 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/VersionedDatabaseJobHistoryStore.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/database/VersionedDatabaseJobHistoryStore.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.database;
+package org.apache.gobblin.metastore.database;
 
-import gobblin.metastore.JobHistoryStore;
+import org.apache.gobblin.metastore.JobHistoryStore;
 
 import javax.sql.DataSource;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/nameParser/DatasetUrnStateStoreNameParser.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/nameParser/DatasetUrnStateStoreNameParser.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/nameParser/DatasetUrnStateStoreNameParser.java
index f50ffe0..ace61af 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/nameParser/DatasetUrnStateStoreNameParser.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/nameParser/DatasetUrnStateStoreNameParser.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.nameParser;
+package org.apache.gobblin.metastore.nameParser;
 
 import java.io.IOException;
 import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/nameParser/GuidDatasetUrnStateStoreNameParser.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/nameParser/GuidDatasetUrnStateStoreNameParser.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/nameParser/GuidDatasetUrnStateStoreNameParser.java
index f660c22..cbb35b4 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/nameParser/GuidDatasetUrnStateStoreNameParser.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/nameParser/GuidDatasetUrnStateStoreNameParser.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.nameParser;
+package org.apache.gobblin.metastore.nameParser;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,7 +34,7 @@ import com.google.common.collect.HashBiMap;
 import com.google.common.collect.Maps;
 import com.google.common.io.LineReader;
 
-import gobblin.util.guid.Guid;
+import org.apache.gobblin.util.guid.Guid;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/nameParser/SimpleDatasetUrnStateStoreNameParser.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/nameParser/SimpleDatasetUrnStateStoreNameParser.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/nameParser/SimpleDatasetUrnStateStoreNameParser.java
index 967ecda..31fdfb3 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/nameParser/SimpleDatasetUrnStateStoreNameParser.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/nameParser/SimpleDatasetUrnStateStoreNameParser.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.nameParser;
+package org.apache.gobblin.metastore.nameParser;
 
 import java.io.IOException;
 import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/util/DatabaseJobHistoryStoreSchemaManager.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/util/DatabaseJobHistoryStoreSchemaManager.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/util/DatabaseJobHistoryStoreSchemaManager.java
index 60ee54a..57f8027 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/util/DatabaseJobHistoryStoreSchemaManager.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/util/DatabaseJobHistoryStoreSchemaManager.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.util;
+package org.apache.gobblin.metastore.util;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -36,7 +36,7 @@ import org.flywaydb.core.api.MigrationInfoService;
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.internal.info.MigrationInfoDumper;
 
-import gobblin.metastore.DatabaseJobHistoryStore;
+import org.apache.gobblin.metastore.DatabaseJobHistoryStore;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/util/MySqlJdbcUrl.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/util/MySqlJdbcUrl.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/util/MySqlJdbcUrl.java
index e34e243..a1cbb99 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/util/MySqlJdbcUrl.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/util/MySqlJdbcUrl.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.util;
+package org.apache.gobblin.metastore.util;
 
 import org.apache.http.client.utils.URIBuilder;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/util/StateStoreCleaner.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/util/StateStoreCleaner.java b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/util/StateStoreCleaner.java
index b3a9b74..5e125a5 100644
--- a/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/util/StateStoreCleaner.java
+++ b/gobblin-metastore/src/main/java/org/apache/gobblin/metastore/util/StateStoreCleaner.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.util;
+package org.apache.gobblin.metastore.util;
 
 import java.io.Closeable;
 import java.io.FileInputStream;
@@ -44,9 +44,9 @@ import com.google.common.collect.Lists;
 import com.google.common.io.Closer;
 import com.google.common.io.Files;
 
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.metastore.nameParser.GuidDatasetUrnStateStoreNameParser;
-import gobblin.util.ExecutorsUtils;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.metastore.nameParser.GuidDatasetUrnStateStoreNameParser;
+import org.apache.gobblin.util.ExecutorsUtils;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/DatabaseJobHistoryStoreTest.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/DatabaseJobHistoryStoreTest.java b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/DatabaseJobHistoryStoreTest.java
index 31f4312..7a48105 100644
--- a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/DatabaseJobHistoryStoreTest.java
+++ b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/DatabaseJobHistoryStoreTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
 import java.io.IOException;
 import java.util.List;
@@ -34,22 +34,22 @@ import com.google.inject.Injector;
 import com.linkedin.data.template.StringMap;
 import com.typesafe.config.ConfigFactory;
 
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.metastore.testing.ITestMetastoreDatabase;
-import gobblin.metastore.testing.TestMetastoreDatabaseFactory;
-import gobblin.rest.JobExecutionInfo;
-import gobblin.rest.JobExecutionQuery;
-import gobblin.rest.JobStateEnum;
-import gobblin.rest.LauncherTypeEnum;
-import gobblin.rest.Metric;
-import gobblin.rest.MetricArray;
-import gobblin.rest.MetricTypeEnum;
-import gobblin.rest.QueryIdTypeEnum;
-import gobblin.rest.Table;
-import gobblin.rest.TableTypeEnum;
-import gobblin.rest.TaskExecutionInfo;
-import gobblin.rest.TaskExecutionInfoArray;
-import gobblin.rest.TaskStateEnum;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.metastore.testing.ITestMetastoreDatabase;
+import org.apache.gobblin.metastore.testing.TestMetastoreDatabaseFactory;
+import org.apache.gobblin.rest.JobExecutionInfo;
+import org.apache.gobblin.rest.JobExecutionQuery;
+import org.apache.gobblin.rest.JobStateEnum;
+import org.apache.gobblin.rest.LauncherTypeEnum;
+import org.apache.gobblin.rest.Metric;
+import org.apache.gobblin.rest.MetricArray;
+import org.apache.gobblin.rest.MetricTypeEnum;
+import org.apache.gobblin.rest.QueryIdTypeEnum;
+import org.apache.gobblin.rest.Table;
+import org.apache.gobblin.rest.TableTypeEnum;
+import org.apache.gobblin.rest.TaskExecutionInfo;
+import org.apache.gobblin.rest.TaskExecutionInfoArray;
+import org.apache.gobblin.rest.TaskStateEnum;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/DatabaseJobHistoryStoreV100Test.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/DatabaseJobHistoryStoreV100Test.java b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/DatabaseJobHistoryStoreV100Test.java
index 83e6b95..afe3805 100644
--- a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/DatabaseJobHistoryStoreV100Test.java
+++ b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/DatabaseJobHistoryStoreV100Test.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
 import org.testng.annotations.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/DatabaseJobHistoryStoreV101Test.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/DatabaseJobHistoryStoreV101Test.java b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/DatabaseJobHistoryStoreV101Test.java
index e6efcb0..04fbf17 100644
--- a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/DatabaseJobHistoryStoreV101Test.java
+++ b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/DatabaseJobHistoryStoreV101Test.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
 import org.testng.annotations.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/FsStateStoreTest.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/FsStateStoreTest.java b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/FsStateStoreTest.java
index 72cd6f3..052f1d2 100644
--- a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/FsStateStoreTest.java
+++ b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/FsStateStoreTest.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package gobblin.metastore;
+package org.apache.gobblin.metastore;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import com.typesafe.config.ConfigValueFactory;
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.util.ClassAliasResolver;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.util.ClassAliasResolver;
 import java.io.IOException;
 import java.net.URL;
 import java.util.List;
@@ -36,7 +36,7 @@ import org.testng.annotations.Test;
 
 import com.google.common.collect.Lists;
 
-import gobblin.configuration.State;
+import org.apache.gobblin.configuration.State;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/nameParser/GuidDatasetUrnStateStoreNameParserTest.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/nameParser/GuidDatasetUrnStateStoreNameParserTest.java b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/nameParser/GuidDatasetUrnStateStoreNameParserTest.java
index e685f57..8ca4492 100644
--- a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/nameParser/GuidDatasetUrnStateStoreNameParserTest.java
+++ b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/nameParser/GuidDatasetUrnStateStoreNameParserTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.nameParser;
+package org.apache.gobblin.metastore.nameParser;
 
 import java.io.IOException;
 
@@ -29,7 +29,7 @@ import org.testng.annotations.Test;
 
 import com.google.common.collect.Lists;
 
-import gobblin.util.guid.Guid;
+import org.apache.gobblin.util.guid.Guid;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/ITestMetastoreDatabase.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/ITestMetastoreDatabase.java b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/ITestMetastoreDatabase.java
index a2a4a6b..1ee3bf2 100644
--- a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/ITestMetastoreDatabase.java
+++ b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/ITestMetastoreDatabase.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.testing;
+package org.apache.gobblin.metastore.testing;
 
 import java.io.Closeable;
 import java.net.URISyntaxException;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/TestMetadataDatabase.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/TestMetadataDatabase.java b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/TestMetadataDatabase.java
index 63a05d4..d755e83 100644
--- a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/TestMetadataDatabase.java
+++ b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/TestMetadataDatabase.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.testing;
+package org.apache.gobblin.metastore.testing;
 
 import org.apache.commons.lang.StringUtils;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/TestMetastoreDatabaseFactory.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/TestMetastoreDatabaseFactory.java b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/TestMetastoreDatabaseFactory.java
index adb49c2..bf5295d 100644
--- a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/TestMetastoreDatabaseFactory.java
+++ b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/TestMetastoreDatabaseFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.testing;
+package org.apache.gobblin.metastore.testing;
 
 import java.io.Closeable;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/TestMetastoreDatabaseServer.java
----------------------------------------------------------------------
diff --git a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/TestMetastoreDatabaseServer.java b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/TestMetastoreDatabaseServer.java
index 170aa50..599d16f 100644
--- a/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/TestMetastoreDatabaseServer.java
+++ b/gobblin-metastore/src/test/java/org/apache/gobblin/metastore/testing/TestMetastoreDatabaseServer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metastore.testing;
+package org.apache.gobblin.metastore.testing;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -41,10 +41,10 @@ import com.wix.mysql.EmbeddedMysql;
 import com.wix.mysql.config.MysqldConfig;
 import com.wix.mysql.distribution.Version;
 
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.metastore.MetaStoreModule;
-import gobblin.metastore.util.DatabaseJobHistoryStoreSchemaManager;
-import gobblin.metastore.util.MySqlJdbcUrl;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.metastore.MetaStoreModule;
+import org.apache.gobblin.metastore.util.DatabaseJobHistoryStoreSchemaManager;
+import org.apache.gobblin.metastore.util.MySqlJdbcUrl;
 
 
 class TestMetastoreDatabaseServer implements Closeable {

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/avro/FlatGobblinMetric.avsc
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/avro/FlatGobblinMetric.avsc b/gobblin-metrics-libs/gobblin-metrics-base/src/main/avro/FlatGobblinMetric.avsc
index fc129f8..f00a548 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/avro/FlatGobblinMetric.avsc
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/avro/FlatGobblinMetric.avsc
@@ -4,7 +4,7 @@
 {
   "type": "record",
   "name": "FlatGobblinMetric",
-  "namespace": "gobblin.metrics",
+  "namesapce" : "org.apache.gobblin.metrics",
   "fields" : [
     {
       "name": "tags",

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/avro/GobblinTrackingEvent.avsc
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/avro/GobblinTrackingEvent.avsc b/gobblin-metrics-libs/gobblin-metrics-base/src/main/avro/GobblinTrackingEvent.avsc
index 3290404..844138a 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/avro/GobblinTrackingEvent.avsc
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/avro/GobblinTrackingEvent.avsc
@@ -1,7 +1,7 @@
 {
   "type": "record",
   "name": "GobblinTrackingEvent",
-  "namespace": "gobblin.metrics",
+  "namesapce" : "org.apache.gobblin.metrics",
   "fields": [
     {
       "name": "timestamp",

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/avro/MetricReport.avsc
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/avro/MetricReport.avsc b/gobblin-metrics-libs/gobblin-metrics-base/src/main/avro/MetricReport.avsc
index 7ec96fb..04310b9 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/avro/MetricReport.avsc
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/avro/MetricReport.avsc
@@ -4,7 +4,7 @@
 {
   "type": "record",
   "name": "MetricReport",
-  "namespace": "gobblin.metrics",
+  "namesapce" : "org.apache.gobblin.metrics",
   "fields" : [
     {
       "name": "tags",

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/FlatGobblinMetric.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/FlatGobblinMetric.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/FlatGobblinMetric.java
index 6e41133..d6e8a70 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/FlatGobblinMetric.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/FlatGobblinMetric.java
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT DIRECTLY
  */
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import org.apache.avro.specific.SpecificData;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/GobblinTrackingEvent.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/GobblinTrackingEvent.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/GobblinTrackingEvent.java
index c8acdf7..59c956c 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/GobblinTrackingEvent.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/GobblinTrackingEvent.java
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT DIRECTLY
  */
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import org.apache.avro.specific.SpecificData;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/Metric.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/Metric.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/Metric.java
index 84823b9..1160507 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/Metric.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/Metric.java
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT DIRECTLY
  */
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import org.apache.avro.specific.SpecificData;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/MetricReport.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/MetricReport.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/MetricReport.java
index ae16f2e..6cbf097 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/MetricReport.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/gen-java/org/apache/gobblin/metrics/MetricReport.java
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT DIRECTLY
  */
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import org.apache.avro.specific.SpecificData;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/filesystem/MetricsFileSystemInstrumentation.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/filesystem/MetricsFileSystemInstrumentation.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/filesystem/MetricsFileSystemInstrumentation.java
index 8f157fb..1ba09a8 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/filesystem/MetricsFileSystemInstrumentation.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/filesystem/MetricsFileSystemInstrumentation.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.filesystem;
+package org.apache.gobblin.filesystem;
 
 import java.io.Closeable;
 import java.io.FileNotFoundException;
@@ -31,14 +31,14 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Closer;
 
-import gobblin.broker.iface.ConfigView;
-import gobblin.broker.iface.ScopeType;
-import gobblin.broker.iface.SharedResourcesBroker;
-import gobblin.metrics.ContextAwareTimer;
-import gobblin.metrics.MetricContext;
-import gobblin.util.filesystem.FileSystemInstrumentation;
-import gobblin.util.filesystem.FileSystemInstrumentationFactory;
-import gobblin.util.filesystem.FileSystemKey;
+import org.apache.gobblin.broker.iface.ConfigView;
+import org.apache.gobblin.broker.iface.ScopeType;
+import org.apache.gobblin.broker.iface.SharedResourcesBroker;
+import org.apache.gobblin.metrics.ContextAwareTimer;
+import org.apache.gobblin.metrics.MetricContext;
+import org.apache.gobblin.util.filesystem.FileSystemInstrumentation;
+import org.apache.gobblin.util.filesystem.FileSystemInstrumentationFactory;
+import org.apache.gobblin.util.filesystem.FileSystemKey;
 
 import org.apache.hadoop.fs.*;
 import org.apache.hadoop.fs.permission.FsPermission;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ConsoleEventReporterFactory.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ConsoleEventReporterFactory.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ConsoleEventReporterFactory.java
index 168e5ea..dfc7eed 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ConsoleEventReporterFactory.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ConsoleEventReporterFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.io.IOException;
 import java.util.Properties;
@@ -22,7 +22,7 @@ import java.util.Properties;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.ScheduledReporter;
 
-import gobblin.metrics.reporter.OutputStreamEventReporter;
+import org.apache.gobblin.metrics.reporter.OutputStreamEventReporter;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ConsoleReporterFactory.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ConsoleReporterFactory.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ConsoleReporterFactory.java
index 43abef9..6a86d98 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ConsoleReporterFactory.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ConsoleReporterFactory.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.io.IOException;
 import java.util.Properties;
 
-import gobblin.metrics.reporter.OutputStreamReporter;
-import gobblin.metrics.reporter.ScheduledReporter;
+import org.apache.gobblin.metrics.reporter.OutputStreamReporter;
+import org.apache.gobblin.metrics.reporter.ScheduledReporter;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareCounter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareCounter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareCounter.java
index 8451563..bada80d 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareCounter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareCounter.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 import com.codahale.metrics.Counter;
 
-import gobblin.metrics.metric.InnerMetric;
-import gobblin.metrics.metric.ProxyMetric;
+import org.apache.gobblin.metrics.metric.InnerMetric;
+import org.apache.gobblin.metrics.metric.ProxyMetric;
 
 import lombok.experimental.Delegate;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareGauge.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareGauge.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareGauge.java
index 0aa7608..292a584 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareGauge.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareGauge.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import lombok.experimental.Delegate;
 
 import com.codahale.metrics.Gauge;
 
-import gobblin.metrics.metric.InnerMetric;
+import org.apache.gobblin.metrics.metric.InnerMetric;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareHistogram.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareHistogram.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareHistogram.java
index eedeebf..94b3615 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareHistogram.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareHistogram.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import lombok.experimental.Delegate;
 
 import com.codahale.metrics.ExponentiallyDecayingReservoir;
 import com.codahale.metrics.Histogram;
 
-import gobblin.metrics.metric.InnerMetric;
+import org.apache.gobblin.metrics.metric.InnerMetric;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareMeter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareMeter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareMeter.java
index 8087707..13de0b6 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareMeter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareMeter.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import com.codahale.metrics.Meter;
 
-import gobblin.metrics.metric.InnerMetric;
+import org.apache.gobblin.metrics.metric.InnerMetric;
 
 import lombok.experimental.Delegate;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareMetric.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareMetric.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareMetric.java
index bb3fd20..8375737 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareMetric.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareMetric.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import com.codahale.metrics.Metric;
 
-import gobblin.metrics.metric.ProxyMetric;
+import org.apache.gobblin.metrics.metric.ProxyMetric;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareMetricFactory.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareMetricFactory.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareMetricFactory.java
index 20e1ba4..d699b06 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareMetricFactory.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareMetricFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.Histogram;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareTimer.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareTimer.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareTimer.java
index 28a06e2..25c81dd 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareTimer.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/ContextAwareTimer.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import com.codahale.metrics.Timer;
 
-import gobblin.metrics.metric.InnerMetric;
+import org.apache.gobblin.metrics.metric.InnerMetric;
 
 import lombok.experimental.Delegate;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Counters.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Counters.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Counters.java
index 1588c43..7d1737f 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Counters.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Counters.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.util.Arrays;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/CustomCodahaleReporterFactory.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/CustomCodahaleReporterFactory.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/CustomCodahaleReporterFactory.java
index e5c95b6..81dfd3c 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/CustomCodahaleReporterFactory.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/CustomCodahaleReporterFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.io.IOException;
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/CustomReporterFactory.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/CustomReporterFactory.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/CustomReporterFactory.java
index ae6dbf9..55d0bec 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/CustomReporterFactory.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/CustomReporterFactory.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.io.IOException;
 import java.util.Properties;
 
-import gobblin.metrics.reporter.ScheduledReporter;
+import org.apache.gobblin.metrics.reporter.ScheduledReporter;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerCounter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerCounter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerCounter.java
index a613255..9e95888 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerCounter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerCounter.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.lang.ref.WeakReference;
 
 import com.codahale.metrics.Counter;
 import com.google.common.base.Optional;
 
-import gobblin.metrics.metric.InnerMetric;
+import org.apache.gobblin.metrics.metric.InnerMetric;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerGauge.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerGauge.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerGauge.java
index eeff694..5c13915 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerGauge.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerGauge.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.lang.ref.WeakReference;
 
 import com.codahale.metrics.Gauge;
 
-import gobblin.metrics.metric.InnerMetric;
+import org.apache.gobblin.metrics.metric.InnerMetric;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerHistogram.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerHistogram.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerHistogram.java
index feb5194..7fb5401 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerHistogram.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerHistogram.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.lang.ref.WeakReference;
 
@@ -23,7 +23,7 @@ import com.codahale.metrics.ExponentiallyDecayingReservoir;
 import com.codahale.metrics.Histogram;
 import com.google.common.base.Optional;
 
-import gobblin.metrics.metric.InnerMetric;
+import org.apache.gobblin.metrics.metric.InnerMetric;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerMeter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerMeter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerMeter.java
index 3d07f61..5f4f89c 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerMeter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerMeter.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.lang.ref.WeakReference;
 
 import com.codahale.metrics.Meter;
 import com.google.common.base.Optional;
 
-import gobblin.metrics.metric.InnerMetric;
+import org.apache.gobblin.metrics.metric.InnerMetric;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerMetricContext.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerMetricContext.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerMetricContext.java
index 41f4300..ac7e7e3 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerMetricContext.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerMetricContext.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -50,10 +50,10 @@ import com.google.common.io.Closer;
 
 import lombok.Getter;
 
-import gobblin.metrics.context.ContextWeakReference;
-import gobblin.metrics.context.NameConflictException;
-import gobblin.metrics.context.ReportableContext;
-import gobblin.metrics.metric.InnerMetric;
+import org.apache.gobblin.metrics.context.ContextWeakReference;
+import org.apache.gobblin.metrics.context.NameConflictException;
+import org.apache.gobblin.metrics.context.ReportableContext;
+import org.apache.gobblin.metrics.metric.InnerMetric;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerTimer.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerTimer.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerTimer.java
index b840039..db4fc0a 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerTimer.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/InnerTimer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.lang.ref.WeakReference;
 import java.util.concurrent.TimeUnit;
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
 import com.codahale.metrics.Timer;
 import com.google.common.base.Optional;
 
-import gobblin.metrics.metric.InnerMetric;
+import org.apache.gobblin.metrics.metric.InnerMetric;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Measurements.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Measurements.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Measurements.java
index 5ffd4c2..fe0fb98 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Measurements.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Measurements.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/MetricContext.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/MetricContext.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/MetricContext.java
index b4b0313..7552876 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/MetricContext.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/MetricContext.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import lombok.Getter;
 
@@ -59,11 +59,11 @@ import com.google.common.collect.Sets;
 import com.google.common.io.Closer;
 import com.google.common.util.concurrent.MoreExecutors;
 
-import gobblin.metrics.context.NameConflictException;
-import gobblin.metrics.context.ReportableContext;
-import gobblin.metrics.notification.EventNotification;
-import gobblin.metrics.notification.Notification;
-import gobblin.util.ExecutorsUtils;
+import org.apache.gobblin.metrics.context.NameConflictException;
+import org.apache.gobblin.metrics.context.ReportableContext;
+import org.apache.gobblin.metrics.notification.EventNotification;
+import org.apache.gobblin.metrics.notification.Notification;
+import org.apache.gobblin.util.ExecutorsUtils;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/MetricNames.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/MetricNames.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/MetricNames.java
index fe58076..f2c58d3 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/MetricNames.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/MetricNames.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 /**
  * Contains names for all metrics generated in gobblin-core.

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/RootMetricContext.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/RootMetricContext.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/RootMetricContext.java
index d60305a..ac61943 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/RootMetricContext.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/RootMetricContext.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -34,12 +34,12 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.MoreExecutors;
 
-import gobblin.metrics.context.ContextWeakReference;
-import gobblin.metrics.context.NameConflictException;
-import gobblin.metrics.notification.MetricContextCleanupNotification;
-import gobblin.metrics.notification.NewMetricContextNotification;
-import gobblin.metrics.reporter.ContextAwareReporter;
-import gobblin.util.ExecutorsUtils;
+import org.apache.gobblin.metrics.context.ContextWeakReference;
+import org.apache.gobblin.metrics.context.NameConflictException;
+import org.apache.gobblin.metrics.notification.MetricContextCleanupNotification;
+import org.apache.gobblin.metrics.notification.NewMetricContextNotification;
+import org.apache.gobblin.metrics.reporter.ContextAwareReporter;
+import org.apache.gobblin.util.ExecutorsUtils;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Tag.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Tag.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Tag.java
index a092a7f..341408d 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Tag.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Tag.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.util.AbstractMap;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/TagBasedMetricFilter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/TagBasedMetricFilter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/TagBasedMetricFilter.java
index 2438458..ddc08d1 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/TagBasedMetricFilter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/TagBasedMetricFilter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.util.Collection;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Taggable.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Taggable.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Taggable.java
index 54a4bfe..5c0f7d7 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Taggable.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Taggable.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.util.Collection;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Tagged.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Tagged.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Tagged.java
index fa8f10f..0296e16 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Tagged.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/Tagged.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.util.Collection;
 import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/broker/MetricContextFactory.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/broker/MetricContextFactory.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/broker/MetricContextFactory.java
index 6269698..4912915 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/broker/MetricContextFactory.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/broker/MetricContextFactory.java
@@ -15,22 +15,22 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.broker;
+package org.apache.gobblin.metrics.broker;
 
 import com.typesafe.config.ConfigValue;
-import gobblin.broker.ResourceInstance;
-import gobblin.broker.iface.ConfigView;
-import gobblin.broker.iface.NoSuchScopeException;
-import gobblin.broker.iface.NotConfiguredException;
-import gobblin.broker.iface.ScopeType;
-import gobblin.broker.iface.ScopedConfigView;
-import gobblin.broker.iface.SharedResourceFactory;
-import gobblin.broker.iface.SharedResourceFactoryResponse;
-import gobblin.broker.iface.SharedResourcesBroker;
-import gobblin.metrics.MetricContext;
-import gobblin.metrics.RootMetricContext;
-import gobblin.metrics.Tag;
-import gobblin.util.ConfigUtils;
+import org.apache.gobblin.broker.ResourceInstance;
+import org.apache.gobblin.broker.iface.ConfigView;
+import org.apache.gobblin.broker.iface.NoSuchScopeException;
+import org.apache.gobblin.broker.iface.NotConfiguredException;
+import org.apache.gobblin.broker.iface.ScopeType;
+import org.apache.gobblin.broker.iface.ScopedConfigView;
+import org.apache.gobblin.broker.iface.SharedResourceFactory;
+import org.apache.gobblin.broker.iface.SharedResourceFactoryResponse;
+import org.apache.gobblin.broker.iface.SharedResourcesBroker;
+import org.apache.gobblin.metrics.MetricContext;
+import org.apache.gobblin.metrics.RootMetricContext;
+import org.apache.gobblin.metrics.Tag;
+import org.apache.gobblin.util.ConfigUtils;
 import java.util.Collection;
 import java.util.Map;
 import java.util.UUID;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/broker/MetricContextKey.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/broker/MetricContextKey.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/broker/MetricContextKey.java
index 4dc12b9..70a8f22 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/broker/MetricContextKey.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/broker/MetricContextKey.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.broker;
+package org.apache.gobblin.metrics.broker;
 
-import gobblin.broker.iface.SharedResourceKey;
+import org.apache.gobblin.broker.iface.SharedResourceKey;
 import lombok.Data;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/broker/SubTaggedMetricContextKey.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/broker/SubTaggedMetricContextKey.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/broker/SubTaggedMetricContextKey.java
index 035af28..cad2317 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/broker/SubTaggedMetricContextKey.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/broker/SubTaggedMetricContextKey.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.broker;
+package org.apache.gobblin.metrics.broker;
 
 import com.google.common.collect.ImmutableMap;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/ContextWeakReference.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/ContextWeakReference.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/ContextWeakReference.java
index 2df8c09..aa4be39 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/ContextWeakReference.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/ContextWeakReference.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.context;
+package org.apache.gobblin.metrics.context;
 
 import lombok.Getter;
 
 import java.lang.ref.WeakReference;
 
-import gobblin.metrics.InnerMetricContext;
-import gobblin.metrics.MetricContext;
-import gobblin.metrics.RootMetricContext;
+import org.apache.gobblin.metrics.InnerMetricContext;
+import org.apache.gobblin.metrics.MetricContext;
+import org.apache.gobblin.metrics.RootMetricContext;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/NameConflictException.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/NameConflictException.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/NameConflictException.java
index 671dd6c..2788a7e 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/NameConflictException.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/NameConflictException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.context;
+package org.apache.gobblin.metrics.context;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/ReportableContext.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/ReportableContext.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/ReportableContext.java
index 91f7904..3e58c9d 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/ReportableContext.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/ReportableContext.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.context;
+package org.apache.gobblin.metrics.context;
 
 import java.util.List;
 import java.util.Map;
@@ -30,8 +30,8 @@ import com.codahale.metrics.MetricFilter;
 import com.codahale.metrics.Timer;
 import com.google.common.base.Optional;
 
-import gobblin.metrics.MetricContext;
-import gobblin.metrics.Tag;
+import org.apache.gobblin.metrics.MetricContext;
+import org.apache.gobblin.metrics.Tag;
 
 /**
  * Interface for a context that can be reported (e.g. {@link gobblin.metrics.InnerMetricContext},

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/filter/AllContextFilter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/filter/AllContextFilter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/filter/AllContextFilter.java
index 634c633..e6a982a 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/filter/AllContextFilter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/filter/AllContextFilter.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.context.filter;
+package org.apache.gobblin.metrics.context.filter;
 
 import java.util.Set;
 
 import com.google.common.collect.ImmutableSet;
 
-import gobblin.metrics.InnerMetricContext;
-import gobblin.metrics.MetricContext;
-import gobblin.metrics.RootMetricContext;
+import org.apache.gobblin.metrics.InnerMetricContext;
+import org.apache.gobblin.metrics.MetricContext;
+import org.apache.gobblin.metrics.RootMetricContext;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/filter/ContextFilter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/filter/ContextFilter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/filter/ContextFilter.java
index 1839eb3..b85ac87 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/filter/ContextFilter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/filter/ContextFilter.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.context.filter;
+package org.apache.gobblin.metrics.context.filter;
 
 import java.util.Set;
 
-import gobblin.metrics.InnerMetricContext;
-import gobblin.metrics.MetricContext;
+import org.apache.gobblin.metrics.InnerMetricContext;
+import org.apache.gobblin.metrics.MetricContext;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/filter/ContextFilterFactory.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/filter/ContextFilterFactory.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/filter/ContextFilterFactory.java
index 7a5f2b4..ef31d17 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/filter/ContextFilterFactory.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/context/filter/ContextFilterFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.context.filter;
+package org.apache.gobblin.metrics.context.filter;
 
 import lombok.extern.slf4j.Slf4j;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/EventName.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/EventName.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/EventName.java
index 679da12..ff2e9c7 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/EventName.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/EventName.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.event;
+package org.apache.gobblin.metrics.event;
 
 import java.util.HashMap;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/EventSubmitter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/EventSubmitter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/EventSubmitter.java
index e9306fb..c8f4aa5 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/EventSubmitter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/EventSubmitter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.event;
+package org.apache.gobblin.metrics.event;
 
 import java.util.Map;
 
@@ -23,8 +23,8 @@ import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 
-import gobblin.metrics.GobblinTrackingEvent;
-import gobblin.metrics.MetricContext;
+import org.apache.gobblin.metrics.GobblinTrackingEvent;
+import org.apache.gobblin.metrics.MetricContext;
 
 import lombok.Getter;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/JobEvent.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/JobEvent.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/JobEvent.java
index de21e78..d9310fb 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/JobEvent.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/JobEvent.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.event;
+package org.apache.gobblin.metrics.event;
 
-import gobblin.metrics.GobblinTrackingEvent;
+import org.apache.gobblin.metrics.GobblinTrackingEvent;
 
 /**
  * Job-related event types and their metadata, stored in {@link GobblinTrackingEvent#metadata}