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

Restlet 2.0 instrumentation #4535

Merged
merged 3 commits into from
Nov 9, 2021
Merged

Conversation

anosek-an
Copy link
Contributor

@anosek-an anosek-an commented Oct 28, 2021

Resolves #3661
Most of the code is taken from 1.0 instrumentation. Due to changes in packaging (most importantly Request and Response being moved from org.restlet.data to org.restlet) creating a common module for 1.0 and 2.0 instrumentations was impossible.

Copy link
Member

@mateuszrzeszutek mateuszrzeszutek left a comment

Choose a reason for hiding this comment

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

Left a few minor comments, but overall 👍

Copy link
Member

@mateuszrzeszutek mateuszrzeszutek left a comment

Choose a reason for hiding this comment

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

Thanks! 👍

Copy link
Member

@trask trask left a comment

Choose a reason for hiding this comment

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

thx @Enkelian!

implementation(project(":instrumentation:restlet:restlet-2.0:library"))

testImplementation(project(":instrumentation:restlet:restlet-2.0:testing"))
testImplementation("org.restlet.jse:org.restlet.ext.jetty:2.0.2")
Copy link
Member

Choose a reason for hiding this comment

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

does this work, and avoid needing the resolutionStrategy below?

Suggested change
testImplementation("org.restlet.jse:org.restlet.ext.jetty:2.0.2")
testLibrary("org.restlet.jse:org.restlet.ext.jetty:2.0.2")
latestDepTestLibrary("org.restlet.jse:org.restlet.ext.jetty:2.+")

Copy link
Member

Choose a reason for hiding this comment

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

is the resolutionStrategy below still needed? I think latestDepTestLibrary is supposed to handle that

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Unfortunately it seems that even with testLibrary the wrong engine gets picked up and the resolutionStrategy is still needed.

Copy link
Member

Choose a reason for hiding this comment

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

ok, thanks for confirming 👍

library("org.restlet.jse:org.restlet:2.0.2")

testImplementation(project(":instrumentation:restlet:restlet-2.0:testing"))
testImplementation("org.restlet.jse:org.restlet.ext.jetty:2.0.2")
Copy link
Member

Choose a reason for hiding this comment

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

(same question here)

@trask trask merged commit 8b7c097 into open-telemetry:main Nov 9, 2021
@anosek-an anosek-an deleted the restlet-2.0 branch November 15, 2021 10:03
RashmiRam pushed a commit to RashmiRam/opentelemetry-auto-instr-java that referenced this pull request May 23, 2022
* add restlet 2.0 instrumentation

* add restlet 2.0 instrumentation

* revies: testLibrary, create RestletInstrumenterFactory
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.

Restlet instrumentation
3 participants