(skywalking-java) branch fix deleted (was f9dbe89741)
This is an automated email from the ASF dual-hosted git repository. wankai pushed a change to branch fix in repository https://gitbox.apache.org/repos/asf/skywalking-java.git was f9dbe89741 Merge branch 'main' into fix The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking-java) branch main updated: Rename system env name from `sw_plugin_kafka_producer_config` to `SW_PLUGIN_KAFKA_PRODUCER_CONFIG` (#668)
This is an automated email from the ASF dual-hosted git repository.
wankai pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
The following commit(s) were added to refs/heads/main by this push:
new b1c96da0d4 Rename system env name from
`sw_plugin_kafka_producer_config` to `SW_PLUGIN_KAFKA_PRODUCER_CONFIG` (#668)
b1c96da0d4 is described below
commit b1c96da0d4b7192ae6c6cdce61dd1124df84ec96
Author: 吴晟 Wu Sheng
AuthorDate: Mon Jan 22 13:50:20 2024 +0800
Rename system env name from `sw_plugin_kafka_producer_config` to
`SW_PLUGIN_KAFKA_PRODUCER_CONFIG` (#668)
---
CHANGES.md | 1 +
apm-sniffer/config/agent.config | 2 +-
docs/en/setup/service-agent/java-agent/configurations.md | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index bd249be6e3..276aec1f38 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ Release Notes.
* Support for HttpExchange request tracing.
* Support tracing for async producing, batch sync consuming, and batch async
consuming in rocketMQ-client-java-5.x-plugin.
* Convert the Redisson span into an async span.
+* Rename system env name from `sw_plugin_kafka_producer_config` to
`SW_PLUGIN_KAFKA_PRODUCER_CONFIG`.
Documentation
diff --git a/apm-sniffer/config/agent.config b/apm-sniffer/config/agent.config
index 0a18b8873b..65b95a6fbd 100755
--- a/apm-sniffer/config/agent.config
+++ b/apm-sniffer/config/agent.config
@@ -239,7 +239,7 @@
plugin.kafka.bootstrap_servers=${SW_KAFKA_BOOTSTRAP_SERVERS:localhost:9092}
plugin.kafka.get_topic_timeout=${SW_GET_TOPIC_TIMEOUT:10}
# Kafka producer configuration. Read [producer
configure](http://kafka.apache.org/24/documentation.html#producerconfigs)
# to get more details. Check document for more details and examples.
-plugin.kafka.producer_config=${sw_plugin_kafka_producer_config:}
+plugin.kafka.producer_config=${SW_PLUGIN_KAFKA_PRODUCER_CONFIG:}
# Configure Kafka Producer configuration in JSON format. Notice it will be
overridden by plugin.kafka.producer_config[key], if the key duplication.
plugin.kafka.producer_config_json=${SW_PLUGIN_KAFKA_PRODUCER_CONFIG_JSON:}
# Specify which Kafka topic name for Meter System data to report to.
diff --git a/docs/en/setup/service-agent/java-agent/configurations.md
b/docs/en/setup/service-agent/java-agent/configurations.md
index 121c0c3e25..4126407d18 100644
--- a/docs/en/setup/service-agent/java-agent/configurations.md
+++ b/docs/en/setup/service-agent/java-agent/configurations.md
@@ -92,7 +92,7 @@ This is the properties list supported in
`agent/config/agent.config`.
| `plugin.dubbo.provider_arguments_length_threshold` | When
`plugin.dubbo.collect_provider_arguments` is `true`, Arguments of length from
the front will to the OAP backend
[...]
| `plugin.kafka.bootstrap_servers`| A list of
host/port pairs to use for establishing the initial connection to the Kafka
cluster.
[...]
| `plugin.kafka.get_topic_timeout`| Timeout
period of reading topics from the Kafka server, the unit is second.
[...]
-| `plugin.kafka.producer_config` | Kafka
producer configuration. Read [producer
configure](http://kafka.apache.org/24/documentation.html#producerconfigs) to
get more details. Check [Kafka report
doc](advanced-reporters.md#kafka-reporter) for more details and examples.
[...]
+| `plugin.kafka.producer_config` | Kafka
producer configuration. Read [producer
configure](http://kafka.apache.org/24/documentation.html#producerconfigs) to
get more details. Check [Kafka report
Re: [PR] Rename system env name `sw_plugin_kafka_producer_config` to `SW_PLUGIN_KAFKA_PRODUCER_CONFIG` [skywalking-java]
wankai123 merged PR #668: URL: https://github.com/apache/skywalking-java/pull/668 -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-java) branch fix updated (0b92eced4d -> f9dbe89741)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch fix
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
from 0b92eced4d Rename system env name from
`sw_plugin_kafka_producer_config` to `SW_PLUGIN_KAFKA_PRODUCER_CONFIG`
add bbb177a893 Support tracing for async producing, batch sync consuming,
and batch async consuming in rocketMQ-client-java-5.x-plugin (#665)
add eebc4512ec Convert the Redisson lock span into an async span (#667)
add f9dbe89741 Merge branch 'main' into fix
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 4 +-
.../v3/RedissonHighLevelLockInterceptor.java | 14 ++
.../redisson/v3/RedissonLockInterceptor.java | 14 ++
.../client/java/v5/MessageListenerInterceptor.java | 4 +-
...eptor.java => MessageSendAsyncInterceptor.java} | 83 ---
.../client/java/v5/MessageSendInterceptor.java | 22 +-
.../java/v5/RocketMqClientJavaPluginConfig.java} | 18 +-
.../v5/SimpleConsumerImplAsyncInterceptor.java | 126 +++
...tor.java => SimpleConsumerImplInterceptor.java} | 71 +++---
java => ProducerImplAsyncInstrumentation.java} | 10 +-
.../SimpleConsumerImplAsyncInstrumentation.java} | 26 ++-
.../define/SimpleConsumerImplInstrumentation.java} | 26 ++-
.../src/main/resources/skywalking-plugin.def | 3 +
apm-sniffer/config/agent.config| 4 +
.../service-agent/java-agent/configurations.md | 2 +
.../rocketmq-5-grpc-scenario/bin/startup.sh| 2 +-
.../config/expectedData.yaml | 152 +++--
.../client/java/controller/CaseController.java | 148 -
.../client/java/controller/MessageService.java | 240 +
.../client/java/controller/ProducerSingleton.java | 61 ++
.../rocketmq-5-grpc-scenario/support-version.list | 1 +
21 files changed, 803 insertions(+), 228 deletions(-)
copy
apm-sniffer/apm-sdk-plugin/rocketMQ-client-java-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/client/java/v5/{MessageSendInterceptor.java
=> MessageSendAsyncInterceptor.java} (59%)
copy
apm-sniffer/apm-sdk-plugin/{solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/SolrJPluginConfig.java
=>
rocketMQ-client-java-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/client/java/v5/RocketMqClientJavaPluginConfig.java}
(62%)
create mode 100644
apm-sniffer/apm-sdk-plugin/rocketMQ-client-java-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/client/java/v5/SimpleConsumerImplAsyncInterceptor.java
copy
apm-sniffer/apm-sdk-plugin/rocketMQ-client-java-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/client/java/v5/{MessageListenerInterceptor.java
=> SimpleConsumerImplInterceptor.java} (55%)
copy
apm-sniffer/apm-sdk-plugin/rocketMQ-client-java-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/client/java/v5/define/{ProducerImplInstrumentation.java
=> ProducerImplAsyncInstrumentation.java} (83%)
copy
apm-sniffer/apm-sdk-plugin/{undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/RequestDispatcherImplInstrumentation.java
=>
rocketMQ-client-java-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/client/java/v5/define/SimpleConsumerImplAsyncInstrumentation.java}
(79%)
copy
apm-sniffer/apm-sdk-plugin/{undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/RequestDispatcherImplInstrumentation.java
=>
rocketMQ-client-java-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/client/java/v5/define/SimpleConsumerImplInstrumentation.java}
(79%)
create mode 100644
test/plugin/scenarios/rocketmq-5-grpc-scenario/src/main/java/test/apache/skywalking/apm/testcase/rocketmq/client/java/controller/MessageService.java
create mode 100644
test/plugin/scenarios/rocketmq-5-grpc-scenario/src/main/java/test/apache/skywalking/apm/testcase/rocketmq/client/java/controller/ProducerSingleton.java
[PR] Rename system env name `sw_plugin_kafka_producer_config` to `SW_PLUGIN_KAFKA_PRODUCER_CONFIG` [skywalking-java]
wu-sheng opened a new pull request, #668: URL: https://github.com/apache/skywalking-java/pull/668 - [ ] If this pull request closes/resolves/fixes an existing issue, replace the issue number. Closes #. - [x] Update the [`CHANGES` log](https://github.com/apache/skywalking-java/blob/main/CHANGES.md). -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-java) branch fix created (now 0b92eced4d)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch fix in repository https://gitbox.apache.org/repos/asf/skywalking-java.git at 0b92eced4d Rename system env name from `sw_plugin_kafka_producer_config` to `SW_PLUGIN_KAFKA_PRODUCER_CONFIG` This branch includes the following new commits: new 0b92eced4d Rename system env name from `sw_plugin_kafka_producer_config` to `SW_PLUGIN_KAFKA_PRODUCER_CONFIG` The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking-java) 01/01: Rename system env name from `sw_plugin_kafka_producer_config` to `SW_PLUGIN_KAFKA_PRODUCER_CONFIG`
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch fix
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit 0b92eced4dab0a95d621313807e44953db6211e7
Author: Wu Sheng
AuthorDate: Mon Jan 22 11:44:05 2024 +0800
Rename system env name from `sw_plugin_kafka_producer_config` to
`SW_PLUGIN_KAFKA_PRODUCER_CONFIG`
---
CHANGES.md | 1 +
apm-sniffer/config/agent.config | 2 +-
docs/en/setup/service-agent/java-agent/configurations.md | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 5225574210..6ad3f98d6b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Release Notes.
* Fix re-transform bug when plugin enhanced class proxy parent method.
* Fix error HTTP status codes not recording as SLA failures in Vert.x plugins.
* Support for HttpExchange request tracing
+* Rename system env name from `sw_plugin_kafka_producer_config` to
`SW_PLUGIN_KAFKA_PRODUCER_CONFIG`.
Documentation
diff --git a/apm-sniffer/config/agent.config b/apm-sniffer/config/agent.config
index 6827c0a912..42d933fe9d 100755
--- a/apm-sniffer/config/agent.config
+++ b/apm-sniffer/config/agent.config
@@ -239,7 +239,7 @@
plugin.kafka.bootstrap_servers=${SW_KAFKA_BOOTSTRAP_SERVERS:localhost:9092}
plugin.kafka.get_topic_timeout=${SW_GET_TOPIC_TIMEOUT:10}
# Kafka producer configuration. Read [producer
configure](http://kafka.apache.org/24/documentation.html#producerconfigs)
# to get more details. Check document for more details and examples.
-plugin.kafka.producer_config=${sw_plugin_kafka_producer_config:}
+plugin.kafka.producer_config=${SW_PLUGIN_KAFKA_PRODUCER_CONFIG:}
# Configure Kafka Producer configuration in JSON format. Notice it will be
overridden by plugin.kafka.producer_config[key], if the key duplication.
plugin.kafka.producer_config_json=${SW_PLUGIN_KAFKA_PRODUCER_CONFIG_JSON:}
# Specify which Kafka topic name for Meter System data to report to.
diff --git a/docs/en/setup/service-agent/java-agent/configurations.md
b/docs/en/setup/service-agent/java-agent/configurations.md
index 718f08dc76..8df23a4aa0 100644
--- a/docs/en/setup/service-agent/java-agent/configurations.md
+++ b/docs/en/setup/service-agent/java-agent/configurations.md
@@ -92,7 +92,7 @@ This is the properties list supported in
`agent/config/agent.config`.
| `plugin.dubbo.provider_arguments_length_threshold` | When
`plugin.dubbo.collect_provider_arguments` is `true`, Arguments of length from
the front will to the OAP backend
[...]
| `plugin.kafka.bootstrap_servers`| A list of
host/port pairs to use for establishing the initial connection to the Kafka
cluster.
[...]
| `plugin.kafka.get_topic_timeout`| Timeout
period of reading topics from the Kafka server, the unit is second.
[...]
-| `plugin.kafka.producer_config` | Kafka
producer configuration. Read [producer
configure](http://kafka.apache.org/24/documentation.html#producerconfigs) to
get more details. Check [Kafka report
doc](advanced-reporters.md#kafka-reporter) for more details and examples.
[...]
+| `plugin.kafka.producer_config` | Kafka
producer configuration. Read [producer
configure](http://kafka.apache.org/24/documentation.html#producerconfigs) to
get more details. Check [Kafka report
doc](advanced-reporters.md#kafka-reporter) for more details and examples.
[...]
|
Re: [I] [Bug] Booster-UI d3 trace graph is incomplete [skywalking]
Fine0830 commented on issue #11809: URL: https://github.com/apache/skywalking/issues/11809#issuecomment-1903038291 Okay -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] Booster-UI d3 trace graph is incomplete [skywalking]
wu-sheng commented on issue #11809: URL: https://github.com/apache/skywalking/issues/11809#issuecomment-1902987327 @Fine0830 Could you try to fix this? -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] Booster-UI d3 trace graph is incomplete [skywalking]
CzyerChen commented on issue #11809: URL: https://github.com/apache/skywalking/issues/11809#issuecomment-1902951436 > @CzyerChen Are you going to submit the patch? I'm not very proficient in front-end, but I can give it a try. -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] Booster-UI d3 trace graph is incomplete [skywalking]
wu-sheng commented on issue #11809: URL: https://github.com/apache/skywalking/issues/11809#issuecomment-1902883853 @CzyerChen Are you going to submit the patch? -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[I] [Bug] Booster-UI d3 trace graph is incomplete [skywalking]
CzyerChen opened a new issue, #11809:
URL: https://github.com/apache/skywalking/issues/11809
### Search before asking
- [X] I had searched in the
[issues](https://github.com/apache/skywalking/issues?q=is%3Aissue) and found no
similar issues.
### Apache SkyWalking Component
UI (apache/skywalking-booster-ui)
### What happened
The trace that contains several refs shown is incomplete in
trace/components/D3Graph
span.size = 9
svg init size = (9+1)*48 = 480
svg resize = 480+20 = 500
img:
https://github.com/apache/skywalking/assets/22817918/5308a14d-9885-4618-8be5-dd4db0aee434;>
data:
```
{
"data": {
"trace": {
"spans": [
{
"traceId": "a8a4841cfd704c9d8b47c97f52637776.50.17058839304190001",
"segmentId":
"a8a4841cfd704c9d8b47c97f52637776.50.1705883930418",
"spanId": 0,
"parentSpanId": -1,
"refs": [],
"serviceCode": "rmq5-grpc-A-scenario",
"serviceInstanceName":
"6500e1104b16418e8e5489c9c656ec95@198.18.0.1",
"startTime": 1705883930421,
"endTime": 1705883935188,
"endpointName": "GET:/case/rocketmq-5-grpc-scenario",
"type": "Entry",
"peer": "",
"component": "SpringMVC",
"isError": false,
"layer": "Http",
"tags": [
{
"key": "url",
"value":
"http://127.0.0.1:8080/rocketmq-5-grpc-scenario/case/rocketmq-5-grpc-scenario;
},
{
"key": "http.method",
"value": "GET"
},
{
"key": "http.status_code",
"value": "200"
}
],
"logs": [],
"attachedEvents": []
},
{
"traceId": "a8a4841cfd704c9d8b47c97f52637776.50.17058839304190001",
"segmentId":
"a8a4841cfd704c9d8b47c97f52637776.50.1705883930418",
"spanId": 1,
"parentSpanId": 0,
"refs": [],
"serviceCode": "rmq5-grpc-A-scenario",
"serviceInstanceName":
"6500e1104b16418e8e5489c9c656ec95@198.18.0.1",
"startTime": 1705883932347,
"endTime": 1705883932603,
"endpointName": "RocketMQ/NormalTopicTest/Producer",
"type": "Exit",
"peer": "123.56.194.74:8081",
"component": "rocketMQ-producer",
"isError": false,
"layer": "MQ",
"tags": [
{
"key": "mq.broker",
"value": "123.56.194.74:8081"
},
{
"key": "mq.topic",
"value": "NormalTopicTest"
},
{
"key": "mq.message.keys",
"value": "d733befb-bfca-4707-bbc7-1dc54d804834"
},
{
"key": "mq.message.tags",
"value": "Tag:normal"
},
{
"key": "mq.message.id",
"value": "01ACDE48001122917105BF531C"
}
],
"logs": [],
"attachedEvents": []
},
{
"traceId": "a8a4841cfd704c9d8b47c97f52637776.50.17058839304190001",
"segmentId":
"a8a4841cfd704c9d8b47c97f52637776.161.1705883935281",
"spanId": 0,
"parentSpanId": -1,
"refs": [
{
"traceId":
"a8a4841cfd704c9d8b47c97f52637776.50.17058839304190001",
"parentSegmentId":
"a8a4841cfd704c9d8b47c97f52637776.50.1705883930418",
"parentSpanId": 1,
"type": "CROSS_PROCESS"
}
],
"serviceCode": "rmq5-grpc-A-scenario",
"serviceInstanceName":
"6500e1104b16418e8e5489c9c656ec95@198.18.0.1",
"startTime": 1705883935281,
"endTime": 1705883935281,
"endpointName": "RocketMQ/NormalTopicTest/Consumer",
"type": "Entry",
"peer": "123.56.194.74:8081",
"component": "rocketMQ-consumer",
"isError": false,
"layer": "MQ",
"tags": [
{
"key": "transmission.latency",
"value": "2932"
},
{
"key": "mq.topic",
"value": "NormalTopicTest"
},
{
"key": "mq.message.id",
"value": "01ACDE48001122917105BF531C"
},
{
"key": "mq.broker",
"value": "123.56.194.74:8081"
}
],
"logs": [],
Re: [PR] Optimize service conflict error message [skywalking-java]
lujiajing1126 closed pull request #666: Optimize service conflict error message URL: https://github.com/apache/skywalking-java/pull/666 -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Optimize service conflict error message [skywalking-java]
lujiajing1126 commented on PR #666: URL: https://github.com/apache/skywalking-java/pull/666#issuecomment-1902872991 > > I am confused why this is related to the [apache/skywalking#10991](https://github.com/apache/skywalking/issues/10991)? > > The linked issue may be caused by version compatibility of the Netty plugin. It must not relevant to the kernel. > > @wu-sheng @lujiajing1126 I am so sorry, this was my mistake, I checked again the relate issue [intercept failure](https://github.com/apache/skywalking/issues/10991), it should be relate to [issues/11205](https://github.com/apache/skywalking/issues/11205), when `ServiceManager.bootedServices` initial failure, it will print many of NPE error message in skywalking-api.log, I hope this optimeize can help us to find the cause of the problem quickly. As I comment here, https://github.com/apache/skywalking/issues/11205#issuecomment-1902871724 is caused by misunderstanding of the webflux scenario. I am going to close the issue since it actually resolve neither of the issues the author linked here. Feel free to reopen this if you have further idea. -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] [skywalking]
lujiajing1126 commented on issue #11205: URL: https://github.com/apache/skywalking/issues/11205#issuecomment-1902871724 The issue is you have to enable the optional plugin "apm-spring-webflux-5.x-plugin" If you check the test case, https://github.com/apache/skywalking-java/blob/main/test/plugin/scenarios/webflux-scenario/configuration.yml#L22, the optional plugin have been enabled. -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-go) branch main updated: Fix enhance param error when there are multiple params (#162)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-go.git
The following commit(s) were added to refs/heads/main by this push:
new 322daeb Fix enhance param error when there are multiple params (#162)
322daeb is described below
commit 322daeb60b64b05ce7d174b433100c64834835b2
Author: Starry
AuthorDate: Mon Jan 22 01:30:57 2024 +0800
Fix enhance param error when there are multiple params (#162)
---
CHANGES.md | 1 +
tools/go-agent/tools/enhancement.go | 1 -
tools/go-agent/tools/enhancement_test.go | 55
3 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index b4c2a70..a6ef940 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,7 @@ Release Notes.
* Fix ParseVendorModule error for special case in vendor/modules.txt.
* Fix enhance method error when unknown parameter type.
* Fix wrong tracing context when trace have been sampled.
+* Fix enhance param error when there are multiple params.
Issues and PR
- All issues are
[here](https://github.com/apache/skywalking/milestone/197?closed=1)
diff --git a/tools/go-agent/tools/enhancement.go
b/tools/go-agent/tools/enhancement.go
index 4171f61..04a3052 100644
--- a/tools/go-agent/tools/enhancement.go
+++ b/tools/go-agent/tools/enhancement.go
@@ -88,7 +88,6 @@ func EnhanceParameterNames(fields *dst.FieldList, fieldType
FieldListType) []*Pa
for _, n := range f.Names {
result = append(result,
newParameterInfo(n.Name, f.Type))
- break
}
}
}
diff --git a/tools/go-agent/tools/enhancement_test.go
b/tools/go-agent/tools/enhancement_test.go
index e2a8c51..3bd5d6c 100644
--- a/tools/go-agent/tools/enhancement_test.go
+++ b/tools/go-agent/tools/enhancement_test.go
@@ -30,13 +30,15 @@ func buildParameterValidateInfo(name, typeName string)
*ParameterInfo {
}
}
+type TestEnhanceParameterInfo struct {
+ funcCode string
+ recvs[]*ParameterInfo
+ params []*ParameterInfo
+ results []*ParameterInfo
+}
+
func TestEnhanceParameterNames(t *testing.T) {
- tests := []struct {
- funcCode string
- recvs[]*ParameterInfo
- params []*ParameterInfo
- results []*ParameterInfo
- }{
+ tests := []TestEnhanceParameterInfo{
{
funcCode: `func (*Example) Test(int) bool {
return false
@@ -67,6 +69,47 @@ func TestEnhanceParameterNames(t *testing.T) {
},
}
+ validateParameterTestList(t, tests)
+}
+
+func TestEnhanceParameterNamesMultiParams(t *testing.T) {
+ tests := []TestEnhanceParameterInfo{
+ {
+ funcCode: `func (*Example) Test(n, m int) bool {
+ return false
+ }`,
+ recvs: []*ParameterInfo{
+ buildParameterValidateInfo("skywalking_recv_0",
"*Example"),
+ },
+ params: []*ParameterInfo{
+ buildParameterValidateInfo("n", "int"),
+ buildParameterValidateInfo("m", "int"),
+ },
+ results: []*ParameterInfo{
+
buildParameterValidateInfo("skywalking_result_0", "bool"),
+ },
+ },
+ {
+ funcCode: `func (e *Example) Test(n, m int) (b bool) {
+ return false
+}`,
+ recvs: []*ParameterInfo{
+ buildParameterValidateInfo("e", "*Example"),
+ },
+ params: []*ParameterInfo{
+ buildParameterValidateInfo("n", "int"),
+ buildParameterValidateInfo("m", "int"),
+ },
+ results: []*ParameterInfo{
+ buildParameterValidateInfo("b", "bool"),
+ },
+ },
+ }
+
+ validateParameterTestList(t, tests)
+}
+
+func validateParameterTestList(t *testing.T, tests []TestEnhanceParameterInfo)
{
for i, test := range tests {
fun := GoStringToDecls(test.funcCode)[0].(*dst.FuncDecl)
var actualRecv, actualParams, actualResults []*ParameterInfo
Re: [PR] Fix enhance param error when there are multiple params [skywalking-go]
wu-sheng merged PR #162: URL: https://github.com/apache/skywalking-go/pull/162 -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Fix enhance param error when there are multiple params [skywalking-go]
CodePrometheus commented on PR #162: URL: https://github.com/apache/skywalking-go/pull/162#issuecomment-1902678926 Thank you for your time as well, Teacher Liu. -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Fix enhance param error when there are multiple params [skywalking-go]
CodePrometheus commented on code in PR #162:
URL: https://github.com/apache/skywalking-go/pull/162#discussion_r1460954479
##
tools/go-agent/tools/enhancement.go:
##
@@ -88,7 +88,6 @@ func EnhanceParameterNames(fields *dst.FieldList, fieldType
FieldListType) []*Pa
for _, n := range f.Names {
result = append(result,
newParameterInfo(n.Name, f.Type))
- break
Review Comment:
done~
--
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: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Fix enhance param error when there are multiple params [skywalking-go]
mrproliu commented on code in PR #162: URL: https://github.com/apache/skywalking-go/pull/162#discussion_r1460949421 ## go.work.sum: ## @@ -1759,6 +1760,7 @@ golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= Review Comment: Then, please restore to the upstream version. -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Fix enhance param error when there are multiple params [skywalking-go]
CodePrometheus commented on code in PR #162: URL: https://github.com/apache/skywalking-go/pull/162#discussion_r1460944735 ## go.work.sum: ## @@ -1759,6 +1760,7 @@ golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= Review Comment: Maybe it was caused by my executing `go mod tidy` locally. -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Fix enhance param error when there are multiple params [skywalking-go]
mrproliu commented on code in PR #162:
URL: https://github.com/apache/skywalking-go/pull/162#discussion_r1460936744
##
go.work.sum:
##
@@ -1759,6 +1760,7 @@ golang.org/x/text v0.11.0
h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod
h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6/go.mod
h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
Review Comment:
Why you need to modify the go.mod? It seems no dependency update.
##
tools/go-agent/tools/enhancement.go:
##
@@ -88,7 +88,6 @@ func EnhanceParameterNames(fields *dst.FieldList, fieldType
FieldListType) []*Pa
for _, n := range f.Names {
result = append(result,
newParameterInfo(n.Name, f.Type))
- break
Review Comment:
Could you help to add more test case on this?
--
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: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[PR] Fix enhance param error when there are multiple params [skywalking-go]
CodePrometheus opened a new pull request, #162:
URL: https://github.com/apache/skywalking-go/pull/162
### **summary**
```go
// tools/go-agent/tools/enhancement.go:63
func EnhanceParameterNames(fields *dst.FieldList, fieldType FieldListType)
[]*ParameterInfo {
if fields == nil {
return nil
}
result := make([]*ParameterInfo, 0)
for i, f := range fields.List {
var defineName string
switch fieldType {
case FieldListTypeParam:
defineName = fmt.Sprintf("skywalking_param_%d", i)
case FieldListTypeResult:
defineName = fmt.Sprintf("skywalking_result_%d", i)
case FieldListTypeRecv:
defineName = fmt.Sprintf("skywalking_recv_%d", i)
}
if len(f.Names) == 0 {
f.Names = []*dst.Ident{{Name: defineName}}
result = append(result, newParameterInfo(defineName,
f.Type))
} else {
for _, n := range f.Names {
if n.Name == "_" {
*n = *dst.NewIdent(defineName)
break
}
}
for _, n := range f.Names {
result = append(result,
newParameterInfo(n.Name, f.Type))
// If there are multiple parameters in
f.Names, only the first element of the array will be processed here
break
}
}
}
return result
}
```
--
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: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Sync data collect for update access log protocol [skywalking-goapi]
wu-sheng merged PR #76: URL: https://github.com/apache/skywalking-goapi/pull/76 -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-showcase) branch main updated: Update the exclude namespaces with helm variable (#158)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
The following commit(s) were added to refs/heads/main by this push:
new 90746f6 Update the exclude namespaces with helm variable (#158)
90746f6 is described below
commit 90746f664e6bb7be65daa4ea8e647f265ce60928
Author: mrproliu <741550...@qq.com>
AuthorDate: Sun Jan 21 19:17:52 2024 +0800
Update the exclude namespaces with helm variable (#158)
---
deploy/platform/kubernetes/templates/feature-rover/resources.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deploy/platform/kubernetes/templates/feature-rover/resources.yaml
b/deploy/platform/kubernetes/templates/feature-rover/resources.yaml
index a0bf590..db840fd 100644
--- a/deploy/platform/kubernetes/templates/feature-rover/resources.yaml
+++ b/deploy/platform/kubernetes/templates/feature-rover/resources.yaml
@@ -72,7 +72,7 @@ spec:
- name: ROVER_ACCESS_LOG_ACTIVE
value: "true"
- name: ROVER_ACCESS_LOG_EXCLUDE_NAMESPACES
- value: gmp-system,kube-system,skywalking-showcase
+ value: gmp-system,kube-system,{{.Release.Namespace}}
- name: ROVER_ACCESS_LOG_EXCLUDE_CLUSTER
value: mesh-svr
hostPID: true
Re: [PR] Update the exclude namespaces with helm variable [skywalking-showcase]
kezhenxu94 merged PR #158: URL: https://github.com/apache/skywalking-showcase/pull/158 -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-data-collect-protocol) branch master updated: Wrap the node info to metadata in the Access Log Protocol (#93)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/skywalking-data-collect-protocol.git
The following commit(s) were added to refs/heads/master by this push:
new cc8aa8c Wrap the node info to metadata in the Access Log Protocol
(#93)
cc8aa8c is described below
commit cc8aa8ca4ee53a44487982a55762f72825824d73
Author: mrproliu <741550...@qq.com>
AuthorDate: Sun Jan 21 18:17:38 2024 +0800
Wrap the node info to metadata in the Access Log Protocol (#93)
---
ebpf/accesslog.proto | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/ebpf/accesslog.proto b/ebpf/accesslog.proto
index 324094b..de5477f 100644
--- a/ebpf/accesslog.proto
+++ b/ebpf/accesslog.proto
@@ -32,8 +32,8 @@ service EBPFAccessLogService {
}
message EBPFAccessLogMessage {
-// current node information, only not null when first message or have
update
-EBPFAccessLogNodeInfo node = 1;
+// metadata of access log, only not null when first message
+EBPFAccessLogMetadata metadata = 1;
// local process and remote process connection information
AccessLogConnection connection = 2;
// kernel level metrics
@@ -44,6 +44,18 @@ message EBPFAccessLogMessage {
AccessLogProtocolLogs protocolLog = 4;
}
+message EBPFAccessLogMetadata {
+// current node information
+EBPFAccessLogNodeInfo node = 1;
+// policy for access logs
+EBPFAccessLogPolicy policy = 2;
+}
+
+message EBPFAccessLogPolicy {
+// which namespaces should be excluded to generate the connection
+repeated string excludeNamespaces = 1;
+}
+
message EBPFAccessLogNodeInfo {
// Node name
string name = 1;
Re: [PR] Wrap the node info to metadata in the Access Log Protocol [skywalking-data-collect-protocol]
wu-sheng merged PR #93: URL: https://github.com/apache/skywalking-data-collect-protocol/pull/93 -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-website) branch asf-site updated: deploy: fe0471f578a9a1fae0f184d69a384e4680aa5aa5
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 517378d804d deploy: fe0471f578a9a1fae0f184d69a384e4680aa5aa5 517378d804d is described below commit 517378d804d51fb3a5187aad316c6f66aa754153 Author: wu-sheng AuthorDate: Sun Jan 21 10:04:59 2024 + deploy: fe0471f578a9a1fae0f184d69a384e4680aa5aa5 --- contributors/index.html| 394 ++--- .../next/en/contribution/compiling/index.html | 2 +- .../en/contribution/release-java-agent/index.html | 2 +- .../next/en/faq/ext-dirs/index.html| 2 +- docs/skywalking-java/next/en/faq/osgi/index.html | 2 +- .../java-agent/advanced-features/index.html| 2 +- .../java-agent/advanced-reporters/index.html | 2 +- .../kotlin-coroutine-plugin/index.html | 2 +- .../oracle-resin-plugins/index.html| 2 +- .../spring-annotation-plugin/index.html| 2 +- .../trace-ignore-plugin/index.html | 2 +- .../application-toolkit-dependency/index.html | 2 +- .../application-toolkit-kafka/index.html | 2 +- .../application-toolkit-log4j-1.x/index.html | 2 +- .../application-toolkit-log4j-2.x/index.html | 2 +- .../application-toolkit-logback-1.x/index.html | 2 +- .../application-toolkit-meter/index.html | 2 +- .../application-toolkit-micrometer-1.10/index.html | 2 +- .../application-toolkit-micrometer/index.html | 2 +- .../index.html | 2 +- .../index.html | 2 +- .../index.html | 2 +- .../index.html | 2 +- .../application-toolkit-trace/index.html | 2 +- .../application-toolkit-tracer/index.html | 2 +- .../application-toolkit-webflux/index.html | 2 +- .../java-agent/bootstrap-plugins/index.html| 2 +- .../java-agent/configuration-discovery/index.html | 2 +- .../java-agent/configurations/index.html | 16 +- .../java-agent/containerization/index.html | 2 +- .../java-agent/customize-enhance-trace/index.html | 2 +- .../java-agent/how-to-disable-plugin/index.html| 2 +- .../how-to-tolerate-exceptions/index.html | 2 +- .../java-plugin-development-guide/index.html | 4 +- .../java-agent/logic-endpoint/index.html | 2 +- .../java-agent/opentracing/index.html | 2 +- .../java-agent/optional-plugins/index.html | 2 +- .../java-agent/plugin-list/index.html | 2 +- .../java-agent/plugin-test/index.html | 26 +- .../service-agent/java-agent/readme/index.html | 2 +- .../java-agent/setting-override/index.html | 2 +- .../java-agent/specified-agent-config/index.html | 2 +- .../java-agent/supported-list/index.html | 2 +- .../setup/service-agent/java-agent/tls/index.html | 4 +- .../service-agent/java-agent/token-auth/index.html | 2 +- docs/skywalking-java/next/readme/index.html| 2 +- index.json | 2 +- searchindex.json | 2 +- team/index.html| 168 - 49 files changed, 355 insertions(+), 343 deletions(-) diff --git a/contributors/index.html b/contributors/index.html index 3183ed68d44..1505a14e4a2 100644 --- a/contributors/index.html +++ b/contributors/index.html @@ -535,7 +535,7 @@ -130 +131 2 @@ -9577,29 +9577,29 @@ - + -https://github.com/honganan; target="_blank"> +https://github.com/jjtyro; target="_blank"> - honganan + jjtyro -6 -61 +6 +61 - + -https://github.com/jjtyro; target="_blank"> +https://github.com/honganan; target="_blank"> - jjtyro + honganan -6
[PR] Update the exclude namespaces with helm variable [skywalking-showcase]
mrproliu opened a new pull request, #158: URL: https://github.com/apache/skywalking-showcase/pull/158 Following https://github.com/apache/skywalking-showcase/pull/157#discussion_r1459191440, update the namespaces to the helm variable. -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Wrap the node info to metadata in the Access Log Protocol [skywalking-data-collect-protocol]
mrproliu opened a new pull request, #93: URL: https://github.com/apache/skywalking-data-collect-protocol/pull/93 (no comment) -- 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: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
