Skip to content

Commit 1a232ec

Browse files
committed
[API] Expose OperatorMetricGroup via RuntimeContext
Move the dependency of flink-metric-core from flink-core to flink-core-api
1 parent 33e207a commit 1a232ec

File tree

6 files changed

+32
-6
lines changed

6 files changed

+32
-6
lines changed

flink-core-api/pom.xml

+7
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ under the License.
4040
<version>${project.version}</version>
4141
</dependency>
4242

43+
<dependency>
44+
<groupId>org.apache.flink</groupId>
45+
<artifactId>flink-metrics-core</artifactId>
46+
<version>${project.version}</version>
47+
</dependency>
48+
49+
4350
<!-- ================== test dependencies ================== -->
4451

4552
<dependency>

flink-core/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,6 @@ under the License.
7171
<version>${project.version}</version>
7272
</dependency>
7373

74-
<dependency>
75-
<groupId>org.apache.flink</groupId>
76-
<artifactId>flink-metrics-core</artifactId>
77-
<version>${project.version}</version>
78-
</dependency>
79-
8074
<!-- ArchUnit test dependencies -->
8175

8276
<dependency>

flink-process-function-parent/flink-process-function-api/src/main/java/org/apache/flink/process/api/context/RuntimeContext.java

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.apache.flink.process.api.context;
2020

2121
import org.apache.flink.annotation.Experimental;
22+
import org.apache.flink.metrics.groups.OperatorMetricGroup;
2223

2324
/**
2425
* A RuntimeContext contains information about the context in which process functions are executed.
@@ -41,6 +42,9 @@ public interface RuntimeContext {
4142
/** Get the {@link ProcessingTimeManager} of this process function. */
4243
ProcessingTimeManager getProcessingTimeManager();
4344

45+
/** Get the metric group of this process function. */
46+
OperatorMetricGroup getMetricGroup();
47+
4448
/** Get the {@link TimestampManager} of this process function. */
4549
TimestampManager getTimestampManager();
4650
}

flink-process-function-parent/flink-process-function/src/main/java/org/apache/flink/process/impl/context/DefaultNonPartitionedContext.java

+6
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.flink.process.impl.context;
2020

21+
import org.apache.flink.metrics.groups.OperatorMetricGroup;
2122
import org.apache.flink.process.api.context.JobInfo;
2223
import org.apache.flink.process.api.context.NonPartitionedContext;
2324
import org.apache.flink.process.api.context.ProcessingTimeManager;
@@ -61,6 +62,11 @@ public ProcessingTimeManager getProcessingTimeManager() {
6162
return UnsupportedProcessingTimeManager.INSTANCE;
6263
}
6364

65+
@Override
66+
public OperatorMetricGroup getMetricGroup() {
67+
return context.getMetricGroup();
68+
}
69+
6470
@Override
6571
public TimestampManager getTimestampManager() {
6672
return context.getTimestampManager();

flink-process-function-parent/flink-process-function/src/main/java/org/apache/flink/process/impl/context/DefaultRuntimeContext.java

+9
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.flink.process.impl.context;
2020

21+
import org.apache.flink.metrics.groups.OperatorMetricGroup;
2122
import org.apache.flink.process.api.context.JobInfo;
2223
import org.apache.flink.process.api.context.ProcessingTimeManager;
2324
import org.apache.flink.process.api.context.RuntimeContext;
@@ -38,6 +39,8 @@ public class DefaultRuntimeContext implements RuntimeContext {
3839

3940
private final ProcessingTimeManager processingTimeManager;
4041

42+
private final OperatorMetricGroup metricGroup;
43+
4144
private final DefaultTimestampManager timestampManager;
4245

4346
public DefaultRuntimeContext(
@@ -52,6 +55,7 @@ public DefaultRuntimeContext(
5255
this.taskInfo = new DefaultTaskInfo(parallelism, maxParallelism, taskName);
5356
this.stateManager = new DefaultStateManager(currentKeySupplier, currentKeySetter);
5457
this.processingTimeManager = processingTimeManager;
58+
this.metricGroup = operatorContext.getMetricGroup();
5559
this.timestampManager = new DefaultTimestampManager();
5660
}
5761

@@ -74,6 +78,11 @@ public ProcessingTimeManager getProcessingTimeManager() {
7478
return processingTimeManager;
7579
}
7680

81+
@Override
82+
public OperatorMetricGroup getMetricGroup() {
83+
return metricGroup;
84+
}
85+
7786
@Override
7887
public DefaultTimestampManager getTimestampManager() {
7988
return timestampManager;

flink-process-function-parent/flink-process-function/src/main/java/org/apache/flink/process/impl/context/DefaultTwoOutputNonPartitionedContext.java

+6
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.flink.process.impl.context;
2020

21+
import org.apache.flink.metrics.groups.OperatorMetricGroup;
2122
import org.apache.flink.process.api.context.JobInfo;
2223
import org.apache.flink.process.api.context.ProcessingTimeManager;
2324
import org.apache.flink.process.api.context.StateManager;
@@ -63,6 +64,11 @@ public ProcessingTimeManager getProcessingTimeManager() {
6364
return UnsupportedProcessingTimeManager.INSTANCE;
6465
}
6566

67+
@Override
68+
public OperatorMetricGroup getMetricGroup() {
69+
return context.getMetricGroup();
70+
}
71+
6672
@Override
6773
public TimestampManager getTimestampManager() {
6874
return context.getTimestampManager();

0 commit comments

Comments
 (0)