Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/edge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ on:
branches:
- main
paths-ignore:
- '**.md'
- '**.asciidoc'
- '**/**.md'
- '**/**.asciidoc'
- 'docs/**'
- 'examples/**'

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ on:
branches:
- main
paths-ignore:
- '*.md'
- '*.asciidoc'
- '**/*.md'
- '**/*.asciidoc'
- 'docs/**'
pull_request:
branches:
- main
paths-ignore:
- '*.md'
- '*.asciidoc'
- '**/*.md'
- '**/*.asciidoc'
- 'docs/**'

jobs:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ on:
branches:
- main
paths-ignore:
- '*.md'
- '*.asciidoc'
- '**/*.md'
- '**/*.asciidoc'
- 'docs/**'
- 'examples/**'
pull_request:
branches:
- main
paths-ignore:
- '*.md'
- '*.asciidoc'
- '**/*.md'
- '**/*.asciidoc'
- 'docs/**'
- 'examples/**'

Expand Down
5 changes: 2 additions & 3 deletions examples/trace-redis.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
// A small example showing Elastic APM tracing the 'redis' package.
//
// This assumes a Redis server running on localhost. You can use:
// npm run docker:start
// to start an Redis docker container (and other containers used for
// testing of this project). Then `npm run docker:stop` to stop them.
// npm run docker:start redis
// to start an Redis docker container. Then `npm run docker:stop` to stop it.

const apm = require('../').start({ // elastic-apm-node
serviceName: 'example-trace-redis4',
Expand Down
2 changes: 1 addition & 1 deletion test/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ apm.addMetadataFilter(filter1)
apm.addMetadataFilter(filter2)
apm.addMetadataFilter(filter3)

apm.flush()
apm.flush().finally(() => {})
apm.flush(() => {})

apm.destroy()
Expand Down