From 7ffc58045124ea01441681c1dc6177ba5af60cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Andr=C3=A9=20Dinis?= Date: Tue, 5 Sep 2023 15:24:11 +0100 Subject: [PATCH 1/2] 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. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 55f62ca249414..dd1ab5d32f0b8 100644 --- a/go.mod +++ b/go.mod @@ -160,7 +160,7 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 - go.opentelemetry.io/otel/sdk v1.16.0 + go.opentelemetry.io/otel/sdk v1.17.0 go.opentelemetry.io/otel/trace v1.17.0 go.opentelemetry.io/proto/otlp v1.0.0 golang.org/x/crypto v0.12.0 diff --git a/go.sum b/go.sum index c44bcd9797b7e..86910b3bc7a5c 100644 --- a/go.sum +++ b/go.sum @@ -1621,8 +1621,8 @@ go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+p go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= -go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= -go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= +go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= From df62def357ca763a1a04dcdace37091bef30b688 Mon Sep 17 00:00:00 2001 From: Tim Ross Date: Tue, 5 Sep 2023 14:12:16 -0400 Subject: [PATCH 2/2] update semconv version to match otel --- lib/observability/tracing/tracing.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/observability/tracing/tracing.go b/lib/observability/tracing/tracing.go index 0fa814b0a37a9..40fb9b4140b54 100644 --- a/lib/observability/tracing/tracing.go +++ b/lib/observability/tracing/tracing.go @@ -29,7 +29,7 @@ import ( "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" - semconv "go.opentelemetry.io/otel/semconv/v1.17.0" + semconv "go.opentelemetry.io/otel/semconv/v1.21.0" oteltrace "go.opentelemetry.io/otel/trace" "github.com/gravitational/teleport"