Merge 'main' into 'collector_logging' #370
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 <dashpole@google.com> * 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 <dashpole@google.com>
…oudPlatform#349) * demonstrate that integration tests aren't catching failures
update dependencies
* send timeseries syncronously * update docs, and fix existing broken test
* update opentelemetry collector to v0.49.0 * drop histograms without a sum
* add sum of squared deviation estimate
…loudPlatform#365) * Add instrumentation library to span attributes. * Add test to ensure resource + instrumentation-scope labels show up in spans. * Expand testing. * Move resource mapping into shared module, and add monitored resource labels to trace spans. * Do the go mod tidy shuffle. * Fix docker build to include new shared module. * Bump back to go 1.17 * Migrate to SDK version of semantic convention constants instead of Collector's. * Clean up documents.
…oudPlatform#360) * normalize remaining cumulative data points
dashpole
reviewed
Apr 29, 2022
damemi
force-pushed
the
rebase-main-final
branch
from
8cb2b7d
to
b0a5617
Compare
dashpole
approved these changes
Apr 29, 2022
damemi
force-pushed
the
rebase-main-final
branch
from
b0a5617
to
fc5b988
Compare
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.
Similar to #362 and #350, merge changes from
mainintocollector_loggingto resolve conflicts in preparation for merging the feature branch back intomain