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.

Sign up for GitHub

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

Jump to bottom

Fix support for new line in config URI location #6309

Merged
merged 5 commits into from
Oct 13, 2022
Merged

Fix support for new line in config URI location #6309

merged 5 commits into from
Oct 13, 2022

Conversation

bogdandrutu
Copy link
Member

Fixes #6306

paivagustavo and others added 4 commits October 12, 2022 15:56
@paivagustavo
upgrade otel go to latest version v1.11.0/v0.32.3/v0.36.3 (open-telem…
b33b12a 
…etry#6293)
@bogdandrutu
[chore] move service pipeline id validation to main config Validate (o…
2118622 
…pen-telemetry#6281)

Signed-off-by: Bogdan <bogdandrutu@gmail.com>

Signed-off-by: Bogdan <bogdandrutu@gmail.com>
@paivagustavo
Instrument obsreport.receiver metrics with otel go (open-telemetry#6222)
a9f41a2 
* Instrument obs_receiver with otel go

* add changelog entry

* remove views configuration

* move otel-go metrics to obsreport

* add UseOtelForMetrics to TelemetrySettings; extract otel sdk initialization changes to another pr; remove public InstrumentWithOtel from obsreport;

* default UseOtelForMetrics to false

* remove duplicate oc registry initialization

* move `UseOtelForMetrics` to the internal package `obsreportconfig`

* address comments

* only register view if featuregate is disabled

* prefix meter name with `receiver/`

* change meter scope name

* upgrade otel metric sdk

* run make gotidy

* update changelog

* revert: otel go version upgrade

* revert: x/sys upgrades
[chore] add chloggen for changelog (open-telemetry#6062)
f24a6ac 
This change updates the changelog process in this repo to match the process in the contrib repo.
@bogdandrutu bogdandrutu requested a review from a team as a code owner October 13, 2022 19:41
@bogdandrutu
Copy link
Member Author

/cc @cpheps

@codecov
Copy link

codecov bot commented Oct 13, 2022 •
edited

Codecov Report

Base: 92.03% // Head: 91.97% // Decreases project coverage by -0.05% ⚠️

Coverage data is based on head (4cbdff4) compared to base (a9f41a2).
Patch has no changes to coverable lines.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #6309      +/-   ##
==========================================
- Coverage   92.03%   91.97%   -0.06%     
==========================================
  Files         218      219       +1     
  Lines       13203    13239      +36     
==========================================
+ Hits        12151    12177      +26     
- Misses        832      840       +8     
- Partials      220      222       +2
Impacted Files Coverage Δ
confmap/resolver.go 98.13% <ø> (ø)
service/service.go 69.44% <0.00%> (-1.99%) ⬇️
pdata/pcommon/trace_state.go 100.00% <0.00%> (ø)
pdata/pcommon/generated_primitive_slice.go 100.00% <0.00%> (ø)
service/internal/telemetry/process_telemetry.go
service/internal/telemetrylogs/logger.go
service/internal/otel_trace_sampler.go
service/telemetry/otel_trace_sampler.go 66.66% <0.00%> (ø)
service/telemetry/telemetry.go 83.33% <0.00%> (ø)
...ervice/internal/proctelemetry/process_telemetry.go 71.79% <0.00%> (ø)
... and 1 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

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

@bogdandrutu
Fix support for new line in config URI location
4cbdff4 
Signed-off-by: Bogdan <bogdandrutu@gmail.com>
StefanKurek
StefanKurek approved these changes Oct 13, 2022
View reviewed changes
Copy link

@StefanKurek StefanKurek left a comment

Choose a reason for hiding this comment

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

just tested this and looks good

@bogdandrutu bogdandrutu changed the base branch from main to release/v0.62.x October 13, 2022 19:54
@bogdandrutu bogdandrutu changed the base branch from release/v0.62.x to main October 13, 2022 19:59
codeboten
codeboten approved these changes Oct 13, 2022
View reviewed changes
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.

Restarted the windows tests, don't think their failure was related

@bogdandrutu
Copy link
Member Author

@codeboten do you know if this should go on the release branch, then merge into main or the other way around?

@bogdandrutu bogdandrutu changed the base branch from main to release/v0.62.x October 13, 2022 20:18
@bogdandrutu bogdandrutu merged commit d4261eb into open-telemetry:release/v0.62.x Oct 13, 2022
@bogdandrutu bogdandrutu deleted the fix6306 branch October 13, 2022 20:18
@codeboten
Copy link
Contributor

@bogdandrutu as per @Aneurysm9's comment in a slack thread:

  1. make change on release/v0.62.x
  2. tag and release commit at head of release/v0.62.x
  3. merge release/v0.62.x into main with a three-way merge to ensure that the tagged commit from release/v0.62.x is in the history of the head of main

@cpheps cpheps mentioned this pull request Oct 13, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codeboten codeboten codeboten approved these changes

@cpheps cpheps cpheps approved these changes

@StefanKurek StefanKurek StefanKurek approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

confmap Resolver URI Parsing doesn't work for valid yaml URIs
5 participants
@bogdandrutu @codeboten @cpheps @StefanKurek @paivagustavo