Bump gopsutil/v3 to v3.21.9 #5544
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mx-psi
changed the title
mx-psi
force-pushed
the
mx-psi/bump-gopsutil
branch
from
b290e5f
to
241dc6d
Compare
codeboten
approved these changes
Oct 1, 2021
bogdandrutu
reviewed
Oct 1, 2021
| @@ -344,7 +344,7 @@ require ( | |||
| github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect | |||
| github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210223165440-c65ae3540d44 // indirect | |||
| github.com/shirou/gopsutil v3.21.8+incompatible // indirect | |||
| github.com/shirou/gopsutil/v3 v3.21.6 // indirect | |||
| github.com/shirou/gopsutil/v3 v3.21.9 // indirect | |||
There was a problem hiding this comment.
These are "indirect" deps, if I merge this, download the code locally, re-run go mod I think they will get reverted correct? If you want to enforce this probably a replace statement is better or find who uses this as direct dep and fix there.
There was a problem hiding this comment.
Since they were already there, they will be kept there by go mod tidy
luckyj5
pushed a commit
to luckyj5/opentelemetry-collector-contrib
that referenced
this pull request
Oct 1, 2021
* Bump gopsutil/v3 * make go tidy
luckyj5
pushed a commit
to luckyj5/opentelemetry-collector-contrib
that referenced
this pull request
Oct 1, 2021
* Bump gopsutil/v3 * make go tidy
luckyj5
added a commit
to luckyj5/opentelemetry-collector-contrib
that referenced
this pull request
Oct 1, 2021
``` time make -C ./receiver/opencensusreceiver test make: Entering directory '/home/qmanfroi/git/signalfx/opentelemetry-collector-contrib/receiver/opencensusreceiver' go test -race -timeout 300s --tags=containers_image_openpgp,exclude_graphdriver_btrfs,exclude_graphdriver_devicemapper ./... ok github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver 140.310s ok github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver/internal/ocmetrics 0.329s ok github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver/internal/octrace 0.614s make: Leaving directory '/home/qmanfroi/git/signalfx/opentelemetry-collector-contrib/receiver/opencensusreceiver' real 2m21.503s user 0m4.198s sys 0m1.047s ``` here is the specification of my laptop: * CPU: Intel(R) Core(TM) i7-8550U CPU * Memory: 16GB * Disk: PM981 NVMe Samsung 512GB * OS: Arch Linux * Update dependencies logzio exporter * Updated example * Updated README.md * New line * Update config.yaml Co-authored-by: Bogdan Drutu <lazy@splunk.com> Update loki-label-best-practices page (open-telemetry#5277) [awscontainerinsights receiver]Add Readme for ECS (open-telemetry#4375) * Add Readme for ECS * Revise based on the comments Add invert match on tail sampling string attribute (open-telemetry#4393) Fix $attributes.file_path when collecting logs from Kubernetes (open-telemetry#5061) * Update otel-collector-config.yml On AWS EKS 1.21, I'd get this error (from your original code): ```console $ kubectl logs -f --tail=10 ds/otel-collector 2021-08-28T17:46:38.930Z error Failed to process entry {"kind": "receiver", "name": "filelog", "operator_id": "$.extract_metadata_from_filepath", "operator_type": "regex_parser", "error": {"description": "Entry is missing the expected parse_from field.", "suggestion": "Ensure that all incoming entries contain the parse_from field.", "details": {"parse_from": "$attributes.file_path"}}, "action": "send", "entry": {"timestamp":"2021-08-28T17:22:14.809709717Z","body":{"log":"2021-08-28T17:22:14+0000 DEBUG This is a debug log that shows a log that can be ignored.\n","stream":"stdout"},"attributes":{"file.path":"/var/log/pods/default_random-logger_4cf99717-08db-425b-88b6-1ee98fdf3660/random-logger/0.log"},"severity":0}} ``` The error message is showing that the actual attribute is "file.path", not "file_path". My proposed fix will correct that. * Update otel-collector.yaml * support untyped and _total metrics without the suffix in the metadata lookup * Fix spacing * remove debug line and run go fmt * fix typo * Add Apache httpd receiver - part 1 * Incorporate PR feedback * Remove unnecessary string building step * Simplify config validation * Merge main * Do not require a path * Remove port requirement Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com> * Add mysql receiver config and factory * Incorporate PR feedback * Add dependabot * Rerun make generate * PR feedback Bump gopsutil/v3 to v3.21.9 (open-telemetry#5544) * Bump gopsutil/v3 * make go tidy Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com> bump aws-sdk-go to v1.40.53 (open-telemetry#5569) fix: remove squash on configtls.TLSClientSetting for AWS components (open-telemetry#5454) * fix: remove squash on configtls.TLSClientSetting * fix: update yamls and readmes to reflect de-squashed tls * fix: solve merge conflict * fix: remove unnecessary file changes * chore: add CHANGELOG * fix: add relevant readme files * fix: includes aws components only
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
Bump gopsutil/v3 to include shirou/gopsutil#1137. Run
make gotidy.Link to tracking Issue: Fixes #5425