Fixing typos for include in requirements.txt in examples/http/*.

.github/workflows/merge.yml

@@ -22,7 +22,6 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.7", "3.8", "3.9"]
-
     steps:
       - name: Run apt-get update
         run: sudo apt-get update
@@ -35,18 +34,21 @@ jobs:
           sudo apt install software-properties-common
           sudo add-apt-repository ppa:deadsnakes/ppa -y
           sudo apt-get install python${{ matrix.python-version }}
-          python --version
+          sudo apt-get install python3-all
+          python${{ matrix.python-version }} --version
 
       - name: Install pip
-        run: sudo apt-get install python3-pip
+        run: |
+          sudo apt-get install python3-pip
+#          sudo pip install --upgrade pip
 
       - name: Install pip build
         run: python3 -m pip install --upgrade build
 
       - uses: actions/checkout@v2
 
       - name: Install tox
-        run: pip install --user -r dev-requirements.txt
+        run: pip install --user -r dev-requirements.txt -r requirements.txt
 
       - name: Lint files
         run: make lint
@@ -65,7 +67,7 @@ jobs:
         run: sudo pip install pytest-asyncio
 
       - name: Run tests
-        run: PYTHON_VERSION=${{ matrix.python }} make test
+        run: PYTHON_VERSION=${{ matrix.python-version }} make test
 
       - name: Build package
         run: make build

Makefile

@@ -12,7 +12,7 @@ test-unit:
 
 .PHONY: test-integration
 test-integration:
-	@echo "Running integration tests over $(PY_TARGET) with LOG_LEVEL=$(LOG_LEVEL)" 
+	@echo "Running integration tests over $(PY_TARGET) with LOG_LEVEL=$(LOG_LEVEL), PY_TARGET=${PY_TARGET}" 
 	cd ${TEST_DIR}/flask; HT_LOG_LEVEL=${LOG_LEVEL} tox -e ${PY_TARGET}
 	cd ${TEST_DIR}/grpc; HT_LOG_LEVEL=${LOG_LEVEL} tox -e ${PY_TARGET}
 	cd ${TEST_DIR}/mysql; HT_LOG_LEVEL=${LOG_LEVEL} tox -e ${PY_TARGET}

dev-requirements.txt

@@ -1,21 +1,13 @@
-opentelemetry-api>=1.1.0
-opentelemetry-exporter-otlp>=1.1.0
-opentelemetry-exporter-zipkin>=1.1.0
-opentelemetry-instrumentation>=0.20b0
-opentelemetry-instrumentation-aiohttp-client>=0.20b0
-opentelemetry-instrumentation-wsgi>=0.20b0
-opentelemetry-instrumentation-flask>=0.20b0
-opentelemetry-instrumentation-mysql>=0.20b0
-opentelemetry-instrumentation-psycopg2>=0.20b0
-opentelemetry-instrumentation-requests>=0.20b0
-opentelemetry-instrumentation-grpc>=0.20b0
-opentelemetry-propagator-b3>=1.1.0
-opentelemetry-sdk>=1.1.0
-opentelemetry-util-http>=0.20b0
 google>=3.0.0
 pyyaml
 pytest>=6.2.3
 protobuf>=3.15.8
 tox>=3.23.0
-pylint>=2.7.4
-pdoc3>=0.9.2
+pylint==2.8.2
+pdoc3==0.9.2
+flask
+aiohttp
+requests
+mysql-connector-python==8.0.23
+psycopg2-binary
+grpcio

docs/hypertrace/agent/instrumentation/aiohttp/index.html

@@ -253,7 +253,7 @@ <h1 class="title">Module <code>hypertrace.agent.instrumentation.aiohttp</code></
 <h2 class="section-title" id="header-functions">Functions</h2>
 <dl>
 <dt id="hypertrace.agent.instrumentation.aiohttp.create_trace_config"><code class="name flex">
-<span>def <span class="ident">create_trace_config</span></span>(<span>url_filter: Optional[Callable[[str], str]] = None, span_name: Union[Callable[[aiohttp.tracing.TraceRequestStartParams], str], str, NoneType] = None, tracer_provider: opentelemetry.trace.TracerProvider = None, aiohttp_client_wrapper: <a title="hypertrace.agent.instrumentation.aiohttp.AioHttpClientInstrumentorWrapper" href="#hypertrace.agent.instrumentation.aiohttp.AioHttpClientInstrumentorWrapper">AioHttpClientInstrumentorWrapper</a> = None) ‑> aiohttp.tracing.TraceConfig</span>
+<span>def <span class="ident">create_trace_config</span></span>(<span>url_filter: Union[Callable[[str], str], NoneType] = None, span_name: Union[Callable[[aiohttp.tracing.TraceRequestStartParams], str], str, NoneType] = None, tracer_provider: opentelemetry.trace.TracerProvider = None, aiohttp_client_wrapper: <a title="hypertrace.agent.instrumentation.aiohttp.AioHttpClientInstrumentorWrapper" href="#hypertrace.agent.instrumentation.aiohttp.AioHttpClientInstrumentorWrapper">AioHttpClientInstrumentorWrapper</a> = None) ‑> aiohttp.tracing.TraceConfig</span>
 </code></dt>
 <dd>
 <div class="desc"><p>Build an aiohttp-client trace config for use with Hypertrace</p></div>

docs/hypertrace/agent/instrumentation/flask/index.html

@@ -38,7 +38,6 @@ <h1 class="title">Module <code>hypertrace.agent.instrumentation.flask</code></h1
 from opentelemetry.instrumentation.flask import (
     _InstrumentedFlask,
     FlaskInstrumentor,
-    get_default_span_name,
     _teardown_request,
     _ENVIRON_SPAN_KEY,
 )
@@ -173,14 +172,15 @@ <h1 class="title">Module <code>hypertrace.agent.instrumentation.flask</code></h1
     # Initialize instrumentation wrapper
     def instrument_app(self,
                        app,
-                       name_callback=get_default_span_name,
+                       request_hook=None,
+                       response_hook=None,
                        tracer_provider=None) -&gt; None:
         &#39;&#39;&#39;Initialize instrumentation&#39;&#39;&#39;
         logger.debug(&#39;Entering FlaskInstrumentorWrapper.instument_app().&#39;)
         try:
 
             # Call parent class&#39;s initialization
-            super().instrument_app(app, name_callback)
+            super().instrument_app(app)
 
             self._app = app
             # Set pre-request handler
@@ -280,14 +280,15 @@ <h2 class="section-title" id="header-classes">Classes</h2>
     # Initialize instrumentation wrapper
     def instrument_app(self,
                        app,
-                       name_callback=get_default_span_name,
+                       request_hook=None,
+                       response_hook=None,
                        tracer_provider=None) -&gt; None:
         &#39;&#39;&#39;Initialize instrumentation&#39;&#39;&#39;
         logger.debug(&#39;Entering FlaskInstrumentorWrapper.instument_app().&#39;)
         try:
 
             # Call parent class&#39;s initialization
-            super().instrument_app(app, name_callback)
+            super().instrument_app(app)
 
             self._app = app
             # Set pre-request handler
@@ -345,7 +346,7 @@ <h3>Methods</h3>
 </details>
 </dd>
 <dt id="hypertrace.agent.instrumentation.flask.FlaskInstrumentorWrapper.instrument_app"><code class="name flex">
-<span>def <span class="ident">instrument_app</span></span>(<span>self, app, name_callback=&lt;function get_default_span_name&gt;, tracer_provider=None) ‑> NoneType</span>
+<span>def <span class="ident">instrument_app</span></span>(<span>self, app, request_hook=None, response_hook=None, tracer_provider=None) ‑> NoneType</span>
 </code></dt>
 <dd>
 <div class="desc"><p>Initialize instrumentation</p></div>
@@ -355,14 +356,15 @@ <h3>Methods</h3>
 </summary>
 <pre><code class="python">def instrument_app(self,
                    app,
-                   name_callback=get_default_span_name,
+                   request_hook=None,
+                   response_hook=None,
                    tracer_provider=None) -&gt; None:
     &#39;&#39;&#39;Initialize instrumentation&#39;&#39;&#39;
     logger.debug(&#39;Entering FlaskInstrumentorWrapper.instument_app().&#39;)
     try:
 
         # Call parent class&#39;s initialization
-        super().instrument_app(app, name_callback)
+        super().instrument_app(app)
 
         self._app = app
         # Set pre-request handler

docs/hypertrace/agent/instrumentation/grpc/index.html

@@ -162,7 +162,7 @@ <h1 class="title">Module <code>hypertrace.agent.instrumentation.grpc</code></h1>
     return OpenTelemetryClientInterceptorWrapper(tracer)
 
 # Wrapper around Server-side telemetry context
-class _OpenTelemetryWrapperServicerContext(_server._OpenTelemetryServicerContext): # pylint: disable=W0212
+class _OpenTelemetryWrapperServicerContext(_server._OpenTelemetryServicerContext): # pylint: disable=W0212,W0223
     &#39;&#39;&#39;grpc:server telemetry context&#39;&#39;&#39;
     def __init__(self, servicer_context, active_span):
         &#39;&#39;&#39;constructor&#39;&#39;&#39;
@@ -642,8 +642,7 @@ <h3>Inherited members</h3>
     ) -&gt; None:
         &#39;&#39;&#39;process streaming request for hypertrace&#39;&#39;&#39;
         logger.debug(
-            &#39;Entering OpenTelemetryClientInterceptorWrapper.intercept_stream().&#39;)
-        # COME_BACK -- need to implement this</code></pre>
+            &#39;Entering OpenTelemetryClientInterceptorWrapper.intercept_stream().&#39;)</code></pre>
 </details>
 <h3>Ancestors</h3>
 <ul class="hlist">
@@ -672,8 +671,7 @@ <h3>Methods</h3>
 ) -&gt; None:
     &#39;&#39;&#39;process streaming request for hypertrace&#39;&#39;&#39;
     logger.debug(
-        &#39;Entering OpenTelemetryClientInterceptorWrapper.intercept_stream().&#39;)
-    # COME_BACK -- need to implement this</code></pre>
+        &#39;Entering OpenTelemetryClientInterceptorWrapper.intercept_stream().&#39;)</code></pre>
 </details>
 </dd>
 <dt id="hypertrace.agent.instrumentation.grpc.OpenTelemetryClientInterceptorWrapper.intercept_unary"><code class="name flex">
@@ -789,8 +787,7 @@ <h3>Methods</h3>
             context) -&gt; None:
         &#39;&#39;&#39;Setup interceptor helper for streaming requests.&#39;&#39;&#39;
         logger.debug(
-            &#39;Entering OpenTelemetryServerInterceptorWrapper.intercept_server_stream().&#39;)
-        # COME_BACK -- need to implement this</code></pre>
+            &#39;Entering OpenTelemetryServerInterceptorWrapper.intercept_server_stream().&#39;)</code></pre>
 </details>
 <h3>Ancestors</h3>
 <ul class="hlist">

docs/hypertrace/version.html

@@ -30,7 +30,7 @@ <h1 class="title">Module <code>hypertrace.version</code></h1>
 <pre><code class="python"># Code generated by ./release.sh. DO NOT EDIT.
 
 &#34;&#34;&#34;Package version&#34;&#34;&#34;
-__version__ = &#34;0.1.2-dev&#34;</code></pre>
+__version__ = &#34;0.1.3-dev&#34;</code></pre>
 </details>
 </section>
 <section>

examples/http/client/requirements.txt

@@ -1,3 +1,3 @@
-../../
+../../..
 aiohttp
-asyncio
+asyncio

examples/http/server/requirements.txt

@@ -1,3 +1,3 @@
-../../
+../../..
 flask
 mysql-connector-python==8.0.23

requirements.txt

@@ -1,17 +1,17 @@
-opentelemetry-api>=1.1.0
-opentelemetry-exporter-otlp>=1.1.0
-opentelemetry-exporter-zipkin>=1.1.0
-opentelemetry-instrumentation>=0.20b0
-opentelemetry-instrumentation-aiohttp-client>=0.20b0
-opentelemetry-instrumentation-wsgi>=0.20b0
-opentelemetry-instrumentation-flask>=0.20b0
-opentelemetry-instrumentation-mysql>=0.20b0
-opentelemetry-instrumentation-psycopg2>=0.20b0
-opentelemetry-instrumentation-requests>=0.20b0
-opentelemetry-instrumentation-grpc>=0.20b0
-opentelemetry-propagator-b3>=1.1.0
-opentelemetry-sdk>=1.1.0
-opentelemetry-util-http>=0.20b0
+opentelemetry-api==1.3.0
+opentelemetry-exporter-otlp==1.3.0
+opentelemetry-exporter-zipkin==1.3.0
+opentelemetry-instrumentation==0.22b0
+opentelemetry-instrumentation-aiohttp-client==0.22b0
+opentelemetry-instrumentation-wsgi==0.22b0
+opentelemetry-instrumentation-flask==0.22b0
+opentelemetry-instrumentation-mysql==0.22b0
+opentelemetry-instrumentation-psycopg2==0.22b0
+opentelemetry-instrumentation-requests==0.22b0
+opentelemetry-instrumentation-grpc==0.22b0
+opentelemetry-propagator-b3==1.3.0
+opentelemetry-sdk==1.3.0
+opentelemetry-util-http
 google>=3.0.0
 pyyaml
 protobuf>=3.15.8

setup.py

@@ -26,20 +26,20 @@
     packages=find_packages(where="src"),
     python_requires=">=3.7",
     install_requires=[
-        "opentelemetry-api>=1.1.0",
-        "opentelemetry-exporter-otlp>=1.1.0",
-        "opentelemetry-exporter-zipkin>=1.1.0",
-        "opentelemetry-instrumentation>=0.20b0",
-        "opentelemetry-instrumentation-aiohttp-client>=0.20b0",
-        "opentelemetry-instrumentation-wsgi>=0.20b0",
-        "opentelemetry-instrumentation-flask>=0.20b0",
-        "opentelemetry-instrumentation-mysql>=0.20b0",
-        "opentelemetry-instrumentation-psycopg2>=0.20b0",
-        "opentelemetry-instrumentation-requests>=0.20b0",
-        "opentelemetry-instrumentation-grpc>=0.20b0",
-        "opentelemetry-propagator-b3>=1.1.0",
-        "opentelemetry-sdk>=1.1.0",
-        "opentelemetry-util-http>=0.20b0",
+        "opentelemetry-api==1.3.0",
+        "opentelemetry-exporter-otlp==1.3.0",
+        "opentelemetry-exporter-zipkin==1.3.0",
+        "opentelemetry-instrumentation==0.22b0",
+        "opentelemetry-instrumentation-aiohttp-client==0.22b0",
+        "opentelemetry-instrumentation-wsgi==0.22b0",
+        "opentelemetry-instrumentation-flask==0.22b0",
+        "opentelemetry-instrumentation-mysql==0.22b0",
+        "opentelemetry-instrumentation-psycopg2==0.22b0",
+        "opentelemetry-instrumentation-requests==0.22b0",
+        "opentelemetry-instrumentation-grpc==0.22b0",
+        "opentelemetry-propagator-b3==1.3.0",
+        "opentelemetry-sdk==1.3.0",
+        "opentelemetry-util-http==0.22b0",
         "google>=3.0.0",
         "pyyaml",
         "protobuf>=3.15.8"