Merge branch 'main' into main

Author: lzchen

CHANGELOG.md

@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2300](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2300))
 - Rename AwsLambdaInstrumentor span attributes `faas.id` to `cloud.resource_id`, `faas.execution` to `faas.invocation_id`
   ([#2372](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2372))
+- Drop support for instrumenting elasticsearch client < 6`
+  ([#2422](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2422))
 
 ### Added
 

docs-requirements.txt

@@ -28,7 +28,7 @@ boto3~=1.0
 cassandra-driver~=3.25
 celery>=4.0
 confluent-kafka>= 1.8.2,<= 2.3.0
-elasticsearch>=2.0,<9.0
+elasticsearch>=6.0,<9.0
 flask~=2.0
 falcon~=2.0
 grpcio~=1.27

instrumentation/opentelemetry-instrumentation-elasticsearch/pyproject.toml

@@ -32,7 +32,7 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = [
-  "elasticsearch >= 2.0",
+  "elasticsearch >= 6.0",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-0.txt

@@ -44,10 +44,6 @@
     from . import helpers_es7 as helpers  # pylint: disable=no-name-in-module
 elif major_version == 6:
     from . import helpers_es6 as helpers  # pylint: disable=no-name-in-module
-elif major_version == 5:
-    from . import helpers_es5 as helpers  # pylint: disable=no-name-in-module
-else:
-    from . import helpers_es2 as helpers  # pylint: disable=no-name-in-module
 
 Article = helpers.Article
 

instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-1.txt

@@ -73,7 +73,7 @@
         "instrumentation": "opentelemetry-instrumentation-django==0.46b0.dev",
     },
     {
-        "library": "elasticsearch >= 2.0",
+        "library": "elasticsearch >= 6.0",
         "instrumentation": "opentelemetry-instrumentation-elasticsearch==0.46b0.dev",
     },
     {

instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-2.txt instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-6.txt

@@ -78,13 +78,9 @@ envlist =
     ; FIXME: Elasticsearch >=7 causes CI workflow tests to hang, see open-telemetry/opentelemetry-python-contrib#620
     ; The numbers at the end of the environment names
     ; below mean these dependencies are being used:
-    ; 0: elasticsearch-dsl>=2.0,<3.0 elasticsearch>=2.0,<3.0
-    ; 1: elasticsearch-dsl>=5.0,<6.0 elasticsearch>=5.0,<6.0
-    ; 2: elasticsearch-dsl>=6.0,<7.0 elasticsearch>=6.0,<7.0
-    py3{8,9,10,11}-test-instrumentation-elasticsearch-{0,2}
-    pypy3-test-instrumentation-elasticsearch-{0,2}
-    py3{8,9}-test-instrumentation-elasticsearch-1
-    pypy3-test-instrumentation-elasticsearch-1
+    ; 6: elasticsearch-dsl>=6.0,<7.0 elasticsearch>=6.0,<7.0
+    py3{8,9,10,11}-test-instrumentation-elasticsearch-6
+    pypy3-test-instrumentation-elasticsearch-6
 
     ; opentelemetry-instrumentation-falcon
     ; py310 does not work with falcon 1
@@ -452,9 +448,7 @@ commands_pre =
   sqlalchemy-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-0.txt
   sqlalchemy-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt
 
-  elasticsearch-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-0.txt
-  elasticsearch-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-1.txt
-  elasticsearch-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-2.txt
+  elasticsearch-6: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-6.txt
 
   asyncio: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt
 
@@ -617,7 +611,7 @@ commands_pre =
   # prerequisite: follow the instructions here https://github.com/PyMySQL/mysqlclient#install
   # for your OS to install the required dependencies
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/test-requirements.txt
-  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-2.txt
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-6.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/test-requirements.txt