Upgrade proto to v1.4.0 #193

florianl · 2024-11-21T20:09:34Z

Release of the v1.4.0 version of the OTLP.

Release of the [v1.4.0][otlp] version of the OTLP. [otlp]: https://github.com/open-telemetry/opentelemetry-proto/releases/tag/v1.4.0 Signed-off-by: Florian Lehner <dev@der-flo.net>

pellared · 2024-11-25T19:42:29Z

I have a feeling that a newer version of Go is needed because of go-grpc dependency:

opentelemetry-proto-go/otlp/go.mod

Line 3 in 53bebda

go 1.17

See #194 (comment)

florianl · 2024-11-26T07:08:31Z

I have a feeling that a newer version of Go is needed because of go-grpc dependency:

@pellared this proposed change does not touch dependencies. There is no change in go.mod or go.sum. Can you provide more details, why the Go version should be bumped here?

pellared · 2024-11-26T07:16:32Z

I think it is a bug that should be fixed before the release.

florianl · 2024-11-26T07:22:19Z

I'm not sure and can't follow how this is related to this PR. From checking the PR again, I didn't identify an element, that would require a Go version bump.
Is there something in the current code base, that would require a Go version bump, was missed and is unrelated to this PR?

pellared · 2024-11-26T07:46:48Z

I'm not sure and can't follow how this is related to this PR. From checking the PR again, I didn't identify an element, that would require a Go version bump. Is there something in the current code base, that would require a Go version bump, was missed and is unrelated to this PR?

I created a bug:

Improper version of go in go.mod #195

README.md

Signed-off-by: Florian Lehner <dev@der-flo.net>

go.mod was updated with ad54459 Signed-off-by: Florian Lehner <dev@der-flo.net>

florianl · 2024-11-28T10:52:24Z

The following error sounds like a circular dependency issue resulting from multiple go.mod files:

go: finding module for package go.opentelemetry.io/proto/slim/otlp/profiles/v1development
go: go.opentelemetry.io/proto/gen/go/go.opentelemetry.io/proto/slim/otlp/collector/profiles/v1development imports
	go.opentelemetry.io/proto/slim/otlp/profiles/v1development: module go.opentelemetry.io/proto/slim/otlp@latest found (v1.3.1), but does not contain package go.opentelemetry.io/proto/slim/otlp/profiles/v1development
make: *** [Makefile:169: go-mod-tidy/.] Error 1

dmathieu · 2024-11-28T10:57:19Z

From the CI output, it looks like go-mod-tidy still doesn't remove the gen folder, which is weird as it works fine both on my mac and on a debian VM.

pellared · 2024-11-28T10:58:42Z

You should not generate slim/otlp/collector/profiles/v1development. slim modules should not have collector directory which brings the grpc dependency.

I wonder how was it even generated...

florianl · 2024-11-28T11:03:48Z

You should not generate slim/otlp/collector/profiles/v1development. slim modules should not have collector directory which brings the grpc dependency.

I wonder how was it even generated...

Can you provide more background on this? the Makefile target gen-otlp-protobuf-slim does not differentiate between collector and other parts.

opentelemetry-proto-go/Makefile

Lines 135 to 139 in f83a33f

    
           .PHONY: gen-otlp-protobuf-slim 
        
           gen-otlp-protobuf-slim: $(SOURCE_PROTOSLIM_FILES) 
        
           	rm -rf ./$(PROTOBUF_TEMP_DIR) 
        
           	mkdir -p ./$(PROTOBUF_TEMP_DIR) 
        
           	$(foreach file,$(SOURCE_PROTOSLIM_FILES),$(call exec-command,$(PROTOC_SLIM) $(PROTO_INCLUDES) --go_out=./$(PROTOBUF_TEMP_DIR) $(file)))

While in the target gen-otlp-protobuf for every signal also a collector part is generated:
https://github.com/open-telemetry/opentelemetry-proto-go/blob/f83a33f5490808194d466cc3ff18c6e66a48a407/Makefile#L118C9-L126

Release of the [v1.4.0][otlp] version of the OTLP. Verify open-telemetry#193 [otlp]: https://github.com/open-telemetry/opentelemetry-proto/releases/tag/v1.4.0 Signed-off-by: Florian Lehner <florian.lehner@elastic.co>

florianl · 2024-11-28T11:17:50Z

I can reproduce the issue (see https://github.com/florianl/opentelemetry-proto-go/tree/release-v1.4.0-try-2) with a clean state on main and following the release process:

# update Makefile and repalce experimental with development
make sync VERSION=v1.4.0
# update versions.yaml from 1.3.1 to 1.4.0
make verify-versions
git diff

It is in all cases the combination of make clean protobuf go-mod-tidy ( as executed in CI), that breaks something.

pellared · 2024-11-28T11:41:26Z

Can you provide more background on this?

See: #155

Maybe I did some mistake(s). I am not a make expert.

pellared

@florianl, @dmathieu, good work 👍

MikeGoldsmith

Thanks @florianl

…o into mike/update-proto Module set all, Version v1.4.0 -----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAAhcAAAAHc3NoLXJzYQAAAAMBAAEAAAIBAKPZJFEnbUEMpjgH+rae0P F71PPgEX77tsI8HSkSLfnhj9mdZhTWmVtMkM1y5thLnmY5BFMXgATsKQadB/E/qNDYs0kT F7oYjHaAp9jkwIL69bGf5M+RFhV4NxQo90A86Bh3yWFkfG3RidmEfWthvknRYw4E1QRiyR zgBSIZ9VZgaMtu3cK5MHgNchAF0jkQBZ4YYAhCBSsFWwr/JYCFQxgBeG5tGBEfWjjDg+RQ Vh+lU0iKForTV8/S0LzPdLI2MBexaG0eEVUMt3GQnCX/b/IpUSPmjyEo52Z9EBIRMUjlS6 89ibY62qXryktv85yqK5DJb+d2AvaavN39bakwSzkSOrRcTFyhC2j1w1WsUx1Jw8bFRQkb ImUp1SDErizQRFKdFQGxeXDw+a4oXZrALJ9ABoCgjbXCPsc0Yq5w0QwJkA80zBxuyouC0g PQwx9ZxwNgKfLox0ytjSXs+XuUKgHWN9qFfIUO6RZ8Aq9TxX+VfZTp2IsuUX5x/pw4Rv+9 F8jrUuWlCFxBs4kPtVZQ5gUkVtggslVPY2Pn67KOj5Uy1oIQTw5BCzcLO8GdcQ4yDXlpso LSvp1AWQeC1mWVbBc9EOTkKo/tEYbyb2bOJSbQfzG+dvND29W6eJVdhkNmya5H/AdCV06U kbFo97K46wpRF4GelldOXNFm5DbZ7S2nAAAAA2dpdAAAAAAAAAAGc2hhNTEyAAACFAAAAA xyc2Etc2hhMi0yNTYAAAIAAL8gc41EJAvXAcF2UnQVoOAJnLHKB9snsORMHn1z5HRcVULr 7Z8IfPBFUbQ7y09PQboL7SnaxutTb61KaFH+9GBBaXBDc6LHh0Q9CmARhTkyjAcsD/srVU avkp7+2rphpl/5K6EaXcBIN8SmTim9w7TZiRBNenx2dNDKy2N2++Ugj0zKvQMIIjd3kuDc NKYfIiAlE5TlO+9iIemvKLmh1ySPK5o6LIKKBZ7BEvgnHHadeFLTDa/HIS6zicZVhzP6F+ H4xJhMO/KWOsGUfi/SM+iiP9dvIL3Po2BX1AmGLo6oSEUB2I0eTcnz4YS1i02nkrJVS5zA 9WLVfgRcj/ed6vKxSgeESen9/KODn2mOLp4fin9dzGE2EogRRsHXO4p86LYte0gHV+GvQo +iQ+VVcFelaZBnT3Y6MvXDNWMEUg/rwbVGSF63vf+5o/lEjAq/+KVRYkR8WvYo5msbbuOl QCOpBdKWLbzvrCeSFk1CEbTpOg2YUVgBrP7M+p1fYSKp37zxxWWrhOYZ1WUIWvj70Dkhl+ mpsZM8EMZGYWTSBxX9rGRag8y133QfFy1tHVR2mws9a+bCWDrcfhykGOVpkFIH3NDA6zWC 7WJXS0+BYtbuppe5uQi+yosy6sV1TL1TPoYmI/f3o/sPJc53RTxY/XCE+y5IgXObCXqCtO a4RjU= -----END SSH SIGNATURE----- * tag 'v1.4.0' of github.com:open-telemetry/opentelemetry-proto-go: (89 commits) Upgrade proto to v1.4.0 (open-telemetry#193) Don't run clean-gen twice (open-telemetry#214) clean the gen folder before running tidy (open-telemetry#211) Remove compat from go mod tidy (open-telemetry#213) Update module github.com/grpc-ecosystem/grpc-gateway/v2 to v2.24.0 (open-telemetry#209) Update google.golang.org/genproto/googleapis/api digest to e639e21 (open-telemetry#197) Update module golang.org/x/net to v0.31.0 (open-telemetry#203) Update google.golang.org/genproto/googleapis/rpc digest to e639e21 (open-telemetry#198) Update module golang.org/x/text to v0.20.0 (open-telemetry#206) Update module go.opentelemetry.io/build-tools/multimod to v0.15.0 (open-telemetry#201) Prevent the use of toolchain in go.mod (open-telemetry#202) Document and test supported versions of Go (open-telemetry#205) Switch from dependabot to renovate (open-telemetry#196) Bump google.golang.org/protobuf from 1.35.1 to 1.35.2 in /slim/otlp (open-telemetry#192) Bump google.golang.org/protobuf from 1.35.1 to 1.35.2 in /otlp (open-telemetry#191) Bump github.com/grpc-ecosystem/grpc-gateway/v2 in /otlp (open-telemetry#188) Bump google.golang.org/protobuf from 1.34.2 to 1.35.1 in /slim/otlp (open-telemetry#187) Bump google.golang.org/protobuf from 1.34.2 to 1.35.1 in /otlp (open-telemetry#186) Bump github.com/grpc-ecosystem/grpc-gateway/v2 in /otlp (open-telemetry#185) Bump github.com/grpc-ecosystem/grpc-gateway/v2 in /otlp (open-telemetry#184) ...

…o into mike/update-proto-2 Module set all, Version v1.4.0 -----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAAhcAAAAHc3NoLXJzYQAAAAMBAAEAAAIBAKPZJFEnbUEMpjgH+rae0P F71PPgEX77tsI8HSkSLfnhj9mdZhTWmVtMkM1y5thLnmY5BFMXgATsKQadB/E/qNDYs0kT F7oYjHaAp9jkwIL69bGf5M+RFhV4NxQo90A86Bh3yWFkfG3RidmEfWthvknRYw4E1QRiyR zgBSIZ9VZgaMtu3cK5MHgNchAF0jkQBZ4YYAhCBSsFWwr/JYCFQxgBeG5tGBEfWjjDg+RQ Vh+lU0iKForTV8/S0LzPdLI2MBexaG0eEVUMt3GQnCX/b/IpUSPmjyEo52Z9EBIRMUjlS6 89ibY62qXryktv85yqK5DJb+d2AvaavN39bakwSzkSOrRcTFyhC2j1w1WsUx1Jw8bFRQkb ImUp1SDErizQRFKdFQGxeXDw+a4oXZrALJ9ABoCgjbXCPsc0Yq5w0QwJkA80zBxuyouC0g PQwx9ZxwNgKfLox0ytjSXs+XuUKgHWN9qFfIUO6RZ8Aq9TxX+VfZTp2IsuUX5x/pw4Rv+9 F8jrUuWlCFxBs4kPtVZQ5gUkVtggslVPY2Pn67KOj5Uy1oIQTw5BCzcLO8GdcQ4yDXlpso LSvp1AWQeC1mWVbBc9EOTkKo/tEYbyb2bOJSbQfzG+dvND29W6eJVdhkNmya5H/AdCV06U kbFo97K46wpRF4GelldOXNFm5DbZ7S2nAAAAA2dpdAAAAAAAAAAGc2hhNTEyAAACFAAAAA xyc2Etc2hhMi0yNTYAAAIAAL8gc41EJAvXAcF2UnQVoOAJnLHKB9snsORMHn1z5HRcVULr 7Z8IfPBFUbQ7y09PQboL7SnaxutTb61KaFH+9GBBaXBDc6LHh0Q9CmARhTkyjAcsD/srVU avkp7+2rphpl/5K6EaXcBIN8SmTim9w7TZiRBNenx2dNDKy2N2++Ugj0zKvQMIIjd3kuDc NKYfIiAlE5TlO+9iIemvKLmh1ySPK5o6LIKKBZ7BEvgnHHadeFLTDa/HIS6zicZVhzP6F+ H4xJhMO/KWOsGUfi/SM+iiP9dvIL3Po2BX1AmGLo6oSEUB2I0eTcnz4YS1i02nkrJVS5zA 9WLVfgRcj/ed6vKxSgeESen9/KODn2mOLp4fin9dzGE2EogRRsHXO4p86LYte0gHV+GvQo +iQ+VVcFelaZBnT3Y6MvXDNWMEUg/rwbVGSF63vf+5o/lEjAq/+KVRYkR8WvYo5msbbuOl QCOpBdKWLbzvrCeSFk1CEbTpOg2YUVgBrP7M+p1fYSKp37zxxWWrhOYZ1WUIWvj70Dkhl+ mpsZM8EMZGYWTSBxX9rGRag8y133QfFy1tHVR2mws9a+bCWDrcfhykGOVpkFIH3NDA6zWC 7WJXS0+BYtbuppe5uQi+yosy6sV1TL1TPoYmI/f3o/sPJc53RTxY/XCE+y5IgXObCXqCtO a4RjU= -----END SSH SIGNATURE----- * tag 'v1.4.0' of github.com:open-telemetry/opentelemetry-proto-go: (89 commits) Upgrade proto to v1.4.0 (open-telemetry#193) Don't run clean-gen twice (open-telemetry#214) clean the gen folder before running tidy (open-telemetry#211) Remove compat from go mod tidy (open-telemetry#213) Update module github.com/grpc-ecosystem/grpc-gateway/v2 to v2.24.0 (open-telemetry#209) Update google.golang.org/genproto/googleapis/api digest to e639e21 (open-telemetry#197) Update module golang.org/x/net to v0.31.0 (open-telemetry#203) Update google.golang.org/genproto/googleapis/rpc digest to e639e21 (open-telemetry#198) Update module golang.org/x/text to v0.20.0 (open-telemetry#206) Update module go.opentelemetry.io/build-tools/multimod to v0.15.0 (open-telemetry#201) Prevent the use of toolchain in go.mod (open-telemetry#202) Document and test supported versions of Go (open-telemetry#205) Switch from dependabot to renovate (open-telemetry#196) Bump google.golang.org/protobuf from 1.35.1 to 1.35.2 in /slim/otlp (open-telemetry#192) Bump google.golang.org/protobuf from 1.35.1 to 1.35.2 in /otlp (open-telemetry#191) Bump github.com/grpc-ecosystem/grpc-gateway/v2 in /otlp (open-telemetry#188) Bump google.golang.org/protobuf from 1.34.2 to 1.35.1 in /slim/otlp (open-telemetry#187) Bump google.golang.org/protobuf from 1.34.2 to 1.35.1 in /otlp (open-telemetry#186) Bump github.com/grpc-ecosystem/grpc-gateway/v2 in /otlp (open-telemetry#185) Bump github.com/grpc-ecosystem/grpc-gateway/v2 in /otlp (open-telemetry#184) ...

florianl requested a review from a team as a code owner November 21, 2024 20:09

florianl force-pushed the release-v1.4.0 branch from 14fbcc3 to 19a61d8 Compare November 21, 2024 20:16

Release v1.4.0

f038502

Release of the [v1.4.0][otlp] version of the OTLP. [otlp]: https://github.com/open-telemetry/opentelemetry-proto/releases/tag/v1.4.0 Signed-off-by: Florian Lehner <dev@der-flo.net>

florianl force-pushed the release-v1.4.0 branch from 19a61d8 to f038502 Compare November 21, 2024 20:22

dmathieu approved these changes Nov 22, 2024

View reviewed changes

Merge branch 'main' into release-v1.4.0

7067711

dmathieu reviewed Nov 28, 2024

View reviewed changes

README.md Outdated Show resolved Hide resolved

florianl added 2 commits November 28, 2024 10:18

fixup: replace experimental with development

39759ac

Signed-off-by: Florian Lehner <dev@der-flo.net>

fixup: Makefile update compat to GO 1.22

9c93460

go.mod was updated with ad54459 Signed-off-by: Florian Lehner <dev@der-flo.net>

This was referenced Nov 28, 2024

Clean the gen folder before running tidy #211

Merged

Remove root module #212

Closed

florianl and others added 2 commits November 28, 2024 11:25

Merge branch 'main' into release-v1.4.0

2b19842

Merge branch 'main' into release-v1.4.0

01c5bf6

florianl force-pushed the release-v1.4.0 branch from 397470b to 01c5bf6 Compare November 28, 2024 13:43

fixup empty commit

b455f59

florianl mentioned this pull request Nov 28, 2024

Don't run clean-gen twice #214

Merged

Merge branch 'main' into release-v1.4.0

dac0cd3

pellared approved these changes Nov 28, 2024

View reviewed changes

dmathieu changed the title ~~Release v1.4.0~~ Upgrade proto to v1.4.0 Nov 28, 2024

MikeGoldsmith approved these changes Dec 2, 2024

View reviewed changes

MikeGoldsmith merged commit 158176a into open-telemetry:main Dec 2, 2024
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade proto to v1.4.0 #193

Upgrade proto to v1.4.0 #193

florianl commented Nov 21, 2024

pellared commented Nov 25, 2024

florianl commented Nov 26, 2024

pellared commented Nov 26, 2024

florianl commented Nov 26, 2024

pellared commented Nov 26, 2024 •

edited

Loading

florianl commented Nov 28, 2024

dmathieu commented Nov 28, 2024

pellared commented Nov 28, 2024 •

edited

Loading

florianl commented Nov 28, 2024

florianl commented Nov 28, 2024 •

edited

Loading

pellared commented Nov 28, 2024 •

edited

Loading

pellared left a comment

MikeGoldsmith left a comment

Upgrade proto to v1.4.0 #193

Upgrade proto to v1.4.0 #193

Conversation

florianl commented Nov 21, 2024

pellared commented Nov 25, 2024

florianl commented Nov 26, 2024

pellared commented Nov 26, 2024

florianl commented Nov 26, 2024

pellared commented Nov 26, 2024 • edited Loading

florianl commented Nov 28, 2024

dmathieu commented Nov 28, 2024

pellared commented Nov 28, 2024 • edited Loading

florianl commented Nov 28, 2024

florianl commented Nov 28, 2024 • edited Loading

pellared commented Nov 28, 2024 • edited Loading

pellared left a comment

Choose a reason for hiding this comment

MikeGoldsmith left a comment

Choose a reason for hiding this comment

pellared commented Nov 26, 2024 •

edited

Loading

pellared commented Nov 28, 2024 •

edited

Loading

florianl commented Nov 28, 2024 •

edited

Loading

pellared commented Nov 28, 2024 •

edited

Loading