-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1951 from theonefx/endpoints
add Endpoints and dubbo issue fix
- Loading branch information
Showing
10 changed files
with
222 additions
and
34 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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
93 changes: 93 additions & 0 deletions
93
...-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/endpoint/DubboDiscoveryEndpoint.java
This file contains 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,93 @@ | ||
| /* | ||
| * Copyright 2013-2018 the original author or authors. | ||
| * | ||
| * Licensed 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 | ||
| * | ||
| * https://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 com.alibaba.cloud.dubbo.actuate.endpoint; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import com.alibaba.cloud.dubbo.registry.DubboCloudRegistry; | ||
| import com.alibaba.cloud.dubbo.registry.SpringCloudRegistryFactory; | ||
| import org.apache.dubbo.common.URL; | ||
| import org.apache.dubbo.registry.NotifyListener; | ||
| import org.apache.dubbo.registry.integration.RegistryDirectory; | ||
| import org.apache.dubbo.rpc.Invoker; | ||
|
|
||
| import org.springframework.boot.actuate.endpoint.annotation.Endpoint; | ||
| import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; | ||
|
|
||
| import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER_SIDE; | ||
| import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY; | ||
| import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; | ||
|
|
||
| /** | ||
| * Dubbo Registry Directory Metadata {@link DubboCloudRegistry}. | ||
| * | ||
| * @author <a href="mailto:[email protected]">Theonefx</a> | ||
| */ | ||
| @Endpoint(id = "dubboRegistryDirectory") | ||
| public class DubboDiscoveryEndpoint { | ||
|
|
||
| @ReadOperation(produces = APPLICATION_JSON_VALUE) | ||
| public Object get() { | ||
| DubboCloudRegistry registry = (DubboCloudRegistry) SpringCloudRegistryFactory | ||
| .getRegistries().stream().filter(o -> o instanceof DubboCloudRegistry) | ||
| .findFirst().orElse(null); | ||
|
|
||
| if (registry == null) { | ||
| return Collections.emptyMap(); | ||
| } | ||
|
|
||
| Map<URL, Set<NotifyListener>> subscribeMap = registry.getSubscribed(); | ||
|
|
||
| Map<String, List<Map<String, Object>>> result = new HashMap<>(); | ||
| subscribeMap.forEach((url, listeners) -> { | ||
| String side = url.getParameter(SIDE_KEY); | ||
| if (!CONSUMER_SIDE.equals(side)) { | ||
| return; | ||
| } | ||
|
|
||
| List<Map<String, Object>> pairs = result.computeIfAbsent(url.getServiceKey(), | ||
| o -> new ArrayList<>()); | ||
|
|
||
| Map<String, Object> pair = new HashMap<>(); | ||
| List<String> invokerServices = new ArrayList<>(); | ||
| for (NotifyListener listener : listeners) { | ||
| if (!(listener instanceof RegistryDirectory)) { | ||
| continue; | ||
| } | ||
| RegistryDirectory<?> directory = (RegistryDirectory<?>) listener; | ||
| List<? extends Invoker<?>> invokers = directory.getAllInvokers(); | ||
| if (invokers == null) { | ||
| continue; | ||
| } | ||
| invokerServices.addAll(invokers.stream().map(Invoker::getUrl) | ||
| .map(URL::toServiceString).collect(Collectors.toList())); | ||
| } | ||
| pair.put("invokers", invokerServices); | ||
| pair.put("subscribeUrl", url.toMap()); | ||
|
|
||
| pairs.add(pair); | ||
| }); | ||
| return result; | ||
| } | ||
|
|
||
| } |
44 changes: 44 additions & 0 deletions
44
...bbo/src/main/java/com/alibaba/cloud/dubbo/actuate/endpoint/DubboExportedURLsEndpoint.java
This file contains 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,44 @@ | ||
| /* | ||
| * Copyright 2013-2018 the original author or authors. | ||
| * | ||
| * Licensed 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 | ||
| * | ||
| * https://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 com.alibaba.cloud.dubbo.actuate.endpoint; | ||
|
|
||
| import com.alibaba.cloud.dubbo.service.DubboMetadataService; | ||
|
|
||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.boot.actuate.endpoint.annotation.Endpoint; | ||
| import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; | ||
|
|
||
| import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; | ||
|
|
||
| /** | ||
| * Dubbo exported URLs. | ||
| * {@link org.springframework.boot.actuate.endpoint.annotation.Endpoint}. | ||
| * | ||
| * @author <a href="mailto:[email protected]">Theonefx</a> | ||
| */ | ||
| @Endpoint(id = "dubboExportedURLs") | ||
| public class DubboExportedURLsEndpoint { | ||
|
|
||
| @Autowired | ||
| private DubboMetadataService dubboMetadataService; | ||
|
|
||
| @ReadOperation(produces = APPLICATION_JSON_UTF8_VALUE) | ||
| public Object get() { | ||
| return dubboMetadataService.getAllExportedURLs(); | ||
| } | ||
|
|
||
| } |
This file contains 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 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 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