[
https://issues.apache.org/jira/browse/BEAM-6181?focusedWorklogId=177724&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-177724
]
ASF GitHub Bot logged work on BEAM-6181:
----------------------------------------
Author: ASF GitHub Bot
Created on: 20/Dec/18 19:45
Start Date: 20/Dec/18 19:45
Worklog Time Spent: 10m
Work Description: ajamato commented on a change in pull request #7323:
[BEAM-6181] Implemented msec counters support in FnApi world.
URL: https://github.com/apache/beam/pull/7323#discussion_r243394709
##########
File path:
runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/control/MSecMonitoringInfoToCounterUpdateTransformerTest.java
##########
@@ -0,0 +1,167 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.beam.runners.dataflow.worker.fn.control;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.google.api.services.dataflow.model.CounterUpdate;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import org.apache.beam.model.fnexecution.v1.BeamFnApi.MonitoringInfo;
+import org.apache.beam.runners.core.metrics.SpecMonitoringInfoValidator;
+import
org.apache.beam.runners.dataflow.worker.DataflowExecutionContext.DataflowStepContext;
+import org.apache.beam.runners.dataflow.worker.counters.NameContext;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class MSecMonitoringInfoToCounterUpdateTransformerTest {
+
+ @Rule public final ExpectedException exception = ExpectedException.none();
+
+ @Mock private SpecMonitoringInfoValidator mockSpecValidator;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ }
+
+ @Test
+ public void testTransformReturnsNullIfSpecValidationFails() {
+ Map<String, String> counterNameMapping = new HashMap<>();
+ counterNameMapping.put("beam:counter:supported", "supportedCounter");
+
+ Map<String, DataflowStepContext> stepContextMapping = new HashMap<>();
+
+ MSecMonitoringInfoToCounterUpdateTransformer testObject =
+ new MSecMonitoringInfoToCounterUpdateTransformer(
+ mockSpecValidator, stepContextMapping, counterNameMapping);
+
+ Optional<String> error = Optional.of("Error text");
+ when(mockSpecValidator.validate(any())).thenReturn(error);
+
+ MonitoringInfo monitoringInfo =
+ MonitoringInfo.newBuilder()
+
.setUrn("beam:metric:pardo_execution_time:start_bundle_msecs:v1:invalid")
+ .build();
+ assertEquals(null, testObject.transform(monitoringInfo));
+ }
+
+ @Test
+ public void testTransformThrowsIfMonitoringInfoWithUnknownUrnReceived() {
+ Map<String, String> counterNameMapping = new HashMap<>();
+ counterNameMapping.put("beam:counter:supported", "supportedCounter");
+
+ Map<String, DataflowStepContext> stepContextMapping = new HashMap<>();
+ MonitoringInfo monitoringInfo =
+ MonitoringInfo.newBuilder()
+
.setUrn("beam:metric:pardo_execution_time:start_bundle_msecs:v1:invalid")
+ .build();
+
+ MSecMonitoringInfoToCounterUpdateTransformer testObject =
+ new MSecMonitoringInfoToCounterUpdateTransformer(
+ mockSpecValidator, stepContextMapping, counterNameMapping);
+
+ when(mockSpecValidator.validate(any())).thenReturn(Optional.empty());
+
+ exception.expect(RuntimeException.class);
+ testObject.transform(monitoringInfo);
+ }
+
+ @Test
+ public void
testTransformThrowsIfMonitoringInfoWithUnknownPTransformLabelPresent() {
+ Map<String, String> counterNameMapping = new HashMap<>();
+ counterNameMapping.put("beam:counter:supported", "supportedCounter");
+
+ Map<String, DataflowStepContext> stepContextMapping = new HashMap<>();
+
+ MSecMonitoringInfoToCounterUpdateTransformer testObject =
+ new MSecMonitoringInfoToCounterUpdateTransformer(mockSpecValidator,
stepContextMapping);
+
+ when(mockSpecValidator.validate(any())).thenReturn(Optional.empty());
+
+ MonitoringInfo monitoringInfo =
+ MonitoringInfo.newBuilder()
+ .setUrn("beam:counter:unsupported")
+ .putLabels("PTRANSFORM", "anyValue")
+ .build();
+
+ exception.expect(RuntimeException.class);
+ testObject.transform(monitoringInfo);
+ }
+
+ @Test
+ public void
testTransformReturnsValidCounterUpdateWhenValidMSecMonitoringInfoReceived() {
+ // Setup
+ Map<String, String> counterNameMapping = new HashMap<>();
+ counterNameMapping.put("beam:counter:supported", "supportedCounter");
+
+ Map<String, DataflowStepContext> stepContextMapping = new HashMap<>();
+ NameContext nc =
+ NameContext.create("anyStageName", "anyOriginalName", "anySystemName",
"anyUserName");
+ DataflowStepContext dsc = mock(DataflowStepContext.class);
+ when(dsc.getNameContext()).thenReturn(nc);
+ stepContextMapping.put("anyValue", dsc);
+
+ MSecMonitoringInfoToCounterUpdateTransformer testObject =
+ new MSecMonitoringInfoToCounterUpdateTransformer(
+ mockSpecValidator, stepContextMapping, counterNameMapping);
+ when(mockSpecValidator.validate(any())).thenReturn(Optional.empty());
+
+ // Execute
+ MonitoringInfo monitoringInfo =
+ MonitoringInfo.newBuilder()
+ .setUrn("beam:counter:supported")
+ .putLabels("PTRANSFORM", "anyValue")
+ .build();
+
+ CounterUpdate result = testObject.transform(monitoringInfo);
+
+ // Validate
+ assertNotEquals(null, result);
+
+ assertEquals(
+ "{cumulative=true, integer={highBits=0, lowBits=0}, "
+ + "structuredNameAndMetadata={metadata={kind=SUM}, "
+ + "name={executionStepName=anyStageName, name=supportedCounter,
origin=SYSTEM, "
+ + "originalStepName=anyOriginalName}}}",
+ result.toString());
+ }
+
+ @Test
+ public void testCreateKnownUrnToCounterNameMappingRetursExpectedValues() {
Review comment:
spelling Returns
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 177724)
Time Spent: 9.5h (was: 9h 20m)
> Utilize MetricInfo for reporting user metrics in Portable Dataflow Java
> Runner.
> -------------------------------------------------------------------------------
>
> Key: BEAM-6181
> URL: https://issues.apache.org/jira/browse/BEAM-6181
> Project: Beam
> Issue Type: Bug
> Components: java-fn-execution
> Reporter: Mikhail Gryzykhin
> Assignee: Mikhail Gryzykhin
> Priority: Major
> Time Spent: 9.5h
> Remaining Estimate: 0h
>
> New approach to report metrics in FnApi is to utilize MetricInfo structures.
> This approach is implemented in Python SDK and work is ongoing in Java SDK.
> This tasks includes plumbing User metrics reported via MetricInfos through
> Dataflow Java Runner.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
