Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Setting event timestamp from OTel observed timestamp #11935

Merged
merged 14 commits into from
Nov 16, 2023
Merged

Setting event timestamp from OTel observed timestamp #11935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e572d08
Upgrading apm-data version
LikeTheSalad Oct 24, 2023
f9cc8e6
Updating NOTICE.txt
LikeTheSalad Oct 24, 2023
029eabf
Updating changelog
LikeTheSalad Oct 24, 2023
15d6bf2
Updating changelog
LikeTheSalad Oct 24, 2023
32ddb36
Merge branch 'main' into otel-observed-timestamp
LikeTheSalad Oct 26, 2023
91324a3
Upgrading apm-data
LikeTheSalad Oct 26, 2023
cca45a8
Merge branch 'main' into otel-observed-timestamp
LikeTheSalad Nov 13, 2023
7866215
Upgrading apm-data
LikeTheSalad Nov 13, 2023
f0071ad
fmt update
LikeTheSalad Nov 13, 2023
ff7c366
Merge branch 'main' into otel-observed-timestamp
LikeTheSalad Nov 15, 2023
ec06664
Upgrading apm-data
LikeTheSalad Nov 15, 2023
878bf84
Merge branch 'main' into otel-observed-timestamp
LikeTheSalad Nov 16, 2023
1ce4c36
Upgrading apm-data
LikeTheSalad Nov 16, 2023
48f7abf
Merge branch 'main' into otel-observed-timestamp
kruskall Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected].20231019084040-a0f7950e9775/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].20231019120308-82201b991ae5/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down
1 change: 1 addition & 0 deletions changelogs/head.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down