Skip to content

Conversation

ShadowMaxLeb
Copy link
Contributor

Fixes #3091

Changes

Try to follow as much as possible the ECS guidelines and the ECS Logs reference

This impacts fields:

  • timestamp: now set to @timestamp with a Date string
  • body: now set to message
  • name: now set to log.logger
  • severity: now set to log.level
  • attributes: not under the attributes key anymore

@ShadowMaxLeb ShadowMaxLeb requested a review from a team as a code owner October 18, 2024 09:07
Copy link

netlify bot commented Oct 18, 2024

Deploy Preview for opentelemetry-cpp-api-docs canceled.

Name Link
🔨 Latest commit fa03dc3
🔍 Latest deploy log https://app.netlify.com/sites/opentelemetry-cpp-api-docs/deploys/671c741ddfaa200008cfc0c4

@ShadowMaxLeb ShadowMaxLeb force-pushed the elastic-exporter-els-format branch 2 times, most recently from c295345 to 67d7e6b Compare October 18, 2024 09:23
Copy link

codecov bot commented Oct 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.91%. Comparing base (497eaf4) to head (fa03dc3).
Report is 149 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #3107      +/-   ##
==========================================
+ Coverage   87.12%   87.91%   +0.79%     
==========================================
  Files         200      195       -5     
  Lines        6109     6133      +24     
==========================================
+ Hits         5322     5391      +69     
+ Misses        787      742      -45     

see 98 files with indirect coverage changes

`attributes`

This allows user to set other fields that are part of the [ECS log documentation](https://www.elastic.co/guide/en/ecs/8.11/ecs-log.html).
For instance, it allows to have an attribute with key `log.file`, that
will, thanks to `nlohmann::json`, appear as :
```
{
  "log": {
    "file": "xxx"
  }
}
```

Closes open-telemetry#3091
@ShadowMaxLeb ShadowMaxLeb force-pushed the elastic-exporter-els-format branch from 27eadab to 6d72624 Compare October 18, 2024 14:00
Copy link
Member

@marcalff marcalff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for the fix.

@marcalff marcalff changed the title Elastic Search exporter follow ECS guidelines [EXPORTER] Elastic Search exporter follow ECS guidelines Oct 21, 2024
@marcalff
Copy link
Member

Thanks for the fix.

@ShadowMaxLeb Please merge main into this PR, to resolve "This branch is out-of-date with the base branch".

@marcalff marcalff added the ok-to-merge The PR is ok to merge (has two approves or raised by a maintainer/approver and has one approve) label Oct 22, 2024
@MaxLeb
Copy link

MaxLeb commented Oct 23, 2024

Thanks for the fix.

@ShadowMaxLeb Please merge main into this PR, to resolve "This branch is out-of-date with the base branch".

I will try to update it next week as I cannot do it right now.

@ShadowMaxLeb
Copy link
Contributor Author

@marcalff , How can I retry the failed job as it failed because it was lacking a runner ?

@marcalff marcalff merged commit 5e62859 into open-telemetry:main Oct 27, 2024
55 of 56 checks passed
@ShadowMaxLeb ShadowMaxLeb deleted the elastic-exporter-els-format branch October 28, 2024 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ok-to-merge The PR is ok to merge (has two approves or raised by a maintainer/approver and has one approve)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ElasticSearch Exporter does not follow ECS guidelines and logging reference

5 participants