-
Notifications
You must be signed in to change notification settings - Fork 1k
JMS Jodd HTTP and JSF metadata updates #15212
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| display_name: JMS (Java Message Service) | ||
| description: > | ||
| This instrumentation enables messaging spans for JMS (Java Message Service) message producers and | ||
| consumers. | ||
| semantic_conventions: | ||
| - MESSAGING_SPANS | ||
| library_link: https://javaee.github.io/javaee-spec/javadocs/javax/jms/package-summary.html | ||
| configurations: | ||
| - name: otel.instrumentation.messaging.experimental.receive-telemetry.enabled | ||
| description: > | ||
| Enables experimental receive telemetry, which will cause consumers to start a new trace, with | ||
| only a span link connecting it to the producer trace. | ||
| type: boolean | ||
| default: false | ||
| - name: otel.instrumentation.messaging.experimental.capture-headers | ||
| description: > | ||
| Enables capturing messaging headers as span attributes. Provide a comma-separated list of | ||
| header names to capture. | ||
| type: list | ||
| default: '' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| display_name: JMS (Java Message Service) | ||
| description: > | ||
| This instrumentation enables messaging spans for Jakarta JMS (Java Message Service) message | ||
| producers and consumers. | ||
| semantic_conventions: | ||
| - MESSAGING_SPANS | ||
| library_link: https://jakarta.ee/specifications/messaging/3.0/ | ||
| configurations: | ||
| - name: otel.instrumentation.messaging.experimental.receive-telemetry.enabled | ||
| description: > | ||
| Enables experimental receive telemetry, which will cause consumers to start a new trace, with | ||
| only a span link connecting it to the producer trace. | ||
| type: boolean | ||
| default: false | ||
| - name: otel.instrumentation.messaging.experimental.capture-headers | ||
| description: > | ||
| Enables capturing messaging headers as span attributes. Provide a comma-separated list of | ||
| header names to capture. | ||
| type: list | ||
| default: '' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| display_name: Jodd HTTP | ||
| description: This instrumentation enables HTTP client spans and HTTP client metrics for Jodd HTTP. | ||
| semantic_conventions: | ||
| - HTTP_CLIENT_SPANS | ||
| - HTTP_CLIENT_METRICS | ||
| library_link: https://http.jodd.org/ | ||
| configurations: | ||
| - name: otel.instrumentation.http.known-methods | ||
| description: > | ||
| Configures the instrumentation to recognize an alternative set of HTTP request methods. All | ||
| other methods will be treated as `_OTHER`. | ||
| type: list | ||
| default: "CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE" | ||
| - name: otel.instrumentation.http.client.capture-request-headers | ||
| description: List of HTTP request headers to capture in HTTP client telemetry. | ||
| type: list | ||
| default: "" | ||
| - name: otel.instrumentation.http.client.capture-response-headers | ||
| description: List of HTTP response headers to capture in HTTP client telemetry. | ||
| type: list | ||
| default: "" | ||
| - name: otel.instrumentation.common.peer-service-mapping | ||
| description: Used to specify a mapping from host names or IP addresses to peer services. | ||
| type: map | ||
| default: "" | ||
| - name: otel.instrumentation.http.client.emit-experimental-telemetry | ||
| description: > | ||
| Enable the capture of experimental HTTP client telemetry. Adds the `http.request.body.size` | ||
| and `http.response.body.size` attributes to spans, and records `http.client.request.size` and | ||
| `http.client.response.size` metrics. | ||
| type: boolean | ||
| default: false | ||
| - name: otel.instrumentation.http.client.experimental.redact-query-parameters | ||
| description: Redact sensitive URL parameters. See https://opentelemetry.io/docs/specs/semconv/http/http-spans. | ||
| type: boolean | ||
| default: true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| display_name: JSF | ||
| description: > | ||
| This instrumentation enables controller spans for Mojarra JSF action listeners (controller spans | ||
| are disabled by default). | ||
| features: | ||
| - CONTROLLER_SPANS | ||
| library_link: https://github.com/eclipse-ee4j/mojarra | ||
| configurations: | ||
| - name: otel.instrumentation.common.experimental.controller-telemetry.enabled | ||
| description: Enables the creation of experimental controller spans. | ||
| type: boolean | ||
| default: false |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
besides controller spans jsf instrumentations also update the server span name, but they don't update the route
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i was on the fence about including that detail as a feature, but thinking more about it, i think we should. I think it's useful to know when an instrumentation might impact a server span generated by another instrumentation. I'm going to followup and add a new
SERVER_SPAN_NAMEfeatureThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We are a bit inconsistent with this. There are some instrumentations that update just the span name and some that update the route even though the set route won't match what was actually requested (it is questionable whether such usage of route is allowed by spec). Metadata of some jaxws instrumentations also includes
HTTP_ROUTEalthough these also just set the server span name.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yea, i was just doing some digging and identified cxf, metro, and axis jaxws all fall into this category. I'm going to review more