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:37 UTC

[19/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-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/MultiPartEvent.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/MultiPartEvent.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/MultiPartEvent.java
index d26b8e8..7954579 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/MultiPartEvent.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/MultiPartEvent.java
@@ -15,22 +15,22 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.event;
+package org.apache.gobblin.metrics.event;
 
-import static gobblin.metrics.event.JobEvent.JOB_STATE;
-import static gobblin.metrics.event.JobEvent.METADATA_JOB_COMPLETED_TASKS;
-import static gobblin.metrics.event.JobEvent.METADATA_JOB_END_TIME;
-import static gobblin.metrics.event.JobEvent.METADATA_JOB_LAUNCHED_TASKS;
-import static gobblin.metrics.event.JobEvent.METADATA_JOB_START_TIME;
-import static gobblin.metrics.event.JobEvent.METADATA_JOB_STATE;
-import static gobblin.metrics.event.TaskEvent.METADATA_TASK_END_TIME;
-import static gobblin.metrics.event.TaskEvent.METADATA_TASK_START_TIME;
-import static gobblin.metrics.event.TaskEvent.METADATA_TASK_WORKING_STATE;
-import static gobblin.metrics.event.TaskEvent.TASK_STATE;
-import static gobblin.metrics.event.TimingEvent.METADATA_DURATION;
-import static gobblin.metrics.event.TimingEvent.METADATA_END_TIME;
-import static gobblin.metrics.event.TimingEvent.METADATA_START_TIME;
-import static gobblin.metrics.event.TimingEvent.METADATA_TIMING_EVENT;
+import static org.apache.gobblin.metrics.event.JobEvent.JOB_STATE;
+import static org.apache.gobblin.metrics.event.JobEvent.METADATA_JOB_COMPLETED_TASKS;
+import static org.apache.gobblin.metrics.event.JobEvent.METADATA_JOB_END_TIME;
+import static org.apache.gobblin.metrics.event.JobEvent.METADATA_JOB_LAUNCHED_TASKS;
+import static org.apache.gobblin.metrics.event.JobEvent.METADATA_JOB_START_TIME;
+import static org.apache.gobblin.metrics.event.JobEvent.METADATA_JOB_STATE;
+import static org.apache.gobblin.metrics.event.TaskEvent.METADATA_TASK_END_TIME;
+import static org.apache.gobblin.metrics.event.TaskEvent.METADATA_TASK_START_TIME;
+import static org.apache.gobblin.metrics.event.TaskEvent.METADATA_TASK_WORKING_STATE;
+import static org.apache.gobblin.metrics.event.TaskEvent.TASK_STATE;
+import static org.apache.gobblin.metrics.event.TimingEvent.METADATA_DURATION;
+import static org.apache.gobblin.metrics.event.TimingEvent.METADATA_END_TIME;
+import static org.apache.gobblin.metrics.event.TimingEvent.METADATA_START_TIME;
+import static org.apache.gobblin.metrics.event.TimingEvent.METADATA_TIMING_EVENT;
 
 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/MultiTimingEvent.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/MultiTimingEvent.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/MultiTimingEvent.java
index d4181a8..162bc1b 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/MultiTimingEvent.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/MultiTimingEvent.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.event;
+package org.apache.gobblin.metrics.event;
 
 import java.io.Closeable;
 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/event/TaskEvent.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/TaskEvent.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/TaskEvent.java
index 7a29d99..cb6b248 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/TaskEvent.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/TaskEvent.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;
 
 /**
  * Task-related event types and their metadata, stored in {@link GobblinTrackingEvent#metadata}

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/TimingEvent.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/TimingEvent.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/TimingEvent.java
index 8049e22..a598348 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/TimingEvent.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/TimingEvent.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.event;
+package org.apache.gobblin.metrics.event;
 
 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/sla/SlaEventKeys.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/sla/SlaEventKeys.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/sla/SlaEventKeys.java
index a8234c4..bf068b3 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/sla/SlaEventKeys.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/sla/SlaEventKeys.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.event.sla;
+package org.apache.gobblin.metrics.event.sla;
 
 public class SlaEventKeys {
 

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/sla/SlaEventSubmitter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/sla/SlaEventSubmitter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/sla/SlaEventSubmitter.java
index 25164c9..5c48cc8 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/sla/SlaEventSubmitter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/event/sla/SlaEventSubmitter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.event.sla;
+package org.apache.gobblin.metrics.event.sla;
 
 import java.util.Map;
 import java.util.Map.Entry;
@@ -35,8 +35,8 @@ import com.google.common.base.Predicates;
 import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
 
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.metrics.event.EventSubmitter;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.metrics.event.EventSubmitter;
 
 /**
  * A wrapper around the {@link EventSubmitter} which can submit SLA Events.

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/example/ReporterExampleBase.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/example/ReporterExampleBase.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/example/ReporterExampleBase.java
index 09ca5bb..12e88fd 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/example/ReporterExampleBase.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/example/ReporterExampleBase.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.example;
+package org.apache.gobblin.metrics.example;
 
 import java.io.IOException;
 import java.util.Random;
@@ -32,10 +32,10 @@ import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.Timer;
 
-import gobblin.metrics.event.JobEvent;
-import gobblin.metrics.reporter.ContextAwareScheduledReporter;
-import gobblin.metrics.MetricContext;
-import gobblin.metrics.Tag;
+import org.apache.gobblin.metrics.event.JobEvent;
+import org.apache.gobblin.metrics.reporter.ContextAwareScheduledReporter;
+import org.apache.gobblin.metrics.MetricContext;
+import org.apache.gobblin.metrics.Tag;
 
 
 /**

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/metric/InnerMetric.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/InnerMetric.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/InnerMetric.java
index 5f8da39..26dd307 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/InnerMetric.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/InnerMetric.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.metric;
+package org.apache.gobblin.metrics.metric;
 
 import com.codahale.metrics.Metric;
 
-import gobblin.metrics.ContextAwareMetric;
+import org.apache.gobblin.metrics.ContextAwareMetric;
 
 
 /**

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/metric/Metrics.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/Metrics.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/Metrics.java
index 34f44b6..5278fbd 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/Metrics.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/Metrics.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.metric;
+package org.apache.gobblin.metrics.metric;
 
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.Gauge;

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/metric/ProxyMetric.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/ProxyMetric.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/ProxyMetric.java
index 0005cf6..14270d0 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/ProxyMetric.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/ProxyMetric.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.metric;
+package org.apache.gobblin.metrics.metric;
 
 import com.codahale.metrics.Metric;
 

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/metric/filter/MetricFilters.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/filter/MetricFilters.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/filter/MetricFilters.java
index 5c71d09..2fd7df2 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/filter/MetricFilters.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/filter/MetricFilters.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.metric.filter;
+package org.apache.gobblin.metrics.metric.filter;
 
 import com.codahale.metrics.Metric;
 import com.codahale.metrics.MetricFilter;

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/metric/filter/MetricNameRegexFilter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/filter/MetricNameRegexFilter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/filter/MetricNameRegexFilter.java
index adcd1ca..8f3d4ee 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/filter/MetricNameRegexFilter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/filter/MetricNameRegexFilter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.metric.filter;
+package org.apache.gobblin.metrics.metric.filter;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

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/metric/filter/MetricTypeFilter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/filter/MetricTypeFilter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/filter/MetricTypeFilter.java
index 2a0b18b..40366d5 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/filter/MetricTypeFilter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/metric/filter/MetricTypeFilter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.metric.filter;
+package org.apache.gobblin.metrics.metric.filter;
 
 import java.util.List;
 
@@ -31,7 +31,7 @@ import com.google.common.base.Strings;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
-import gobblin.metrics.metric.Metrics;
+import org.apache.gobblin.metrics.metric.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/notification/EventNotification.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/notification/EventNotification.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/notification/EventNotification.java
index 3167e48..764bc72 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/notification/EventNotification.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/notification/EventNotification.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.notification;
+package org.apache.gobblin.metrics.notification;
 
-import gobblin.metrics.GobblinTrackingEvent;
+import org.apache.gobblin.metrics.GobblinTrackingEvent;
 
 
 /**

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/notification/MetricContextCleanupNotification.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/notification/MetricContextCleanupNotification.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/notification/MetricContextCleanupNotification.java
index b1be811..aa426d2 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/notification/MetricContextCleanupNotification.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/notification/MetricContextCleanupNotification.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.notification;
+package org.apache.gobblin.metrics.notification;
 
 import lombok.Data;
 
-import gobblin.metrics.InnerMetricContext;
+import org.apache.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/notification/NewMetricContextNotification.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/notification/NewMetricContextNotification.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/notification/NewMetricContextNotification.java
index 6ef04c2..5294975 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/notification/NewMetricContextNotification.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/notification/NewMetricContextNotification.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.notification;
+package org.apache.gobblin.metrics.notification;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-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/notification/Notification.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/notification/Notification.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/notification/Notification.java
index 630c80f..15e83da 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/notification/Notification.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/notification/Notification.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.notification;
+package org.apache.gobblin.metrics.notification;
 
 /**
  * Generic interface for notifications.

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/reporter/ConfiguredScheduledReporter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/ConfiguredScheduledReporter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/ConfiguredScheduledReporter.java
index 7b076ff..26a9ab1 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/ConfiguredScheduledReporter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/ConfiguredScheduledReporter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter;
+package org.apache.gobblin.metrics.reporter;
 
 import java.io.IOException;
 import java.util.List;
@@ -24,7 +24,7 @@ import java.util.SortedMap;
 import java.util.concurrent.TimeUnit;
 
 import com.google.common.base.Strings;
-import gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.configuration.ConfigurationKeys;
 import lombok.Getter;
 
 import org.slf4j.Logger;
@@ -41,8 +41,8 @@ import com.google.common.collect.Maps;
 import com.google.common.io.Closer;
 import com.typesafe.config.Config;
 
-import gobblin.metrics.MetricContext;
-import gobblin.metrics.Tag;
+import org.apache.gobblin.metrics.MetricContext;
+import org.apache.gobblin.metrics.Tag;
 
 
 /**

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/reporter/ContextAwareReporter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/ContextAwareReporter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/ContextAwareReporter.java
index beb124a..0eb4eb3 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/ContextAwareReporter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/ContextAwareReporter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter;
+package org.apache.gobblin.metrics.reporter;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -34,15 +34,15 @@ import com.typesafe.config.Config;
 
 import lombok.extern.slf4j.Slf4j;
 
-import gobblin.metrics.InnerMetricContext;
-import gobblin.metrics.MetricContext;
-import gobblin.metrics.RootMetricContext;
-import gobblin.metrics.context.ReportableContext;
-import gobblin.metrics.context.filter.ContextFilter;
-import gobblin.metrics.context.filter.ContextFilterFactory;
-import gobblin.metrics.notification.MetricContextCleanupNotification;
-import gobblin.metrics.notification.NewMetricContextNotification;
-import gobblin.metrics.notification.Notification;
+import org.apache.gobblin.metrics.InnerMetricContext;
+import org.apache.gobblin.metrics.MetricContext;
+import org.apache.gobblin.metrics.RootMetricContext;
+import org.apache.gobblin.metrics.context.ReportableContext;
+import org.apache.gobblin.metrics.context.filter.ContextFilter;
+import org.apache.gobblin.metrics.context.filter.ContextFilterFactory;
+import org.apache.gobblin.metrics.notification.MetricContextCleanupNotification;
+import org.apache.gobblin.metrics.notification.NewMetricContextNotification;
+import org.apache.gobblin.metrics.notification.Notification;
 
 
 /**

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/reporter/ContextAwareScheduledReporter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/ContextAwareScheduledReporter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/ContextAwareScheduledReporter.java
index 5247ba1..2f005df 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/ContextAwareScheduledReporter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/ContextAwareScheduledReporter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter;
+package org.apache.gobblin.metrics.reporter;
 
 import java.util.SortedMap;
 import java.util.concurrent.TimeUnit;
@@ -30,7 +30,7 @@ import com.codahale.metrics.Timer;
 
 import com.google.common.base.Optional;
 
-import gobblin.metrics.MetricContext;
+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/reporter/EventReporter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/EventReporter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/EventReporter.java
index 39c1233..d93e4a6 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/EventReporter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/EventReporter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter;
+package org.apache.gobblin.metrics.reporter;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -50,14 +50,14 @@ import com.google.common.collect.Queues;
 import com.google.common.io.Closer;
 import com.google.common.util.concurrent.MoreExecutors;
 
-import gobblin.metrics.GobblinTrackingEvent;
-import gobblin.metrics.MetricContext;
-import gobblin.metrics.notification.EventNotification;
-import gobblin.metrics.notification.Notification;
-import gobblin.util.ExecutorsUtils;
+import org.apache.gobblin.metrics.GobblinTrackingEvent;
+import org.apache.gobblin.metrics.MetricContext;
+import org.apache.gobblin.metrics.notification.EventNotification;
+import org.apache.gobblin.metrics.notification.Notification;
+import org.apache.gobblin.util.ExecutorsUtils;
 
-import static gobblin.metrics.event.JobEvent.METADATA_JOB_ID;
-import static gobblin.metrics.event.TaskEvent.METADATA_TASK_ID;
+import static org.apache.gobblin.metrics.event.JobEvent.METADATA_JOB_ID;
+import static org.apache.gobblin.metrics.event.TaskEvent.METADATA_TASK_ID;
 
 /**
  * Abstract class for reporting {@link gobblin.metrics.GobblinTrackingEvent}s at a fixed schedule.

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/reporter/MetricReportReporter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/MetricReportReporter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/MetricReportReporter.java
index a9de343..59508f2 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/MetricReportReporter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/MetricReportReporter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter;
+package org.apache.gobblin.metrics.reporter;
 
 import java.util.List;
 import java.util.Map;
@@ -41,9 +41,9 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.typesafe.config.Config;
 
-import gobblin.metrics.Measurements;
-import gobblin.metrics.Metric;
-import gobblin.metrics.MetricReport;
+import org.apache.gobblin.metrics.Measurements;
+import org.apache.gobblin.metrics.Metric;
+import org.apache.gobblin.metrics.MetricReport;
 
 
 /**

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/reporter/OutputStreamEventReporter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/OutputStreamEventReporter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/OutputStreamEventReporter.java
index 2934d93..44d7aed 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/OutputStreamEventReporter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/OutputStreamEventReporter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter;
+package org.apache.gobblin.metrics.reporter;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -32,11 +32,11 @@ import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Charsets;
 
-import gobblin.metrics.GobblinTrackingEvent;
-import gobblin.metrics.MetricContext;
-import gobblin.metrics.reporter.util.AvroJsonSerializer;
-import gobblin.metrics.reporter.util.AvroSerializer;
-import gobblin.metrics.reporter.util.NoopSchemaVersionWriter;
+import org.apache.gobblin.metrics.GobblinTrackingEvent;
+import org.apache.gobblin.metrics.MetricContext;
+import org.apache.gobblin.metrics.reporter.util.AvroJsonSerializer;
+import org.apache.gobblin.metrics.reporter.util.AvroSerializer;
+import org.apache.gobblin.metrics.reporter.util.NoopSchemaVersionWriter;
 
 
 /**

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/reporter/OutputStreamReporter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/OutputStreamReporter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/OutputStreamReporter.java
index 4953ce9..36b7678 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/OutputStreamReporter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/OutputStreamReporter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter;
+package org.apache.gobblin.metrics.reporter;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -47,8 +47,8 @@ import com.google.common.base.Charsets;
 import com.google.common.base.Optional;
 import com.google.common.io.Closer;
 
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.util.ConfigUtils;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.util.ConfigUtils;
 
 
 public class OutputStreamReporter extends ConfiguredScheduledReporter {

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/reporter/RecursiveScheduledMetricReporter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/RecursiveScheduledMetricReporter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/RecursiveScheduledMetricReporter.java
index ae8f1dc..b25c561 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/RecursiveScheduledMetricReporter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/RecursiveScheduledMetricReporter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter;
+package org.apache.gobblin.metrics.reporter;
 
 import java.util.Map;
 import java.util.SortedMap;
@@ -31,7 +31,7 @@ import com.codahale.metrics.Timer;
 import com.google.common.base.Function;
 import com.google.common.collect.Maps;
 
-import gobblin.metrics.MetricContext;
+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/reporter/RecursiveScheduledReporter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/RecursiveScheduledReporter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/RecursiveScheduledReporter.java
index 1df5564..f612736 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/RecursiveScheduledReporter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/RecursiveScheduledReporter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter;
+package org.apache.gobblin.metrics.reporter;
 
 import java.util.SortedMap;
 import java.util.concurrent.TimeUnit;
@@ -29,7 +29,7 @@ import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.ScheduledReporter;
 import com.codahale.metrics.Timer;
 
-import gobblin.metrics.MetricContext;
+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/reporter/ScheduledReporter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/ScheduledReporter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/ScheduledReporter.java
index 594a7ba..154dd3a 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/ScheduledReporter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/ScheduledReporter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter;
+package org.apache.gobblin.metrics.reporter;
 
 import java.io.IOException;
 import java.util.Map;
@@ -45,13 +45,13 @@ import com.typesafe.config.ConfigValueFactory;
 
 import lombok.extern.slf4j.Slf4j;
 
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.metrics.InnerMetricContext;
-import gobblin.metrics.context.ReportableContext;
-import gobblin.metrics.metric.filter.MetricFilters;
-import gobblin.metrics.metric.filter.MetricNameRegexFilter;
-import gobblin.metrics.metric.filter.MetricTypeFilter;
-import gobblin.util.ExecutorsUtils;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.metrics.InnerMetricContext;
+import org.apache.gobblin.metrics.context.ReportableContext;
+import org.apache.gobblin.metrics.metric.filter.MetricFilters;
+import org.apache.gobblin.metrics.metric.filter.MetricNameRegexFilter;
+import org.apache.gobblin.metrics.metric.filter.MetricTypeFilter;
+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/reporter/util/AvroBinarySerializer.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/AvroBinarySerializer.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/AvroBinarySerializer.java
index 710cc50..977c036 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/AvroBinarySerializer.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/AvroBinarySerializer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter.util;
+package org.apache.gobblin.metrics.reporter.util;
 
 import java.io.IOException;
 import java.io.OutputStream;

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/reporter/util/AvroJsonSerializer.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/AvroJsonSerializer.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/AvroJsonSerializer.java
index f8e395e..4866ed9 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/AvroJsonSerializer.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/AvroJsonSerializer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter.util;
+package org.apache.gobblin.metrics.reporter.util;
 
 import java.io.IOException;
 import java.io.OutputStream;

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/reporter/util/AvroSerializer.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/AvroSerializer.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/AvroSerializer.java
index b7fc462..8d70157 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/AvroSerializer.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/AvroSerializer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter.util;
+package org.apache.gobblin.metrics.reporter.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;

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/reporter/util/EventUtils.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/EventUtils.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/EventUtils.java
index 52ee3ee..14ad49f 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/EventUtils.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/EventUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter.util;
+package org.apache.gobblin.metrics.reporter.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -28,7 +28,7 @@ import org.apache.avro.specific.SpecificDatumReader;
 import com.google.common.base.Optional;
 import com.google.common.io.Closer;
 
-import gobblin.metrics.GobblinTrackingEvent;
+import org.apache.gobblin.metrics.GobblinTrackingEvent;
 
 
 /**

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/reporter/util/FixedSchemaVersionWriter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/FixedSchemaVersionWriter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/FixedSchemaVersionWriter.java
index 03e2f17..4778c21 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/FixedSchemaVersionWriter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/FixedSchemaVersionWriter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter.util;
+package org.apache.gobblin.metrics.reporter.util;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -23,7 +23,7 @@ import java.io.IOException;
 
 import org.apache.avro.Schema;
 
-import gobblin.annotation.Alias;
+import org.apache.gobblin.annotation.Alias;
 
 
 /**

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/reporter/util/MetricReportUtils.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/MetricReportUtils.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/MetricReportUtils.java
index 4f10745..4574bc3 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/MetricReportUtils.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/MetricReportUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter.util;
+package org.apache.gobblin.metrics.reporter.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -28,7 +28,7 @@ import org.apache.avro.specific.SpecificDatumReader;
 import com.google.common.base.Optional;
 import com.google.common.io.Closer;
 
-import gobblin.metrics.MetricReport;
+import org.apache.gobblin.metrics.MetricReport;
 
 
 /**

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/reporter/util/NoopSchemaVersionWriter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/NoopSchemaVersionWriter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/NoopSchemaVersionWriter.java
index 24a9888..11ff620 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/NoopSchemaVersionWriter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/NoopSchemaVersionWriter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter.util;
+package org.apache.gobblin.metrics.reporter.util;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -23,7 +23,7 @@ import java.io.IOException;
 
 import org.apache.avro.Schema;
 
-import gobblin.annotation.Alias;
+import org.apache.gobblin.annotation.Alias;
 
 
 /**

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/reporter/util/SchemaVersionWriter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/SchemaVersionWriter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/SchemaVersionWriter.java
index 92643dc..c96b1f0 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/SchemaVersionWriter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/reporter/util/SchemaVersionWriter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter.util;
+package org.apache.gobblin.metrics.reporter.util;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

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/test/ContextStoreReporter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/test/ContextStoreReporter.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/test/ContextStoreReporter.java
index 9ff2bd5..06df1eb 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/test/ContextStoreReporter.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/test/ContextStoreReporter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.test;
+package org.apache.gobblin.metrics.test;
 
 import java.util.List;
 import java.util.Map;
@@ -31,8 +31,8 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.typesafe.config.Config;
 
-import gobblin.metrics.context.ReportableContext;
-import gobblin.metrics.reporter.ScheduledReporter;
+import org.apache.gobblin.metrics.context.ReportableContext;
+import org.apache.gobblin.metrics.reporter.ScheduledReporter;
 
 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/test/MetricsAssert.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/test/MetricsAssert.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/test/MetricsAssert.java
index 9b7d4f4..7cf17dc 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/test/MetricsAssert.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/test/MetricsAssert.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.metrics.test;
+package org.apache.gobblin.metrics.test;
 
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
@@ -25,10 +25,10 @@ import javax.annotation.Nonnull;
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 
-import gobblin.metrics.GobblinTrackingEvent;
-import gobblin.metrics.MetricContext;
-import gobblin.metrics.notification.EventNotification;
-import gobblin.metrics.notification.Notification;
+import org.apache.gobblin.metrics.GobblinTrackingEvent;
+import org.apache.gobblin.metrics.MetricContext;
+import org.apache.gobblin.metrics.notification.EventNotification;
+import org.apache.gobblin.metrics.notification.Notification;
 
 /**
  * A class to help with testing metrics. It provides asserts on a {@link 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/test/TestConstants.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/test/TestConstants.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/test/TestConstants.java
index 9d51b55..9142432 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/test/TestConstants.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/test/TestConstants.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.test;
+package org.apache.gobblin.metrics.test;
 
 /**
  * A central place for constants used in tests for 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/test/TimestampedValue.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/test/TimestampedValue.java b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/test/TimestampedValue.java
index fc8c3eb..1232cd2 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/test/TimestampedValue.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/main/java/org/apache/gobblin/metrics/test/TimestampedValue.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.test;
+package org.apache.gobblin.metrics.test;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/filesystem/MetricsFileSystemInstrumentationTest.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/filesystem/MetricsFileSystemInstrumentationTest.java b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/filesystem/MetricsFileSystemInstrumentationTest.java
index 5b6d406..b2878ad 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/filesystem/MetricsFileSystemInstrumentationTest.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/filesystem/MetricsFileSystemInstrumentationTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.filesystem;
+package org.apache.gobblin.filesystem;
 
 import java.io.IOException;
 import java.net.URI;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/ContextAwareMetricFactoryTest.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/ContextAwareMetricFactoryTest.java b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/ContextAwareMetricFactoryTest.java
index ebee85d..898562c 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/ContextAwareMetricFactoryTest.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/ContextAwareMetricFactoryTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.io.IOException;
 
@@ -26,7 +26,7 @@ import org.testng.annotations.Test;
 
 import com.codahale.metrics.MetricRegistry;
 
-import static gobblin.metrics.test.TestConstants.*;
+import static org.apache.gobblin.metrics.test.TestConstants.*;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/MetricContextTest.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/MetricContextTest.java b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/MetricContextTest.java
index 5ddcc68..4a1ba1e 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/MetricContextTest.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/MetricContextTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.io.IOException;
 import java.util.Map;
@@ -37,9 +37,9 @@ import com.codahale.metrics.Metric;
 import com.codahale.metrics.MetricFilter;
 import com.codahale.metrics.Timer;
 
-import static gobblin.metrics.test.TestConstants.*;
+import static org.apache.gobblin.metrics.test.TestConstants.*;
 
-import gobblin.metrics.reporter.ContextAwareScheduledReporter;
+import org.apache.gobblin.metrics.reporter.ContextAwareScheduledReporter;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/OutputStreamReporterTest.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/OutputStreamReporterTest.java b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/OutputStreamReporterTest.java
index 92a959f..13bf29d 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/OutputStreamReporterTest.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/OutputStreamReporterTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -34,7 +34,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import gobblin.metrics.reporter.OutputStreamReporter;
+import org.apache.gobblin.metrics.reporter.OutputStreamReporter;
 
 
 @Test(groups = { "gobblin.metrics" })

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/RootMetricContextTest.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/RootMetricContextTest.java b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/RootMetricContextTest.java
index fdca834..156e974 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/RootMetricContextTest.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/RootMetricContextTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -33,11 +33,11 @@ import com.typesafe.config.ConfigFactory;
 
 import lombok.AllArgsConstructor;
 
-import gobblin.metrics.callback.NotificationStore;
-import gobblin.metrics.notification.MetricContextCleanupNotification;
-import gobblin.metrics.notification.NewMetricContextNotification;
-import gobblin.metrics.notification.Notification;
-import gobblin.metrics.test.ContextStoreReporter;
+import org.apache.gobblin.metrics.callback.NotificationStore;
+import org.apache.gobblin.metrics.notification.MetricContextCleanupNotification;
+import org.apache.gobblin.metrics.notification.NewMetricContextNotification;
+import org.apache.gobblin.metrics.notification.Notification;
+import org.apache.gobblin.metrics.test.ContextStoreReporter;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/TagTest.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/TagTest.java b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/TagTest.java
index ba15243..ac03e52 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/TagTest.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/TagTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/TaggedTest.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/TaggedTest.java b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/TaggedTest.java
index 5111262..10c986e 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/TaggedTest.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/TaggedTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.util.List;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/broker/MetricContextFactoryTest.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/broker/MetricContextFactoryTest.java b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/broker/MetricContextFactoryTest.java
index c1d5418..184d33d 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/broker/MetricContextFactoryTest.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/broker/MetricContextFactoryTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.broker;
+package org.apache.gobblin.metrics.broker;
 
 import java.util.Map;
 
@@ -26,12 +26,12 @@ import com.google.common.collect.ImmutableMap;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
-import gobblin.broker.BrokerConfigurationKeyGenerator;
-import gobblin.broker.SharedResourcesBrokerFactory;
-import gobblin.broker.SimpleScopeType;
-import gobblin.broker.iface.SharedResourcesBroker;
-import gobblin.metrics.MetricContext;
-import gobblin.metrics.Tag;
+import org.apache.gobblin.broker.BrokerConfigurationKeyGenerator;
+import org.apache.gobblin.broker.SharedResourcesBrokerFactory;
+import org.apache.gobblin.broker.SimpleScopeType;
+import org.apache.gobblin.broker.iface.SharedResourcesBroker;
+import org.apache.gobblin.metrics.MetricContext;
+import org.apache.gobblin.metrics.Tag;
 
 
 public class MetricContextFactoryTest {

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/callback/NotificationStore.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/callback/NotificationStore.java b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/callback/NotificationStore.java
index 1d1f58b..18a725a 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/callback/NotificationStore.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/callback/NotificationStore.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.callback;
+package org.apache.gobblin.metrics.callback;
 
 import lombok.Getter;
 
@@ -27,7 +27,7 @@ import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 
-import gobblin.metrics.notification.Notification;
+import org.apache.gobblin.metrics.notification.Notification;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/metric/filter/MetricFiltersTest.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/metric/filter/MetricFiltersTest.java b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/metric/filter/MetricFiltersTest.java
index 92d7fbf..5c425ce 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/metric/filter/MetricFiltersTest.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/metric/filter/MetricFiltersTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.metric.filter;
+package org.apache.gobblin.metrics.metric.filter;
 
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/metric/filter/MetricNameRegexFilterTest.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/metric/filter/MetricNameRegexFilterTest.java b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/metric/filter/MetricNameRegexFilterTest.java
index 97d5773..18eb6ff 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/metric/filter/MetricNameRegexFilterTest.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/metric/filter/MetricNameRegexFilterTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.metric.filter;
+package org.apache.gobblin.metrics.metric.filter;
 
 import static org.mockito.Mockito.mock;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/metric/filter/MetricTypeFilterTest.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/metric/filter/MetricTypeFilterTest.java b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/metric/filter/MetricTypeFilterTest.java
index d7f7175..fdf48de 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/metric/filter/MetricTypeFilterTest.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/metric/filter/MetricTypeFilterTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.metric.filter;
+package org.apache.gobblin.metrics.metric.filter;
 
 import static org.mockito.Mockito.mock;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/Incrementer.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/Incrementer.java b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/Incrementer.java
index 9cddce0..a958305 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/Incrementer.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/Incrementer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.performance;
+package org.apache.gobblin.metrics.performance;
 
 import lombok.extern.slf4j.Slf4j;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/MetricsPerformanceTest.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/MetricsPerformanceTest.java b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/MetricsPerformanceTest.java
index 0e819b2..cab8cdc 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/MetricsPerformanceTest.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/MetricsPerformanceTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.performance;
+package org.apache.gobblin.metrics.performance;
 
 
 import org.testng.annotations.Test;

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/MetricsUpdater.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/MetricsUpdater.java b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/MetricsUpdater.java
index c4976e9..ddc3a6f 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/MetricsUpdater.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/MetricsUpdater.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.performance;
+package org.apache.gobblin.metrics.performance;
 
 import lombok.Builder;
 import lombok.Getter;
@@ -31,8 +31,8 @@ import com.codahale.metrics.Meter;
 import com.codahale.metrics.Timer;
 import com.google.common.collect.Lists;
 
-import gobblin.metrics.MetricContext;
-import gobblin.metrics.RootMetricContext;
+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/test/java/org/apache/gobblin/metrics/performance/PerformanceUtils.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/PerformanceUtils.java b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/PerformanceUtils.java
index 05c445d..52909e0 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/PerformanceUtils.java
+++ b/gobblin-metrics-libs/gobblin-metrics-base/src/test/java/org/apache/gobblin/metrics/performance/PerformanceUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.performance;
+package org.apache.gobblin.metrics.performance;
 
 import lombok.Builder;
 import lombok.Singular;
@@ -37,7 +37,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
-import gobblin.util.ExecutorsUtils;
+import org.apache.gobblin.util.ExecutorsUtils;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics/src/main/java/org/apache/gobblin/MetricsHelper.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics/src/main/java/org/apache/gobblin/MetricsHelper.java b/gobblin-metrics-libs/gobblin-metrics/src/main/java/org/apache/gobblin/MetricsHelper.java
index dff6f83..1896da4 100644
--- a/gobblin-metrics-libs/gobblin-metrics/src/main/java/org/apache/gobblin/MetricsHelper.java
+++ b/gobblin-metrics-libs/gobblin-metrics/src/main/java/org/apache/gobblin/MetricsHelper.java
@@ -23,8 +23,8 @@ import java.util.Map;
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.Timer;
 
-import gobblin.metrics.MetricContext;
-import gobblin.metrics.Tag;
+import org.apache.gobblin.metrics.MetricContext;
+import org.apache.gobblin.metrics.Tag;
 
 
 public class MetricsHelper {

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics/src/main/java/org/apache/gobblin/metrics/GobblinMetrics.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics/src/main/java/org/apache/gobblin/metrics/GobblinMetrics.java b/gobblin-metrics-libs/gobblin-metrics/src/main/java/org/apache/gobblin/metrics/GobblinMetrics.java
index 98bb100..6dcd477 100644
--- a/gobblin-metrics-libs/gobblin-metrics/src/main/java/org/apache/gobblin/metrics/GobblinMetrics.java
+++ b/gobblin-metrics-libs/gobblin-metrics/src/main/java/org/apache/gobblin/metrics/GobblinMetrics.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -46,19 +46,19 @@ import com.google.common.collect.Lists;
 import com.google.common.io.Closer;
 import com.typesafe.config.Config;
 
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.configuration.State;
-import gobblin.metrics.graphite.GraphiteConnectionType;
-import gobblin.metrics.graphite.GraphiteEventReporter;
-import gobblin.metrics.graphite.GraphiteReporter;
-import gobblin.metrics.influxdb.InfluxDBConnectionType;
-import gobblin.metrics.influxdb.InfluxDBEventReporter;
-import gobblin.metrics.influxdb.InfluxDBReporter;
-import gobblin.metrics.reporter.OutputStreamEventReporter;
-import gobblin.metrics.reporter.OutputStreamReporter;
-import gobblin.metrics.reporter.ScheduledReporter;
-import gobblin.password.PasswordManager;
-import gobblin.util.PropertiesUtils;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.configuration.State;
+import org.apache.gobblin.metrics.graphite.GraphiteConnectionType;
+import org.apache.gobblin.metrics.graphite.GraphiteEventReporter;
+import org.apache.gobblin.metrics.graphite.GraphiteReporter;
+import org.apache.gobblin.metrics.influxdb.InfluxDBConnectionType;
+import org.apache.gobblin.metrics.influxdb.InfluxDBEventReporter;
+import org.apache.gobblin.metrics.influxdb.InfluxDBReporter;
+import org.apache.gobblin.metrics.reporter.OutputStreamEventReporter;
+import org.apache.gobblin.metrics.reporter.OutputStreamReporter;
+import org.apache.gobblin.metrics.reporter.ScheduledReporter;
+import org.apache.gobblin.password.PasswordManager;
+import org.apache.gobblin.util.PropertiesUtils;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics/src/main/java/org/apache/gobblin/metrics/GobblinMetricsRegistry.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics/src/main/java/org/apache/gobblin/metrics/GobblinMetricsRegistry.java b/gobblin-metrics-libs/gobblin-metrics/src/main/java/org/apache/gobblin/metrics/GobblinMetricsRegistry.java
index 561e018..76a8c0f 100644
--- a/gobblin-metrics-libs/gobblin-metrics/src/main/java/org/apache/gobblin/metrics/GobblinMetricsRegistry.java
+++ b/gobblin-metrics-libs/gobblin-metrics/src/main/java/org/apache/gobblin/metrics/GobblinMetricsRegistry.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics;
+package org.apache.gobblin.metrics;
 
 import java.util.List;
 import java.util.Random;
@@ -28,8 +28,8 @@ import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.Lists;
 
-import gobblin.configuration.ConfigurationKeys;
-import gobblin.configuration.State;
+import org.apache.gobblin.configuration.ConfigurationKeys;
+import org.apache.gobblin.configuration.State;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics/src/test/java/org/apache/gobblin/metrics/reporter/PrefixContextFilter.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics/src/test/java/org/apache/gobblin/metrics/reporter/PrefixContextFilter.java b/gobblin-metrics-libs/gobblin-metrics/src/test/java/org/apache/gobblin/metrics/reporter/PrefixContextFilter.java
index 734fbcd..9f8204b 100644
--- a/gobblin-metrics-libs/gobblin-metrics/src/test/java/org/apache/gobblin/metrics/reporter/PrefixContextFilter.java
+++ b/gobblin-metrics-libs/gobblin-metrics/src/test/java/org/apache/gobblin/metrics/reporter/PrefixContextFilter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter;
+package org.apache.gobblin.metrics.reporter;
 
 import java.util.Set;
 
@@ -25,10 +25,10 @@ import com.google.common.collect.Sets;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigValueFactory;
 
-import gobblin.metrics.InnerMetricContext;
-import gobblin.metrics.MetricContext;
-import gobblin.metrics.RootMetricContext;
-import gobblin.metrics.context.filter.ContextFilter;
+import org.apache.gobblin.metrics.InnerMetricContext;
+import org.apache.gobblin.metrics.MetricContext;
+import org.apache.gobblin.metrics.RootMetricContext;
+import org.apache.gobblin.metrics.context.filter.ContextFilter;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-metrics-libs/gobblin-metrics/src/test/java/org/apache/gobblin/metrics/reporter/ScheduledReporterTest.java
----------------------------------------------------------------------
diff --git a/gobblin-metrics-libs/gobblin-metrics/src/test/java/org/apache/gobblin/metrics/reporter/ScheduledReporterTest.java b/gobblin-metrics-libs/gobblin-metrics/src/test/java/org/apache/gobblin/metrics/reporter/ScheduledReporterTest.java
index 5b89e40..0a61b3a 100644
--- a/gobblin-metrics-libs/gobblin-metrics/src/test/java/org/apache/gobblin/metrics/reporter/ScheduledReporterTest.java
+++ b/gobblin-metrics-libs/gobblin-metrics/src/test/java/org/apache/gobblin/metrics/reporter/ScheduledReporterTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.metrics.reporter;
+package org.apache.gobblin.metrics.reporter;
 
 import java.util.Properties;
 import java.util.Set;
@@ -31,11 +31,11 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import com.typesafe.config.Config;
 
-import gobblin.metrics.MetricContext;
-import gobblin.metrics.context.ReportableContext;
-import gobblin.metrics.context.filter.ContextFilterFactory;
-import gobblin.metrics.test.ContextStoreReporter;
-import gobblin.util.ConfigUtils;
+import org.apache.gobblin.metrics.MetricContext;
+import org.apache.gobblin.metrics.context.ReportableContext;
+import org.apache.gobblin.metrics.context.filter.ContextFilterFactory;
+import org.apache.gobblin.metrics.test.ContextStoreReporter;
+import org.apache.gobblin.util.ConfigUtils;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonBytesConverter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonBytesConverter.java b/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonBytesConverter.java
index 1834cbc..d70e724 100644
--- a/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonBytesConverter.java
+++ b/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonBytesConverter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.converter.avro;
+package org.apache.gobblin.converter.avro;
 
 public class AvroToJsonBytesConverter extends AvroToJsonStringConverterBase<byte[]> {
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonBytesWithMetadataConverter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonBytesWithMetadataConverter.java b/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonBytesWithMetadataConverter.java
index 05a72e8..295c7ee 100644
--- a/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonBytesWithMetadataConverter.java
+++ b/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonBytesWithMetadataConverter.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.converter.avro;
+package org.apache.gobblin.converter.avro;
 
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericRecord;
 
-import gobblin.configuration.WorkUnitState;
-import gobblin.converter.MetadataConverterWrapper;
-import gobblin.converter.SchemaConversionException;
-import gobblin.metadata.types.Metadata;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.converter.MetadataConverterWrapper;
+import org.apache.gobblin.converter.SchemaConversionException;
+import org.apache.gobblin.metadata.types.Metadata;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonConverter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonConverter.java b/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonConverter.java
index 4eb9ab9..1b31592 100644
--- a/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonConverter.java
+++ b/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonConverter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.converter.avro;
+package org.apache.gobblin.converter.avro;
 
 import java.util.Collections;
 import java.util.Map;
@@ -31,10 +31,10 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-import gobblin.configuration.WorkUnitState;
-import gobblin.converter.Converter;
-import gobblin.converter.DataConversionException;
-import gobblin.converter.SchemaConversionException;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.converter.Converter;
+import org.apache.gobblin.converter.DataConversionException;
+import org.apache.gobblin.converter.SchemaConversionException;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverter.java b/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverter.java
index f69875a..60c4661 100644
--- a/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverter.java
+++ b/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.converter.avro;
+package org.apache.gobblin.converter.avro;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -24,12 +24,12 @@ import org.apache.avro.generic.GenericRecord;
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.ObjectMapper;
 
-import gobblin.configuration.WorkUnitState;
-import gobblin.converter.Converter;
-import gobblin.converter.DataConversionException;
-import gobblin.converter.SchemaConversionException;
-import gobblin.metadata.types.Metadata;
-import gobblin.type.RecordWithMetadata;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.converter.Converter;
+import org.apache.gobblin.converter.DataConversionException;
+import org.apache.gobblin.converter.SchemaConversionException;
+import org.apache.gobblin.metadata.types.Metadata;
+import org.apache.gobblin.type.RecordWithMetadata;
 
 
 public class AvroToJsonRecordWithMetadataConverter extends Converter<Schema, String, GenericRecord, RecordWithMetadata<JsonNode>> {

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverter.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverter.java b/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverter.java
index a9218b1..505d76d 100644
--- a/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverter.java
+++ b/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gobblin.converter.avro;
+package org.apache.gobblin.converter.avro;
 
 import java.nio.charset.StandardCharsets;
 

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverterBase.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverterBase.java b/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverterBase.java
index a385b51..e494963 100644
--- a/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverterBase.java
+++ b/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverterBase.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.converter.avro;
+package org.apache.gobblin.converter.avro;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -30,10 +30,10 @@ import org.apache.commons.io.output.ByteArrayOutputStream;
 import com.google.common.base.Charsets;
 import com.google.common.collect.Lists;
 
-import gobblin.configuration.WorkUnitState;
-import gobblin.converter.Converter;
-import gobblin.converter.DataConversionException;
-import gobblin.converter.SchemaConversionException;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.converter.Converter;
+import org.apache.gobblin.converter.DataConversionException;
+import org.apache.gobblin.converter.SchemaConversionException;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverterTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverterTest.java b/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverterTest.java
index 9f5035a..3a34600 100644
--- a/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverterTest.java
+++ b/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverterTest.java
@@ -1,4 +1,4 @@
-package gobblin.converter.avro;
+package org.apache.gobblin.converter.avro;
 
 import org.apache.avro.generic.GenericRecord;
 import org.codehaus.jackson.JsonNode;
@@ -6,11 +6,11 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import gobblin.configuration.WorkUnitState;
-import gobblin.converter.DataConversionException;
-import gobblin.converter.SchemaConversionException;
-import gobblin.test.TestUtils;
-import gobblin.type.RecordWithMetadata;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.converter.DataConversionException;
+import org.apache.gobblin.converter.SchemaConversionException;
+import org.apache.gobblin.test.TestUtils;
+import org.apache.gobblin.type.RecordWithMetadata;
 
 
 public class AvroToJsonRecordWithMetadataConverterTest {

http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/2c22b8a9/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverterTest.java
----------------------------------------------------------------------
diff --git a/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverterTest.java b/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverterTest.java
index f477306..28ee844 100644
--- a/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverterTest.java
+++ b/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverterTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package gobblin.converter.avro;
+package org.apache.gobblin.converter.avro;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -27,10 +27,10 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import gobblin.configuration.WorkUnitState;
-import gobblin.converter.DataConversionException;
-import gobblin.converter.SchemaConversionException;
-import gobblin.test.TestUtils;
+import org.apache.gobblin.configuration.WorkUnitState;
+import org.apache.gobblin.converter.DataConversionException;
+import org.apache.gobblin.converter.SchemaConversionException;
+import org.apache.gobblin.test.TestUtils;
 
 
 public class AvroToJsonStringConverterTest {