Skip to content

Commit 164259e

Browse files
authored
Improve elasticsearch instrumentation examples (#3367)
* Improve elasticsearch instrumentation examples * Fix doc_type for elasticsearch instrumentation examples
1 parent db617eb commit 164259e

File tree

1 file changed

+8
-5
lines changed
  • instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch

1 file changed

+8
-5
lines changed

instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
3333
from opentelemetry.instrumentation.elasticsearch import ElasticsearchInstrumentor
3434
import elasticsearch
35-
35+
from datetime import datetime
3636
3737
# instrument elasticsearch
3838
ElasticsearchInstrumentor().instrument()
3939
4040
# Using elasticsearch as normal now will automatically generate spans
4141
es = elasticsearch.Elasticsearch()
42-
es.index(index='my-index', doc_type='my-type', id=1, body={'my': 'data', 'timestamp': datetime.now()})
43-
es.get(index='my-index', doc_type='my-type', id=1)
42+
es.index(index='my-index', doc_type='_doc', id=1, body={'my': 'data', 'timestamp': datetime.now()})
43+
es.get(index='my-index', doc_type='_doc', id=1)
4444
4545
Elasticsearch instrumentation prefixes operation names with the string "Elasticsearch". This
4646
can be changed to a different string by either setting the OTEL_PYTHON_ELASTICSEARCH_NAME_PREFIX
@@ -49,6 +49,8 @@
4949
5050
.. code-block:: python
5151
52+
from opentelemetry.instrumentation.elasticsearch import ElasticsearchInstrumentor
53+
5254
ElasticsearchInstrumentor("my-custom-prefix").instrument()
5355
5456
The instrument() method accepts the following keyword args:
@@ -67,6 +69,7 @@ def response_hook(span: Span, response: dict)
6769
6870
from opentelemetry.instrumentation.elasticsearch import ElasticsearchInstrumentor
6971
import elasticsearch
72+
from datetime import datetime
7073
7174
def request_hook(span, method, url, kwargs):
7275
if span and span.is_recording():
@@ -82,8 +85,8 @@ def response_hook(span, response):
8285
# Using elasticsearch as normal now will automatically generate spans,
8386
# including user custom attributes added from the hooks
8487
es = elasticsearch.Elasticsearch()
85-
es.index(index='my-index', doc_type='my-type', id=1, body={'my': 'data', 'timestamp': datetime.now()})
86-
es.get(index='my-index', doc_type='my-type', id=1)
88+
es.index(index='my-index', doc_type='_doc', id=1, body={'my': 'data', 'timestamp': datetime.now()})
89+
es.get(index='my-index', doc_type='_doc', id=1)
8790
8891
API
8992
---

0 commit comments

Comments
 (0)