upgrade nacos client from 1.4.2 to 2.3.2 #12362
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,9 @@ | |
| package org.apache.skywalking.oap.server.cluster.plugin.nacos; | ||
|
|
||
| import com.alibaba.nacos.api.naming.NamingService; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import lombok.Getter; | ||
| import org.apache.skywalking.oap.server.core.cluster.ClusterCoordinator; | ||
| import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery; | ||
|
|
@@ -33,6 +36,7 @@ | |
| import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; | ||
| import org.apache.skywalking.oap.server.telemetry.none.MetricsCreatorNoop; | ||
| import org.apache.skywalking.oap.server.telemetry.none.NoneTelemetryProvider; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
|
|
@@ -46,10 +50,6 @@ | |
| import org.testcontainers.junit.jupiter.Testcontainers; | ||
| import org.testcontainers.utility.DockerImageName; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
|
@@ -58,17 +58,16 @@ | |
| @ExtendWith(MockitoExtension.class) | ||
| public class ClusterModuleNacosProviderFunctionalIT { | ||
|
|
||
| @Container | ||
| public final GenericContainer<?> container = | ||
| new GenericContainer<>(DockerImageName.parse("nacos/nacos-server:v2.3.2-slim")) | ||
| .waitingFor(Wait.forLogMessage(".*Nacos started successfully.*", 1)) | ||
| .withEnv(Collections.singletonMap("MODE", "standalone")) | ||
| .withLogConsumer(outputFrame -> System.out.print(outputFrame.getUtf8String())) | ||
| .withExposedPorts(8848, 9848); | ||
| private final String username = "nacos"; | ||
| private final String password = "nacos"; | ||
| private String nacosAddress; | ||
| @Mock | ||
| private ModuleManager moduleManager; | ||
| @Mock | ||
|
|
@@ -82,6 +81,13 @@ public void before() { | |
| Whitebox.setInternalState(telemetryModule, "loadedProvider", telemetryProvider); | ||
| Mockito.when(moduleManager.find(TelemetryModule.NAME)).thenReturn(telemetryModule); | ||
| nacosAddress = container.getHost() + ":" + container.getMappedPort(8848); | ||
| Integer nacosPortOffset = container.getMappedPort(9848) - container.getMappedPort(8848); | ||
| System.setProperty("nacos.server.grpc.port.offset", nacosPortOffset.toString()); | ||
|
Comment on lines
+84
to
+85
There was a problem hiding this comment. Nacos 2.x server have two port, 8848(http) and 9948(gRPC) by default. Nacos Client 's implement use 8848(http.port) + 1000(nacos.server.grpc.port.offset) as gRPC port. It works on virtual machine. Doc ref :https://nacos.io/docs/next/manual/user/java-sdk/properties/#24-%E8%BF%9E%E6%8E%A5%E7%9B%B8%E5%85%B3 |
||
| } | ||
|
|
||
| @AfterEach | ||
| public void after() { | ||
| System.clearProperty("nacos.server.grpc.port.offset"); | ||
| } | ||
|
|
||
| @Test | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we need to add this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
module apache-skywalking-apm without dependencyManagement can not handle dependency conflict and version management
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oap-server has that, and dist itself is just packaging, it should not include any new dependency AFAIK.