-
Notifications
You must be signed in to change notification settings - Fork 6.6k
GraphQL API: metadata, topology, log and trace support query by name. #13388
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
06eed19
GraphQL API: metadata, topology, log and trace support query by name.
wankai123 d868410
add more service check before query topology
wankai123 5061e9b
do not check unreal services id
wankai123 0b12178
更新 TopologyQueryService.java
wu-sheng 9f42e27
rollback serve check and make gateway e2e use banyandb
wankai123 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
...re/src/main/java/org/apache/skywalking/oap/server/core/query/input/EndpointCondition.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * 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.server.core.query.input; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
| import lombok.ToString; | ||
| import org.apache.skywalking.oap.server.core.analysis.IDManager; | ||
| import org.apache.skywalking.oap.server.core.analysis.Layer; | ||
|
|
||
| @Setter | ||
| @Getter | ||
| @ToString | ||
| public class EndpointCondition { | ||
| private String serviceName; | ||
| private String endpointName; | ||
| @Nullable | ||
| private String layer; | ||
|
|
||
| /** | ||
| * Get the endpoint ID based on the service name, endpoint name and {@link Layer} name. | ||
| * The layer can be null, in which case it defaults to a normal layer. | ||
| * Otherwise, it uses the provided layer to determine if the service is normal or not. | ||
| * The un-normal layer includes VIRTUAL_DATABASE/VIRTUAL_MQ/VIRTUAL_GATEWAY, etc. | ||
| * | ||
| * @return endpoint ID | ||
| */ | ||
| public String getEndpointId() { | ||
| // default to true if service layer is not provided | ||
| return IDManager.EndpointID.buildId( | ||
| IDManager.ServiceID.buildId( | ||
| serviceName, | ||
| layer == null || Layer.nameOf(layer).isNormal() | ||
| ), | ||
| endpointName | ||
| ); | ||
| } | ||
| } |
54 changes: 54 additions & 0 deletions
54
...re/src/main/java/org/apache/skywalking/oap/server/core/query/input/InstanceCondition.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * 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.server.core.query.input; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
| import lombok.ToString; | ||
| import org.apache.skywalking.oap.server.core.analysis.IDManager; | ||
| import org.apache.skywalking.oap.server.core.analysis.Layer; | ||
|
|
||
| @Setter | ||
| @Getter | ||
| @ToString | ||
| public class InstanceCondition { | ||
| private String serviceName; | ||
| private String instanceName; | ||
| @Nullable | ||
| private String layer; | ||
|
|
||
| /** | ||
| * Get the instance ID based on the service name, instance name and {@link Layer} name. | ||
| * The layer can be null, in which case it defaults to a normal layer. | ||
| * Otherwise, it uses the provided layer to determine if the service is normal or not. | ||
| * The un-normal layer includes VIRTUAL_DATABASE/VIRTUAL_MQ/VIRTUAL_GATEWAY, etc. | ||
| * @return instance ID | ||
| */ | ||
| public String getInstanceId() { | ||
| // default to true if service layer is not provided | ||
| return IDManager.ServiceInstanceID.buildId( | ||
| IDManager.ServiceID.buildId( | ||
| serviceName, | ||
| layer == null || Layer.nameOf(layer).isNormal() | ||
| ), | ||
| instanceName | ||
| ); | ||
| } | ||
| } |
67 changes: 67 additions & 0 deletions
67
.../main/java/org/apache/skywalking/oap/server/core/query/input/LogQueryConditionByName.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * 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.server.core.query.input; | ||
|
|
||
| import java.util.List; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
| import lombok.ToString; | ||
| import org.apache.skywalking.oap.server.core.analysis.manual.searchtag.Tag; | ||
| import org.apache.skywalking.oap.server.core.query.enumeration.Order; | ||
| import org.apache.skywalking.oap.server.core.query.type.Pagination; | ||
|
|
||
| @Getter | ||
| @Setter | ||
| @ToString | ||
| public class LogQueryConditionByName { | ||
| private ServiceCondition service; | ||
| private InstanceCondition instance; | ||
| private EndpointCondition endpoint; | ||
| private TraceScopeCondition relatedTrace; | ||
| private Duration queryDuration; | ||
| private Pagination paging; | ||
| private List<Tag> tags; | ||
| private List<String> keywordsOfContent; | ||
| private List<String> excludingKeywordsOfContent; | ||
| private Order queryOrder; | ||
|
|
||
| public String getServiceId() { | ||
| if (service != null) { | ||
| return service.getServiceId(); | ||
| } else { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| public String getServiceInstanceId() { | ||
| if (instance != null) { | ||
| return instance.getInstanceId(); | ||
| } else { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| public String getEndpointId() { | ||
| if (endpoint != null) { | ||
| return endpoint.getEndpointId(); | ||
| } else { | ||
| return null; | ||
| } | ||
| } | ||
| } |
47 changes: 47 additions & 0 deletions
47
...ore/src/main/java/org/apache/skywalking/oap/server/core/query/input/ServiceCondition.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * 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.server.core.query.input; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
| import lombok.ToString; | ||
| import org.apache.skywalking.oap.server.core.analysis.IDManager; | ||
| import org.apache.skywalking.oap.server.core.analysis.Layer; | ||
|
|
||
| @Setter | ||
| @Getter | ||
| @ToString | ||
| public class ServiceCondition { | ||
| private String serviceName; | ||
| @Nullable | ||
| private String layer; | ||
|
|
||
| /** | ||
| * Get the service ID based on the service name and {@link Layer} name. | ||
| * The layer can be null, in which case it defaults to a normal layer. | ||
| * Otherwise, it uses the provided layer to determine if the service is normal or not. | ||
| * The un-normal layer includes VIRTUAL_DATABASE/VIRTUAL_MQ/VIRTUAL_GATEWAY, etc. | ||
| * @return service ID | ||
| */ | ||
| public String getServiceId() { | ||
| // default to true if service layer is not provided | ||
| return IDManager.ServiceID.buildId(serviceName, layer == null || Layer.nameOf(layer).isNormal()); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.