[CSM] Use xds-enabled server and xds credentials in examples (#11706) · grpc/grpc-java@a79982c

File tree

3 files changed

lines changed

  • examples/example-gcp-csm-observability

    • src/main/java/io/grpc/examples/csmobservability

3 files changed

lines changed

Original file line numberDiff line numberDiff line change

@@ -34,6 +34,7 @@ dependencies {

3434

implementation "io.grpc:grpc-protobuf:${grpcVersion}"

3535

implementation "io.grpc:grpc-stub:${grpcVersion}"

3636

implementation "io.grpc:grpc-gcp-csm-observability:${grpcVersion}"

37+

implementation "io.grpc:grpc-xds:${grpcVersion}"

3738

implementation "io.opentelemetry:opentelemetry-sdk:${openTelemetryVersion}"

3839

implementation "io.opentelemetry:opentelemetry-sdk-metrics:${openTelemetryVersion}"

3940

implementation "io.opentelemetry:opentelemetry-exporter-prometheus:${openTelemetryPrometheusVersion}"

Original file line numberDiff line numberDiff line change

@@ -25,6 +25,7 @@

2525

import io.grpc.examples.helloworld.HelloReply;

2626

import io.grpc.examples.helloworld.HelloRequest;

2727

import io.grpc.gcp.csm.observability.CsmObservability;

28+

import io.grpc.xds.XdsChannelCredentials;

2829

import io.opentelemetry.exporter.prometheus.PrometheusHttpServer;

2930

import io.opentelemetry.sdk.OpenTelemetrySdk;

3031

import io.opentelemetry.sdk.metrics.SdkMeterProvider;

@@ -127,8 +128,10 @@ public void run() {

127128

observability.registerGlobal();

128129
129130

// Create a communication channel to the server, known as a Channel.

130-

ManagedChannel channel = Grpc.newChannelBuilder(target, InsecureChannelCredentials.create())

131-

.build();

131+

ManagedChannel channel =

132+

Grpc.newChannelBuilder(

133+

target, XdsChannelCredentials.create(InsecureChannelCredentials.create()))

134+

.build();

132135

CsmObservabilityClient client = new CsmObservabilityClient(channel);

133136
134137

try {

Original file line numberDiff line numberDiff line change

@@ -24,6 +24,8 @@

2424

import io.grpc.examples.helloworld.HelloRequest;

2525

import io.grpc.gcp.csm.observability.CsmObservability;

2626

import io.grpc.stub.StreamObserver;

27+

import io.grpc.xds.XdsServerBuilder;

28+

import io.grpc.xds.XdsServerCredentials;

2729

import io.opentelemetry.exporter.prometheus.PrometheusHttpServer;

2830

import io.opentelemetry.sdk.OpenTelemetrySdk;

2931

import io.opentelemetry.sdk.metrics.SdkMeterProvider;

@@ -40,10 +42,12 @@ public class CsmObservabilityServer {

4042
4143

private Server server;

4244

private void start(int port) throws IOException {

43-

server = Grpc.newServerBuilderForPort(port, InsecureServerCredentials.create())

44-

.addService(new GreeterImpl())

45-

.build()

46-

.start();

45+

server =

46+

XdsServerBuilder.forPort(

47+

port, XdsServerCredentials.create(InsecureServerCredentials.create()))

48+

.addService(new GreeterImpl())

49+

.build()

50+

.start();

4751

logger.info("Server started, listening on " + port);

4852

}

4953