szaszm commented on code in PR #1360: URL: https://github.com/apache/nifi-minifi-cpp/pull/1360#discussion_r925855542
########## C2.md: ########## @@ -55,48 +58,49 @@ With this change, heartbeat with agent manifest included is sent only for the fi light weight heartbeat. If for some reason the C2 server does not receive the first full heartbeat, the manifest can be requested via C2 DESCRIBE manifest command. - #in minifi.properties +``` +#in minifi.properties - # Disable/Enable C2 - nifi.c2.enable=true +# Disable/Enable C2 +nifi.c2.enable=true Review Comment: I prefer the original [classic markdown style](https://www.markdownguide.org/basic-syntax#code-blocks-1) over the github markdown extension. ########## extensions/standard-processors/processors/GetFile.h: ########## @@ -62,23 +62,27 @@ class GetFileMetrics : public state::response::ResponseNode { std::vector<state::response::SerializedResponseNode> serialize() override { std::vector<state::response::SerializedResponseNode> resp; + state::response::SerializedResponseNode root_node; + root_node.name = source_component_.getName(); Review Comment: Indexing components by UUID would be more robust, and would work when multiple processors of the same type share the same name. What do you think? ########## libminifi/test/resources/TestSameProcessorMetrics.yml: ########## @@ -0,0 +1,119 @@ +# +# 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. +# +Flow Controller: + name: MiNiFi Flow + id: 2438e3c8-015a-1000-79ca-83af40ec1990 +Processors: + - name: GetFile1 + id: 471deef6-2a6e-4a7d-912a-81cc17e3a206 + class: org.apache.nifi.processors.standard.GetFile + max concurrent tasks: 1 + scheduling strategy: TIMER_DRIVEN + scheduling period: 1 sec + penalization period: 30 sec + yield period: 1 sec + run duration nanos: 0 + auto-terminated relationships list: + Properties: + Input Directory: /tmp/getfile1 + Keep Source File: true + - name: GetFile2 + id: 471deef6-2a6e-4a7d-912a-81cc17e3a207 + class: org.apache.nifi.processors.standard.GetFile + max concurrent tasks: 1 + scheduling strategy: TIMER_DRIVEN + scheduling period: 1 sec + penalization period: 30 sec + yield period: 1 sec + run duration nanos: 0 + auto-terminated relationships list: + Properties: + Input Directory: /tmp/getfile2 + Keep Source File: true + - name: GetTCP1 + id: 2438e3c8-015a-1000-79ca-83af40ec1995 + class: org.apache.nifi.processors.standard.GetTCP + max concurrent tasks: 1 + scheduling strategy: TIMER_DRIVEN + scheduling period: 10 msec + penalization period: 30 msec + yield period: 10 msec + run duration nanos: 0 + auto-terminated relationships list: + Properties: + SSL Context Service: SSLContextService + endpoint-list: localhost:8776 + end-of-message-byte: d + reconnect-interval: 100ms + connection-attempt-timeout: 2000 + - name: GetTCP2 + id: 2438e3c8-015a-1000-79ca-83af40ec1996 + class: org.apache.nifi.processors.standard.GetTCP + max concurrent tasks: 1 + scheduling strategy: TIMER_DRIVEN + scheduling period: 10 msec + penalization period: 30 msec + yield period: 10 msec + run duration nanos: 0 + auto-terminated relationships list: + Properties: + SSL Context Service: SSLContextService + endpoint-list: localhost:8776 + end-of-message-byte: d + reconnect-interval: 100ms + connection-attempt-timeout: 2000 + - name: LogAttribute + id: 2438e3c8-015a-1000-79ca-83af40ec1992 + class: org.apache.nifi.processors.standard.LogAttribute + max concurrent tasks: 1 + scheduling strategy: TIMER_DRIVEN + scheduling period: 1 sec + penalization period: 30 sec + yield period: 1 sec + run duration nanos: 0 + auto-terminated relationships list: + - response Review Comment: No such relationship on LogAttribute. Did you mean success? ########## extensions/http-curl/tests/C2DescribeMetricsTest.cpp: ########## @@ -0,0 +1,156 @@ +/** + * + * 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. + */ + +#undef NDEBUG +#include <memory> + +#include "TestBase.h" +#include "HTTPIntegrationBase.h" +#include "HTTPHandlers.h" +#include "processors/TailFile.h" +#include "state/ProcessorController.h" +#include "utils/file/FileUtils.h" +#include "utils/TestUtils.h" +#include "processors/GetTCP.h" +#include "utils/StringUtils.h" +#include "utils/file/PathUtils.h" + +using namespace std::literals::chrono_literals; + +namespace org::apache::nifi::minifi::test { + +class VerifyEmptyC2Metric : public VerifyC2Base { + public: + explicit VerifyEmptyC2Metric(const std::atomic_bool& metrics_found) : metrics_found_(metrics_found) { + } + + void testSetup() override { + LogTestController::getInstance().setTrace<minifi::c2::C2Agent>(); + LogTestController::getInstance().setTrace<minifi::c2::C2Client>(); + LogTestController::getInstance().setDebug<minifi::c2::RESTSender>(); + LogTestController::getInstance().setDebug<minifi::FlowController>(); + LogTestController::getInstance().setOff<minifi::processors::GetTCP>(); Review Comment: Since the test is under the minifi namespace, the `minifi::` prefix is not necessary. ########## libminifi/test/resources/TestSameProcessorMetrics.yml: ########## @@ -0,0 +1,119 @@ +# +# 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. +# +Flow Controller: + name: MiNiFi Flow + id: 2438e3c8-015a-1000-79ca-83af40ec1990 +Processors: + - name: GetFile1 + id: 471deef6-2a6e-4a7d-912a-81cc17e3a206 + class: org.apache.nifi.processors.standard.GetFile + max concurrent tasks: 1 + scheduling strategy: TIMER_DRIVEN + scheduling period: 1 sec + penalization period: 30 sec + yield period: 1 sec + run duration nanos: 0 + auto-terminated relationships list: + Properties: + Input Directory: /tmp/getfile1 + Keep Source File: true + - name: GetFile2 + id: 471deef6-2a6e-4a7d-912a-81cc17e3a207 + class: org.apache.nifi.processors.standard.GetFile + max concurrent tasks: 1 + scheduling strategy: TIMER_DRIVEN + scheduling period: 1 sec + penalization period: 30 sec + yield period: 1 sec + run duration nanos: 0 + auto-terminated relationships list: + Properties: + Input Directory: /tmp/getfile2 + Keep Source File: true + - name: GetTCP1 + id: 2438e3c8-015a-1000-79ca-83af40ec1995 + class: org.apache.nifi.processors.standard.GetTCP + max concurrent tasks: 1 + scheduling strategy: TIMER_DRIVEN + scheduling period: 10 msec + penalization period: 30 msec + yield period: 10 msec + run duration nanos: 0 + auto-terminated relationships list: + Properties: + SSL Context Service: SSLContextService + endpoint-list: localhost:8776 + end-of-message-byte: d + reconnect-interval: 100ms + connection-attempt-timeout: 2000 + - name: GetTCP2 + id: 2438e3c8-015a-1000-79ca-83af40ec1996 + class: org.apache.nifi.processors.standard.GetTCP + max concurrent tasks: 1 + scheduling strategy: TIMER_DRIVEN + scheduling period: 10 msec + penalization period: 30 msec + yield period: 10 msec + run duration nanos: 0 + auto-terminated relationships list: + Properties: + SSL Context Service: SSLContextService + endpoint-list: localhost:8776 + end-of-message-byte: d + reconnect-interval: 100ms + connection-attempt-timeout: 2000 + - name: LogAttribute + id: 2438e3c8-015a-1000-79ca-83af40ec1992 + class: org.apache.nifi.processors.standard.LogAttribute + max concurrent tasks: 1 + scheduling strategy: TIMER_DRIVEN + scheduling period: 1 sec + penalization period: 30 sec + yield period: 1 sec + run duration nanos: 0 + auto-terminated relationships list: + - response + Properties: + Log Level: info + Log Payload: true + +Connections: Review Comment: The GetTCP relationships are neither connected nor auto-terminated. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@nifi.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
