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

Jump to bottom

Deprecate IGNORE_URLS and replace with TRANSACTION_IGNORE_URLS #811

Merged
merged 6 commits into from Sep 1, 2020
Merged

Deprecate IGNORE_URLS and replace with TRANSACTION_IGNORE_URLS #811

merged 6 commits into from Sep 1, 2020

Conversation

jalvz
Copy link
Contributor

@jalvz jalvz commented Aug 31, 2020

Closes #792

@apmmachine
Copy link
Collaborator

apmmachine commented Aug 31, 2020 •
edited

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #811 updated]

  • Start Time: 2020-09-01T08:27:10.200+0000

  • Duration: 26 min 25 sec

Test stats 🧪

Test Results
Failed 0
Passed 7282
Skipped 182
Total 7464

axw
axw approved these changes Sep 1, 2020
View reviewed changes
Copy link
Member

@axw axw 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!

Seems that there's a CI issue caused by some changes to gorm... looking into it

docs/configuration.asciidoc
| Environment | Default | Example
| `ELASTIC_APM_IGNORE_URLS` | | `/heartbeat*, *.jpg`
| Environment | Default | Example
| `ELASTIC_APM_TRANSACTION_IGNORE_URLS` | | `/heartbeat*, *.jpg`
|============

A list of patterns to match HTTP requests to ignore. An incoming HTTP request
Copy link
Member

Choose a reason for hiding this comment

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

Can you please add a note below that we'll continue to support "ELASTIC_APM_IGNORE_URLS", and that it's deprecated and will be removed in a future release

@axw
Copy link
Member

axw commented Sep 1, 2020

Ah there's also a formatting issue - please run make fmt

axw
axw approved these changes Sep 1, 2020
View reviewed changes
docs/configuration.asciidoc Outdated Show resolved Hide resolved
@jalvz @axw
Update docs/configuration.asciidoc
31eca71 
Co-authored-by: Andrew Wilkins <axwalk@gmail.com>
@axw
Copy link
Member

axw commented Sep 1, 2020

@jalvz sorry, I forgot to mention earlier: the gorm CI failure is fixed on master - please merge master into the PR.

@codecov-commenter
Copy link

Codecov Report

Merging #811 into master will decrease coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #811      +/-   ##
==========================================
- Coverage   84.67%   84.65%   -0.02%     
==========================================
  Files         130      130              
  Lines        8472     8474       +2     
==========================================
  Hits         7174     7174              
- Misses        911      912       +1     
- Partials      387      388       +1
Impacted Files Coverage Δ
module/apmhttp/ignorer.go 55.00% <100.00%> (+5.00%) ⬆️
tracer.go 88.88% <0.00%> (-0.31%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ee97405...241f5d0. Read the comment docs.

@jalvz jalvz merged commit 65fb3f0 into elastic:master Sep 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@axw axw axw approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implement transaction_ignore_urls
4 participants
@jalvz @apmmachine @axw @codecov-commenter