Skip to content

Commit

Permalink
Regenerate Thrift types and enable Thrift check (#5039)
Browse files Browse the repository at this point in the history
## Which problem is this PR solving?
- Thrift types were not re-synced after upgrading to the latest Thrift
compiler

## Description of the changes
- Regenerate files - all changes seem to be formatting related
- Enable Thrift generation check in CI to prevent this in the future

## How was this change tested?
- CI

Signed-off-by: Yuri Shkuro <[email protected]>
  • Loading branch information
yurishkuro authored Dec 26, 2023
1 parent 82dd29a commit c3fa953
Show file tree
Hide file tree
Showing 17 changed files with 5,260 additions and 5,965 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-protogen-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ jobs:
- name: Verify Protobuf types are up to date
run: make proto && git diff --name-status --exit-code

# - name: Verify Thrift types are up to date
# run: make thrift && git diff --name-status --exit-code
- name: Verify Thrift types are up to date
run: make thrift && git diff --name-status --exit-code
2 changes: 1 addition & 1 deletion Makefile.Protobuf.mk
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ proto-zipkin:

# Target 'proto-prepare-otel' modifies OTEL proto to use proto-import path jaeger.proto.*
# The modification is needed because OTEL collector already uses opentelemetry.proto.*
# and two complied protobuf types cannot have the same import path. The root cause is that the compiled OTLP
# and two compiled protobuf types cannot have the same import path. The root cause is that the compiled OTLP
# in the collector is in private package, hence it cannot be used in Jaeger.
.PHONY: proto-prepare-otel
proto-prepare-otel:
Expand Down
3 changes: 2 additions & 1 deletion thrift-gen/agent/GoUnusedProtection__.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions thrift-gen/agent/agent-consts.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c3fa953

Please sign in to comment.