This is an automated email from the ASF dual-hosted git repository.
lynwee pushed a commit to branch release-v0.21
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/release-v0.21 by this push:
new 1888cef6c feat(tapd): add more log when converting unicode (#8164)
(#8165)
1888cef6c is described below
commit 1888cef6c51edcd40e5f5d70384d203b92917213
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Oct 30 17:09:55 2024 +0800
feat(tapd): add more log when converting unicode (#8164) (#8165)
* feat(tapd): add more log when converting unicode
* feat(tapd): ignore errors when converting unicode fails
Co-authored-by: Lynwee <[email protected]>
---
backend/plugins/tapd/tasks/bug_changelog_extractor.go | 5 ++++-
backend/plugins/tapd/tasks/story_changelog_extractor.go | 5 +++--
backend/plugins/tapd/tasks/task_changelog_extractor.go | 5 +++--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/backend/plugins/tapd/tasks/bug_changelog_extractor.go
b/backend/plugins/tapd/tasks/bug_changelog_extractor.go
index 958f52275..84238e576 100644
--- a/backend/plugins/tapd/tasks/bug_changelog_extractor.go
+++ b/backend/plugins/tapd/tasks/bug_changelog_extractor.go
@@ -37,6 +37,7 @@ var ExtractBugChangelogMeta = plugin.SubTaskMeta{
func ExtractBugChangelog(taskCtx plugin.SubTaskContext) errors.Error {
rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx,
RAW_BUG_CHANGELOG_TABLE)
+ logger := taskCtx.GetLogger()
extractor, err := api.NewApiExtractor(api.ApiExtractorArgs{
RawDataSubTaskArgs: *rawDataSubTaskArgs,
Extract: func(row *api.RawData) ([]interface{}, errors.Error) {
@@ -46,6 +47,7 @@ func ExtractBugChangelog(taskCtx plugin.SubTaskContext)
errors.Error {
}
err := errors.Convert(json.Unmarshal(row.Data,
&bugChangelogBody))
if err != nil {
+ logger.Error(err, "unmarshal: %s, err: %s",
row.Data, err)
return nil, err
}
bugChangelog := bugChangelogBody.BugChange
@@ -61,11 +63,12 @@ func ExtractBugChangelog(taskCtx plugin.SubTaskContext)
errors.Error {
}
err = convertUnicode(item)
if err != nil {
- return nil, err
+ logger.Error(err, "convert unicode: %s, err:
%s", item, err)
}
if item.Field == "iteration_id" {
iterationFrom, iterationTo, err :=
parseIterationChangelog(taskCtx, item.ValueBeforeParsed, item.ValueAfterParsed)
if err != nil {
+ logger.Error(err,
"parseIterationChangelog: %s, err: %s", item, err)
return nil, err
}
item.IterationIdFrom = iterationFrom
diff --git a/backend/plugins/tapd/tasks/story_changelog_extractor.go
b/backend/plugins/tapd/tasks/story_changelog_extractor.go
index 62c09ea72..667e833cc 100644
--- a/backend/plugins/tapd/tasks/story_changelog_extractor.go
+++ b/backend/plugins/tapd/tasks/story_changelog_extractor.go
@@ -36,6 +36,7 @@ var ExtractStoryChangelogMeta = plugin.SubTaskMeta{
}
func ExtractStoryChangelog(taskCtx plugin.SubTaskContext) errors.Error {
+ logger := taskCtx.GetLogger()
rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx,
RAW_STORY_CHANGELOG_TABLE)
extractor, err := api.NewApiExtractor(api.ApiExtractorArgs{
RawDataSubTaskArgs: *rawDataSubTaskArgs,
@@ -89,7 +90,7 @@ func ExtractStoryChangelog(taskCtx plugin.SubTaskContext)
errors.Error {
}
err = convertUnicode(&item)
if err != nil {
- return nil, err
+ logger.Error(err,
"convert unicode: %s, err: %s", item, err)
}
results = append(results, &item)
}
@@ -103,7 +104,7 @@ func ExtractStoryChangelog(taskCtx plugin.SubTaskContext)
errors.Error {
}
err = convertUnicode(&item)
if err != nil {
- return nil, err
+ logger.Error(err, "convert unicode: %s,
err: %s", item, err)
}
if item.Field == "iteration_id" {
// some users' tapd will not return
iteration_id_from/iteration_id_to
diff --git a/backend/plugins/tapd/tasks/task_changelog_extractor.go
b/backend/plugins/tapd/tasks/task_changelog_extractor.go
index 1ccfd1479..df9834b37 100644
--- a/backend/plugins/tapd/tasks/task_changelog_extractor.go
+++ b/backend/plugins/tapd/tasks/task_changelog_extractor.go
@@ -38,6 +38,7 @@ var ExtractTaskChangelogMeta = plugin.SubTaskMeta{
func ExtractTaskChangelog(taskCtx plugin.SubTaskContext) errors.Error {
rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx,
RAW_TASK_CHANGELOG_TABLE)
+ logger := taskCtx.GetLogger()
extractor, err := api.NewApiExtractor(api.ApiExtractorArgs{
RawDataSubTaskArgs: *rawDataSubTaskArgs,
Extract: func(row *api.RawData) ([]interface{}, errors.Error) {
@@ -92,7 +93,7 @@ func ExtractTaskChangelog(taskCtx plugin.SubTaskContext)
errors.Error {
}
err = convertUnicode(&item)
if err != nil {
- return nil, err
+ logger.Error(err, "convert
unicode: %s, err: %s", item, err)
}
default:
item.ConnectionId =
data.Options.ConnectionId
@@ -103,7 +104,7 @@ func ExtractTaskChangelog(taskCtx plugin.SubTaskContext)
errors.Error {
}
err = convertUnicode(&item)
if err != nil {
- return nil, err
+ logger.Error(err, "convert unicode: %s,
err: %s", item, err)
}
if item.Field == "iteration_id" {
iterationFrom, iterationTo, err :=
parseIterationChangelog(taskCtx, item.ValueBeforeParsed, item.ValueAfterParsed)
