[hotfix] [metrics] Add missing @Internal annotations
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/0492dcc8 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/0492dcc8 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/0492dcc8 Branch: refs/heads/master Commit: 0492dcc8e2d7fb21ee817f5cf5cc39a8b091ba9c Parents: 70704de Author: zentol <ches...@apache.org> Authored: Fri Aug 19 11:46:14 2016 +0200 Committer: zentol <ches...@apache.org> Committed: Thu Sep 15 19:17:53 2016 +0200 ---------------------------------------------------------------------- .../apache/flink/runtime/metrics/groups/AbstractMetricGroup.java | 2 ++ .../apache/flink/runtime/metrics/groups/ComponentMetricGroup.java | 2 ++ .../apache/flink/runtime/metrics/groups/GenericMetricGroup.java | 2 ++ .../flink/runtime/metrics/groups/JobManagerJobMetricGroup.java | 2 ++ .../apache/flink/runtime/metrics/groups/OperatorMetricGroup.java | 2 ++ .../flink/runtime/metrics/groups/TaskManagerJobMetricGroup.java | 2 ++ .../flink/runtime/metrics/groups/TaskManagerMetricGroup.java | 2 ++ .../org/apache/flink/runtime/metrics/groups/TaskMetricGroup.java | 2 ++ 8 files changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/0492dcc8/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroup.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroup.java index 75476a6..d9338ec 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroup.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroup.java @@ -18,6 +18,7 @@ package org.apache.flink.runtime.metrics.groups; +import org.apache.flink.annotation.Internal; import org.apache.flink.metrics.CharacterFilter; import org.apache.flink.metrics.Counter; import org.apache.flink.metrics.Gauge; @@ -57,6 +58,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull; * * @param <A> The type of the parent MetricGroup */ +@Internal public abstract class AbstractMetricGroup<A extends AbstractMetricGroup<?>> implements MetricGroup { /** shared logger */ http://git-wip-us.apache.org/repos/asf/flink/blob/0492dcc8/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/ComponentMetricGroup.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/ComponentMetricGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/ComponentMetricGroup.java index 9a93fbd..9f0f483 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/ComponentMetricGroup.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/ComponentMetricGroup.java @@ -18,6 +18,7 @@ package org.apache.flink.runtime.metrics.groups; +import org.apache.flink.annotation.Internal; import org.apache.flink.runtime.metrics.MetricRegistry; import java.util.HashMap; @@ -38,6 +39,7 @@ import java.util.Map; * * @param <P> The type of the parent MetricGroup. */ +@Internal public abstract class ComponentMetricGroup<P extends AbstractMetricGroup<?>> extends AbstractMetricGroup<P> { /** http://git-wip-us.apache.org/repos/asf/flink/blob/0492dcc8/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/GenericMetricGroup.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/GenericMetricGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/GenericMetricGroup.java index ab6418d..54fbed4 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/GenericMetricGroup.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/GenericMetricGroup.java @@ -18,6 +18,7 @@ package org.apache.flink.runtime.metrics.groups; +import org.apache.flink.annotation.Internal; import org.apache.flink.metrics.CharacterFilter; import org.apache.flink.runtime.metrics.MetricRegistry; import org.apache.flink.runtime.metrics.dump.QueryScopeInfo; @@ -26,6 +27,7 @@ import org.apache.flink.runtime.metrics.dump.QueryScopeInfo; * A simple named {@link org.apache.flink.metrics.MetricGroup} that is used to hold * subgroups of metrics. */ +@Internal public class GenericMetricGroup extends AbstractMetricGroup<AbstractMetricGroup<?>> { /** The name of this group */ private String name; http://git-wip-us.apache.org/repos/asf/flink/blob/0492dcc8/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/JobManagerJobMetricGroup.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/JobManagerJobMetricGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/JobManagerJobMetricGroup.java index 9d384d8..c4902e8 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/JobManagerJobMetricGroup.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/JobManagerJobMetricGroup.java @@ -17,6 +17,7 @@ */ package org.apache.flink.runtime.metrics.groups; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.JobID; import org.apache.flink.runtime.metrics.MetricRegistry; @@ -29,6 +30,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull; * Special {@link org.apache.flink.metrics.MetricGroup} representing everything belonging to * a specific job, running on the JobManager. */ +@Internal public class JobManagerJobMetricGroup extends JobMetricGroup<JobManagerMetricGroup> { public JobManagerJobMetricGroup( MetricRegistry registry, http://git-wip-us.apache.org/repos/asf/flink/blob/0492dcc8/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/OperatorMetricGroup.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/OperatorMetricGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/OperatorMetricGroup.java index 1ed55d0..f1354b5 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/OperatorMetricGroup.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/OperatorMetricGroup.java @@ -18,6 +18,7 @@ package org.apache.flink.runtime.metrics.groups; +import org.apache.flink.annotation.Internal; import org.apache.flink.metrics.CharacterFilter; import org.apache.flink.runtime.metrics.MetricRegistry; import org.apache.flink.runtime.metrics.dump.QueryScopeInfo; @@ -31,6 +32,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull; /** * Special {@link org.apache.flink.metrics.MetricGroup} representing an Operator. */ +@Internal public class OperatorMetricGroup extends ComponentMetricGroup<TaskMetricGroup> { private final String operatorName; http://git-wip-us.apache.org/repos/asf/flink/blob/0492dcc8/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskManagerJobMetricGroup.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskManagerJobMetricGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskManagerJobMetricGroup.java index 1f852c7..3961c14 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskManagerJobMetricGroup.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskManagerJobMetricGroup.java @@ -17,6 +17,7 @@ */ package org.apache.flink.runtime.metrics.groups; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.JobID; import org.apache.flink.runtime.deployment.TaskDeploymentDescriptor; import org.apache.flink.runtime.metrics.MetricRegistry; @@ -34,6 +35,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull; * * <p>Contains extra logic for adding Tasks ({@link TaskMetricGroup}). */ +@Internal public class TaskManagerJobMetricGroup extends JobMetricGroup<TaskManagerMetricGroup> { /** Map from execution attempt ID (task identifier) to task metrics */ http://git-wip-us.apache.org/repos/asf/flink/blob/0492dcc8/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskManagerMetricGroup.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskManagerMetricGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskManagerMetricGroup.java index 5bdd014..a8fa828 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskManagerMetricGroup.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskManagerMetricGroup.java @@ -18,6 +18,7 @@ package org.apache.flink.runtime.metrics.groups; +import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.JobID; import org.apache.flink.metrics.CharacterFilter; import org.apache.flink.runtime.deployment.TaskDeploymentDescriptor; @@ -34,6 +35,7 @@ import java.util.Map; * <p>Contains extra logic for adding jobs with tasks, and removing jobs when they do * not contain tasks any more */ +@Internal public class TaskManagerMetricGroup extends ComponentMetricGroup<TaskManagerMetricGroup> { private final Map<JobID, TaskManagerJobMetricGroup> jobs = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/flink/blob/0492dcc8/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskMetricGroup.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskMetricGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskMetricGroup.java index 0e76ab0..5082fd8 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskMetricGroup.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/TaskMetricGroup.java @@ -18,6 +18,7 @@ package org.apache.flink.runtime.metrics.groups; +import org.apache.flink.annotation.Internal; import org.apache.flink.metrics.CharacterFilter; import org.apache.flink.runtime.metrics.MetricRegistry; import org.apache.flink.runtime.metrics.dump.QueryScopeInfo; @@ -35,6 +36,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull; * * <p>Contains extra logic for adding operators. */ +@Internal public class TaskMetricGroup extends ComponentMetricGroup<TaskManagerJobMetricGroup> { private final Map<String, OperatorMetricGroup> operators = new HashMap<>();
