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.
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
Update dd agent #23682
Update dd agent #23682
Conversation
@mbbx6spp, thanks for your PR! By analyzing the history of the files in this pull request, we identified @offlinehacker, @rbvermaa, @edolstra and @FRidh to be potential reviewers. |
Thanks. Could you put the |
a73c900
to
d048253
Compare
Thanks for the speedy review. @FRidh I kept the two commits format of the PR, both should still work as expected. I removed the older As a last sanity check I did the following:
$ dd-agent -h
Traceback (most recent call last):
File "/nix/store/g4xqhraqc3q78yp2a639v6j9yrbjmpwh-dd-agent-5.11.2/bin/.dd-agent-wrapped", line 13, in <module>
from config import get_version, initialize_logging # noqa
File "/nix/store/g4xqhraqc3q78yp2a639v6j9yrbjmpwh-dd-agent-5.11.2/agent/config.py", line 29, in <module>
from utils.service_discovery.config import extract_agent_config
File "/nix/store/g4xqhraqc3q78yp2a639v6j9yrbjmpwh-dd-agent-5.11.2/agent/utils/service_discovery/config.py", line 9, in <module>
from utils.service_discovery.sd_backend import SD_BACKENDS
File "/nix/store/g4xqhraqc3q78yp2a639v6j9yrbjmpwh-dd-agent-5.11.2/agent/utils/service_discovery/sd_backend.py", line 9, in <module>
from utils.service_discovery.sd_docker_backend import SDDockerBackend
File "/nix/store/g4xqhraqc3q78yp2a639v6j9yrbjmpwh-dd-agent-5.11.2/agent/utils/service_discovery/sd_docker_backend.py", line 10, in <module>
from docker.errors import NullResource, NotFound
ImportError: No module named docker.errors
?=1 | Error
|
Thank you. I've pushed this to master. I made some minor changes in 35f9f63. While in Nixpkgs we typically pass in individual packages, in the case of Python we pass the whole package set in order to prevent any accidental mixing. |
Any chance it can get backported to 17.03? |
Done! |
Motivation for this change
dd-agent
is currently broken on master and 17.03. This happened when this PR was merged, this brokedd-agent
's dependency ondocker
python package in NixOS (it depends on 1.10.x, and 2.x changes symbols around): https://github.com/NixOS/nixpkgs/pull/22201/filesI also added missing python package dependencies in
dd-agent
forpython-etcd
andconsul
.As a separate commit I also updated the
dd-agent
package sources from 5.5.2 -> 5.11.2 and create appropriate git logs as per contributing guide for each.Things done
(nix.useSandbox on NixOS,
or option
build-use-sandbox
innix.conf
on non-NixOS)
nix-shell -p nox --run "nox-review wip"
./result/bin/
)Output from
nox-review
: