From 9029f16c9446e25ce0ca40a061416689caf12fe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar?= <56847527+LikeTheSalad@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:53:46 +0100 Subject: [PATCH] Setting event timestamp from OTel observed timestamp (#11935) * Upgrading apm-data version * Updating NOTICE.txt * Updating changelog * Updating changelog * Upgrading apm-data * Upgrading apm-data * fmt update * Upgrading apm-data * Upgrading apm-data --------- Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> --- NOTICE.txt | 4 ++-- changelogs/head.asciidoc | 1 + go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index c5259fb097d..e9d1b9dc93c 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -362,11 +362,11 @@ these terms. -------------------------------------------------------------------------------- Dependency : github.com/elastic/apm-data -Version: v0.1.1-0.20231019084040-a0f7950e9775 +Version: v0.1.1-0.20231019120308-82201b991ae5 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v0.1.1-0.20231019084040-a0f7950e9775/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v0.1.1-0.20231019120308-82201b991ae5/LICENSE: Apache License Version 2.0, January 2004 diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index 9652643289c..5e6155333cf 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -20,3 +20,4 @@ https://github.com/elastic/apm-server/compare/8.11\...main[View commits] ==== Added - Update container base image to Ubuntu 22.04 {pull}11778[11778] - Add support for returning partial success response in OTLP input {pull}11883[11883] +- Setting event timestamp from OTel observed timestamp when needed {pull}11935[11935] \ No newline at end of file diff --git a/go.mod b/go.mod index 56dc0dc03d0..12db89a67f1 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 - github.com/elastic/apm-data v0.1.1-0.20231019084040-a0f7950e9775 + github.com/elastic/apm-data v0.1.1-0.20231019120308-82201b991ae5 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115142753-0f656292d196 github.com/elastic/elastic-agent-client/v7 v7.4.0 github.com/elastic/elastic-agent-libs v0.6.2 diff --git a/go.sum b/go.sum index 11513434ad2..127650ef6c5 100644 --- a/go.sum +++ b/go.sum @@ -132,8 +132,8 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HEE0a5BDFmhEmJV/Uo4uzj/paHjd7yl6+KYguw= github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= -github.com/elastic/apm-data v0.1.1-0.20231019084040-a0f7950e9775 h1:IPo/osxNyRxn8akP082O51YyEtrPiUjkB7yxZV57AKQ= -github.com/elastic/apm-data v0.1.1-0.20231019084040-a0f7950e9775/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= +github.com/elastic/apm-data v0.1.1-0.20231019120308-82201b991ae5 h1:URlDi0TZetSAo8KAIbaMZQhM5EG8+SDgs0jTen7WvMg= +github.com/elastic/apm-data v0.1.1-0.20231019120308-82201b991ae5/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115142753-0f656292d196 h1:TVYeKGZK8p987p5gxukuVFzhFi3r3ZODehgpex79CJ0= github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231115142753-0f656292d196/go.mod h1:FEFhfHnru9wDCgYGuqDiuXgEUD2KlkzN/YJ7yV2UO14= github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA=