Get mesh_id local label from "CSM_MESH_ID" environment variable, rat… · grpc/grpc-java@84d30af
@@ -77,17 +77,14 @@ public void tearDown() {
77777878@Test
7979public void unknownDataExchange() throws Exception {
80-String xdsBootstrap = "";
8180MetadataExchanger clientExchanger = new MetadataExchanger(
8281Attributes.builder().build(),
83-ImmutableMap.<String, String>of()::get,
84- () -> xdsBootstrap);
82+ImmutableMap.<String, String>of()::get);
8583CsmObservability.Builder clientCsmBuilder = new CsmObservability.Builder(clientExchanger)
8684 .sdk(openTelemetryTesting.getOpenTelemetry());
8785MetadataExchanger serverExchanger = new MetadataExchanger(
8886Attributes.builder().build(),
89-ImmutableMap.<String, String>of()::get,
90- () -> xdsBootstrap);
87+ImmutableMap.<String, String>of()::get);
9188CsmObservability.Builder serverCsmBuilder = new CsmObservability.Builder(serverExchanger)
9289 .sdk(openTelemetryTesting.getOpenTelemetry());
9390@@ -140,11 +137,9 @@ public void unknownDataExchange() throws Exception {
140137141138@Test
142139public void nonCsmServer() throws Exception {
143-String xdsBootstrap = "";
144140MetadataExchanger clientExchanger = new MetadataExchanger(
145141Attributes.builder().build(),
146-ImmutableMap.<String, String>of()::get,
147- () -> xdsBootstrap);
142+ImmutableMap.<String, String>of()::get);
148143CsmObservability.Builder clientCsmBuilder = new CsmObservability.Builder(clientExchanger)
149144 .sdk(openTelemetryTesting.getOpenTelemetry());
150145@@ -205,19 +200,16 @@ public void nonCsmServer() throws Exception {
205200206201@Test
207202public void nonCsmClient() throws Exception {
208-String xdsBootstrap = "";
209203MetadataExchanger clientExchanger = new MetadataExchanger(
210204Attributes.builder()
211205 .put(stringKey("cloud.platform"), "gcp_kubernetes_engine")
212206 .build(),
213-ImmutableMap.<String, String>of()::get,
214- () -> xdsBootstrap);
207+ImmutableMap.<String, String>of()::get);
215208CsmObservability.Builder clientCsmBuilder = new CsmObservability.Builder(clientExchanger)
216209 .sdk(openTelemetryTesting.getOpenTelemetry());
217210MetadataExchanger serverExchanger = new MetadataExchanger(
218211Attributes.builder().build(),
219-ImmutableMap.<String, String>of()::get,
220- () -> xdsBootstrap);
212+ImmutableMap.<String, String>of()::get);
221213CsmObservability.Builder serverCsmBuilder = new CsmObservability.Builder(serverExchanger)
222214 .sdk(openTelemetryTesting.getOpenTelemetry());
223215@@ -262,11 +254,6 @@ public void nonCsmClient() throws Exception {
262254263255@Test
264256public void k8sExchange() throws Exception {
265-// Purposefully use a different project ID in the bootstrap than the resource, as the mesh could
266-// be in a different project than the running account.
267-String clientBootstrap = "{\"node\": {"
268- + "\"id\": \"projects/12/networks/mesh:mymesh/nodes/a6420022-cbc5-4e10-808c-507e3fc95f2e\""
269- + "}}";
270257MetadataExchanger clientExchanger = new MetadataExchanger(
271258Attributes.builder()
272259 .put(stringKey("cloud.platform"), "gcp_kubernetes_engine")
@@ -277,13 +264,10 @@ public void k8sExchange() throws Exception {
277264 .build(),
278265ImmutableMap.of(
279266"CSM_CANONICAL_SERVICE_NAME", "canon-service-is-a-client",
280-"CSM_WORKLOAD_NAME", "best-client")::get,
281-() -> clientBootstrap);
267+"CSM_WORKLOAD_NAME", "best-client",
268+ "CSM_MESH_ID", "mymesh")::get);
282269CsmObservability.Builder clientCsmBuilder = new CsmObservability.Builder(clientExchanger)
283270 .sdk(openTelemetryTesting.getOpenTelemetry());
284-String serverBootstrap = "{\"node\": {"
285- + "\"id\": \"projects/34/networks/mesh:meshhh/nodes/4969ef19-24b6-44c0-baf3-86d188ff5967\""
286- + "}}";
287271MetadataExchanger serverExchanger = new MetadataExchanger(
288272Attributes.builder()
289273 .put(stringKey("cloud.platform"), "gcp_kubernetes_engine")
@@ -295,8 +279,8 @@ public void k8sExchange() throws Exception {
295279 .build(),
296280ImmutableMap.of(
297281"CSM_CANONICAL_SERVICE_NAME", "server-has-a-single-name",
298-"CSM_WORKLOAD_NAME", "fast-server")::get,
299-() -> serverBootstrap);
282+"CSM_WORKLOAD_NAME", "fast-server",
283+ "CSM_MESH_ID", "meshhh")::get);
300284CsmObservability.Builder serverCsmBuilder = new CsmObservability.Builder(serverExchanger)
301285 .sdk(openTelemetryTesting.getOpenTelemetry());
302286@@ -366,11 +350,6 @@ public void k8sExchange() throws Exception {
366350367351@Test
368352public void gceExchange() throws Exception {
369-// Purposefully use a different project ID in the bootstrap than the resource, as the mesh could
370-// be in a different project than the running account.
371-String clientBootstrap = "{\"node\": {"
372- + "\"id\": \"projects/12/networks/mesh:mymesh/nodes/a6420022-cbc5-4e10-808c-507e3fc95f2e\""
373- + "}}";
374353MetadataExchanger clientExchanger = new MetadataExchanger(
375354Attributes.builder()
376355 .put(stringKey("cloud.platform"), "gcp_compute_engine")
@@ -379,13 +358,10 @@ public void gceExchange() throws Exception {
379358 .build(),
380359ImmutableMap.of(
381360"CSM_CANONICAL_SERVICE_NAME", "canon-service-is-a-client",
382-"CSM_WORKLOAD_NAME", "best-client")::get,
383-() -> clientBootstrap);
361+"CSM_WORKLOAD_NAME", "best-client",
362+ "CSM_MESH_ID", "mymesh")::get);
384363CsmObservability.Builder clientCsmBuilder = new CsmObservability.Builder(clientExchanger)
385364 .sdk(openTelemetryTesting.getOpenTelemetry());
386-String serverBootstrap = "{\"node\": {"
387- + "\"id\": \"projects/34/networks/mesh:meshhh/nodes/4969ef19-24b6-44c0-baf3-86d188ff5967\""
388- + "}}";
389365MetadataExchanger serverExchanger = new MetadataExchanger(
390366Attributes.builder()
391367 .put(stringKey("cloud.platform"), "gcp_compute_engine")
@@ -395,8 +371,8 @@ public void gceExchange() throws Exception {
395371 .build(),
396372ImmutableMap.of(
397373"CSM_CANONICAL_SERVICE_NAME", "server-has-a-single-name",
398-"CSM_WORKLOAD_NAME", "fast-server")::get,
399-() -> serverBootstrap);
374+"CSM_WORKLOAD_NAME", "fast-server",
375+ "CSM_MESH_ID", "meshhh")::get);
400376CsmObservability.Builder serverCsmBuilder = new CsmObservability.Builder(serverExchanger)
401377 .sdk(openTelemetryTesting.getOpenTelemetry());
402378@@ -456,9 +432,6 @@ public void gceExchange() throws Exception {
456432457433@Test
458434public void trailersOnly() throws Exception {
459-String clientBootstrap = "{\"node\": {"
460- + "\"id\": \"projects/12/networks/mesh:mymesh/nodes/a6420022-cbc5-4e10-808c-507e3fc95f2e\""
461- + "}}";
462435MetadataExchanger clientExchanger = new MetadataExchanger(
463436Attributes.builder()
464437 .put(stringKey("cloud.platform"), "gcp_compute_engine")
@@ -467,13 +440,11 @@ public void trailersOnly() throws Exception {
467440 .build(),
468441ImmutableMap.of(
469442"CSM_CANONICAL_SERVICE_NAME", "canon-service-is-a-client",
470-"CSM_WORKLOAD_NAME", "best-client")::get,
471-() -> clientBootstrap);
443+"CSM_WORKLOAD_NAME", "best-client",
444+ "CSM_MESH_ID", "mymesh")::get);
472445CsmObservability.Builder clientCsmBuilder = new CsmObservability.Builder(clientExchanger)
473446 .sdk(openTelemetryTesting.getOpenTelemetry());
474-String serverBootstrap = "{\"node\": {"
475- + "\"id\": \"projects/34/networks/mesh:meshhh/nodes/4969ef19-24b6-44c0-baf3-86d188ff5967\""
476- + "}}";
447+477448MetadataExchanger serverExchanger = new MetadataExchanger(
478449Attributes.builder()
479450 .put(stringKey("cloud.platform"), "gcp_compute_engine")
@@ -483,8 +454,8 @@ public void trailersOnly() throws Exception {
483454 .build(),
484455ImmutableMap.of(
485456"CSM_CANONICAL_SERVICE_NAME", "server-has-a-single-name",
486-"CSM_WORKLOAD_NAME", "fast-server")::get,
487-() -> serverBootstrap);
457+"CSM_WORKLOAD_NAME", "fast-server",
458+ "CSM_MESH_ID", "meshhh")::get);
488459CsmObservability.Builder serverCsmBuilder = new CsmObservability.Builder(serverExchanger)
489460 .sdk(openTelemetryTesting.getOpenTelemetry());
490461