Fix some deprecation warnings that were missed in the 6.0.0 release

[basepi]

What does this pull request do?

Happened to notice these DeprecationWarnings weren't updated when we released 6.0.0. This simplifies the warnings and the tests.

[ghost]

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

• Start Time: 2023-01-26T22:28:27.162+0000

• Duration: 19 min 18 sec

Test stats 🧪

Test	Results
Failed	0
Passed	5081
Skipped	3679
Total	8760

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

• /test : Re-trigger the build.

• /test linters : Run the Python linters only.

• /test full : Run the full matrix of tests.

• /test benchmark : Run the APM Agent Python benchmarks tests.

• run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

[ghost]

🌐 Coverage report

Name	Metrics % (covered/total)	Diff
Packages	100.0% (73/73)	💚
Files	100.0% (241/241)	💚
Classes	100.0% (241/241)	💚
Lines	91.919% (18746/20394)	👍 0.002
Conditionals	74.98% (2877/3837)	👎 -0.013

[beniwohli]

Good catch!