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

Update generated config types #6347

Merged
merged 5 commits into from
Nov 20, 2024

Conversation

evan-bradley
Copy link
Contributor

This updates the generated config types to be created with go-jsonschema v0.17.0, which includes an update to add a struct tag the AdditionalProperties field that allows it to be marshaled.

Making this change fixes the following error that occurs when I marshal a basic otelcol.Config struct, then run it with the Collector:

'metrics.readers[0].pull.exporter' has invalid keys: additionalproperties

Related to open-telemetry/opentelemetry-collector#11711.

cc @codeboten

This uses go-jsonschema v0.17.0, which includes an update to add a struct tag the `AdditionalProperties` field to ensure it can be marshaled.
@evan-bradley evan-bradley requested review from pellared and a team as code owners November 19, 2024 20:18
Copy link

codecov bot commented Nov 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 66.9%. Comparing base (3704ded) to head (9c6dc4f).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@          Coverage Diff          @@
##            main   #6347   +/-   ##
=====================================
  Coverage   66.9%   66.9%           
=====================================
  Files        193     193           
  Lines      15652   15652           
=====================================
+ Hits       10479   10482    +3     
+ Misses      4882    4880    -2     
+ Partials     291     290    -1     

see 1 file with indirect coverage changes

---- 🚨 Try these New Features:

CHANGELOG.md Outdated Show resolved Hide resolved
evan-bradley and others added 2 commits November 20, 2024 07:51
Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

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

thanks @evan-bradley!

@pellared pellared merged commit df35547 into open-telemetry:main Nov 20, 2024
25 checks passed
dmathieu added a commit that referenced this pull request Dec 3, 2024
#6347 is
updating the generated JSON schema, as it has changed with upgrades of
`go-jsonschema`.
We update the binary semi automatically with dependabot. However, this
means there could be unseen regressions or changes like this that we
miss.

This runs the schema generation on CI, before checking for a clean
repository, so we can keep the generated code up to date with the binary
version.

This should fail until #6347 and #6349 are merged.

---------

Co-authored-by: Robert Pająk <pellared@hotmail.com>
@MrAlias MrAlias added this to the v1.33.0 milestone Dec 11, 2024
MrAlias added a commit that referenced this pull request Dec 12, 2024
### Added

- Added support for providing `endpoint`, `pollingIntervalMs` and
`initialSamplingRate` using environment variable
`OTEL_TRACES_SAMPLER_ARG` in
`go.opentelemetry.io/contrib/samples/jaegerremote`. (#6310)
- Added support exporting logs via OTLP over gRPC in
`go.opentelemetry.io/contrib/config`. (#6340)
- The `go.opentelemetry.io/contrib/bridges/otellogr` module.
This module provides an OpenTelemetry logging bridge for
`github.com/go-logr/logr`. (#6386)
- Added SNS instrumentation in
`go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws`.
(#6388)

### Changed

- Change the span name to be `GET /path` so it complies with the OTel
HTTP semantic conventions in
`go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho`.
(#6365)
- Record errors instead of setting the `gin.errors` attribute in
`go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin`.
(#6346)
- The `go.opentelemetry.io/contrib/config` now supports multiple schemas
in subdirectories (i.e. `go.opentelemetry.io/contrib/config/v0.3.0`) for
easier migration. (#6412)

### Fixed

- Fix broken AWS presigned URLs when using instrumentation in
`go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws`.
(#5975)
- Fixed the value for configuring the OTLP exporter to use `grpc`
instead of `grpc/protobuf` in `go.opentelemetry.io/contrib/config`.
(#6338)
- Allow marshaling types in `go.opentelemetry.io/contrib/config`.
(#6347)
- Removed the redundant handling of panic from the `HTML` function in
`go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin`.
(#6373)
- The `code.function` attribute emitted by
`go.opentelemetry.io/contrib/bridges/otelslog` now stores just the
function name instead the package path-qualified function name. The
`code.namespace` attribute now stores the package path. (#6415)
- The `code.function` attribute emitted by
`go.opentelemetry.io/contrib/bridges/otelzap` now stores just the
function name instead the package path-qualified function name. The
`code.namespace` attribute now stores the package path. (#6423)
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.

5 participants