[v12] OpenTelemetry Update Backport#33552
Merged
jentfoo merged 5 commits intobranch/v12from Oct 17, 2023
Merged
Conversation
* Bump go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp Bumps [go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp](https://github.com/open-telemetry/opentelemetry-go-contrib) from 0.42.0 to 0.44.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go-contrib@zpages/v0.42.0...zpages/v0.44.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Bump go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp Bumps [go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp](https://github.com/open-telemetry/opentelemetry-go-contrib) from 0.42.0 to 0.44.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go-contrib@zpages/v0.42.0...zpages/v0.44.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Additional OpenTelemetry updates This updates other OpenTelemetry dependencies that Dependabot did not automatically open. I believe it's safest if we generally just update all of OpenTelemetry to the latest. * sync `api` OpenTelemetry versions to parent versions * Bump go.opentelemetry.io/otel/sdk from 1.16.0 to 1.17.0 (#31185) * AWS OIDC - List EC2: add instance id as label (#31415) When listing EC2 instances we should be able to tell which ones were already added. To do so, we should use the instance-id which is unique. We can't use the Spec.CloudMetadata.AWS.InstanceID because predicate can't use fields that are optional. This PR adds the InstanceID as label. It uses `teleport.dev/instance-id` label key. When creating a Node from WebUI, it will send the same set of labels that was received. So, WebUI will send this same label. When listing EC2 instances, WebUI queries the backend for a list of Nodes of type EC2 EICE and the same `instance-id` and uses the result to show which ones were already added. * update semconv version to match otel --------- Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com> Co-authored-by: Tim Ross <tim.ross@goteleport.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com> Co-authored-by: Tim Ross <tim.ross@goteleport.com>
* Bump go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp Bumps [go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp](https://github.com/open-telemetry/opentelemetry-go-contrib) from 0.42.0 to 0.44.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go-contrib@zpages/v0.42.0...zpages/v0.44.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Bump go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp Bumps [go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp](https://github.com/open-telemetry/opentelemetry-go-contrib) from 0.42.0 to 0.44.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go-contrib@zpages/v0.42.0...zpages/v0.44.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Additional OpenTelemetry updates This updates other OpenTelemetry dependencies that Dependabot did not automatically open. I believe it's safest if we generally just update all of OpenTelemetry to the latest. * sync `api` OpenTelemetry versions to parent versions * Bump go.opentelemetry.io/otel/sdk from 1.16.0 to 1.17.0 (#31185) * AWS OIDC - List EC2: add instance id as label (#31415) When listing EC2 instances we should be able to tell which ones were already added. To do so, we should use the instance-id which is unique. We can't use the Spec.CloudMetadata.AWS.InstanceID because predicate can't use fields that are optional. This PR adds the InstanceID as label. It uses `teleport.dev/instance-id` label key. When creating a Node from WebUI, it will send the same set of labels that was received. So, WebUI will send this same label. When listing EC2 instances, WebUI queries the backend for a list of Nodes of type EC2 EICE and the same `instance-id` and uses the result to show which ones were already added. * update semconv version to match otel --------- Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com> Co-authored-by: Tim Ross <tim.ross@goteleport.com> * v14 Examples OpenTelemetry Updates --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com> Co-authored-by: Tim Ross <tim.ross@goteleport.com>
jentfoo
added
go
jentfoo
requested review from
capnspacehook,
codingllama,
ptgott,
rosstimothy and
zmb3
* update dep * implicit aggregate * fix kind check * remove cring address manip * correct import * invert if * fix rename --------- Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
Contributor
Author
codingllama
approved these changes
Oct 17, 2023
public-teleport-github-review-bot
Bot
removed request for
capnspacehook,
ptgott,
rosstimothy,
xacrimon and
zmb3
rosstimothy
reviewed
Oct 17, 2023
* Updated grpc/otelgrpc to 0.44.0 * Removed new `require` block
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
jentfoo
added
the
no-changelog
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
v12 backport of PR #33523 and #33550
Similar to v13 backport #33551, we must take in the latest version of OpenTelemetry to address their http/2 GHSA-rcjv-mgp8-qvmr. As such this also increases the grpc version to match v14 and master
#21190 needed to also be backported in order to handle an incompatibility with Firestone