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

[chore] update jsonschema #8113

Merged

Conversation

codeboten
Copy link
Contributor

This updates the jsonschema to the latest in main. It additionally adds a sed patch for making Headers a map[string]string instead of a map[string]interface.

@mx-psi

This updates the jsonschema to the latest in main. It additionally
adds a sed patch for making Headers a map[string]string instead of
a map[string]interface.

Signed-off-by: Alex Boten <aboten@lightstep.com>
@codecov
Copy link

codecov bot commented Jul 19, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.36 ⚠️

Comparison is base (b5e511c) 90.55% compared to head (8375b4a) 90.19%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #8113      +/-   ##
==========================================
- Coverage   90.55%   90.19%   -0.36%     
==========================================
  Files         301      301              
  Lines       15317    15377      +60     
==========================================
  Hits        13870    13870              
- Misses       1161     1221      +60     
  Partials      286      286              
Impacted Files Coverage Δ
service/telemetry/generated_config.go 0.00% <0.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Member

@mx-psi mx-psi left a comment

Choose a reason for hiding this comment

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

Approving with a suggestion we can deal with now or later

# go-jsonschema always generates patternProperties as
# map[string]interface{}, for more specific types, they must
# be replaced here
s+type Headers.*+type Headers map[string]string+g
Copy link
Member

Choose a reason for hiding this comment

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

nit: I think an actual patch to be applied by patch would be more resilient here (not a fan of sed specially after open-telemetry/opentelemetry-collector-contrib/issues/23981)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fair, I can open an issue following this to use patch instead of sed for both jsonschema & proto generation

@codeboten codeboten merged commit a1efc0e into open-telemetry:main Jul 20, 2023
@codeboten codeboten deleted the codeboten/update-jsonschema2 branch July 20, 2023 15:07
@github-actions github-actions bot added this to the next release milestone Jul 20, 2023
codeboten pushed a commit that referenced this pull request Jul 21, 2023
Internal collector metrics can now be exported via OTLP
using the otel-go otlpgrpc and otlphttp exporters.

Closes #7641 

Follow up to
#8113

---------

Signed-off-by: Alex Boten <aboten@lightstep.com>
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.

2 participants