Skip to content

Named tracers (rebase) #326

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

Closed
wants to merge 24 commits into from
Closed

Conversation

c24t
Copy link
Member

@c24t c24t commented Dec 10, 2019

This PR is #301 with an extra commit (4de385e) to merge master and fix a conflict in ext/opentelemetry-ext-wsgi/src/opentelemetry/ext/wsgi/__init__.py

Oberon00 and others added 23 commits November 22, 2019 13:31
	examples/opentelemetry-example-app/src/opentelemetry_example_app/flask_example.py
	ext/opentelemetry-ext-wsgi/src/opentelemetry/ext/wsgi/__init__.py
	ext/opentelemetry-ext-wsgi/tests/test_wsgi_middleware.py
Conflicts:
	ext/opentelemetry-ext-opentracing-shim/src/opentelemetry/ext/opentracing_shim/__init__.py
	ext/opentelemetry-ext-testutil/src/opentelemetry/ext/testutil/wsgitestutil.py
	ext/opentelemetry-ext-wsgi/src/opentelemetry/ext/wsgi/__init__.py
	opentelemetry-sdk/tests/trace/test_trace.py
 Conflicts:
	opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py
@c24t c24t requested a review from a team December 10, 2019 22:40
Copy link
Member

@Oberon00 Oberon00 left a comment

Choose a reason for hiding this comment

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

I incorporated the changes in #301. If any new merge conflicts come up, Im still fine with merging this instead, since you can modify this one.

@toumorokoshi
Copy link
Member

Since #301 is merged, closing this pr.

srikanthccv pushed a commit to srikanthccv/opentelemetry-python that referenced this pull request Nov 1, 2020
* docs(grpc): add grpc example

* docs(readme): add zipkin ui image

* fix: typos, add local images, refactor

* fix: typo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants