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

[processor/resourcedetection] Fix system detector not setting attributes (#24670) #24684

Merged

Conversation

jpkrohling
Copy link
Member

Cherry-pick the commit from the patch release v0.82.1

@jpkrohling jpkrohling requested review from dmitryax and a team July 31, 2023 13:07
@github-actions github-actions bot added the processor/resourcedetection Resource detection processor label Jul 31, 2023
@jpkrohling
Copy link
Member Author

I was hoping to simply cherry-pick the same commit into the branch, but looks like I can't push it:

remote: error: GH006: Protected branch update failed for refs/heads/release/v0.82.x.
remote: error: Required status check "EasyCLA" is expected.
To github.com:open-telemetry/opentelemetry-collector-contrib.git
 ! [remote rejected]       release/v0.82.x -> release/v0.82.x (protected branch hook declined)
error: failed to push some refs to 'github.com:open-telemetry/opentelemetry-collector-contrib.git'

Is a PR more appropriate?

@codecov
Copy link

codecov bot commented Jul 31, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: +0.01% 🎉

Comparison is base (79513ba) 82.93% compared to head (19f2a53) 82.95%.

Additional details and impacted files
@@                 Coverage Diff                 @@
##           release/v0.82.x   #24684      +/-   ##
===================================================
+ Coverage            82.93%   82.95%   +0.01%     
===================================================
  Files                 1633     1633              
  Lines               153880   153880              
===================================================
+ Hits                127627   127650      +23     
+ Misses               22775    22756      -19     
+ Partials              3478     3474       -4     
Files Changed Coverage Δ
...sourcedetectionprocessor/internal/system/system.go 70.96% <100.00%> (+6.45%) ⬆️

... and 6 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dmitryax dmitryax closed this Jul 31, 2023
@dmitryax dmitryax reopened this Jul 31, 2023
@dmitryax dmitryax merged commit 92b0d3e into open-telemetry:release/v0.82.x Jul 31, 2023
269 of 272 checks passed
@github-actions github-actions bot added this to the next release milestone Jul 31, 2023
taj-p added a commit to Canva/opentelemetry-collector-contrib that referenced this pull request Oct 10, 2023
* [processor/resourcedetection] Fix system detector not setting attributes (open-telemetry#24670) (open-telemetry#24684)

Cherry-pick the commit from the patch release v0.82.1

Co-authored-by: Dmitrii Anoshin <anoshindx@gmail.com>

* feat: working

* .

* .

* .

* .

* .

---------

Co-authored-by: Juraci Paixão Kröhling <juraci@kroehling.de>
Co-authored-by: Dmitrii Anoshin <anoshindx@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
processor/resourcedetection Resource detection processor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants