Merge main branch into collector_logging #350
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
…orm#336) * do not use IsZero on timestamps obtained from pdata
…oogleCloudPlatform#346) * update fixtures based on upstream changes to the prometheus receiver
…m#343) * feat(propagator): create a new one-way propagator CloudTraceOneWayPropagator moves trace info from X-cloud-trace-context into 'traceparent'. * Apply suggestions from code review Co-authored-by: David Ashpole <[email protected]> * Update propagator to extract both, emit only traceparent Users will no longer need to create a composite propagator, and there's a clear precedence order between trace headers. Co-authored-by: David Ashpole <[email protected]>
…oudPlatform#349) * demonstrate that integration tests aren't catching failures
update dependencies
Rebase the collector_logging feature branch onto upstream/main
dashpole
approved these changes
Apr 11, 2022
damemi
added a commit
to damemi/opentelemetry-operations-go
that referenced
this pull request
Apr 19, 2022
* Do not use IsZero on timestamps obtained from pdata (GoogleCloudPlatform#336) * do not use IsZero on timestamps obtained from pdata * send summary counts as doubles instead of integers (GoogleCloudPlatform#338) * drop data points with no value set (GoogleCloudPlatform#339) * handle NaN sums in histograms and exponential histograms (GoogleCloudPlatform#340) * Fix broken links, typos in docs (GoogleCloudPlatform#345) * Update fixtures based on upstream changes to the prometheus receiver (GoogleCloudPlatform#346) * update fixtures based on upstream changes to the prometheus receiver * feat(propagator): create a new one-way propagator (GoogleCloudPlatform#343) * feat(propagator): create a new one-way propagator CloudTraceOneWayPropagator moves trace info from X-cloud-trace-context into 'traceparent'. * Apply suggestions from code review Co-authored-by: David Ashpole <[email protected]> * Update propagator to extract both, emit only traceparent Users will no longer need to create a composite propagator, and there's a clear precedence order between trace headers. Co-authored-by: David Ashpole <[email protected]> * Demonstrate that integration tests aren't catching failures (GoogleCloudPlatform#349) * demonstrate that integration tests aren't catching failures * Update dependencies (GoogleCloudPlatform#347) update dependencies * make gotidy * React to rebase Co-authored-by: David Ashpole <[email protected]> Co-authored-by: Marc Dougherty <[email protected]>
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.
Following #347, there were merge conflicts (in go.mod/go.sum files) that prevented a basic rebase from being able to merge. Rather than force-push directly to the feature branch, I'm opening this to merge in, resolve the conflicts, and re-run
make gotidy