Skip to content
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.

Sign up for GitHub

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

interop/xds: Interop client and server changes for CSM Observability #7280

Merged
merged 10 commits into from
May 31, 2024
Merged

interop/xds: Interop client and server changes for CSM Observability #7280

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
65dfe2b
Interop client and server changes for CSM Observability
zasweq May 29, 2024
082b078
Responded to Doug's comments
zasweq May 30, 2024
e432a12
Switch port
zasweq May 30, 2024
88f2fef
Fix?
zasweq May 30, 2024
68b63b9
Remove pretty
zasweq May 30, 2024
41262c1
Thanks Doug
zasweq May 30, 2024
c2e6647
Responded to Doug's comments
zasweq May 31, 2024
4c66137
Add Prometheus address env var
zasweq May 31, 2024
4484a86
Switch to build .
zasweq May 31, 2024
e818269
go mod tidy
zasweq May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Responded to Doug's comments
  • Loading branch information
@zasweq
zasweq committed May 31, 2024
commit 082b0780543f2da2026674d39ee36fedc4aa921c
4 changes: 2 additions & 2 deletions interop/xds/client/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
FROM golang:1.21-alpine as build

# Make a grpc-go directory and copy the repo into it.
WORKDIR /go/src/grpc-go/
WORKDIR /go/src/grpc-go
COPY . .

# Build a static binary without cgo so that we can copy just the binary in the
Expand All @@ -34,4 +34,4 @@ COPY --from=build /go/src/grpc-go/interop/xds/client/client .
ENV GRPC_GO_LOG_VERBOSITY_LEVEL=99
ENV GRPC_GO_LOG_SEVERITY_LEVEL="info"
ENV GRPC_GO_LOG_FORMATTER="json"
ENTRYPOINT ["./client"]
ENTRYPOINT ["./client"]
2 changes: 1 addition & 1 deletion interop/xds/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/credentials/xds"
"google.golang.org/grpc/grpclog"
_ "google.golang.org/grpc/interop/xds"
_ "google.golang.org/grpc/interop/xds" // to register Custom LB.
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/peer"
"google.golang.org/grpc/reflection"
Expand Down
46 changes: 0 additions & 46 deletions interop/xds/client/go.mod
View file
Open in desktop
dfawley marked this conversation as resolved.
Outdated Show resolved Hide resolved

This file was deleted.

9 changes: 6 additions & 3 deletions interop/xds/server/go.mod → interop/xds/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
module google.golang.org/interop/test/server
module google.golang.org/interop/xds

go 1.21.0

replace google.golang.org/grpc => ../../..
replace google.golang.org/grpc => ../..

replace google.golang.org/grpc/stats/opentelemetry => ../../../stats/opentelemetry
replace google.golang.org/grpc/interop/xds => ./
dfawley marked this conversation as resolved.
Show resolved Hide resolved

replace google.golang.org/grpc/stats/opentelemetry => ../../stats/opentelemetry

require (
github.com/prometheus/client_golang v1.19.1
go.opentelemetry.io/otel/exporters/prometheus v0.49.0
go.opentelemetry.io/otel/sdk/metric v1.27.0
google.golang.org/grpc v1.64.0
google.golang.org/grpc/interop/xds v0.0.0-00010101000000-000000000000
google.golang.org/grpc/stats/opentelemetry v0.0.0-20240523232201-f7d3d3eecbee
)

Expand Down
0 interop/xds/client/go.sum → interop/xds/go.sum
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion interop/xds/server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ COPY --from=build /go/src/grpc-go/interop/xds/server/server .
ENV GRPC_GO_LOG_VERBOSITY_LEVEL=99
ENV GRPC_GO_LOG_SEVERITY_LEVEL="info"
ENV GRPC_GO_LOG_FORMATTER="json"
ENTRYPOINT ["./server"]
ENTRYPOINT ["./server"]
75 changes: 0 additions & 75 deletions interop/xds/server/go.sum
View file
Open in desktop

This file was deleted.