Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix-16573][alert] SQL task alert sending failed #16595

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
+12 −1
Open

[Fix-16573][alert] SQL task alert sending failed #16595

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf949e8
[Fix-16573] The json field value is null
saowu Sep 7, 2024
6ea3b2c
[Fix-16573] NullNode is changed to TextNode to avoid null value
saowu Sep 8, 2024
aac1955
[Fix-16573] NullNode is changed to TextNode to avoid null value
saowu Sep 10, 2024
cd9ca1a
[Fix-16573] NullNode is changed to TextNode to avoid null value
saowu Sep 10, 2024
a35c119
Merge branch 'dev' into Fix-16573
Gallardot Sep 11, 2024
73ef88c
Merge branch 'dev' into Fix-16573
Gallardot Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...rt-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;

import lombok.extern.slf4j.Slf4j;

Expand Down Expand Up @@ -118,7 +119,7 @@ public static String formatContent(AlertData alertData) {
for (Map map : list) {
for (Entry<String, Object> entry : (Iterable<Entry<String, Object>>) map.entrySet()) {
String key = entry.getKey();
String value = entry.getValue().toString();
String value = Objects.nonNull(entry.getValue()) ? entry.getValue().toString() : null;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think entry.getValue() will get npe. Can you provide the reproduce steps?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
The json field value is null.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where did this parameter other comes from? I can't find it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This parameter is used to verify npe and does not exist.
#16573
The sql query results are sent via Feishu, and the field value in the query results is null

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. We should do the data convertion in org.apache.dolphinscheduler.plugin.task.sql.SqlTask. This ensures that other alarm types are normal.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
Is the field value in the result processed here empty?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
Is the second one better?

contents.append(key + ":" + value);
contents.append("\n");
}
Expand Down
3 changes: 2 additions & 1 deletion ...eishu/src/test/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSenderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ public void testFormatContent() {
+ " \"recovery\": \"NO\",\n"
+ " \"retryTimes\": 0,\n"
+ " \"runTimes\": 1,\n"
+ " \"taskId\": 0\n"
+ " \"taskId\": 0,\n"
+ " \"other\": null\n"
+ " }\n"
+ "]";
AlertData alertData = new AlertData();
Expand Down
Loading