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.

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

fix: health.proto has name conflict with the one in google.golang.org/grpc #2395

Merged
merged 4 commits into from
Sep 5, 2023

Conversation

HubQin
Copy link
Contributor

@HubQin HubQin commented Aug 24, 2023

health check in "dubbo.apache.org/dubbo-go/v3/protocol/dubbo3/health/triple_health_v1" conflicts with the one in "google.golang.org/grpc/health/grpc_health_v1".

Fixes #2394

…/grpc

health check in "dubbo.apache.org/dubbo-go/v3/protocol/dubbo3/health/triple_health_v1" conflicts with the one in "google.golang.org/grpc/health/grpc_health_v1".

Fixes apache#2394
@HubQin HubQin changed the title fix: health.proto has name conflict with the one in google.golang.org.grpc fix: health.proto has name conflict with the one in google.golang.org/grpc Aug 24, 2023
@@ -80,11 +75,11 @@ func (x HealthCheckResponse_ServingStatus) String() string {
}

func (HealthCheckResponse_ServingStatus) Descriptor() protoreflect.EnumDescriptor {
return file_protocol_dubbo3_health_triple_health_v1_health_proto_enumTypes[0].Descriptor()
return file_health_proto_enumTypes[0].Descriptor()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this function changed?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is your triple protoc right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes,it is auto-gen by protoc. command to generate:

protoc --go_out=. --go_opt paths=source_relative --go-triple_out=. ./health.proto --go-triple_opt paths=source_relative

@justxuewei
Copy link
Member

justxuewei commented Aug 28, 2023

Btw, you need to add an Apache license for those files.

@sonarcloud
Copy link

sonarcloud bot commented Aug 29, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@HubQin
Copy link
Contributor Author

HubQin commented Aug 29, 2023

Btw, you need to add an Apache license for those files.

@justxuewei already updated

@codecov-commenter
Copy link

Codecov Report

Merging #2395 (2a59627) into main (727a2d8) will decrease coverage by 0.48%.
Report is 3 commits behind head on main.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #2395      +/-   ##
==========================================
- Coverage   44.85%   44.37%   -0.48%     
==========================================
  Files         307      303       -4     
  Lines       18786    18411     -375     
==========================================
- Hits         8426     8170     -256     
+ Misses       9479     9377     -102     
+ Partials      881      864      -17     

see 10 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Contributor

@ev1lQuark ev1lQuark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@justxuewei justxuewei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm, thanks!

@justxuewei justxuewei merged commit 4b9bbd8 into apache:main Sep 5, 2023
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

grpc/health/v1/health.proto has a name conflict over grpc.health.v1.HealthCheckResponse
4 participants