Skip to content

Fix error with elasticsearch(sniff_on_start=True) #1618

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

Merged
merged 5 commits into from
Aug 22, 2022
Merged

Fix error with elasticsearch(sniff_on_start=True) #1618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fde378f
Add test (to make sure it fails)
basepi Aug 18, 2022
2d2cce0
Fix elasticsearch instrumentation error when missing span
basepi Aug 18, 2022
662b907
CHANGELOG
basepi Aug 18, 2022
ea34e8f
Revert "Add test (to make sure it fails)"
basepi Aug 18, 2022
c3c794d
Merge branch 'main' into issue1615
basepi Aug 22, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ endif::[]
* Differentiate Lambda URLs from API Gateway in AWS Lambda integration {pull}#1609[#1609]
* Restrict the size of Django request bodies to prevent APM Server rejection {pull}#1610[#1610]
* Restrict length of `exception.message` for exceptions captured by the agent {pull}#1619[#1619]
* Fix error when using elasticsearch(sniff_on_start=True) {pull}#1618[#1618]



Expand Down
2 changes: 1 addition & 1 deletion elasticapm/instrumentation/packages/elasticsearch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class ElasticsearchConnectionInstrumentation(AbstractInstrumentedModule):

def call(self, module, method, wrapped, instance, args, kwargs):
span = execution_context.get_span()
if isinstance(span, DroppedSpan):
if not span or isinstance(span, DroppedSpan):
return wrapped(*args, **kwargs)

self._update_context_by_request_data(span.context, instance, args, kwargs)
Expand Down