You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by "pg-yang (via GitHub)" <gi...@apache.org> on 2023/04/04 12:59:15 UTC

[GitHub] [skywalking] pg-yang opened a new pull request, #10645: Support Amazon API Gateway monitoring

pg-yang opened a new pull request, #10645:
URL: https://github.com/apache/skywalking/pull/10645

   <!--
       ⚠️ Please make sure to read this template first, pull requests that don't accord with this template
       maybe closed without notice.
       Texts surrounded by `<` and `>` are meant to be replaced by you, e.g. <framework name>, <issue number>.
       Put an `x` in the `[ ]` to mark the item as CHECKED. `[x]`
   -->
   
   <!-- ==== 🐛 Remove this line WHEN AND ONLY WHEN you're fixing a bug, follow the checklist 👇 ====
   ### Fix <bug description or the bug issue number or bug issue link>
   - [ ] Add a unit test to verify that the fix works.
   - [ ] Explain briefly why the bug exists and how to fix it.
        ==== 🐛 Remove this line WHEN AND ONLY WHEN you're fixing a bug, follow the checklist 👆 ==== -->
   
   <!-- ==== 📈 Remove this line WHEN AND ONLY WHEN you're improving the performance, follow the checklist 👇 ====
   ### Improve the performance of <class or module or ...>
   - [ ] Add a benchmark for the improvement, refer to [the existing ones](https://github.com/apache/skywalking/blob/master/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/LinkedArrayBenchmark.java)
   - [ ] The benchmark result.
   ```text
   <Paste the benchmark results here>
   ```
   - [ ] Links/URLs to the theory proof or discussion articles/blogs. <links/URLs here>
        ==== 📈 Remove this line WHEN AND ONLY WHEN you're improving the performance, follow the checklist 👆 ==== -->
   
   <!-- ==== 🆕 Remove this line WHEN AND ONLY WHEN you're adding a new feature, follow the checklist 👇 ====
   ### <Feature description>
   - [ ] If this is non-trivial feature, paste the links/URLs to the design doc.
   - [ ] Update the documentation to include this new feature.
   - [ ] Tests(including UT, IT, E2E) are added to verify the new feature.
   - [ ] If it's UI related, attach the screenshots below.
        ==== 🆕 Remove this line WHEN AND ONLY WHEN you're adding a new feature, follow the checklist 👆 ==== -->
   
   - [ ] If this pull request closes/resolves/fixes an existing issue, replace the issue number. Closes #<issue number>.
   - [ ] Update the [`CHANGES` log](https://github.com/apache/skywalking/blob/master/docs/en/changes/changes.md).
   
   
   ![image](https://user-images.githubusercontent.com/3917424/229798199-e482c722-71e1-41b5-86bb-448ea53b3091.png)
   
   ![image](https://user-images.githubusercontent.com/3917424/229798602-257998b9-6d07-42f7-a239-038d5fa1a20b.png)
   
   
   ![image](https://user-images.githubusercontent.com/3917424/229798284-07f2cbdd-9767-4cad-b210-69a635c875a4.png)
   
   
   ![image](https://user-images.githubusercontent.com/3917424/229798482-620ccc30-6abb-4b7b-817d-53bcc9e3678a.png)
   
   
   Maybe we could close https://github.com/apache/skywalking/issues/9883 ?


-- 
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-unsubscribe@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [skywalking] wu-sheng merged pull request #10645: Support Amazon API Gateway monitoring

Posted by "wu-sheng (via GitHub)" <gi...@apache.org>.
wu-sheng merged PR #10645:
URL: https://github.com/apache/skywalking/pull/10645


-- 
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-unsubscribe@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [skywalking] wu-sheng commented on a diff in pull request #10645: Support Amazon API Gateway monitoring

Posted by "wu-sheng (via GitHub)" <gi...@apache.org>.
wu-sheng commented on code in PR #10645:
URL: https://github.com/apache/skywalking/pull/10645#discussion_r1157225267


##########
docs/menu.yml:
##########
@@ -205,6 +205,8 @@ catalog:
                 path: "/en/setup/backend/backend-aws-s3-monitoring"
               - name: "AWS DynamoDB"
                 path: "/en/setup/backend/backend-aws-dynamodb-monitoring"
+              - name: "AWS API Gateway"
+                path: "/en/setup/backend/backend-aws-api-gateway-monitoring"

Review Comment:
   We should have another menu in the Gateway Monitoring too.



-- 
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-unsubscribe@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [skywalking] pg-yang commented on a diff in pull request #10645: Support Amazon API Gateway monitoring

Posted by "pg-yang (via GitHub)" <gi...@apache.org>.
pg-yang commented on code in PR #10645:
URL: https://github.com/apache/skywalking/pull/10645#discussion_r1157277828


##########
oap-server/server-starter/src/main/resources/application.yml:
##########
@@ -332,7 +332,7 @@ receiver-otel:
   selector: ${SW_OTEL_RECEIVER:default}
   default:
     enabledHandlers: ${SW_OTEL_RECEIVER_ENABLED_HANDLERS:"oc,otlp"}
-    enabledOtelRules: ${SW_OTEL_RECEIVER_ENABLED_OTEL_RULES:"apisix,k8s/*,istio-controlplane,vm,mysql/*,postgresql/*,oap,aws-eks/*,windows,aws-s3/*,aws-dynamodb/*"}
+    enabledOtelRules: ${SW_OTEL_RECEIVER_ENABLED_OTEL_RULES:"aws-gateway/*"}

Review Comment:
   Reverted it



-- 
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-unsubscribe@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [skywalking] wu-sheng commented on pull request #10645: Support Amazon API Gateway monitoring

Posted by "wu-sheng (via GitHub)" <gi...@apache.org>.
wu-sheng commented on PR #10645:
URL: https://github.com/apache/skywalking/pull/10645#issuecomment-1496002255

   The CI would be blocked until https://github.com/apache/skywalking/pull/10643 is 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-unsubscribe@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [skywalking] wu-sheng commented on a diff in pull request #10645: Support Amazon API Gateway monitoring

Posted by "wu-sheng (via GitHub)" <gi...@apache.org>.
wu-sheng commented on code in PR #10645:
URL: https://github.com/apache/skywalking/pull/10645#discussion_r1157226270


##########
oap-server/server-starter/src/main/resources/application.yml:
##########
@@ -332,7 +332,7 @@ receiver-otel:
   selector: ${SW_OTEL_RECEIVER:default}
   default:
     enabledHandlers: ${SW_OTEL_RECEIVER_ENABLED_HANDLERS:"oc,otlp"}
-    enabledOtelRules: ${SW_OTEL_RECEIVER_ENABLED_OTEL_RULES:"apisix,k8s/*,istio-controlplane,vm,mysql/*,postgresql/*,oap,aws-eks/*,windows,aws-s3/*,aws-dynamodb/*"}
+    enabledOtelRules: ${SW_OTEL_RECEIVER_ENABLED_OTEL_RULES:"aws-gateway/*"}

Review Comment:
   I think this is changed by mistakes, which would cause e2e failing.



-- 
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-unsubscribe@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [skywalking] github-code-scanning[bot] commented on pull request #10645: Support Amazon API Gateway monitoring

Posted by "github-code-scanning[bot] (via GitHub)" <gi...@apache.org>.
github-code-scanning[bot] commented on PR #10645:
URL: https://github.com/apache/skywalking/pull/10645#issuecomment-1495936640

   You have successfully added a new CodeQL configuration `.github/workflows/codeql.yaml:analyze/language:java`. As part of the setup process, we have scanned this repository and found no existing alerts. In the future, you will see all code scanning alerts on the repository [Security tab](/pg-yang/skywalking/security/code-scanning?query=pr%3A10645+tool%3ACodeQL+is%3Aopen).


-- 
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-unsubscribe@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [skywalking] wu-sheng commented on pull request #10645: Support Amazon API Gateway monitoring

Posted by "wu-sheng (via GitHub)" <gi...@apache.org>.
wu-sheng commented on PR #10645:
URL: https://github.com/apache/skywalking/pull/10645#issuecomment-1495940316

   > Maybe we could close https://github.com/apache/skywalking/issues/9883 ?
   
   Yes, we should.
   
   ___
   
   In your screenshot, there is an endpoint called `GET /students`. Is this your route rule?


-- 
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-unsubscribe@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [skywalking] pg-yang commented on a diff in pull request #10645: Support Amazon API Gateway monitoring

Posted by "pg-yang (via GitHub)" <gi...@apache.org>.
pg-yang commented on code in PR #10645:
URL: https://github.com/apache/skywalking/pull/10645#discussion_r1157263634


##########
oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java:
##########
@@ -464,7 +464,7 @@ public SampleFamily instance(List<String> serviceKeys, List<String> instanceKeys
         return instance(serviceKeys, Const.POINT, instanceKeys, Const.POINT, layer, null);
     }
 
-    public SampleFamily endpoint(List<String> serviceKeys, List<String> endpointKeys, Layer layer) {
+    public SampleFamily endpoint(List<String> serviceKeys, List<String> endpointKeys, String delimiter, Layer layer) {

Review Comment:
   As mentioned above,  `router` is made by `Method(route method)` and `Resource(route path)` such as `GET /students`.
   `endpoint(['service_name'],['Method','Resource'], Layer.AWS_GATEWAY)`  will generate an endpoint that contains a dot by default, such as `GET./students`. It's better to use space to replace dot to display.
   
   Alternative, ` tags.endpoint_name= tags.Method+' '+tags.Resource` also could generate an endpoint with a space delimiter.
   
   



-- 
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-unsubscribe@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [skywalking] pg-yang commented on pull request #10645: Support Amazon API Gateway monitoring

Posted by "pg-yang (via GitHub)" <gi...@apache.org>.
pg-yang commented on PR #10645:
URL: https://github.com/apache/skywalking/pull/10645#issuecomment-1495951255

   > > Maybe we could close #9883 ?
   > 
   > Yes, we should.
   > 
   > In your screenshot, there is an endpoint called `GET /students`. Is this your route rule?
   
   Yes,  it's made of method and path. BTW `{proxy+}` is a special path for API gateway. 


-- 
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-unsubscribe@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [skywalking] wu-sheng commented on a diff in pull request #10645: Support Amazon API Gateway monitoring

Posted by "wu-sheng (via GitHub)" <gi...@apache.org>.
wu-sheng commented on code in PR #10645:
URL: https://github.com/apache/skywalking/pull/10645#discussion_r1157273376


##########
oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java:
##########
@@ -464,7 +464,7 @@ public SampleFamily instance(List<String> serviceKeys, List<String> instanceKeys
         return instance(serviceKeys, Const.POINT, instanceKeys, Const.POINT, layer, null);
     }
 
-    public SampleFamily endpoint(List<String> serviceKeys, List<String> endpointKeys, Layer layer) {
+    public SampleFamily endpoint(List<String> serviceKeys, List<String> endpointKeys, String delimiter, Layer layer) {

Review Comment:
   OK. If so, you should use `colon` as the delimiter. This style is being used by the agent plugins.



-- 
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-unsubscribe@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [skywalking] pg-yang commented on a diff in pull request #10645: Support Amazon API Gateway monitoring

Posted by "pg-yang (via GitHub)" <gi...@apache.org>.
pg-yang commented on code in PR #10645:
URL: https://github.com/apache/skywalking/pull/10645#discussion_r1157274734


##########
docs/menu.yml:
##########
@@ -205,6 +205,8 @@ catalog:
                 path: "/en/setup/backend/backend-aws-s3-monitoring"
               - name: "AWS DynamoDB"
                 path: "/en/setup/backend/backend-aws-dynamodb-monitoring"
+              - name: "AWS API Gateway"
+                path: "/en/setup/backend/backend-aws-api-gateway-monitoring"

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-unsubscribe@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [skywalking] wu-sheng commented on a diff in pull request #10645: Support Amazon API Gateway monitoring

Posted by "wu-sheng (via GitHub)" <gi...@apache.org>.
wu-sheng commented on code in PR #10645:
URL: https://github.com/apache/skywalking/pull/10645#discussion_r1157229959


##########
oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java:
##########
@@ -464,7 +464,7 @@ public SampleFamily instance(List<String> serviceKeys, List<String> instanceKeys
         return instance(serviceKeys, Const.POINT, instanceKeys, Const.POINT, layer, null);
     }
 
-    public SampleFamily endpoint(List<String> serviceKeys, List<String> endpointKeys, Layer layer) {
+    public SampleFamily endpoint(List<String> serviceKeys, List<String> endpointKeys, String delimiter, Layer layer) {

Review Comment:
   Could you explain a little more about this new delimiter parameter? What happens?



-- 
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-unsubscribe@skywalking.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org