Skip to content

Conversation

@pdimitra
Copy link
Contributor

Closes #301

@pdimitra pdimitra self-assigned this Apr 13, 2021
Copy link
Contributor

@manojpandey manojpandey left a comment

Choose a reason for hiding this comment

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

@pdimitra thanks for working on this - I added some comments in the review :D
Good work!

self.k = 3 # intermediate span
self._populate_local_span_data(span)

if "rabbitmq" in self.data and self.data["rabbitmq"]["sort"] == "consume":
Copy link
Contributor

Choose a reason for hiding this comment

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

@pdimitra:

I checked span.py and it seems like the _populate_entry_span_data & _populate_exit_span_data for rabbitmq is the same. In this case, we can let it stay in the ENTRY_SPANS tuple and just change the method here to publish and set self.k = 2

"mongo", "mysql", "postgres", "rabbitmq", "redis", "rpc-client", "sqlalchemy",
"soap", "tornado-client", "urllib3", "pymongo", "gcs", "gcps-producer")

ENTRY_SPANS = ("aiohttp-server", "aws.lambda.entry", "celery-worker", "django", "wsgi", "rabbitmq",
Copy link
Contributor

Choose a reason for hiding this comment

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

We can keep this. See my other comment below

Comment on lines +79 to +102
python37:
docker:
- image: circleci/python:3.7.9
- image: circleci/postgres:9.6.5-alpine-ram
- image: circleci/mariadb:10-ram
- image: circleci/redis:5.0.4
- image: rabbitmq:3.5.4
- image: circleci/mongo:4.2.3-ram
- image: singularities/pubsub-emulator
environment:
PUBSUB_PROJECT_ID: "project-test"
PUBSUB_LISTEN_ADDRESS: "0.0.0.0:8432"
working_directory: ~/repo
steps:
- checkout
- pip-install-deps
- run:
name: run tests
environment:
INSTANA_TEST: "true"
command: |
. venv/bin/activate
pytest -v
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's see if we can run asqynp on Python 3.8 - if not, then we can have this additional test job.

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like support only until Python 3.7: benjamin-hodgson/asynqp#104
We can keep it @pdimitra

@manojpandey manojpandey self-requested a review April 13, 2021 13:02
Copy link
Contributor

@manojpandey manojpandey left a comment

Choose a reason for hiding this comment

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

LGTM!

@pdimitra pdimitra merged commit 0a3fe3d into master Apr 13, 2021
@pdimitra pdimitra deleted the 52136-fix-rabbitmq-span-kind branch April 13, 2021 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Check implication of __init__ for rabbitmq span type

3 participants