fix(opentelemetry-instrumentation-celery): attach incoming context on…

[malcolmrebughini]

… _trace_prerun

Description

Currently incoming baggage does not get picked up. So this PR applies the fix described in the original issue.

Fixes #784

Type of change

Please delete options that are not relevant.

• [x] Bug fix (non-breaking change which fixes an issue)
• [ ] New feature (non-breaking change which adds functionality)
• [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
• [ ] This change requires a documentation update

How Has This Been Tested?

The original issue has steps to reproduce.

• [ ] Test A

Does This PR Require a Core Repo Change?

• [ ] Yes. - Link to PR:
• [x] No.

Checklist:

See contributing.md for styleguide, changelog guidelines, and more.

• [x] Followed the style guidelines of this project
• [x] Changelogs have been updated
• [x] Unit tests have been added
• [ ] Documentation has been updated

[linux-foundation-easycla[bot]]

The committers listed above are authorized under a signed CLA.

• :white_check_mark: login: malcolmrebughini / name: Malcolm Rebughini (b5137421bc05c7e9dfd23c29e0b88cca73ccc5e2, 1069c80fded239aa4190443b11061e1dbfeede50, da60ceff67f2d56bdff9ddfc6a7708b0d0fedc8a, eef8b9d54780e43edec03cb982946db56a44c038, 2e19183becd9139d154132407dd4121d212f5cd0, ac7f261504ecad92ee8c16be9ace04af7391682b, 9126473c6f194d00d57cd5016033469086128931, 121a78a30ecbdbb6b4b05d49dcecfe856b4b8b04, 39482d4c5699857bc1a48d2e473d464fa8cb23e2, 0de7c50f4fcc91b71193d1e3ce79c65a654e9cf9, 9674c1614453dd005640a044faeb4251ab4bc8b5)

[malcolmrebughini]

@xrmx Other implementations like the django one, make use of this function that I believe it implies that if there's no active span it should extract the context from the carrier, attach and then creates a span.

As another reference, the kafka client does the context.attach after creating the span here.

Unless I'm misunderstanding your concerns and there is a better way to achieve this.

[xrmx]

@xrmx Other implementations like the django one, make use of this function that I believe it implies that if there's no active span it should extract the context from the carrier, attach and then creates a span.

As another reference, the kafka client does the context.attach after creating the span here.

Unless I'm misunderstanding your concerns and there is a better way to achieve this.

I guess I have taken the example too literally :) if you see the kafka example they push the new context only for the sake of opentelemetry tracing and after the callback has been called it is detached. Same for the helper used by the web frameworks. You have to store the token and do the detach here too.

[malcolmrebughini]

@xrmx Yes, I realized that too. I pushed a new commit that adds the detache of the context and moved the PR to draft for now until I write some tests for the new functions.

Should have it ready tonight.

[malcolmrebughini]

@xrmx Thanks for your patience. This should be good for review now.

[malcolmrebughini]

@xrmx I'm unable to run these test locally to debug. Any pointers?

I run tox -e docker-tests

 error: subprocess-exited-with-error
  
  × python setup.py egg_info did not run successfully.
  │ exit code: 1
  ╰─> [18 lines of output]
      /bin/sh: line 1: mysql_config: command not found
      /bin/sh: line 1: mariadb_config: command not found
      /bin/sh: line 1: mysql_config: command not found
      Traceback (most recent call last):
        File "<string>", line 2, in <module>
        File "<pip-setuptools-caller>", line 34, in <module>
        File "/tmp/pip-install-n07bmqnv/mysqlclient_43431da1ffdb4512b0e26ed321ec0aa5/setup.py", line 15, in <module>
          metadata, options = get_config()
                              ^^^^^^^^^^^^
        File "/tmp/pip-install-n07bmqnv/mysqlclient_43431da1ffdb4512b0e26ed321ec0aa5/setup_posix.py", line 70, in get_config
          libs = mysql_config("libs")
                 ^^^^^^^^^^^^^^^^^^^^
        File "/tmp/pip-install-n07bmqnv/mysqlclient_43431da1ffdb4512b0e26ed321ec0aa5/setup_posix.py", line 31, in mysql_config
          raise OSError("{} not found".format(_mysql_config_path))
      OSError: mysql_config not found
      mysql_config --version
      mariadb_config --version
      mysql_config --libs
      [end of output]
  
  note: This error originates from a subprocess, and is likely not a problem with pip.
error: metadata-generation-failed

× Encountered error while generating package metadata.
╰─> See above for output.

note: This is an issue with the package mentioned above, not pip.
hint: See above for details.

I have libpq and snappy as indicated in the contributing instructions.

[xrmx]

You need mysql_config or mariadb_config that are usually shipped with development libraries of the database, e.g. libmariadb-dev.

[malcolmrebughini]

@xrmx hi again. I've been away for a bit. I was able to fix the docker tests on my latest commit. Please take another look.

[malcolmrebughini]

@ocelotl @lzchen Is there more feedback for this PR? I would like to know what is the path forward for this change.

Thanks :pray:

[rbagd]

I've tested this PR in my local environment and it seems to be working quite nicely. I noticed that context doesn't get propagated in task_postrun signal but not sure if that would even be easy to change.

It'd be great if maintainers could look into the PR before the next release.

[malcolmrebughini]

@rbagd thanks for trying it out.

Can you provide more details on what you mean that the context doesn't get propagated in task_postrun? If there's an issue I have not noticed with this instrumentation I would like to fix it.

[rbagd]

@malcolmrebughini So from what I understood Celery instrumentation registers a task_postrun signal which detaches the OTel context. Since application code might have its own task_postrun signals, then the ordering starts to matter. If you run the instrumentation via opentelemetry-instrument celery, context detachment seems to be executed first and so the remaining task_postrun handlers don't get the OTel context anymore. This should not be an issue with other signals as far as I can say, albeit I didn't test all of them.

I didn't see an obvious way to change the ordering of task_postrun handlers but if there's a way, that might be a good work-around.

P.S. This is not specific to this PR, it must have been there from the start.

[xrmx]

@malcolmrebughini please rebase and move the changelog update to the unreleased section

[malcolmrebughini]

@xrmx done with the rebase and added the changelog entry to unreleased :ok_hand: