[GitHub] [skywalking] wu-sheng commented on a change in pull request #3476: Add pulsar apm plugin
wu-sheng commented on a change in pull request #3476: Add pulsar apm plugin URL: https://github.com/apache/skywalking/pull/3476#discussion_r326943383 ## File path: apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/PulsarConsumerInterceptor.java ## @@ -54,12 +54,11 @@ @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { -if (allArguments.length > 0 && allArguments[0] != null) { +if (allArguments[0] != null) { ConsumerEnhanceRequiredInfo requiredInfo = (ConsumerEnhanceRequiredInfo) objInst.getSkyWalkingDynamicField(); -requiredInfo.setStartTime(System.currentTimeMillis()); AbstractSpan activeSpan = ContextManager.createEntrySpan(OPERATE_NAME_PREFIX + requiredInfo.getTopic() + CONSUMER_OPERATE_NAME + requiredInfo.getSubscriptionName(), null) -.start(requiredInfo.getStartTime()); +.start(System.currentTimeMillis()); Review comment: `#createEntrySpan` has set start time automatically, you could find it in source does. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] wu-sheng commented on issue #3496: Committer vote and set up document.
wu-sheng commented on issue #3496: Committer vote and set up document. URL: https://github.com/apache/skywalking/pull/3496#issuecomment-533952486 /run e2e 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[skywalking] branch new-committer updated (f3e9f6d -> be8db3c)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch new-committer in repository https://gitbox.apache.org/repos/asf/skywalking.git. from f3e9f6d Merge branch 'master' into new-committer add c05e633 Sync latest ALS from Envoy API (#3507) add be8db3c Merge branch 'master' into new-committer No new revisions were added by this update. Summary of changes: .../proto/envoy/data/accesslog/v2/accesslog.proto | 53 -- 1 file changed, 38 insertions(+), 15 deletions(-)
[GitHub] [skywalking] wu-sheng commented on issue #3505: MOD: Kafka-plugin Compatible with KafkaTemplate
wu-sheng commented on issue #3505: MOD: Kafka-plugin Compatible with KafkaTemplate URL: https://github.com/apache/skywalking/pull/3505#issuecomment-533947379 @haodut Could you test this PR codes? It should fix your issue. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] wu-sheng commented on issue #3505: MOD: Kafka-plugin Compatible with KafkaTemplate
wu-sheng commented on issue #3505: MOD: Kafka-plugin Compatible with KafkaTemplate URL: https://github.com/apache/skywalking/pull/3505#issuecomment-533947332 /run e2e 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] stalary commented on issue #3505: MOD: Kafka-plugin Compatible with KafkaTemplate
stalary commented on issue #3505: MOD: Kafka-plugin Compatible with KafkaTemplate URL: https://github.com/apache/skywalking/pull/3505#issuecomment-533944842 > LGTM. @zhaoyuguang Could you run Kafka plugin case again? In case this would break the old things. > > @stalary Do we need another case for this? I tested kafka-clients and kafkaTemplate locally and found no problem. We can add some cases of kafkaTemplate 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[skywalking] branch als-sync deleted (was 155b772)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch als-sync in repository https://gitbox.apache.org/repos/asf/skywalking.git. was 155b772 Sync latest ALS from Envoy API 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] branch master updated: Sync latest ALS from Envoy API (#3507)
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.git The following commit(s) were added to refs/heads/master by this push: new c05e633 Sync latest ALS from Envoy API (#3507) c05e633 is described below commit c05e63353d092723e47373ba485238de2e859d56 Author: 吴晟 Wu Sheng AuthorDate: Mon Sep 23 10:02:33 2019 +0800 Sync latest ALS from Envoy API (#3507) --- .../proto/envoy/data/accesslog/v2/accesslog.proto | 53 -- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/data/accesslog/v2/accesslog.proto b/oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/data/accesslog/v2/accesslog.proto index b387433..8aa38f4 100644 --- a/oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/data/accesslog/v2/accesslog.proto +++ b/oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/data/accesslog/v2/accesslog.proto @@ -12,11 +12,8 @@ import "envoy/api/v2/core/base.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; -import "gogoproto/gogo.proto"; import "validate/validate.proto"; -option (gogoproto.stable_marshaler_all) = true; - // [#protodoc-title: gRPC access logs] // Envoy access logs describe incoming interaction with Envoy over a fixed // period of time, and typically cover a single request/response exchange, @@ -28,10 +25,12 @@ option (gogoproto.stable_marshaler_all) = true; // Fields describing *upstream* interaction will explicitly include ``upstream`` // in their name. -// [#not-implemented-hide:] message TCPAccessLogEntry { // Common properties shared by all Envoy access logs. AccessLogCommon common_properties = 1; + + // Properties of the TCP connection. + ConnectionProperties connection_properties = 2; } message HTTPAccessLogEntry { @@ -54,6 +53,15 @@ message HTTPAccessLogEntry { HTTPResponseProperties response = 4; } +// Defines fields for a connection +message ConnectionProperties { + // Number of bytes received from downstream. + uint64 received_bytes = 1; + + // Number of bytes sent to downstream. + uint64 sent_bytes = 2; +} + // Defines fields that are shared by all Envoy access logs. message AccessLogCommon { // [#not-implemented-hide:] @@ -74,37 +82,37 @@ message AccessLogCommon { // The time that Envoy started servicing this request. This is effectively the time that the first // downstream byte is received. - google.protobuf.Timestamp start_time = 5 [(gogoproto.stdtime) = true]; + google.protobuf.Timestamp start_time = 5; // Interval between the first downstream byte received and the last // downstream byte received (i.e. time it takes to receive a request). - google.protobuf.Duration time_to_last_rx_byte = 6 [(gogoproto.stdduration) = true]; + google.protobuf.Duration time_to_last_rx_byte = 6; // Interval between the first downstream byte received and the first upstream byte sent. There may // by considerable delta between *time_to_last_rx_byte* and this value due to filters. // Additionally, the same caveats apply as documented in *time_to_last_downstream_tx_byte* about // not accounting for kernel socket buffer time, etc. - google.protobuf.Duration time_to_first_upstream_tx_byte = 7 [(gogoproto.stdduration) = true]; + google.protobuf.Duration time_to_first_upstream_tx_byte = 7; // Interval between the first downstream byte received and the last upstream byte sent. There may // by considerable delta between *time_to_last_rx_byte* and this value due to filters. // Additionally, the same caveats apply as documented in *time_to_last_downstream_tx_byte* about // not accounting for kernel socket buffer time, etc. - google.protobuf.Duration time_to_last_upstream_tx_byte = 8 [(gogoproto.stdduration) = true]; + google.protobuf.Duration time_to_last_upstream_tx_byte = 8; // Interval between the first downstream byte received and the first upstream // byte received (i.e. time it takes to start receiving a response). - google.protobuf.Duration time_to_first_upstream_rx_byte = 9 [(gogoproto.stdduration) = true]; + google.protobuf.Duration time_to_first_upstream_rx_byte = 9; // Interval between the first downstream byte received and the last upstream // byte received (i.e. time it takes to receive a complete response). - google.protobuf.Duration time_to_last_upstream_rx_byte = 10 [(gogoproto.stdduration) = true]; + google.protobuf.Duration time_to_last_upstream_rx_byte = 10; // Interval between the first downstream byte received and the first downstream byte sent. // There may be a considerable delta between the *time_to_first_upstream_rx_byte* and this field // due to filters. Additionally, the same caveats
[GitHub] [skywalking] wu-sheng merged pull request #3507: Sync latest ALS from Envoy API
wu-sheng merged pull request #3507: Sync latest ALS from Envoy API URL: https://github.com/apache/skywalking/pull/3507 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] wu-sheng commented on issue #3508: segment 索引 是不是只保存2两天的数据
wu-sheng commented on issue #3508: segment 索引 是不是只保存2两天的数据 URL: https://github.com/apache/skywalking/issues/3508#issuecomment-533937627 6.3 has a bug about TTL setting is not working in some cases, read issue and changelog. 6.4 release has fixed 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] lichengliang1 opened a new issue #3508: segment 索引 是不是只保存2两天的数据
lichengliang1 opened a new issue #3508: segment 索引 是不是只保存2两天的数据 URL: https://github.com/apache/skywalking/issues/3508 Please answer these questions before submitting your issue. - Why do you submit this issue? - [ ] Question or discussion - [ ] Bug - [ ] Requirement - [ ] Feature or performance improvement ___ ### Question - What do you want to know? segment 索引 是不是只保存2两天的数据 ___ ### Bug - Which version of SkyWalking, OS and JRE? skywalking6.3 jdk8 es6.5 - Which company or project? - What happen? If possible, provide a way for reproducing the error. e.g. demo application, component version. ___ ### Requirement or improvement - Please describe about your requirements or improvement suggestions. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] wu-sheng commented on issue #3508: segment 索引 是不是只保存2两天的数据
wu-sheng commented on issue #3508: segment 索引 是不是只保存2两天的数据 URL: https://github.com/apache/skywalking/issues/3508#issuecomment-533937532 English only. TTL document provides this detail. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] wu-sheng closed issue #3508: segment 索引 是不是只保存2两天的数据
wu-sheng closed issue #3508: segment 索引 是不是只保存2两天的数据 URL: https://github.com/apache/skywalking/issues/3508 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] wu-sheng opened a new pull request #3507: Sync latest ALS from Envoy API
wu-sheng opened a new pull request #3507: Sync latest ALS from Envoy API URL: https://github.com/apache/skywalking/pull/3507 Make https://github.com/envoyproxy/envoy/pull/8278 available. After Envoy release includes this, we could use `downstream_direct_remote_address` to replace `downstream_remote_address`. It will provide metrics when `proxy->sidecar`. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[skywalking] branch als-sync created (now 155b772)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch als-sync in repository https://gitbox.apache.org/repos/asf/skywalking.git. at 155b772 Sync latest ALS from Envoy API This branch includes the following new commits: new 155b772 Sync latest ALS from Envoy API 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] 01/01: Sync latest ALS from Envoy API
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch als-sync in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 155b772987146777cf81b47023aed2e84ebf9880 Author: Wu Sheng AuthorDate: Mon Sep 23 09:20:04 2019 +0800 Sync latest ALS from Envoy API --- .../proto/envoy/data/accesslog/v2/accesslog.proto | 53 -- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/data/accesslog/v2/accesslog.proto b/oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/data/accesslog/v2/accesslog.proto index b387433..8aa38f4 100644 --- a/oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/data/accesslog/v2/accesslog.proto +++ b/oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/data/accesslog/v2/accesslog.proto @@ -12,11 +12,8 @@ import "envoy/api/v2/core/base.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; -import "gogoproto/gogo.proto"; import "validate/validate.proto"; -option (gogoproto.stable_marshaler_all) = true; - // [#protodoc-title: gRPC access logs] // Envoy access logs describe incoming interaction with Envoy over a fixed // period of time, and typically cover a single request/response exchange, @@ -28,10 +25,12 @@ option (gogoproto.stable_marshaler_all) = true; // Fields describing *upstream* interaction will explicitly include ``upstream`` // in their name. -// [#not-implemented-hide:] message TCPAccessLogEntry { // Common properties shared by all Envoy access logs. AccessLogCommon common_properties = 1; + + // Properties of the TCP connection. + ConnectionProperties connection_properties = 2; } message HTTPAccessLogEntry { @@ -54,6 +53,15 @@ message HTTPAccessLogEntry { HTTPResponseProperties response = 4; } +// Defines fields for a connection +message ConnectionProperties { + // Number of bytes received from downstream. + uint64 received_bytes = 1; + + // Number of bytes sent to downstream. + uint64 sent_bytes = 2; +} + // Defines fields that are shared by all Envoy access logs. message AccessLogCommon { // [#not-implemented-hide:] @@ -74,37 +82,37 @@ message AccessLogCommon { // The time that Envoy started servicing this request. This is effectively the time that the first // downstream byte is received. - google.protobuf.Timestamp start_time = 5 [(gogoproto.stdtime) = true]; + google.protobuf.Timestamp start_time = 5; // Interval between the first downstream byte received and the last // downstream byte received (i.e. time it takes to receive a request). - google.protobuf.Duration time_to_last_rx_byte = 6 [(gogoproto.stdduration) = true]; + google.protobuf.Duration time_to_last_rx_byte = 6; // Interval between the first downstream byte received and the first upstream byte sent. There may // by considerable delta between *time_to_last_rx_byte* and this value due to filters. // Additionally, the same caveats apply as documented in *time_to_last_downstream_tx_byte* about // not accounting for kernel socket buffer time, etc. - google.protobuf.Duration time_to_first_upstream_tx_byte = 7 [(gogoproto.stdduration) = true]; + google.protobuf.Duration time_to_first_upstream_tx_byte = 7; // Interval between the first downstream byte received and the last upstream byte sent. There may // by considerable delta between *time_to_last_rx_byte* and this value due to filters. // Additionally, the same caveats apply as documented in *time_to_last_downstream_tx_byte* about // not accounting for kernel socket buffer time, etc. - google.protobuf.Duration time_to_last_upstream_tx_byte = 8 [(gogoproto.stdduration) = true]; + google.protobuf.Duration time_to_last_upstream_tx_byte = 8; // Interval between the first downstream byte received and the first upstream // byte received (i.e. time it takes to start receiving a response). - google.protobuf.Duration time_to_first_upstream_rx_byte = 9 [(gogoproto.stdduration) = true]; + google.protobuf.Duration time_to_first_upstream_rx_byte = 9; // Interval between the first downstream byte received and the last upstream // byte received (i.e. time it takes to receive a complete response). - google.protobuf.Duration time_to_last_upstream_rx_byte = 10 [(gogoproto.stdduration) = true]; + google.protobuf.Duration time_to_last_upstream_rx_byte = 10; // Interval between the first downstream byte received and the first downstream byte sent. // There may be a considerable delta between the *time_to_first_upstream_rx_byte* and this field // due to filters. Additionally, the same caveats apply as documented in // *time_to_last_downstream_tx_byte* about not accounting for kernel socket buffer time, etc. - google.protobuf.Duration
[skywalking] branch new-committer updated (697fb82 -> f3e9f6d)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch new-committer in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 697fb82 Merge branch 'master' into new-committer add 24fb612 Revert labeler action and remove .travis.yml (#3504) add f3e9f6d Merge branch 'master' into new-committer No new revisions were added by this update. Summary of changes: .github/labeler.yml | 45 --- .github/workflows/labeler.yml | 13 - .travis.yml | 12 3 files changed, 70 deletions(-) delete mode 100644 .github/labeler.yml delete mode 100644 .github/workflows/labeler.yml delete mode 100644 .travis.yml
[GitHub] [skywalking] wu-sheng closed pull request #3506: Add @types license
wu-sheng closed pull request #3506: Add @types license URL: https://github.com/apache/skywalking/pull/3506 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] wu-sheng commented on issue #3506: Add @types license
wu-sheng commented on issue #3506: Add @types license URL: https://github.com/apache/skywalking/pull/3506#issuecomment-533892904 According to https://github.com/apache/skywalking-rocketbot-ui/pull/159/files, this is a dev stage dependency. Don't need to add the license to dist. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] kezhenxu94 removed a comment on issue #3503: Try to bring coverall test coverage comments back
kezhenxu94 removed a comment on issue #3503: Try to bring coverall test coverage comments back URL: https://github.com/apache/skywalking/pull/3503#issuecomment-533892665 /run ci 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] kezhenxu94 commented on issue #3503: Try to bring coverall test coverage comments back
kezhenxu94 commented on issue #3503: Try to bring coverall test coverage comments back URL: https://github.com/apache/skywalking/pull/3503#issuecomment-533892665 /run ci 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] x22x22 commented on a change in pull request #3506: Add @types license
x22x22 commented on a change in pull request #3506: Add @types license URL: https://github.com/apache/skywalking/pull/3506#discussion_r326906878 ## File path: apm-dist/release-docs/LICENSE ## @@ -417,6 +417,7 @@ popper.js 1.14.7: https://github.com/FezVrasta/popper.js MIT vue-datepicker-local 1.0.19: https://github.com/weifeiyue/vue-datepicker-local MIT vue-js-modal 1.3.31: https://github.com/euvl/vue-js-modalMIT lodash 4.17.15:https://github.com/lodash/lodashMIT +@types:https://github.com/DefinitelyTyped/DefinitelyTyped MIT Review comment: Because @types does not have a version number, there is no version number filled in here. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] x22x22 opened a new pull request #3506: Add @types license
x22x22 opened a new pull request #3506: Add @types license URL: https://github.com/apache/skywalking/pull/3506 Please answer these questions before submitting pull request - Why submit this pull request? - [ ] Bug fix - [ ] New feature provided - [ ] Improve performance - Related issues ___ ### Bug fix - Bug description. - How to fix? ___ ### New feature or improvement - Describe the details and related test reports. Add @types license https://github.com/apache/skywalking-rocketbot-ui/pull/159 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] stalary opened a new pull request #3505: MOD: Compatible with KafkaTemplate
stalary opened a new pull request #3505: MOD: Compatible with KafkaTemplate URL: https://github.com/apache/skywalking/pull/3505 Please answer these questions before submitting pull request - Why submit this pull request? - [ ] Bug fix - [ ] New feature provided - [x] Improve performance - Related issues https://github.com/apache/skywalking/issues/3478 ___ ### Bug fix - Bug description. - How to fix? ___ ### New feature or improvement - Describe the details and related test reports. Compatible with KafkaTemplate 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] kezhenxu94 merged pull request #3504: Revert labeler action and .travis.yml
kezhenxu94 merged pull request #3504: Revert labeler action and .travis.yml URL: https://github.com/apache/skywalking/pull/3504 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[skywalking] branch master updated: Revert labeler action and remove .travis.yml (#3504)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/master by this push: new 24fb612 Revert labeler action and remove .travis.yml (#3504) 24fb612 is described below commit 24fb6120451148cb24a370c6df48f501161f260c Author: kezhenxu94 AuthorDate: Sun Sep 22 21:50:23 2019 +0800 Revert labeler action and remove .travis.yml (#3504) * Revert labeler * Remove .travis.yml as well Remove .travis.yml as well since it's disabled permanently --- .github/labeler.yml | 45 --- .github/workflows/labeler.yml | 13 - .travis.yml | 12 3 files changed, 70 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml deleted file mode 100644 index 986e02b..000 --- a/.github/labeler.yml +++ /dev/null @@ -1,45 +0,0 @@ -document: - - "**/*.md" - -agent: - - "apm-sniffer/apm-sdk-plugin/**" - - "apm-sniffer/optional-plugins/**" - -plugin: - - "apm-sniffer/apm-sdk-plugin/**" - - "apm-sniffer/optional-plugins/**" - - "oap-server/server-cluster-plugin/**" - - "oap-server/configuration/**" - - "oap-server/storage-plugin/**" - - "oap-server/telemetry/**" - - "oap-server/receiver-plugin/**" - -core feature: - - "apm-sniffer/apm-agent-core/**" - - "oap-server/server-core/**" - - "oap-server/server-library/**" - - "oap-server/oal-grammar/**" - - "oap-server/oal-rt/**" - -docker: - - "docker/**" - -OAP-backend: - - "oap-server/**" - -UI: - - "oap-server/server-query-plugin/**" - - "skywalking-ui/**" - -submodule update: - - ".gitmodules" - -CI settings: - - "appveyor.yml" - - "Jenkinsfile" - - "Jenkinsfile-E2E" - - ".github/**" - - "tools/**" - -test: - - "test/**" \ No newline at end of file diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml deleted file mode 100644 index 38d2043..000 --- a/.github/workflows/labeler.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Labeler -on: [pull_request] - -jobs: - label: -runs-on: ubuntu-latest -steps: - - uses: actions/checkout@v1 -with: - submodules: recursive - - uses: actions/labeler@v2 -with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 09d93a8..000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -sudo: required - -os: - - linux - -jdk: - - openjdk8 - -language: java - -install: - - ./mvnw -DskipTests clean install --quiet
[GitHub] [skywalking] kezhenxu94 opened a new pull request #3504: Revert labeler action
kezhenxu94 opened a new pull request #3504: Revert labeler action URL: https://github.com/apache/skywalking/pull/3504 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[skywalking] branch new-committer updated (7924747 -> 697fb82)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch new-committer in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 7924747 Merge branch 'master' into new-committer add 058335f Query server time info (#3498) add 697fb82 Merge branch 'master' into new-committer No new revisions were added by this update. Summary of changes: .../oap/query/graphql/resolver/MetadataQuery.java| 12 .../query/graphql/type/{Duration.java => TimeInfo.java} | 16 +++- .../src/main/resources/query-protocol| 2 +- skywalking-ui| 2 +- 4 files changed, 25 insertions(+), 7 deletions(-) copy oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/{Duration.java => TimeInfo.java} (78%)
[GitHub] [skywalking] wu-sheng merged pull request #3498: Query server time info
wu-sheng merged pull request #3498: Query server time info URL: https://github.com/apache/skywalking/pull/3498 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[skywalking] branch master updated: Query server time info (#3498)
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.git The following commit(s) were added to refs/heads/master by this push: new 058335f Query server time info (#3498) 058335f is described below commit 058335f21a8ed1058fe414a5425f65439748441a Author: Kdump AuthorDate: Sun Sep 22 19:06:33 2019 +0800 Query server time info (#3498) * sync ui * query-server-time-info * query-server-time-info * query-server-time-info * query-server-time-info * query-server-time-info * sync skywalking-query-protocol * sync ui * sync ui * sync skywalking-query-protocol * sync skywalking-query-protocol --- .../oap/query/graphql/resolver/MetadataQuery.java | 12 .../oap/query/graphql/type/TimeInfo.java | 35 ++ .../src/main/resources/query-protocol | 2 +- skywalking-ui | 2 +- 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java index 986d6a6..d2cc8b1 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java @@ -21,8 +21,11 @@ package org.apache.skywalking.oap.query.graphql.resolver; import com.coxautodev.graphql.tools.GraphQLQueryResolver; import java.io.IOException; import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import org.apache.skywalking.oap.query.graphql.type.Duration; +import org.apache.skywalking.oap.query.graphql.type.TimeInfo; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.query.*; import org.apache.skywalking.oap.server.core.query.entity.*; @@ -93,4 +96,13 @@ public class MetadataQuery implements GraphQLQueryResolver { public List getAllDatabases(final Duration duration) throws IOException { return getMetadataQueryService().getAllDatabases(); } + +public TimeInfo getTimeInfo() { +TimeInfo timeInfo = new TimeInfo(); +SimpleDateFormat timezoneFormat = new SimpleDateFormat("ZZ"); +Date date = new Date(); +timeInfo.setCurrentTimestamp(date.getTime()); +timeInfo.setTimezone(timezoneFormat.format(date)); +return timeInfo; +} } diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/TimeInfo.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/TimeInfo.java new file mode 100644 index 000..fd018a2 --- /dev/null +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/TimeInfo.java @@ -0,0 +1,35 @@ +/* + * 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. + * + */ + +package org.apache.skywalking.oap.query.graphql.type; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class TimeInfo { +/** + * server current timezone, format: +0800 + */ +private String timezone; +/** + * server current timestamp, format: 1569124528392 + */ +private Long currentTimestamp; +} diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol index 6fc9665..f9bb3fe 16 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol @@ -1 +1 @@ -Subproject commit
[GitHub] [skywalking] wu-sheng commented on a change in pull request #3498: Query server time info
wu-sheng commented on a change in pull request #3498: Query server time info URL: https://github.com/apache/skywalking/pull/3498#discussion_r326894927 ## File path: oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java ## @@ -93,4 +96,13 @@ public EndpointInfo getEndpointInfo(final int endpointId) throws IOException { public List getAllDatabases(final Duration duration) throws IOException { return getMetadataQueryService().getAllDatabases(); } + +public TimeInfo getTimeInfo() { +TimeInfo timeInfo = new TimeInfo(); +SimpleDateFormat timezoneFormat = new SimpleDateFormat("ZZ"); +Date date = new Date(); +timeInfo.setCurrentTimestamp(date.getTime()); Review comment: Sorry, I miss that. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] x22x22 commented on a change in pull request #3498: Query server time info
x22x22 commented on a change in pull request #3498: Query server time info URL: https://github.com/apache/skywalking/pull/3498#discussion_r326894641 ## File path: oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java ## @@ -93,4 +96,13 @@ public EndpointInfo getEndpointInfo(final int endpointId) throws IOException { public List getAllDatabases(final Duration duration) throws IOException { return getMetadataQueryService().getAllDatabases(); } + +public TimeInfo getTimeInfo() { +TimeInfo timeInfo = new TimeInfo(); +SimpleDateFormat timezoneFormat = new SimpleDateFormat("ZZ"); +Date date = new Date(); +timeInfo.setCurrentTimestamp(date.getTime()); Review comment: how do get the timezone? 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] x22x22 commented on a change in pull request #3498: Query server time info
x22x22 commented on a change in pull request #3498: Query server time info URL: https://github.com/apache/skywalking/pull/3498#discussion_r326894641 ## File path: oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java ## @@ -93,4 +96,13 @@ public EndpointInfo getEndpointInfo(final int endpointId) throws IOException { public List getAllDatabases(final Duration duration) throws IOException { return getMetadataQueryService().getAllDatabases(); } + +public TimeInfo getTimeInfo() { +TimeInfo timeInfo = new TimeInfo(); +SimpleDateFormat timezoneFormat = new SimpleDateFormat("ZZ"); +Date date = new Date(); +timeInfo.setCurrentTimestamp(date.getTime()); Review comment: how do get timezone? 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] kezhenxu94 opened a new pull request #3503: Try to bring coverall test coverage comments back
kezhenxu94 opened a new pull request #3503: Try to bring coverall test coverage comments back URL: https://github.com/apache/skywalking/pull/3503 Please answer these questions before submitting pull request - Why submit this pull request? - [ ] Bug fix - [ ] New feature provided - [ ] Improve performance - Related issues ___ ### Bug fix - Bug description. - How to fix? ___ ### New feature or improvement - Describe the details and related test reports. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] wu-sheng commented on issue #3498: Query server time info
wu-sheng commented on issue #3498: Query server time info URL: https://github.com/apache/skywalking/pull/3498#issuecomment-533864788 @kezhenxu94 Look like some rule causing this auto labeling failure. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[skywalking] branch master updated: Polish labeler settings and support submodule (#3502)
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.git The following commit(s) were added to refs/heads/master by this push: new 701d980 Polish labeler settings and support submodule (#3502) 701d980 is described below commit 701d980f6b47394e3f1be8aa7a9e3c741ddf64c2 Author: kezhenxu94 AuthorDate: Sun Sep 22 17:27:26 2019 +0800 Polish labeler settings and support submodule (#3502) * Polish labeler settings and support submodule * Trigger labeler * Add more labeler paths --- .github/labeler.yml | 18 ++ .github/workflows/labeler.yml | 3 +++ 2 files changed, 21 insertions(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index bba82b6..986e02b 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -8,11 +8,18 @@ agent: plugin: - "apm-sniffer/apm-sdk-plugin/**" - "apm-sniffer/optional-plugins/**" + - "oap-server/server-cluster-plugin/**" + - "oap-server/configuration/**" + - "oap-server/storage-plugin/**" + - "oap-server/telemetry/**" + - "oap-server/receiver-plugin/**" core feature: - "apm-sniffer/apm-agent-core/**" - "oap-server/server-core/**" - "oap-server/server-library/**" + - "oap-server/oal-grammar/**" + - "oap-server/oal-rt/**" docker: - "docker/**" @@ -21,7 +28,18 @@ OAP-backend: - "oap-server/**" UI: + - "oap-server/server-query-plugin/**" - "skywalking-ui/**" +submodule update: + - ".gitmodules" + +CI settings: + - "appveyor.yml" + - "Jenkinsfile" + - "Jenkinsfile-E2E" + - ".github/**" + - "tools/**" + test: - "test/**" \ No newline at end of file diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index d8351c0..38d2043 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -5,6 +5,9 @@ jobs: label: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v1 +with: + submodules: recursive - uses: actions/labeler@v2 with: repo-token: "${{ secrets.GITHUB_TOKEN }}"
[GitHub] [skywalking] wu-sheng merged pull request #3502: Polish labeler settings and support submodule
wu-sheng merged pull request #3502: Polish labeler settings and support submodule URL: https://github.com/apache/skywalking/pull/3502 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[skywalking] branch new-committer updated (05d1b0e -> 7924747)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch new-committer in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 05d1b0e Merge branch 'master' into new-committer add 701d980 Polish labeler settings and support submodule (#3502) add 7924747 Merge branch 'master' into new-committer No new revisions were added by this update. Summary of changes: .github/labeler.yml | 18 ++ .github/workflows/labeler.yml | 3 +++ 2 files changed, 21 insertions(+)
[skywalking] branch kezhenxu94-patch-1 deleted (was 2a88afd)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git. was 2a88afd Add more labeler paths The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[GitHub] [skywalking] kezhenxu94 removed a comment on issue #3502: Polish labeler settings and support submodule
kezhenxu94 removed a comment on issue #3502: Polish labeler settings and support submodule URL: https://github.com/apache/skywalking/pull/3502#issuecomment-533863098 /run e2e 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] kezhenxu94 commented on issue #3502: Polish labeler settings and support submodule
kezhenxu94 commented on issue #3502: Polish labeler settings and support submodule URL: https://github.com/apache/skywalking/pull/3502#issuecomment-533863098 /run e2e 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] kezhenxu94 closed pull request #3503: Try to bring coverall test coverage comments back
kezhenxu94 closed pull request #3503: Try to bring coverall test coverage comments back URL: https://github.com/apache/skywalking/pull/3503 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] kezhenxu94 opened a new pull request #3503: Try to bring coverall test coverage comments back
kezhenxu94 opened a new pull request #3503: Try to bring coverall test coverage comments back URL: https://github.com/apache/skywalking/pull/3503 Please answer these questions before submitting pull request - Why submit this pull request? - [ ] Bug fix - [ ] New feature provided - [ ] Improve performance - Related issues ___ ### Bug fix - Bug description. - How to fix? ___ ### New feature or improvement - Describe the details and related test reports. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] wu-sheng commented on issue #3502: Polish labeler settings and support submodule
wu-sheng commented on issue #3502: Polish labeler settings and support submodule URL: https://github.com/apache/skywalking/pull/3502#issuecomment-533860599 Please send a mail to dev mailing list, notice 1. GitHub Action is active 1. Auto labeling is added. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] wu-sheng commented on a change in pull request #3498: Query server time info
wu-sheng commented on a change in pull request #3498: Query server time info URL: https://github.com/apache/skywalking/pull/3498#discussion_r326889152 ## File path: oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java ## @@ -93,4 +96,13 @@ public EndpointInfo getEndpointInfo(final int endpointId) throws IOException { public List getAllDatabases(final Duration duration) throws IOException { return getMetadataQueryService().getAllDatabases(); } + +public TimeInfo getTimeInfo() { +TimeInfo timeInfo = new TimeInfo(); +SimpleDateFormat timezoneFormat = new SimpleDateFormat("ZZ"); +Date date = new Date(); +timeInfo.setCurrentTimestamp(date.getTime()); Review comment: Ref https://stackoverflow.com/questions/368094/system-currenttimemillis-vs-new-date-vs-calendar-getinstance-gettime `System.currentTimeMillis() ` should be faster and good enough. Right? 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] wu-sheng commented on issue #3478: Kafka plugin not work on Spring Boot and Spring Kafka
wu-sheng commented on issue #3478: Kafka plugin not work on Spring Boot and Spring Kafka URL: https://github.com/apache/skywalking/issues/3478#issuecomment-533860104 You should intercept the constructor. Then you could get it at the initialization stage. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[skywalking] branch kezhenxu94-patch-1 updated (0f83a0f -> 2a88afd)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 0f83a0f Trigger labeler add 2a88afd Add more labeler paths No new revisions were added by this update. Summary of changes: .github/labeler.yml | 7 +++ 1 file changed, 7 insertions(+)
[GitHub] [skywalking] stalary commented on issue #3478: Kafka plugin not work on Spring Boot and Spring Kafka
stalary commented on issue #3478: Kafka plugin not work on Spring Boot and Spring Kafka URL: https://github.com/apache/skywalking/issues/3478#issuecomment-533860005 Yes, I enhanced it, but it wrapped my class, so I didn't get the snapshot, I'm going to see now how do I pass it through the constructor,thanks. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] wu-sheng commented on issue #3478: Kafka plugin not work on Spring Boot and Spring Kafka
wu-sheng commented on issue #3478: Kafka plugin not work on Spring Boot and Spring Kafka URL: https://github.com/apache/skywalking/issues/3478#issuecomment-533859719 Have you enhanced `InterceptorCallback`? I think the snapshot could propagate through the constructor. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] stalary commented on issue #3478: Kafka plugin not work on Spring Boot and Spring Kafka
stalary commented on issue #3478: Kafka plugin not work on Spring Boot and Spring Kafka URL: https://github.com/apache/skywalking/issues/3478#issuecomment-533859414 @wu-sheng I create manual class resolve this problem, but there are new problem. ```java EnhancedInstance callbackInstance = (EnhancedInstance) allArguments[1]; if (null != callbackInstance) { ContextSnapshot snapshot = ContextManager.capture(); if (null != snapshot) { callbackInstance.setSkyWalkingDynamicField(snapshot); } } ``` In this callbackInstance is my manual class org.apache.skywalking.apm.plugin.kafka.KafkaCallback. Then doSend in kafka executes ```java Callback interceptCallback = new InterceptorCallback<>(callback, this.interceptors, tp); ``` This caused me to lose snapshot in CallbackInterceptor ```java ContextSnapshot contextSnapshot = (ContextSnapshot) objInst.getSkyWalkingDynamicField(); ``` contextSnapshot always is null. Can you give me some help? 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[skywalking] branch kezhenxu94-patch-1 updated (af7938c -> 0f83a0f)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git. from af7938c Polish labeler settings and support submodule add 0f83a0f Trigger labeler No new revisions were added by this update. Summary of changes:
[skywalking] branch kezhenxu94-patch-1 updated (6f227f2 -> af7938c)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git. discard 6f227f2 Test discard b1e4397 Revert ui discard 286a5cd Try checkout submodule discard 0849cc0 Try checkout submodule discard dc23140 Test multiple labels discard 54f5c7f Try submodule discard 19f4c95 Test multiple labels discard 19d9a55 Fix anchor, try labeler add af7938c Polish labeler settings and support submodule This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6f227f2) \ N -- N -- N refs/heads/kezhenxu94-patch-1 (af7938c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/labeler.yml | 12 +++- docs/en/concepts-and-designs/service-mesh-probe.md | 2 +- apache.skywalking.oap.server.library.module.ModuleDefine | 2 +- skywalking-ui| 2 +- test/e2e/pom.xml | 1 + 5 files changed, 15 insertions(+), 4 deletions(-)
[skywalking-query-protocol] branch master updated: Delete .graphqlconfig
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-query-protocol.git The following commit(s) were added to refs/heads/master by this push: new f9bb3fe Delete .graphqlconfig f9bb3fe is described below commit f9bb3fe4d85b7c989d0692f38c3341c3c13646e7 Author: 吴晟 Wu Sheng AuthorDate: Sun Sep 22 15:47:34 2019 +0800 Delete .graphqlconfig --- .graphqlconfig | 15 --- 1 file changed, 15 deletions(-) diff --git a/.graphqlconfig b/.graphqlconfig deleted file mode 100644 index a5d6356..000 --- a/.graphqlconfig +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "Skywalking GraphQL Schema", - "schemaPath": "schema.graphql", - "extensions": { -"endpoints": { - "Dev GraphQL Endpoint": { -"url": "http://localhost:12800/graphql;, -"headers": { - "user-agent": "JS GraphQL" -}, -"introspect": false - } -} - } -} \ No newline at end of file
[skywalking] branch kezhenxu94-patch-1 updated (b1e4397 -> 6f227f2)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git. from b1e4397 Revert ui add 6f227f2 Test No new revisions were added by this update. Summary of changes: skywalking-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[skywalking] branch kezhenxu94-patch-1 updated (286a5cd -> b1e4397)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 286a5cd Try checkout submodule add b1e4397 Revert ui No new revisions were added by this update. Summary of changes: skywalking-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [skywalking] codelipenghui commented on a change in pull request #3476: Add pulsar apm plugin
codelipenghui commented on a change in pull request #3476: Add pulsar apm plugin URL: https://github.com/apache/skywalking/pull/3476#discussion_r326887027 ## File path: apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/PulsarProducerInterceptor.java ## @@ -0,0 +1,110 @@ +/* + * 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. + * + */ + +package org.apache.skywalking.apm.plugin.pulsar; + +import org.apache.pulsar.client.api.Message; +import org.apache.pulsar.client.impl.MessageImpl; +import org.apache.pulsar.common.api.proto.PulsarApi; +import org.apache.skywalking.apm.agent.core.context.CarrierItem; +import org.apache.skywalking.apm.agent.core.context.ContextCarrier; +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.ContextSnapshot; +import org.apache.skywalking.apm.agent.core.context.tag.Tags; +import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; +import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; +import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; + +import java.lang.reflect.Method; + +/** + * Interceptor for pulsar producer enhanced instance. + * + * Here is the intercept process steps: + * + * + * 1. Get the {@link ProducerEnhanceRequiredInfo} and record the service url, topic name + * 2. Create the exit span when the producer invoke sendAsync method + * 3. Inject the context to {@link Message#getProperties()} + * 4. Create {@link SendCallbackEnhanceRequiredInfo} with ContextManager.capture() and set the + * callback enhanced instance skywalking dynamic field to the created required info. + * 5. Stop the exit span when sendAsync method finished. + * + * + * @author penghui + */ +public class PulsarProducerInterceptor implements InstanceMethodsAroundInterceptor { + +public static final String OPERATE_NAME_PREFIX = "Pulsar/"; +public static final String PRODUCER_OPERATE_NAME_SUFFIX = "/Producer"; + +@Override +public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { +if (allArguments.length > 0 && allArguments[0] != null) { +ProducerEnhanceRequiredInfo requiredInfo = (ProducerEnhanceRequiredInfo) objInst.getSkyWalkingDynamicField(); +ContextCarrier contextCarrier = new ContextCarrier(); +String topicName = requiredInfo.getTopic(); +AbstractSpan activeSpan = ContextManager.createExitSpan(OPERATE_NAME_PREFIX + topicName + +PRODUCER_OPERATE_NAME_SUFFIX, contextCarrier, requiredInfo.getServiceUrl()); +Tags.MQ_BROKER.set(activeSpan, requiredInfo.getServiceUrl()); +Tags.MQ_TOPIC.set(activeSpan, topicName); +SpanLayer.asMQ(activeSpan); +activeSpan.setComponent(ComponentsDefine.PULSAR_PRODUCER); +CarrierItem next = contextCarrier.items(); +MessageImpl msg = (MessageImpl) allArguments[0]; +while (next.hasNext()) { +next = next.next(); + msg.getMessageBuilder().addProperties(PulsarApi.KeyValue.newBuilder() +.setKey(next.getHeadKey()) +.setValue(next.getHeadValue())); +} +if (allArguments.length > 1) { +EnhancedInstance callbackInstance = (EnhancedInstance) allArguments[1]; +if (callbackInstance != null) { +ContextSnapshot snapshot = ContextManager.capture(); +if (null != snapshot) { +SendCallbackEnhanceRequiredInfo callbackRequiredInfo = new SendCallbackEnhanceRequiredInfo(); +callbackRequiredInfo.setTopic(topicName); +
[skywalking] branch kezhenxu94-patch-1 updated (0849cc0 -> 286a5cd)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 0849cc0 Try checkout submodule add 286a5cd Try checkout submodule No new revisions were added by this update. Summary of changes: .github/workflows/labeler.yml | 2 ++ 1 file changed, 2 insertions(+)
[skywalking] branch kezhenxu94-patch-1 updated (dc23140 -> 0849cc0)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git. from dc23140 Test multiple labels add 0849cc0 Try checkout submodule No new revisions were added by this update. Summary of changes: .github/labeler.yml | 1 + .github/workflows/labeler.yml | 1 + 2 files changed, 2 insertions(+)
[skywalking] branch kezhenxu94-patch-1 updated (54f5c7f -> dc23140)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 54f5c7f Try submodule add dc23140 Test multiple labels No new revisions were added by this update. Summary of changes: .github/labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[skywalking] branch kezhenxu94-patch-1 updated (19f4c95 -> 54f5c7f)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 19f4c95 Test multiple labels add 54f5c7f Try submodule No new revisions were added by this update. Summary of changes: skywalking-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[skywalking] branch kezhenxu94-patch-1 updated (19d9a55 -> 19f4c95)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 19d9a55 Fix anchor, try labeler add 19f4c95 Test multiple labels No new revisions were added by this update. Summary of changes: .../org.apache.skywalking.oap.server.library.module.ModuleDefine| 2 +- test/e2e/pom.xml| 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
[GitHub] [skywalking] wu-sheng removed a comment on issue #3496: Committer vote and set up document.
wu-sheng removed a comment on issue #3496: Committer vote and set up document. URL: https://github.com/apache/skywalking/pull/3496#issuecomment-533855317 /run e2e 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] wu-sheng commented on issue #3496: Committer vote and set up document.
wu-sheng commented on issue #3496: Committer vote and set up document. URL: https://github.com/apache/skywalking/pull/3496#issuecomment-533855317 /run e2e 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] kezhenxu94 opened a new pull request #3502: Fix anchor, try labeler
kezhenxu94 opened a new pull request #3502: Fix anchor, try labeler URL: https://github.com/apache/skywalking/pull/3502 Please answer these questions before submitting pull request - Why submit this pull request? - [ ] Bug fix - [ ] New feature provided - [ ] Improve performance - Related issues ___ ### Bug fix - Bug description. - How to fix? ___ ### New feature or improvement - Describe the details and related test reports. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[skywalking] branch kezhenxu94-patch-1 created (now 19d9a55)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git. at 19d9a55 Fix anchor, try labeler This branch includes the following new commits: new 19d9a55 Fix anchor, try labeler 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] 01/01: Fix anchor, try labeler
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 19d9a55878ca756bf9fcf4d13e9fbfc701e6d700 Author: kezhenxu94 AuthorDate: Sun Sep 22 14:49:40 2019 +0800 Fix anchor, try labeler --- docs/en/concepts-and-designs/service-mesh-probe.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/concepts-and-designs/service-mesh-probe.md b/docs/en/concepts-and-designs/service-mesh-probe.md index 8656688..139d646 100644 --- a/docs/en/concepts-and-designs/service-mesh-probe.md +++ b/docs/en/concepts-and-designs/service-mesh-probe.md @@ -29,4 +29,4 @@ metrics data from parsing tracing data. So, the right expression is: **Service Mesh metrics are exact the metrics, what the traces parsers generate. They are same.** ## What is Next? -- If you want to use the service mesh probe, read [set SkyWalking on Service Mesh](../setup/README.md#on-service-mesh) document. +- If you want to use the service mesh probe, read [set SkyWalking on Service Mesh](../setup/README.md#service-mesh) document.
[GitHub] [skywalking] kezhenxu94 commented on issue #3496: Committer vote and set up document.
kezhenxu94 commented on issue #3496: Committer vote and set up document. URL: https://github.com/apache/skywalking/pull/3496#issuecomment-533853011 /run e2e 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [skywalking] kezhenxu94 removed a comment on issue #3496: Committer vote and set up document.
kezhenxu94 removed a comment on issue #3496: Committer vote and set up document. URL: https://github.com/apache/skywalking/pull/3496#issuecomment-533853011 /run e2e 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services