Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix(metric, log): merge explicit resource with environment variables #5773

Conversation

basti1302
Copy link
Contributor

fixes #5764

Copy link

codecov bot commented Sep 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.5%. Comparing base (8dca9cc) to head (e5b65da).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##            main   #5773     +/-   ##
=======================================
- Coverage   84.6%   84.5%   -0.1%     
=======================================
  Files        272     272             
  Lines      22778   22784      +6     
=======================================
- Hits       19271   19269      -2     
- Misses      3166    3172      +6     
- Partials     341     343      +2     

see 3 files with indirect coverage changes

@basti1302 basti1302 force-pushed the meter-provider-merge-environment-resource-information branch from 7e7ebbe to 2d5dcda Compare September 4, 2024 07:42
@basti1302 basti1302 force-pushed the meter-provider-merge-environment-resource-information branch from ba7a47a to 649d3b2 Compare September 6, 2024 06:26
@basti1302 basti1302 force-pushed the meter-provider-merge-environment-resource-information branch from e93b148 to cdee9c9 Compare September 6, 2024 08:56
@dmathieu dmathieu merged commit 9e1b015 into open-telemetry:main Sep 6, 2024
32 checks passed
@basti1302 basti1302 deleted the meter-provider-merge-environment-resource-information branch September 7, 2024 07:56
@XSAM XSAM added this to the v1.30.0 milestone Sep 9, 2024
XSAM added a commit that referenced this pull request Sep 10, 2024
### Added

- Support `OTEL_EXPORTER_OTLP_LOGS_INSECURE` and
`OTEL_EXPORTER_OTLP_INSECURE` environments in
`go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc`. (#5739)
- The `WithResource` option for `NewMeterProvider` now merges the
provided resources with the ones from environment variables. (#5773)
- The `WithResource` option for `NewLoggerProvider` now merges the
provided resources with the ones from environment variables. (#5773)
- Add UTF-8 support to `go.opentelemetry.io/otel/exporters/prometheus`.
(#5755)
### Fixed

- Fix memory leak in the global `MeterProvider` when identical
instruments are repeatedly created. (#5754)
- Fix panic instruments creation when setting meter provider. (#5758)
- Fix panic on instruments creation when setting meter provider. (#5758)
- Fix an issue where `SetMeterProvider` in `go.opentelemetry.io/otel`
might miss the delegation for instruments and registries. (#5780)

### Removed

- Drop support for [Go 1.21](https://go.dev/doc/go1.21). (#5736, #5740,
#5800)
basti1302 added a commit to dash0hq/dash0-operator that referenced this pull request Sep 11, 2024
Remove merge with resource.Environment() now that
open-telemetry/opentelemetry-go#5773
has been merged.
basti1302 added a commit to dash0hq/dash0-operator that referenced this pull request Sep 11, 2024
Remove merge with resource.Environment() now that
open-telemetry/opentelemetry-go#5773
has been merged.
basti1302 added a commit to dash0hq/dash0-operator that referenced this pull request Sep 11, 2024
Remove merge with resource.Environment() now that
open-telemetry/opentelemetry-go#5773
has been merged.
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
4 participants