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.

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

Add resource attributes #316

Merged
merged 42 commits into from
Oct 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
16f8c68
First commit
theletterf Sep 9, 2021
e4876fd
Separate config from README
theletterf Sep 15, 2021
10782f9
Fixes
theletterf Sep 15, 2021
6ccb0e3
README improvements
theletterf Sep 20, 2021
8208348
Troubleshooting
theletterf Sep 20, 2021
c8726b7
Changes to Troubleshooting
theletterf Sep 20, 2021
f19d922
Update README.md
theletterf Sep 20, 2021
ee32679
Update README.md
theletterf Sep 20, 2021
5628c70
Update README.md
theletterf Sep 20, 2021
be4b531
Update README.md
theletterf Sep 20, 2021
18d560e
Update README.md
theletterf Sep 20, 2021
7d4c57a
Update plugins.md
theletterf Sep 20, 2021
39eff16
Merge branch 'main' into main
theletterf Sep 20, 2021
dafda12
Merge branch 'signalfx:main' into main
theletterf Sep 20, 2021
16718c7
Changes for GA
theletterf Sep 20, 2021
67eb68b
ToDo for Correlation of Traces and Logs
theletterf Sep 20, 2021
3d81a1e
Remove agent talk
theletterf Sep 21, 2021
555eaaf
Fix link
theletterf Sep 21, 2021
765b4a1
Correlate traces and logs
theletterf Sep 21, 2021
66d3368
Change to CONTRIBUTING (see GDI Specs PR129)
theletterf Sep 21, 2021
c289c37
Add callouts
theletterf Sep 21, 2021
db5e4c4
README inside docs
theletterf Sep 21, 2021
52f58e6
Fix links
theletterf Sep 21, 2021
7aaee68
Remove SPLUNK_LOG_INJECTION
theletterf Sep 22, 2021
037df28
Merge branch 'main' into main
rauno56 Sep 27, 2021
b817b4f
Change default port
theletterf Sep 28, 2021
d1c5468
Merge branch 'main' of github.com:theletterf/splunk-otel-js into main
theletterf Sep 28, 2021
5d48e26
Remove log injections vars from Migrating.md
theletterf Sep 28, 2021
2132728
Revert "Change default port"
theletterf Sep 28, 2021
085f38e
Revert "Remove log injections vars from Migrating.md"
theletterf Sep 28, 2021
48d3d45
Restore old fields
theletterf Sep 28, 2021
dc2a7bd
Merge branch 'main' into main
rauno56 Sep 28, 2021
c8e1d6b
Add resource attributes to log injection docs
theletterf Sep 28, 2021
11f71f1
Merge branch 'main' of github.com:theletterf/splunk-otel-js into main
theletterf Sep 28, 2021
6007ce9
Merge remote-tracking branch 'upstream/main' into main
theletterf Sep 28, 2021
262f06b
Merge branch 'main' into main
seemk Sep 28, 2021
534e49b
Merge branch 'main' into main
seemk Sep 29, 2021
8f95070
Merge branch 'main' into main
seemk Sep 29, 2021
7f63140
Update docs/correlate-logs-traces.md
theletterf Oct 1, 2021
bf1a19b
Changes to README
theletterf Oct 1, 2021
691745c
Merge branch 'main' of github.com:theletterf/splunk-otel-js into main
theletterf Oct 1, 2021
24d9dfc
Merge remote-tracking branch 'upstream/main' into main
theletterf Oct 1, 2021
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ node -r @splunk/otel/instrument index.js

## Correlate traces and logs

The Splunk Distribution of OpenTelemetry JS can make trace metadata available to many Node.js logging libraries capable of accessing them, like Pino, Winston, and Bunyan. You can use trace metadata to correlate traces with log events, and explore logs in Observability Cloud.
The Splunk Distribution of OpenTelemetry JS automatically injects trace metadata into logs so that Node.js logging libraries can access it. You can use trace metadata to correlate traces with log events and explore logs in Observability Cloud.

For more information, see [Correlating traces with logs](./docs/correlate-logs-traces.md).

Expand Down Expand Up @@ -139,7 +139,7 @@ opentelemetry-instrumentation-sequelize
opentelemetry-instrumentation-typeorm
```

If log injection is enabled, the corresponding logging library package must be installed beforehand. Supported logging library instrumentations:
The following logging library instrumentations are supported:

```
@opentelemetry/instrumentation-bunyan
Expand Down
5 changes: 3 additions & 2 deletions docs/correlate-logs-traces.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ The following logging librares are supported:
- Pino
- Winston

## Available trace data
## Injected trace data

The following attributes are available for applications instrumented using the Splunk distribution of OpenTelemetry JS:
The following attributes are automatically injected into logs:

- Trace information: `trace_id`, `span_id`, and `trace_flags`
- Resource attributes: `service.name`, `service.version`, and `deployment.environment`(as `service.environment`)

The format of each log message depends on the logging library. The following is a sample log message formatted by the Pino library:

Expand Down