opensource/opentelemetry-python-contrib
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-python-contrib.git synced 2025-07-30 21:56:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'core-instrumentation-pyramid-v0.15b0'

Browse Source
This commit is contained in:
Nathaniel Ruiz Nowell
2020-11-02 11:21:04 -08:00
parent d6686fb60f d6141a0940
commit 842067e462
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg
View File

@ -40,15 +40,15 @@ package_dir=
packages=find_namespace: packages=find_namespace:
install_requires = install_requires =
pyramid >= 1.7 pyramid >= 1.7
opentelemetry-instrumentation == 0.15.dev0 opentelemetry-instrumentation == 0.15b0
opentelemetry-api == 0.15.dev0 opentelemetry-api == 0.15b0
opentelemetry-instrumentation-wsgi == 0.15.dev0 opentelemetry-instrumentation-wsgi == 0.15b0
wrapt >= 1.0.0, < 2.0.0 wrapt >= 1.0.0, < 2.0.0
[options.extras_require] [options.extras_require]
test = test =
werkzeug == 0.16.1 werkzeug == 0.16.1
opentelemetry-test == 0.15.dev0 opentelemetry-test == 0.15b0
[options.packages.find] [options.packages.find]
where = src where = src

2
instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/callbacks.py
View File

@ -70,7 +70,7 @@ def _before_traversal(event):
start_time = environ.get(_ENVIRON_STARTTIME_KEY) start_time = environ.get(_ENVIRON_STARTTIME_KEY)
token = context.attach( token = context.attach(
propagators.extract(otel_wsgi.get_header_from_environ, environ) propagators.extract(otel_wsgi.carrier_getter, environ)
) )
tracer = trace.get_tracer(__name__, __version__) tracer = trace.get_tracer(__name__, __version__)

2
instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/version.py
View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
__version__ = "0.15.dev0" __version__ = "0.15b0"