Skip to content

Commit f9fcfc1

Browse files
authored
chore: Update otel to latest versions (#3961)
* chore: Update otel to latest versions This carries a lot of other upgrade to dependcies along with it. It tried to sync all the code generation versions in Makefile with the updated go modules in go.mod. I also had to switch the minimum version in go.mod from 1.22 to 1.22.0 (because that's what otel does). * Handle empty location index * Remove tool chains * And another one
1 parent 69fc349 commit f9fcfc1

File tree

85 files changed

+2905
-15240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+2905
-15240
lines changed

Makefile

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,12 @@ go/mod_tidy_root:
182182
# doesn't work for go workspace
183183
# GO111MODULE=on go mod verify
184184
go work sync
185-
GO111MODULE=on go mod tidy -go 1.22
185+
GO111MODULE=on go mod tidy -go 1.22.0
186186

187187
.PHONY: go/mod_tidy/%
188188
go/mod_tidy/%: go/mod_tidy_root
189189
cd "$*" && GO111MODULE=on go mod download
190-
cd "$*" && GO111MODULE=on go mod tidy -go 1.22
190+
cd "$*" && GO111MODULE=on go mod tidy -go 1.22.0
191191

192192
.PHONY: fmt
193193
fmt: $(BIN)/golangci-lint $(BIN)/buf $(BIN)/tk ## Automatically fix some lint errors
@@ -346,11 +346,11 @@ $(BIN)/golangci-lint: Makefile
346346

347347
$(BIN)/protoc-gen-go: Makefile go.mod
348348
@mkdir -p $(@D)
349-
GOBIN=$(abspath $(@D)) $(GO) install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.2
349+
GOBIN=$(abspath $(@D)) $(GO) install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.5
350350

351351
$(BIN)/protoc-gen-connect-go: Makefile go.mod
352352
@mkdir -p $(@D)
353-
GOBIN=$(abspath $(@D)) $(GO) install connectrpc.com/connect/cmd/protoc-gen-connect-go@v1.16.2
353+
GOBIN=$(abspath $(@D)) $(GO) install connectrpc.com/connect/cmd/protoc-gen-connect-go@v1.18.1
354354

355355
$(BIN)/protoc-gen-connect-go-mux: Makefile go.mod
356356
@mkdir -p $(@D)
@@ -362,11 +362,11 @@ $(BIN)/protoc-gen-go-vtproto: Makefile go.mod
362362

363363
$(BIN)/protoc-gen-openapiv2: Makefile go.mod
364364
@mkdir -p $(@D)
365-
GOBIN=$(abspath $(@D)) $(GO) install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v2.16.0
365+
GOBIN=$(abspath $(@D)) $(GO) install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v2.25.1
366366

367367
$(BIN)/protoc-gen-grpc-gateway: Makefile go.mod
368368
@mkdir -p $(@D)
369-
GOBIN=$(abspath $(@D)) $(GO) install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v2.16.0
369+
GOBIN=$(abspath $(@D)) $(GO) install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v2.25.1
370370

371371
$(BIN)/gomodifytags: Makefile go.mod
372372
@mkdir -p $(@D)
@@ -492,6 +492,3 @@ run: ## Run the pyroscope binary (pass parameters with 'make run PARAMS=-myparam
492492
.PHONY: mockery
493493
mockery: $(BIN)/mockery
494494
$(BIN)/mockery
495-
496-
# OTLP Protobuf generation
497-
include api/otlp/Makefile

0 commit comments

Comments
 (0)