From e0cbbcd8e0ae064d30b79d101116abaf5813d7f1 Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Fri, 28 Jul 2023 16:22:16 +0000 Subject: [PATCH 1/3] logs: Document Flags mapping in Google Cloud logs appendix --- CHANGELOG.md | 3 +++ specification/logs/data-model-appendix.md | 1 + 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2828457717e..429a02771b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,9 @@ release. ### Logs +- Update GCP data model to use `Flags` instead of + `gcp.trace_sampled`. ([#3629](https://github.com/open-telemetry/opentelemetry-specification/pull/3629)) + ### Resource ### Compatibility diff --git a/specification/logs/data-model-appendix.md b/specification/logs/data-model-appendix.md index 9d1e3fb8157..027ab0273e6 100644 --- a/specification/logs/data-model-appendix.md +++ b/specification/logs/data-model-appendix.md @@ -495,6 +495,7 @@ trace | string | The trace associated with the log entry, span_id | string | The span ID within the trace associated with the log entry. | SpanId labels | map | A set of user-defined (key, value) data that provides additional information about the log entry. | Attributes http_request | HttpRequest | The HTTP request associated with the log entry, if any. | Attributes["gcp.http_request"] +trace_sampled | boolean | The sampling decision of the trace associated with the log entry. | Flags All other fields | | | Attributes["gcp.*"] ### Elastic Common Schema From 989e8d4a6e30402ace3d3987fb3ae339e7f3e90b Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Fri, 28 Jul 2023 18:14:46 +0000 Subject: [PATCH 2/3] feedback --- specification/logs/data-model-appendix.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/logs/data-model-appendix.md b/specification/logs/data-model-appendix.md index 027ab0273e6..6dbf00e9611 100644 --- a/specification/logs/data-model-appendix.md +++ b/specification/logs/data-model-appendix.md @@ -495,7 +495,7 @@ trace | string | The trace associated with the log entry, span_id | string | The span ID within the trace associated with the log entry. | SpanId labels | map | A set of user-defined (key, value) data that provides additional information about the log entry. | Attributes http_request | HttpRequest | The HTTP request associated with the log entry, if any. | Attributes["gcp.http_request"] -trace_sampled | boolean | The sampling decision of the trace associated with the log entry. | Flags +trace_sampled | boolean | The sampling decision of the trace associated with the log entry. | TraceFlags.SAMPLED All other fields | | | Attributes["gcp.*"] ### Elastic Common Schema From 061c5eb8311a3fbf6b8a73265903d24f1f9f4b41 Mon Sep 17 00:00:00 2001 From: Armin Ruech Date: Fri, 11 Aug 2023 16:45:39 +0200 Subject: [PATCH 3/3] Fix CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 429a02771b8..dfea7c640c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ release. ### Logs -- Update GCP data model to use `Flags` instead of +- Update GCP data model to use `TraceFlags` instead of `gcp.trace_sampled`. ([#3629](https://github.com/open-telemetry/opentelemetry-specification/pull/3629)) ### Resource