feat: Bump semantic conventions to version 1.37.0#1952
feat: Bump semantic conventions to version 1.37.0#1952kaylareopelle merged 7 commits intoopen-telemetry:mainfrom
Conversation
|
Opened an issue for the weaver problem: open-telemetry/semantic-conventions#3019 |
Also, update the jinja template for attributes to handle multi- line code comments.
1cf3e76 to
d69cb7a
Compare
error on CI "missing panolint", which is not one of our dependencies
| # client.example.com | ||
| # 10.1.2.80 | ||
| # /tmp/my.sock | ||
| # # client.example.com |
There was a problem hiding this comment.
where are these extra octothorps # coming from? The jinja template?
There was a problem hiding this comment.
Good catch, I'm not sure. I can take a look next week.
There was a problem hiding this comment.
I received a notification that you commented on this but for some reason I do not see it in the UI now.
Did you mention something about a weaver change that added the extra octothorpe?
There was a problem hiding this comment.
@arielvalentin -- strange! This is the comment I submitted before.
This might've been related to a weaver version change. By including the # where we had it in earlier versions, we were able to get some extra indentation before the examples. I can't figure out how to do that now, so the documentation will look like:
# @example Sample Values
# CERN-LineMode/2.15 libwww/2.17b3
# Mozilla/5.0 (iPhone; CPU iPhone OS 14_7_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Mobile/15E148 Safari/604.1
# YourApp/1.0.0 grpc-java-okhttp/1.27.2
I can also add a colon to the end of the Sample Values, if we think that'll make things look better
| {%- if attribute.examples is sequence %} | ||
| {%- for example in attribute.examples %} | ||
| # {{ example }} | ||
| # {{ example | comment }} |
There was a problem hiding this comment.
Is that because the example or comment may already have an octothorp in it?
There was a problem hiding this comment.
I was directed to use this for multi line strings.
However, looking at the comment, I may have got something wrong:
open-telemetry/semantic-conventions#3019 (comment)
Perhaps just using the filter without the prefixed # would solve the issue.
There was a problem hiding this comment.
(assuming the "that" you're referring to is the addition of "| comment" )
There was a problem hiding this comment.
@arielvalentin - Your hypothesis is right, there's already a # in the example/comment.
This might've been related to a weaver version change. By including the # where we had it in earlier versions, we were able to get some extra indentation before the examples. I can't figure out how to do that now, so the documentation will look like:
# @example Sample Values
# CERN-LineMode/2.15 libwww/2.17b3
# Mozilla/5.0 (iPhone; CPU iPhone OS 14_7_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Mobile/15E148 Safari/604.1
# YourApp/1.0.0 grpc-java-okhttp/1.27.2
I can also add a colon to the end of the Sample Values, if we think that'll make things look better.
|
👋 This pull request has been marked as stale because it has been open with no activity. You can: comment on the issue or remove the stale label to hold stale off for a while, add the |
|
👋 This pull request has been marked as stale because it has been open with no activity. You can: comment on the issue or remove the stale label to hold stale off for a while, add the |
| # client.example.com | ||
| # 10.1.2.80 | ||
| # /tmp/my.sock | ||
| # # client.example.com |
There was a problem hiding this comment.
I received a notification that you commented on this but for some reason I do not see it in the UI now.
Did you mention something about a weaver change that added the extra octothorpe?
|
👋 This pull request has been marked as stale because it has been open with no activity. You can: comment on the issue or remove the stale label to hold stale off for a while, add the |
|
Note that the latest semantic conventions are 1.40. |
This removes some of the indentation we had in favor of avoiding duplicate # signs
| # # unhandled | ||
| # | ||
| # handled | ||
| # unhandled |
There was a problem hiding this comment.
I'm sorry I was unavailable the past couple weeks to maybe have caught this earlier.
😬 These indents were part of the Yard markup for getting these values to appear under the @example Sample Values section in the rendered docs.
| Before, with inner indent) | After, without inner indent |
|---|---|
![]() |
![]() |
If showing sample values as Yard @example has gotten too wonky in the weaver templating, we/I can update the template to do something more straightforward.
| {%- if attribute.examples is sequence %} | ||
| {%- for example in attribute.examples %} | ||
| # {{ example | comment }} | ||
| {{ example | comment }} |
There was a problem hiding this comment.
I think I see another fix option: don't pipe the example sample value through the templating comment macro (which prepends an octothorp):
| {{ example | comment }} | |
| # {{ example }} |
There was a problem hiding this comment.
Nope! It's more complicated than that. My current suggestion is for us to remove including examples. The shapes they come in are too varied.


Semantic conventions update for version 1.37.0
Also includes an adjustment to the attributes jinja template to account for multi-line comments in response to open-telemetry/semantic-conventions#3019