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

Add support to protobuf5 for opentelemetry-proto and regenerate proto files #4206

Merged
merged 21 commits into from
Oct 14, 2024
Merged

Add support to protobuf5 for opentelemetry-proto and regenerate proto files #4206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
669f648
first try on bump otel-proto to protobuf5
emdneto Sep 30, 2024
ab72c33
remove indexes from otlp-common from tox.ini
emdneto Sep 30, 2024
d4df9e2
fix doc and docker-tests
emdneto Sep 30, 2024
84a070d
ignore opencensus in tox.ini for now
emdneto Sep 30, 2024
544a2c4
try protobuf==5.26.1
emdneto Sep 30, 2024
8519393
try fix zipkin tests and docker-tests-proto
emdneto Oct 1, 2024
dd28d3d
workflows
emdneto Oct 1, 2024
a114ff9
regenerate protobuf files with grpcio-tools 1.65.5
emdneto Oct 1, 2024
3e428f7
rollback pylint to 3.0.2
emdneto Oct 1, 2024
ba9314e
Merge branch 'main' into protobuf5
emdneto Oct 2, 2024
dbecc8b
regenerate code with grpcio-tools==1.63.2
emdneto Oct 2, 2024
87d33b3
fix docs and add changelog
emdneto Oct 7, 2024
d47c5be
remove unused test-requirements file and fix opencensus tests and rem…
emdneto Oct 8, 2024
bca3cd0
bump grpcio to 1.66.2 and googleapis-common-protos to 1.63.2
emdneto Oct 8, 2024
e173363
bump googleapis-common-protos for otlp-proto-grpc test requirements
emdneto Oct 8, 2024
1840c38
fix pylint
emdneto Oct 8, 2024
591ac8f
Merge branch 'main' into protobuf5
emdneto Oct 8, 2024
4b6b8e6
fix changelog and gen-requirements
emdneto Oct 9, 2024
f5a4c54
Merge branch 'main' into protobuf5
emdneto Oct 10, 2024
644e783
add constraint to grpc >=1.63.2
emdneto Oct 10, 2024
29340e6
Merge branch 'main' into protobuf5
lzchen Oct 14, 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
6 changes: 3 additions & 3 deletions .github/workflows/lint_0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:
- name: Run tests
run: tox -e lint-opentelemetry-api

lint-opentelemetry-proto:
name: opentelemetry-proto
lint-opentelemetry-proto-protobuf5:
name: opentelemetry-proto-protobuf5
runs-on: ubuntu-latest
steps:
- name: Checkout repo @ SHA - ${{ github.sha }}
Expand All @@ -50,7 +50,7 @@ jobs:
run: pip install tox

- name: Run tests
run: tox -e lint-opentelemetry-proto
run: tox -e lint-opentelemetry-proto-protobuf5

lint-opentelemetry-sdk:
name: opentelemetry-sdk
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/misc_0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ jobs:
- name: Run tests
run: tox -e docs

docker-tests-proto3:
name: docker-tests-proto3
docker-tests-otlpexporter:
name: docker-tests-otlpexporter
runs-on: ubuntu-latest
steps:
- name: Checkout repo @ SHA - ${{ github.sha }}
Expand All @@ -140,10 +140,10 @@ jobs:
run: pip install tox

- name: Run tests
run: tox -e docker-tests-proto3
run: tox -e docker-tests-otlpexporter

docker-tests-proto4:
name: docker-tests-proto4
docker-tests-opencensus:
name: docker-tests-opencensus
runs-on: ubuntu-latest
steps:
- name: Checkout repo @ SHA - ${{ github.sha }}
Expand All @@ -158,7 +158,7 @@ jobs:
run: pip install tox

- name: Run tests
run: tox -e docker-tests-proto4
run: tox -e docker-tests-opencensus

public-symbols-check:
name: public-symbols-check
Expand Down
Loading