You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wa...@apache.org on 2026/10/12 08:34:28 UTC
(skywalking) branch feature/otlp-trace-analysis-language updated (d03fa43edf -> aee04105e0)
This is an automated email from the ASF dual-hosted git repository.
wankai123 pushed a change to branch feature/otlp-trace-analysis-language
in repository https://gitbox.apache.org/repos/asf/skywalking.git
from d03fa43edf Fix what the second review of TAL found
add 653eef50e3 Add configurable HTTP timeout for alarm hooks (#14128)
add 217e2e6567 Adopt AI Sessionizer aa67971: a segment is an activity window (#14130)
add aee04105e0 Merge remote-tracking branch 'origin/master' into feature/otlp-trace-analysis-language
No new revisions were added by this update.
Summary of changes:
docs/en/changes/changes.md | 2 +
docs/en/setup/backend/backend-alarm.md | 16 +
docs/en/setup/backend/configuration-vocabulary.md | 1 +
.../conversation/format/SessionFlowRound.java | 9 -
.../agent/conversation/providerbody/Manifest.java | 10 -
.../conversation/view/ConversationViewBuilder.java | 2 -
.../conversation/ConversationViewBuilderTest.java | 4 +-
.../oap/server/ai/agent/conversation/Fixtures.java | 19 +-
.../ai/agent/conversation/SessionFormatsTest.java | 4 +-
.../conversation/withhold/WithheldViewTest.java | 24 +-
.../test/resources/fixtures/asz-view-example.json | 48 +--
.../test/resources/fixtures/asz-view-example.yaml | 41 +-
.../fixtures/input-withheld/asz-view-example.json | 38 +-
...z-view-withheld-system_prompt+tool_schemas.json | 2 +-
.../asz-view-withheld-system_prompt.json | 2 +-
.../asz-view-withheld-tool_schemas.json | 2 +-
...vider_body-20260101T000000.000000000Z-000004.sd | 8 +-
...001-f6917d7d5f75.sf => r000001-9841b6d6c9c0.sf} | 28 +-
.../langchain-subagent/asz-view-example.json | 45 +--
...001-3fd311176e49.sf => r000001-90fcf565d8f9.sf} | 42 +-
.../fixtures/mcp-calls/asz-view-example.json | 45 +--
...001-0465bcdcdb72.sf => r000001-2053bd8e2eca.sf} | 48 +--
.../prompt-snapshot-withheld/asz-view-example.json | 38 +-
...z-view-withheld-system_prompt+tool_schemas.json | 2 +-
.../asz-view-withheld-system_prompt.json | 2 +-
.../asz-view-withheld-tool_schemas.json | 2 +-
...vider_body-20260101T000000.000000000Z-000004.sd | 8 +-
...001-c081727f2581.sf => r000001-bbc6bc7257ea.sf} | 28 +-
.../provider-bodies-errors/asz-view-example.json | 29 +-
...vider_body-20260101T000000.000000000Z-000002.sd | 6 +-
...001-76f9606aacf3.sf => r000001-2e9a9e0b87b2.sf} | 20 +-
.../fixtures/provider-bodies/asz-view-example.json | 68 +---
.../fixtures/provider-bodies/asz-view-example.yaml | 58 +--
...z-view-withheld-system_prompt+tool_schemas.json | 2 +-
.../asz-view-withheld-system_prompt.json | 2 +-
.../asz-view-withheld-tool_schemas.json | 2 +-
...vider_body-20260101T000000.000000000Z-000004.sd | 16 +-
...001-e292bd0f6de6.sf => r000001-30c2e12219c0.sf} | 54 +--
...001-befb6026a577.sf => r000001-58f95b7fc54f.sf} | 44 +--
.../workspace-changes/asz-view-example.json | 41 +-
.../workspace-changes/asz-view-example.yaml | 36 +-
...001-475193a5f44b.sf => r000001-a0076e9f9c3b.sf} | 40 +-
.../core/alarm/provider/AlarmModuleConfig.java} | 20 +-
.../core/alarm/provider/AlarmModuleProvider.java | 35 +-
.../server/core/alarm/provider/NotifyHandler.java | 33 +-
.../provider/dingtalk/DingtalkHookCallback.java | 10 +-
.../provider/discord/DiscordHookCallback.java | 10 +-
.../alarm/provider/feishu/FeishuHookCallback.java | 10 +-
.../provider/pagerduty/PagerDutyHookCallback.java | 10 +-
.../alarm/provider/slack/SlackhookCallback.java | 10 +-
.../alarm/provider/webhook/WebhookCallback.java | 10 +-
.../alarm/provider/wechat/WechatHookCallback.java | 10 +-
.../alarm/provider/welink/WeLinkHookCallback.java | 10 +-
.../alarm/provider/AlarmModuleProviderTest.java | 42 ++
.../core/alarm/provider/NotifyHandlerTest.java | 5 +-
.../dingtalk/DingtalkHookCallbackTest.java | 6 +-
.../provider/feishu/FeishuHookCallbackTest.java | 8 +-
.../pagerduty/PagerDutyHookCallbackTest.java | 6 +-
.../provider/slack/SlackHookCallbackTest.java | 4 +-
.../provider/webhook/WebhookCallbackTest.java | 4 +-
.../provider/wechat/WechatHookCallbackTest.java | 4 +-
.../provider/welink/WeLinkHookCallbackTest.java | 4 +-
.../oap/server/core/alarm/HttpAlarmCallback.java | 29 +-
.../server/core/alarm/HttpAlarmCallbackTest.java | 54 ++-
.../server/library/util/JdkHttpClientUtils.java | 184 +++++++++
.../library/util/JdkHttpClientUtilsTest.java | 426 +++++++++++++++++++++
.../src/main/resources/application.yml | 3 +
.../src/main/resources/application.yml | 3 +
test/e2e-v2/cases/storage/expected/config-dump.yml | 1 +
test/e2e-v2/script/env | 2 +-
70 files changed, 1189 insertions(+), 702 deletions(-)
rename oap-server/analyzer/ai-agent-conversation/src/test/resources/fixtures/input-withheld/{r000001-f6917d7d5f75.sf => r000001-9841b6d6c9c0.sf} (75%)
rename oap-server/analyzer/ai-agent-conversation/src/test/resources/fixtures/langchain-subagent/{r000001-3fd311176e49.sf => r000001-90fcf565d8f9.sf} (74%)
rename oap-server/analyzer/ai-agent-conversation/src/test/resources/fixtures/mcp-calls/{r000001-0465bcdcdb72.sf => r000001-2053bd8e2eca.sf} (73%)
rename oap-server/analyzer/ai-agent-conversation/src/test/resources/fixtures/prompt-snapshot-withheld/{r000001-c081727f2581.sf => r000001-bbc6bc7257ea.sf} (75%)
rename oap-server/analyzer/ai-agent-conversation/src/test/resources/fixtures/provider-bodies-errors/{r000001-76f9606aacf3.sf => r000001-2e9a9e0b87b2.sf} (66%)
rename oap-server/analyzer/ai-agent-conversation/src/test/resources/fixtures/provider-bodies/{r000001-e292bd0f6de6.sf => r000001-30c2e12219c0.sf} (72%)
rename oap-server/analyzer/ai-agent-conversation/src/test/resources/fixtures/{r000001-befb6026a577.sf => r000001-58f95b7fc54f.sf} (77%)
rename oap-server/analyzer/ai-agent-conversation/src/test/resources/fixtures/workspace-changes/{r000001-475193a5f44b.sf => r000001-a0076e9f9c3b.sf} (75%)
copy oap-server/{server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/telegraf/provider/TelegrafModuleConfig.java => server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleConfig.java} (62%)
create mode 100644 oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/JdkHttpClientUtils.java
create mode 100644 oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/JdkHttpClientUtilsTest.java