Skip to content

fix bugs with dubbo - #6640

Merged
mateuszrzeszutek merged 9 commits into
open-telemetry:mainfrom
yingziisme:main
Sep 23, 2022
Merged

fix bugs with dubbo#6640
mateuszrzeszutek merged 9 commits into
open-telemetry:mainfrom
yingziisme:main

Conversation

@yingziisme

@yingziisme yingziisme commented Sep 16, 2022

Copy link
Copy Markdown
Contributor

  1. fix NullPointerException with dubbo getMetadata request

  2. fix dubbo trace passing problem

the trace is third-demo -> consumer-demo -> provider-deme, but the parent of provider-demo is third-demo.
wrong data like this
image

after fixed
image

@yingziisme
Update DubboHeadersSetter.java
d3dd81b 
fix dubbo trace passing problem
@yingziisme
Update TracingFilter.java
bc1607d 
fix NullPointerException  with dubbo getMetadata request
@yingziisme
yingziisme requested a review from a team September 16, 2022 08:50
@linux-foundation-easycla

linux-foundation-easycla Bot commented Sep 16, 2022 •
edited
Loading

Copy link
Copy Markdown

CLA Signed

The committers listed above are authorized under a signed CLA.

@mateuszrzeszutek

mateuszrzeszutek commented Sep 16, 2022

Copy link
Copy Markdown
Member

Hey @yingziisme can you sign the CLA?

@yingziisme

yingziisme commented Sep 17, 2022

Copy link
Copy Markdown
Contributor Author

Hey @yingziisme can you sign the CLA?

ok. signed.

@mateuszrzeszutek

mateuszrzeszutek commented Sep 19, 2022 •
edited
Loading

Copy link
Copy Markdown
Member

Please run ./gradlew spotlessApply on you PR, looks like the build is failing on broken formatting.

Also, can you add a regression test for your case? Especially the broken propagation one

@yingziisme
Update TracingFilter.java
700e80b 
remove unused imports
@yingziisme

yingziisme commented Sep 19, 2022

Copy link
Copy Markdown
Contributor Author

Please run ./gradlew spotlessApply on you PR, looks like the build is failing on broken formatting.

Also, can you add a regression test for your case? Especially the broken propagation one

Hey, Is it necessary to add the test? and do you mean the test with second bug?

@mateuszrzeszutek

mateuszrzeszutek commented Sep 21, 2022

Copy link
Copy Markdown
Member

Hey, Is it necessary to add the test? and do you mean the test with second bug?

It would be great if you could add one, cause it'd prevent this from happening again in case somebody modifies this instrumentation in the future.
Yeah, I meant the dubbo trace passing problem you mentioned in the OP

@yingziisme

yingziisme commented Sep 22, 2022

Copy link
Copy Markdown
Contributor Author

Hey, Is it necessary to add the test? and do you mean the test with second bug?

It would be great if you could add one, cause it'd prevent this from happening again in case somebody modifies this instrumentation in the future. Yeah, I meant the dubbo trace passing problem you mentioned in the OP

Hey, test has added

mateuszrzeszutek
mateuszrzeszutek approved these changes Sep 22, 2022
View reviewed changes

@mateuszrzeszutek mateuszrzeszutek left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks great, thanks!
Left a few minor comments, but overall it LGTM 👍

Comment thread .../groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy Outdated
Comment thread .../groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy Outdated
Comment thread .../groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy Outdated
yingziisme and others added 4 commits September 23, 2022 11:54
@yingziisme Mateusz Rzeszutek
Update instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/op…
3884f39 
…entelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy

Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
@yingziisme Mateusz Rzeszutek
Update instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/op…
37a29bb 
…entelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy

Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
@yingziisme Mateusz Rzeszutek
Update instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/op…
13bc411 
…entelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy

Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
@yingziisme
Update AbstractDubboTraceChainTest.groovy
48d3eb9 
fix dubbo test bug
@yingziisme

yingziisme commented Sep 23, 2022

Copy link
Copy Markdown
Contributor Author

Looks great, thanks! Left a few minor comments, but overall it LGTM 👍

ok. these conversations have resolved.

mateuszrzeszutek
mateuszrzeszutek approved these changes Sep 23, 2022
View reviewed changes

@mateuszrzeszutek mateuszrzeszutek left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks!

@mateuszrzeszutek
mateuszrzeszutek merged commit d26e456 into open-telemetry:main Sep 23, 2022
LironKS pushed a commit to helios/opentelemetry-java-instrumentation that referenced this pull request Oct 23, 2022
@yingziisme Mateusz Rzeszutek @LironKS
fix bugs with dubbo (open-telemetry#6640)
eced8d5 
1. fix NullPointerException with dubbo getMetadata request

2. fix dubbo trace passing problem

the trace is third-demo -> consumer-demo -> provider-deme, but the
parent of provider-demo is third-demo.
wrong data like this
<img width="1994" alt="image"
src="https://user-images.githubusercontent.com/22729740/190597029-ea26569e-96b4-4e30-8ac3-46ead3871b92.png">

after fixed 
<img width="2015" alt="image"
src="https://user-images.githubusercontent.com/22729740/190596923-d65f8646-377d-47ab-9e65-6d75f1407ce0.png">

Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
LironKS pushed a commit to helios/opentelemetry-java-instrumentation that referenced this pull request Oct 31, 2022
@yingziisme Mateusz Rzeszutek @LironKS
fix bugs with dubbo (open-telemetry#6640)
6dc7920 
1. fix NullPointerException with dubbo getMetadata request

2. fix dubbo trace passing problem

the trace is third-demo -> consumer-demo -> provider-deme, but the
parent of provider-demo is third-demo.
wrong data like this
<img width="1994" alt="image"
src="https://user-images.githubusercontent.com/22729740/190597029-ea26569e-96b4-4e30-8ac3-46ead3871b92.png">

after fixed 
<img width="2015" alt="image"
src="https://user-images.githubusercontent.com/22729740/190596923-d65f8646-377d-47ab-9e65-6d75f1407ce0.png">

Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
LironKS pushed a commit to helios/opentelemetry-java-instrumentation that referenced this pull request Dec 4, 2022
@yingziisme Mateusz Rzeszutek @LironKS
fix bugs with dubbo (open-telemetry#6640)
9e61e4a 
1. fix NullPointerException with dubbo getMetadata request

2. fix dubbo trace passing problem

the trace is third-demo -> consumer-demo -> provider-deme, but the
parent of provider-demo is third-demo.
wrong data like this
<img width="1994" alt="image"
src="https://user-images.githubusercontent.com/22729740/190597029-ea26569e-96b4-4e30-8ac3-46ead3871b92.png">

after fixed 
<img width="2015" alt="image"
src="https://user-images.githubusercontent.com/22729740/190596923-d65f8646-377d-47ab-9e65-6d75f1407ce0.png">

Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@mateuszrzeszutek mateuszrzeszutek mateuszrzeszutek approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@yingziisme @mateuszrzeszutek