Skip to content
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

Fix the auto instrumentation command #567

Merged
merged 21 commits into from
May 1, 2020

Conversation

ocelotl
Copy link
Contributor

@ocelotl ocelotl commented Apr 9, 2020

Fixes #566

@ocelotl ocelotl added the instrumentation Related to the instrumentation of third party libraries or frameworks label Apr 9, 2020
@ocelotl ocelotl requested a review from a team as a code owner April 9, 2020 04:50
@ocelotl ocelotl self-assigned this Apr 9, 2020
Copy link
Member

@mauriciovasquezbernal mauriciovasquezbernal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested and it works for me. I have a blocking comment on the PYTHONPATH logic.

Also, please don't forget to update the documentation

.

Copy link
Member

@mauriciovasquezbernal mauriciovasquezbernal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's good to go. Just one question about the cwd path being added.

@codeboten codeboten added the needs reviewers PRs with this label are ready for review and needs people to review to move forward. label Apr 28, 2020
Copy link
Member

@c24t c24t left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like it works as intended, but I don't understand the intended use of sitecustomize outside of run.

This looks good to unblock the other instrumentation PRs, but I think we need better documentation for (or I need a better understanding of) when this package should patch others.

docs/examples/auto-instrumentation/README.md Outdated Show resolved Hide resolved
logger = getLogger(__file__)


for entry_point in iter_entry_points("opentelemetry_instrumentor"):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I understand this, the goal is to load all available instrumentations if the auto_instrumentation package is on the path, which should only be true if the user called auto_instrumentation/auto_instrumentation.py:run?

Why did you decide to use sitecustomize to do this instead of leaving this in run? Loading the instrumentations as an import effect seems dangerous, but I don't know if this is conventional for sitecustomize.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did a little research here. Looks like this is how ddtrace does it too: https://github.com/DataDog/dd-trace-py/blob/master/ddtrace/bootstrap/sitecustomize.py

The main issue that this PR is fixing is the loading + activating of the instrumentations before anything in the downstream script is invoked. In commands like flask_run, you have no control over the actual code, so you can't programatically insert the instrumentation activation into the script itself.

in this scenario the "run" entry point is never invoked by the script that is being execl'd, so auto_instrumentation.py:run will never actually execute in the new python process.

There's very few places that you can run arbitary python code before the script itself starts to run. One of those that I'm aware of is sitecustomize. I'm having trouble thinking of any other place to inject startup code that is guaranteed to run before the script that you're trying to invoke.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, exactly. As @toumorokoshi says, this has been changed to support the frameworks or libraries that use launcher executables (thus requiring execl) and are executed in a new Python process.

Copy link
Contributor

@majorgreys majorgreys Apr 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is similar to how ddtrace-run works to add the directory where thesitecustomize.py @toumorokoshi just linked is located to the PYTHONPATH before calling execl:

https://github.com/DataDog/dd-trace-py/blob/master/ddtrace/commands/ddtrace_run.py

I tried this PR out with the example auto-instrumentation but using uwsgi to load the app and it worked as expected:

$ opentelemetry-auto-instrumentation uwsgi --http :8082 -w server_uninstrumented:app
*** Starting uWSGI 2.0.18 (64bit) on [Thu Apr 30 13:59:02 2020] ***
....
spawned uWSGI worker 1 (and the only) (pid: 54166, cores: 1)
testing
{
    "name": "server_request",
    "context": {
        "trace_id": "0x3416621a548ee3b57495a4ecc3bc9502",
        "span_id": "0xfc0221256e37be82",
        "trace_state": "{}"
    },
    "kind": "SpanKind.SERVER",
    "parent_id": "0xdee7b970d0693b48",
    "start_time": "2020-04-30T17:59:32.630551Z",
    "end_time": "2020-04-30T17:59:32.632212Z",
    "status": {
        "canonical_code": "OK"
    },
    "attributes": {
        "component": "http",
        "http.method": "GET",
        "http.server_name": "tbutt.local",
        "http.scheme": "http",
        "host.port": 8082,
        "http.host": "localhost:8082",
        "http.target": "/server_request?param=testing",
        "net.peer.ip": "127.0.0.1",
        "net.peer.port": "40658",
        "http.flavor": "1.1",
        "http.route": "/server_request",
        "http.status_text": "OK",
        "http.status_code": 200
    },
    "events": [],
    "links": []
}

ocelotl and others added 2 commits April 29, 2020 18:15
Co-Authored-By: Chris Kleinknecht <libc@google.com>
@codeboten codeboten added this to the Beta v0.7 milestone Apr 30, 2020
@toumorokoshi toumorokoshi merged commit 6babff1 into open-telemetry:master May 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
instrumentation Related to the instrumentation of third party libraries or frameworks needs reviewers PRs with this label are ready for review and needs people to review to move forward.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make auto instrumentation support any execution command
6 participants