From 59254f2d2c1bd3fccfec1e64a38f85bf76e14153 Mon Sep 17 00:00:00 2001 From: rcbjBlueMars Date: Mon, 31 May 2021 22:00:54 -0700 Subject: [PATCH 01/27] Fixing typos for include in requirements.txt in examples/http/*. --- examples/http/client/requirements.txt | 4 ++-- examples/http/server/requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/http/client/requirements.txt b/examples/http/client/requirements.txt index cc62860a..a63a5a8e 100644 --- a/examples/http/client/requirements.txt +++ b/examples/http/client/requirements.txt @@ -1,3 +1,3 @@ -../../ +../../.. aiohttp -asyncio \ No newline at end of file +asyncio diff --git a/examples/http/server/requirements.txt b/examples/http/server/requirements.txt index 9c6b95e2..09d6cfe1 100644 --- a/examples/http/server/requirements.txt +++ b/examples/http/server/requirements.txt @@ -1,3 +1,3 @@ -../../ +../../.. flask mysql-connector-python==8.0.23 From 496d550b82a340d3dc132e30fda5bd180e6e64db Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Wed, 2 Jun 2021 16:55:36 -0700 Subject: [PATCH 02/27] Update dev-requirements.txt Specifying exact test and mgmt tools (pytest, tox, pylint, pdoc3) versions. --- dev-requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 6d8fd014..881413f9 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -14,8 +14,8 @@ opentelemetry-sdk>=1.1.0 opentelemetry-util-http>=0.20b0 google>=3.0.0 pyyaml -pytest>=6.2.3 +pytest==6.2.3 protobuf>=3.15.8 -tox>=3.23.0 -pylint>=2.7.4 -pdoc3>=0.9.2 +tox==3.23.0 +pylint==2.7.4 +pdoc3==0.9.2 From 9a47a18ecbc3c225036af1b19d37140c2b44fd20 Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Wed, 2 Jun 2021 17:00:34 -0700 Subject: [PATCH 03/27] Update dev-requirements.txt --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 881413f9..3c23f5e4 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -17,5 +17,5 @@ pyyaml pytest==6.2.3 protobuf>=3.15.8 tox==3.23.0 -pylint==2.7.4 +pylint==2.8.2 pdoc3==0.9.2 From d598f86cf30bbeb22a605b3f5e16819393908afe Mon Sep 17 00:00:00 2001 From: rcbjBlueMars Date: Thu, 3 Jun 2021 00:14:39 -0700 Subject: [PATCH 04/27] Removing OTel package requirements from tests and referencing top-level requirements.txt (or setup.py). Top-level requirements.txt and setup.py now have latest python otel module versions listed. No instrumented modules are listed in setup.py or requirements.txt. This way, unused modules will not be installed. --- dev-requirements.txt | 20 +-- .../agent/instrumentation/aiohttp/index.html | 2 +- .../agent/instrumentation/flask/index.html | 18 ++- .../agent/instrumentation/grpc/index.html | 11 +- docs/hypertrace/version.html | 2 +- requirements.txt | 28 ++-- setup.py | 28 ++-- src/hypertrace/agent/config/config_pb2.py | 146 ++++++++---------- .../agent/instrumentation/flask/__init__.py | 6 +- .../agent/instrumentation/grpc/__init__.py | 2 +- tests/aiohttp/flask_app/requirements.txt | 5 +- tests/aiohttp/requirements.txt | 13 +- tests/autoinstrumentation/requirements.txt | 13 +- tests/flask/requirements.txt | 12 +- tests/grpc/requirements.txt | 19 +-- tests/gunicorn/flask_app/requirements.txt | 4 +- tests/gunicorn/requirements.txt | 14 +- tests/mysql/requirements.txt | 15 +- tests/postgresql/requirements.txt | 14 +- tests/requests/flask_app/requirements.txt | 6 +- tests/requests/requirements.txt | 16 +- tox.ini | 2 +- unittest.txt | 1 + 23 files changed, 141 insertions(+), 256 deletions(-) create mode 100644 unittest.txt diff --git a/dev-requirements.txt b/dev-requirements.txt index 3c23f5e4..a63a07c1 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,17 +1,3 @@ -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 @@ -19,3 +5,9 @@ protobuf>=3.15.8 tox==3.23.0 pylint==2.8.2 pdoc3==0.9.2 +flask +aiohttp +requests +mysql-connector-python==8.0.23 +psycopg2-binary +grpcio diff --git a/docs/hypertrace/agent/instrumentation/aiohttp/index.html b/docs/hypertrace/agent/instrumentation/aiohttp/index.html index d309dd76..6c612c29 100644 --- a/docs/hypertrace/agent/instrumentation/aiohttp/index.html +++ b/docs/hypertrace/agent/instrumentation/aiohttp/index.html @@ -253,7 +253,7 @@

Module hypertrace.agent.instrumentation.aiohttpFunctions

-def create_trace_config(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: AioHttpClientInstrumentorWrapper = None) ‑> aiohttp.tracing.TraceConfig +def create_trace_config(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: AioHttpClientInstrumentorWrapper = None) ‑> aiohttp.tracing.TraceConfig

Build an aiohttp-client trace config for use with Hypertrace

diff --git a/docs/hypertrace/agent/instrumentation/flask/index.html b/docs/hypertrace/agent/instrumentation/flask/index.html index 423e297e..2a9d13cd 100644 --- a/docs/hypertrace/agent/instrumentation/flask/index.html +++ b/docs/hypertrace/agent/instrumentation/flask/index.html @@ -38,7 +38,6 @@

Module hypertrace.agent.instrumentation.flask

Module hypertrace.agent.instrumentation.flaskClasses # Initialize instrumentation wrapper def instrument_app(self, app, - name_callback=get_default_span_name, + request_hook=None, + response_hook=None, tracer_provider=None) -> None: '''Initialize instrumentation''' logger.debug('Entering FlaskInstrumentorWrapper.instument_app().') try: # Call parent class's initialization - super().instrument_app(app, name_callback) + super().instrument_app(app) self._app = app # Set pre-request handler @@ -345,7 +346,7 @@

Methods

-def instrument_app(self, app, name_callback=<function get_default_span_name>, tracer_provider=None) ‑> NoneType +def instrument_app(self, app, request_hook=None, response_hook=None, tracer_provider=None) ‑> NoneType

Initialize instrumentation

@@ -355,14 +356,15 @@

Methods

def instrument_app(self,
                    app,
-                   name_callback=get_default_span_name,
+                   request_hook=None,
+                   response_hook=None,
                    tracer_provider=None) -> None:
     '''Initialize instrumentation'''
     logger.debug('Entering FlaskInstrumentorWrapper.instument_app().')
     try:
 
         # Call parent class's initialization
-        super().instrument_app(app, name_callback)
+        super().instrument_app(app)
 
         self._app = app
         # Set pre-request handler
diff --git a/docs/hypertrace/agent/instrumentation/grpc/index.html b/docs/hypertrace/agent/instrumentation/grpc/index.html
index 2c052ee0..a00e55eb 100644
--- a/docs/hypertrace/agent/instrumentation/grpc/index.html
+++ b/docs/hypertrace/agent/instrumentation/grpc/index.html
@@ -162,7 +162,7 @@ 
Module hypertrace.agent.instrumentation.grpc

     return OpenTelemetryClientInterceptorWrapper(tracer)
 
 # Wrapper around Server-side telemetry context
-class _OpenTelemetryWrapperServicerContext(_server._OpenTelemetryServicerContext): # pylint: disable=W0212
+class _OpenTelemetryWrapperServicerContext(_server._OpenTelemetryServicerContext): # pylint: disable=W0212,W0223
     '''grpc:server telemetry context'''
     def __init__(self, servicer_context, active_span):
         '''constructor'''
@@ -642,8 +642,7 @@ 
Inherited members

     ) -> None:
         '''process streaming request for hypertrace'''
         logger.debug(
-            'Entering OpenTelemetryClientInterceptorWrapper.intercept_stream().')
-        # COME_BACK -- need to implement this
+ 'Entering OpenTelemetryClientInterceptorWrapper.intercept_stream().')

Ancestors

    @@ -672,8 +671,7 @@

    Methods

    ) -> None: '''process streaming request for hypertrace''' logger.debug( - 'Entering OpenTelemetryClientInterceptorWrapper.intercept_stream().') - # COME_BACK -- need to implement this + 'Entering OpenTelemetryClientInterceptorWrapper.intercept_stream().')
@@ -789,8 +787,7 @@

Methods

context) -> None: '''Setup interceptor helper for streaming requests.''' logger.debug( - 'Entering OpenTelemetryServerInterceptorWrapper.intercept_server_stream().') - # COME_BACK -- need to implement this + 'Entering OpenTelemetryServerInterceptorWrapper.intercept_server_stream().')

Ancestors

    diff --git a/docs/hypertrace/version.html b/docs/hypertrace/version.html index b73699c7..f4a1bb64 100644 --- a/docs/hypertrace/version.html +++ b/docs/hypertrace/version.html @@ -30,7 +30,7 @@

    Module hypertrace.version

    # Code generated by ./release.sh. DO NOT EDIT.
 
 """Package version"""
-__version__ = "0.1.2-dev"
    +__version__ = "0.1.3-dev"
    diff --git a/requirements.txt b/requirements.txt index a727a719..ef25ebe0 100644 --- a/requirements.txt +++ b/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 diff --git a/setup.py b/setup.py index e7f899ef..2c7c4571 100644 --- a/setup.py +++ b/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" diff --git a/src/hypertrace/agent/config/config_pb2.py b/src/hypertrace/agent/config/config_pb2.py index acefb025..8d80422c 100644 --- a/src/hypertrace/agent/config/config_pb2.py +++ b/src/hypertrace/agent/config/config_pb2.py @@ -1,7 +1,8 @@ -# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: config.proto -"""Generated protocol buffer code.""" + +import sys +_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf.internal import enum_type_wrapper from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message @@ -19,9 +20,8 @@ name='config.proto', package='org.hypertrace.agent.config', syntax='proto3', - serialized_options=b'\n\033org.hypertrace.agent.configZ$github.com/hypertrace/goagent/config', - create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\x0c\x63onfig.proto\x12\x1borg.hypertrace.agent.config\x1a\x1egoogle/protobuf/wrappers.proto\"\x8b\x04\n\x0b\x41gentConfig\x12\x32\n\x0cservice_name\x18\x01 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12\x39\n\treporting\x18\x02 \x01(\x0b\x32&.org.hypertrace.agent.config.Reporting\x12>\n\x0c\x64\x61ta_capture\x18\x03 \x01(\x0b\x32(.org.hypertrace.agent.config.DataCapture\x12K\n\x13propagation_formats\x18\x04 \x03(\x0e\x32..org.hypertrace.agent.config.PropagationFormat\x12+\n\x07\x65nabled\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\x12\x39\n\tjavaagent\x18\x06 \x01(\x0b\x32&.org.hypertrace.agent.config.JavaAgent\x12]\n\x13resource_attributes\x18\x07 \x03(\x0b\x32@.org.hypertrace.agent.config.AgentConfig.ResourceAttributesEntry\x1a\x39\n\x17ResourceAttributesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x90\x02\n\tReporting\x12.\n\x08\x65ndpoint\x18\x01 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12*\n\x06secure\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\x12+\n\x05token\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12-\n\x03opa\x18\x04 \x01(\x0b\x32 .org.hypertrace.agent.config.Opa\x12K\n\x13trace_reporter_type\x18\x05 \x01(\x0e\x32..org.hypertrace.agent.config.TraceReporterType\"\x9c\x01\n\x03Opa\x12.\n\x08\x65ndpoint\x18\x01 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12\x38\n\x13poll_period_seconds\x18\x02 \x01(\x0b\x32\x1b.google.protobuf.Int32Value\x12+\n\x07\x65nabled\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\"d\n\x07Message\x12+\n\x07request\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\x12,\n\x08response\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\"\xb0\x02\n\x0b\x44\x61taCapture\x12:\n\x0chttp_headers\x18\x01 \x01(\x0b\x32$.org.hypertrace.agent.config.Message\x12\x37\n\thttp_body\x18\x02 \x01(\x0b\x32$.org.hypertrace.agent.config.Message\x12:\n\x0crpc_metadata\x18\x03 \x01(\x0b\x32$.org.hypertrace.agent.config.Message\x12\x36\n\x08rpc_body\x18\x04 \x01(\x0b\x32$.org.hypertrace.agent.config.Message\x12\x38\n\x13\x62ody_max_size_bytes\x18\x05 \x01(\x0b\x32\x1b.google.protobuf.Int32Value\"C\n\tJavaAgent\x12\x36\n\x10\x66ilter_jar_paths\x18\x01 \x03(\x0b\x32\x1c.google.protobuf.StringValue*-\n\x11PropagationFormat\x12\x06\n\x02\x42\x33\x10\x00\x12\x10\n\x0cTRACECONTEXT\x10\x01*:\n\x11TraceReporterType\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\n\n\x06ZIPKIN\x10\x01\x12\x08\n\x04OTLP\x10\x02\x42\x43\n\x1borg.hypertrace.agent.configZ$github.com/hypertrace/goagent/configb\x06proto3' + serialized_options=_b('\n\033org.hypertrace.agent.configZ$github.com/hypertrace/goagent/config'), + serialized_pb=_b('\n\x0c\x63onfig.proto\x12\x1borg.hypertrace.agent.config\x1a\x1egoogle/protobuf/wrappers.proto\"\x8b\x04\n\x0b\x41gentConfig\x12\x32\n\x0cservice_name\x18\x01 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12\x39\n\treporting\x18\x02 \x01(\x0b\x32&.org.hypertrace.agent.config.Reporting\x12>\n\x0c\x64\x61ta_capture\x18\x03 \x01(\x0b\x32(.org.hypertrace.agent.config.DataCapture\x12K\n\x13propagation_formats\x18\x04 \x03(\x0e\x32..org.hypertrace.agent.config.PropagationFormat\x12+\n\x07\x65nabled\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\x12\x39\n\tjavaagent\x18\x06 \x01(\x0b\x32&.org.hypertrace.agent.config.JavaAgent\x12]\n\x13resource_attributes\x18\x07 \x03(\x0b\x32@.org.hypertrace.agent.config.AgentConfig.ResourceAttributesEntry\x1a\x39\n\x17ResourceAttributesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x90\x02\n\tReporting\x12.\n\x08\x65ndpoint\x18\x01 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12*\n\x06secure\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\x12+\n\x05token\x18\x03 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12-\n\x03opa\x18\x04 \x01(\x0b\x32 .org.hypertrace.agent.config.Opa\x12K\n\x13trace_reporter_type\x18\x05 \x01(\x0e\x32..org.hypertrace.agent.config.TraceReporterType\"\x9c\x01\n\x03Opa\x12.\n\x08\x65ndpoint\x18\x01 \x01(\x0b\x32\x1c.google.protobuf.StringValue\x12\x38\n\x13poll_period_seconds\x18\x02 \x01(\x0b\x32\x1b.google.protobuf.Int32Value\x12+\n\x07\x65nabled\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\"d\n\x07Message\x12+\n\x07request\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\x12,\n\x08response\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.BoolValue\"\xb0\x02\n\x0b\x44\x61taCapture\x12:\n\x0chttp_headers\x18\x01 \x01(\x0b\x32$.org.hypertrace.agent.config.Message\x12\x37\n\thttp_body\x18\x02 \x01(\x0b\x32$.org.hypertrace.agent.config.Message\x12:\n\x0crpc_metadata\x18\x03 \x01(\x0b\x32$.org.hypertrace.agent.config.Message\x12\x36\n\x08rpc_body\x18\x04 \x01(\x0b\x32$.org.hypertrace.agent.config.Message\x12\x38\n\x13\x62ody_max_size_bytes\x18\x05 \x01(\x0b\x32\x1b.google.protobuf.Int32Value\"C\n\tJavaAgent\x12\x36\n\x10\x66ilter_jar_paths\x18\x01 \x03(\x0b\x32\x1c.google.protobuf.StringValue*-\n\x11PropagationFormat\x12\x06\n\x02\x42\x33\x10\x00\x12\x10\n\x0cTRACECONTEXT\x10\x01*:\n\x11TraceReporterType\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\n\n\x06ZIPKIN\x10\x01\x12\x08\n\x04OTLP\x10\x02\x42\x43\n\x1borg.hypertrace.agent.configZ$github.com/hypertrace/goagent/configb\x06proto3') , dependencies=[google_dot_protobuf_dot_wrappers__pb2.DESCRIPTOR,]) @@ -30,18 +30,15 @@ full_name='org.hypertrace.agent.config.PropagationFormat', filename=None, file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, values=[ _descriptor.EnumValueDescriptor( name='B3', index=0, number=0, serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), + type=None), _descriptor.EnumValueDescriptor( name='TRACECONTEXT', index=1, number=1, serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), + type=None), ], containing_type=None, serialized_options=None, @@ -56,23 +53,19 @@ full_name='org.hypertrace.agent.config.TraceReporterType', filename=None, file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, values=[ _descriptor.EnumValueDescriptor( name='UNSPECIFIED', index=0, number=0, serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), + type=None), _descriptor.EnumValueDescriptor( name='ZIPKIN', index=1, number=1, serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), + type=None), _descriptor.EnumValueDescriptor( name='OTLP', index=2, number=2, serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), + type=None), ], containing_type=None, serialized_options=None, @@ -96,29 +89,28 @@ filename=None, file=DESCRIPTOR, containing_type=None, - create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='key', full_name='org.hypertrace.agent.config.AgentConfig.ResourceAttributesEntry.key', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), + has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='value', full_name='org.hypertrace.agent.config.AgentConfig.ResourceAttributesEntry.value', index=1, number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), + has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[], enum_types=[ ], - serialized_options=b'8\001', + serialized_options=_b('8\001'), is_extendable=False, syntax='proto3', extension_ranges=[], @@ -134,7 +126,6 @@ filename=None, file=DESCRIPTOR, containing_type=None, - create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='service_name', full_name='org.hypertrace.agent.config.AgentConfig.service_name', index=0, @@ -142,49 +133,49 @@ has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='reporting', full_name='org.hypertrace.agent.config.AgentConfig.reporting', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='data_capture', full_name='org.hypertrace.agent.config.AgentConfig.data_capture', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='propagation_formats', full_name='org.hypertrace.agent.config.AgentConfig.propagation_formats', index=3, number=4, type=14, cpp_type=8, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='enabled', full_name='org.hypertrace.agent.config.AgentConfig.enabled', index=4, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='javaagent', full_name='org.hypertrace.agent.config.AgentConfig.javaagent', index=5, number=6, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='resource_attributes', full_name='org.hypertrace.agent.config.AgentConfig.resource_attributes', index=6, number=7, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -208,7 +199,6 @@ filename=None, file=DESCRIPTOR, containing_type=None, - create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='endpoint', full_name='org.hypertrace.agent.config.Reporting.endpoint', index=0, @@ -216,35 +206,35 @@ has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='secure', full_name='org.hypertrace.agent.config.Reporting.secure', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='token', full_name='org.hypertrace.agent.config.Reporting.token', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='opa', full_name='org.hypertrace.agent.config.Reporting.opa', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='trace_reporter_type', full_name='org.hypertrace.agent.config.Reporting.trace_reporter_type', index=4, number=5, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -268,7 +258,6 @@ filename=None, file=DESCRIPTOR, containing_type=None, - create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='endpoint', full_name='org.hypertrace.agent.config.Opa.endpoint', index=0, @@ -276,21 +265,21 @@ has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='poll_period_seconds', full_name='org.hypertrace.agent.config.Opa.poll_period_seconds', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='enabled', full_name='org.hypertrace.agent.config.Opa.enabled', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -314,7 +303,6 @@ filename=None, file=DESCRIPTOR, containing_type=None, - create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='request', full_name='org.hypertrace.agent.config.Message.request', index=0, @@ -322,14 +310,14 @@ has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='response', full_name='org.hypertrace.agent.config.Message.response', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -353,7 +341,6 @@ filename=None, file=DESCRIPTOR, containing_type=None, - create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='http_headers', full_name='org.hypertrace.agent.config.DataCapture.http_headers', index=0, @@ -361,35 +348,35 @@ has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='http_body', full_name='org.hypertrace.agent.config.DataCapture.http_body', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='rpc_metadata', full_name='org.hypertrace.agent.config.DataCapture.rpc_metadata', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='rpc_body', full_name='org.hypertrace.agent.config.DataCapture.rpc_body', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='body_max_size_bytes', full_name='org.hypertrace.agent.config.DataCapture.body_max_size_bytes', index=4, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -413,7 +400,6 @@ filename=None, file=DESCRIPTOR, containing_type=None, - create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='filter_jar_paths', full_name='org.hypertrace.agent.config.JavaAgent.filter_jar_paths', index=0, @@ -421,7 +407,7 @@ has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -472,54 +458,54 @@ DESCRIPTOR.enum_types_by_name['TraceReporterType'] = _TRACEREPORTERTYPE _sym_db.RegisterFileDescriptor(DESCRIPTOR) -AgentConfig = _reflection.GeneratedProtocolMessageType('AgentConfig', (_message.Message,), { +AgentConfig = _reflection.GeneratedProtocolMessageType('AgentConfig', (_message.Message,), dict( - 'ResourceAttributesEntry' : _reflection.GeneratedProtocolMessageType('ResourceAttributesEntry', (_message.Message,), { - 'DESCRIPTOR' : _AGENTCONFIG_RESOURCEATTRIBUTESENTRY, - '__module__' : 'config_pb2' + ResourceAttributesEntry = _reflection.GeneratedProtocolMessageType('ResourceAttributesEntry', (_message.Message,), dict( + DESCRIPTOR = _AGENTCONFIG_RESOURCEATTRIBUTESENTRY, + __module__ = 'config_pb2' # @@protoc_insertion_point(class_scope:org.hypertrace.agent.config.AgentConfig.ResourceAttributesEntry) - }) + )) , - 'DESCRIPTOR' : _AGENTCONFIG, - '__module__' : 'config_pb2' + DESCRIPTOR = _AGENTCONFIG, + __module__ = 'config_pb2' # @@protoc_insertion_point(class_scope:org.hypertrace.agent.config.AgentConfig) - }) + )) _sym_db.RegisterMessage(AgentConfig) _sym_db.RegisterMessage(AgentConfig.ResourceAttributesEntry) -Reporting = _reflection.GeneratedProtocolMessageType('Reporting', (_message.Message,), { - 'DESCRIPTOR' : _REPORTING, - '__module__' : 'config_pb2' +Reporting = _reflection.GeneratedProtocolMessageType('Reporting', (_message.Message,), dict( + DESCRIPTOR = _REPORTING, + __module__ = 'config_pb2' # @@protoc_insertion_point(class_scope:org.hypertrace.agent.config.Reporting) - }) + )) _sym_db.RegisterMessage(Reporting) -Opa = _reflection.GeneratedProtocolMessageType('Opa', (_message.Message,), { - 'DESCRIPTOR' : _OPA, - '__module__' : 'config_pb2' +Opa = _reflection.GeneratedProtocolMessageType('Opa', (_message.Message,), dict( + DESCRIPTOR = _OPA, + __module__ = 'config_pb2' # @@protoc_insertion_point(class_scope:org.hypertrace.agent.config.Opa) - }) + )) _sym_db.RegisterMessage(Opa) -Message = _reflection.GeneratedProtocolMessageType('Message', (_message.Message,), { - 'DESCRIPTOR' : _MESSAGE, - '__module__' : 'config_pb2' +Message = _reflection.GeneratedProtocolMessageType('Message', (_message.Message,), dict( + DESCRIPTOR = _MESSAGE, + __module__ = 'config_pb2' # @@protoc_insertion_point(class_scope:org.hypertrace.agent.config.Message) - }) + )) _sym_db.RegisterMessage(Message) -DataCapture = _reflection.GeneratedProtocolMessageType('DataCapture', (_message.Message,), { - 'DESCRIPTOR' : _DATACAPTURE, - '__module__' : 'config_pb2' +DataCapture = _reflection.GeneratedProtocolMessageType('DataCapture', (_message.Message,), dict( + DESCRIPTOR = _DATACAPTURE, + __module__ = 'config_pb2' # @@protoc_insertion_point(class_scope:org.hypertrace.agent.config.DataCapture) - }) + )) _sym_db.RegisterMessage(DataCapture) -JavaAgent = _reflection.GeneratedProtocolMessageType('JavaAgent', (_message.Message,), { - 'DESCRIPTOR' : _JAVAAGENT, - '__module__' : 'config_pb2' +JavaAgent = _reflection.GeneratedProtocolMessageType('JavaAgent', (_message.Message,), dict( + DESCRIPTOR = _JAVAAGENT, + __module__ = 'config_pb2' # @@protoc_insertion_point(class_scope:org.hypertrace.agent.config.JavaAgent) - }) + )) _sym_db.RegisterMessage(JavaAgent) diff --git a/src/hypertrace/agent/instrumentation/flask/__init__.py b/src/hypertrace/agent/instrumentation/flask/__init__.py index 4e50106f..b3091b12 100644 --- a/src/hypertrace/agent/instrumentation/flask/__init__.py +++ b/src/hypertrace/agent/instrumentation/flask/__init__.py @@ -9,7 +9,6 @@ from opentelemetry.instrumentation.flask import ( _InstrumentedFlask, FlaskInstrumentor, - get_default_span_name, _teardown_request, _ENVIRON_SPAN_KEY, ) @@ -144,14 +143,15 @@ def _instrument(self, **kwargs): # Initialize instrumentation wrapper def instrument_app(self, app, - name_callback=get_default_span_name, + request_hook=None, + response_hook=None, tracer_provider=None) -> None: '''Initialize instrumentation''' logger.debug('Entering FlaskInstrumentorWrapper.instument_app().') try: # Call parent class's initialization - super().instrument_app(app, name_callback) + super().instrument_app(app) self._app = app # Set pre-request handler diff --git a/src/hypertrace/agent/instrumentation/grpc/__init__.py b/src/hypertrace/agent/instrumentation/grpc/__init__.py index 3519ea9a..6aeecf7a 100644 --- a/src/hypertrace/agent/instrumentation/grpc/__init__.py +++ b/src/hypertrace/agent/instrumentation/grpc/__init__.py @@ -133,7 +133,7 @@ def client_interceptor_wrapper(tracer_provider) -> None: return OpenTelemetryClientInterceptorWrapper(tracer) # Wrapper around Server-side telemetry context -class _OpenTelemetryWrapperServicerContext(_server._OpenTelemetryServicerContext): # pylint: disable=W0212 +class _OpenTelemetryWrapperServicerContext(_server._OpenTelemetryServicerContext): # pylint: disable=W0212,W0223 '''grpc:server telemetry context''' def __init__(self, servicer_context, active_span): '''constructor''' diff --git a/tests/aiohttp/flask_app/requirements.txt b/tests/aiohttp/flask_app/requirements.txt index f8319cba..7291e625 100644 --- a/tests/aiohttp/flask_app/requirements.txt +++ b/tests/aiohttp/flask_app/requirements.txt @@ -1,9 +1,9 @@ -opentelemetry-api==1.1.0 +opentelemetry-api==1.3.0 opentelemetry-instrumentation opentelemetry-exporter-zipkin opentelemetry-exporter-jaeger opentelemetry-propagator-b3 -opentelemetry-exporter-otlp==1.1.0 +opentelemetry-exporter-otlp==1.3.0 opentelemetry-instrumentation-flask opentelemetry-instrumentation-grpc opentelemetry-instrumentation-requests @@ -14,6 +14,7 @@ google protobuf pyyaml flask +aiohttp pytest gunicorn pytest-asyncio diff --git a/tests/aiohttp/requirements.txt b/tests/aiohttp/requirements.txt index e9bfdc7e..19fefe80 100644 --- a/tests/aiohttp/requirements.txt +++ b/tests/aiohttp/requirements.txt @@ -1,15 +1,6 @@ -opentelemetry-api==1.1.0 -opentelemetry-instrumentation -opentelemetry-exporter-zipkin -opentelemetry-propagator-b3 -opentelemetry-exporter-otlp==1.1.0 -opentelemetry-instrumentation-aiohttp_client -opentelemetry-instrumentation-wsgi -opentelemetry-util-http -google -protobuf -pyyaml +../.. flask +aiohttp pytest pytest-xdist pytest-asyncio diff --git a/tests/autoinstrumentation/requirements.txt b/tests/autoinstrumentation/requirements.txt index d63e7fb5..5fea9d4d 100644 --- a/tests/autoinstrumentation/requirements.txt +++ b/tests/autoinstrumentation/requirements.txt @@ -1,15 +1,4 @@ -opentelemetry-api==1.1.0 -opentelemetry-instrumentation -opentelemetry-exporter-zipkin -opentelemetry-exporter-otlp==1.1.0 -opentelemetry-instrumentation-flask -opentelemetry-instrumentation-mysql -opentelemetry-instrumentation-requests -opentelemetry-instrumentation-wsgi -opentelemetry-util-http -google -protobuf -pyyaml +../.. flask pytest pytest-xdist diff --git a/tests/flask/requirements.txt b/tests/flask/requirements.txt index 96c436e5..2a2a57a8 100644 --- a/tests/flask/requirements.txt +++ b/tests/flask/requirements.txt @@ -1,14 +1,4 @@ -opentelemetry-api==1.1.0 -opentelemetry-instrumentation -opentelemetry-exporter-zipkin -opentelemetry-exporter-otlp==1.1.0 -opentelemetry-instrumentation-flask -opentelemetry-instrumentation-requests -opentelemetry-instrumentation-wsgi -opentelemetry-util-http -google -protobuf -pyyaml +../.. flask pytest pytest-xdist diff --git a/tests/grpc/requirements.txt b/tests/grpc/requirements.txt index 57e631b0..42feca78 100644 --- a/tests/grpc/requirements.txt +++ b/tests/grpc/requirements.txt @@ -1,17 +1,2 @@ -opentelemetry-api==1.1.0 -opentelemetry-instrumentation -opentelemetry-exporter-zipkin -opentelemetry-exporter-otlp==1.1.0 -opentelemetry-instrumentation-flask -opentelemetry-instrumentation-grpc -opentelemetry-instrumentation-mysql -opentelemetry-instrumentation-requests -opentelemetry-instrumentation-wsgi -opentelemetry-util-http -google -protobuf -pyyaml -mysql.connector -flask -pytest -pytest-xdist +../.. +grpcio diff --git a/tests/gunicorn/flask_app/requirements.txt b/tests/gunicorn/flask_app/requirements.txt index 20bb98de..c2936805 100644 --- a/tests/gunicorn/flask_app/requirements.txt +++ b/tests/gunicorn/flask_app/requirements.txt @@ -1,7 +1,7 @@ -opentelemetry-api==1.1.0 +opentelemetry-api==1.3.0 opentelemetry-instrumentation opentelemetry-exporter-zipkin -opentelemetry-exporter-otlp==1.1.0 +opentelemetry-exporter-otlp==1.3.0 opentelemetry-instrumentation-flask opentelemetry-instrumentation-grpc opentelemetry-instrumentation-mysql diff --git a/tests/gunicorn/requirements.txt b/tests/gunicorn/requirements.txt index b6a7a4de..5395c2c0 100644 --- a/tests/gunicorn/requirements.txt +++ b/tests/gunicorn/requirements.txt @@ -1,16 +1,4 @@ -opentelemetry-api==1.1.0 -opentelemetry-instrumentation -opentelemetry-exporter-zipkin -opentelemetry-exporter-otlp==1.1.0 -opentelemetry-instrumentation-flask -opentelemetry-instrumentation-grpc -opentelemetry-instrumentation-mysql -opentelemetry-instrumentation-requests -opentelemetry-instrumentation-wsgi -opentelemetry-util-http -google -protobuf -pyyaml +../.. mysql.connector flask pytest diff --git a/tests/mysql/requirements.txt b/tests/mysql/requirements.txt index cb390b2c..9abfa612 100644 --- a/tests/mysql/requirements.txt +++ b/tests/mysql/requirements.txt @@ -1,17 +1,4 @@ -opentelemetry-api==1.1.0 -opentelemetry-instrumentation -opentelemetry-exporter-zipkin -opentelemetry-exporter-otlp==1.1.0 -opentelemetry-instrumentation-flask -opentelemetry-instrumentation-grpc -opentelemetry-instrumentation-mysql -opentelemetry-instrumentation-requests -opentelemetry-instrumentation-wsgi -opentelemetry-util-http -google -protobuf -pyyaml -#mysql.connector +../.. mysql-connector-python==8.0.23 flask pytest diff --git a/tests/postgresql/requirements.txt b/tests/postgresql/requirements.txt index efe6ed6d..b9ff657c 100644 --- a/tests/postgresql/requirements.txt +++ b/tests/postgresql/requirements.txt @@ -1,16 +1,4 @@ -opentelemetry-api==1.1.0 -opentelemetry-sdk -opentelemetry-instrumentation -opentelemetry-exporter-zipkin -opentelemetry-exporter-otlp==1.1.0 -opentelemetry-instrumentation-flask -opentelemetry-instrumentation-psycopg2 -opentelemetry-instrumentation-requests -opentelemetry-instrumentation-wsgi -opentelemetry-util-http -google -protobuf -pyyaml +../.. psycopg2-binary pytest-postgresql flask diff --git a/tests/requests/flask_app/requirements.txt b/tests/requests/flask_app/requirements.txt index ee2ca3ad..2fd30b3c 100644 --- a/tests/requests/flask_app/requirements.txt +++ b/tests/requests/flask_app/requirements.txt @@ -1,14 +1,14 @@ -opentelemetry-api==1.1.0 +opentelemetry-api==1.3.0 opentelemetry-instrumentation opentelemetry-exporter-zipkin opentelemetry-exporter-jaeger -opentelemetry-exporter-otlp==1.1.0 +opentelemetry-exporter-otlp==1.3.0 opentelemetry-instrumentation-flask opentelemetry-instrumentation-grpc opentelemetry-instrumentation-requests opentelemetry-instrumentation-wsgi opentelemetry-util-http -opentelemetry-propagator-b3==1.1.0 +opentelemetry-propagator-b3==1.3.0 google protobuf pyyaml diff --git a/tests/requests/requirements.txt b/tests/requests/requirements.txt index 69177506..d1e6ea9b 100644 --- a/tests/requests/requirements.txt +++ b/tests/requests/requirements.txt @@ -1,17 +1,5 @@ -opentelemetry-api==1.1.0 -opentelemetry-instrumentation -opentelemetry-exporter-zipkin -opentelemetry-propagator-b3 -opentelemetry-exporter-otlp==1.1.0 -opentelemetry-instrumentation-flask -opentelemetry-instrumentation-grpc -opentelemetry-instrumentation-mysql -opentelemetry-instrumentation-requests -opentelemetry-instrumentation-wsgi -opentelemetry-util-http -google -protobuf -pyyaml +../.. +requests flask pytest pytest-xdist diff --git a/tox.ini b/tox.ini index 4666ceb2..7168179a 100644 --- a/tox.ini +++ b/tox.ini @@ -24,6 +24,6 @@ recreate=True basepython=python3 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/dev-requirements.txt - + -r{toxinidir}/unittest.txt commands=pytest -rPx src/hypertrace recreate=True diff --git a/unittest.txt b/unittest.txt new file mode 100644 index 00000000..7e106024 --- /dev/null +++ b/unittest.txt @@ -0,0 +1 @@ +flask From 1128b34592dce34a4469b9c0657351078934fb5a Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Thu, 3 Jun 2021 05:10:37 -0700 Subject: [PATCH 05/27] Update merge.yml --- .github/workflows/merge.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index fd01939a..9b6360da 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -38,7 +38,9 @@ jobs: python --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 From 220549e2480393f6bc4dc023b56b8e26e5bd489c Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Thu, 3 Jun 2021 05:23:14 -0700 Subject: [PATCH 06/27] Update merge.yml --- .github/workflows/merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 9b6360da..6adaa392 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -21,8 +21,8 @@ jobs: strategy: matrix: - python-version: ["3.7", "3.8", "3.9"] - +# python-version: ["3.7", "3.8", "3.9"] + python-version: ["3.7"] steps: - name: Run apt-get update run: sudo apt-get update From 662bb63f1b5a3d5dab3fb0eaee0c560fb5fe35cc Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Thu, 3 Jun 2021 05:57:58 -0700 Subject: [PATCH 07/27] Update tox.ini --- tests/flask/tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/flask/tox.ini b/tests/flask/tox.ini index 9dd1f057..d438f1b0 100644 --- a/tests/flask/tox.ini +++ b/tests/flask/tox.ini @@ -24,6 +24,7 @@ setenv = HT_ENABLE_CONSOLE_SPAN_EXPORTER=True commands = + pip freeze pytest -rPx test_flask_9.py pytest -rPx test_flask_1.py pytest -rPx test_flask_2.py From a25b4143a03f6bcf61aaa0486077ac7d445dc5da Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Thu, 3 Jun 2021 06:08:19 -0700 Subject: [PATCH 08/27] Update test_flask_9.py --- tests/flask/test_flask_9.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/flask/test_flask_9.py b/tests/flask/test_flask_9.py index 3308c022..b497b683 100644 --- a/tests/flask/test_flask_9.py +++ b/tests/flask/test_flask_9.py @@ -11,8 +11,6 @@ import atexit import threading from flask import Flask -# from opentelemetry.exporter.jaeger.thrift import JaegerExporter -from opentelemetry import trace as trace_api from opentelemetry.sdk.trace import TracerProvider, export from opentelemetry.sdk.trace.export.in_memory_span_exporter import InMemorySpanExporter from opentelemetry.sdk.trace.export import BatchSpanProcessor, SimpleSpanProcessor From 2ed317c4afc964d2f977c878a98f0252eed8c6b7 Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Thu, 3 Jun 2021 06:38:24 -0700 Subject: [PATCH 09/27] Update tox.ini --- tests/flask/tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/flask/tox.ini b/tests/flask/tox.ini index d438f1b0..76d95d76 100644 --- a/tests/flask/tox.ini +++ b/tests/flask/tox.ini @@ -7,7 +7,7 @@ sitepackages = True install_command = pip install {opts} {packages} deps = - -rrequirements.txt + -rrequirements.txt -r../../requirements.txt whitelist_externals = pytest From 77329380647ac5d6969894088e9ef5321ce9168a Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Thu, 3 Jun 2021 06:42:13 -0700 Subject: [PATCH 10/27] Update tox.ini --- tests/flask/tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/flask/tox.ini b/tests/flask/tox.ini index 76d95d76..8d6bdf76 100644 --- a/tests/flask/tox.ini +++ b/tests/flask/tox.ini @@ -7,7 +7,8 @@ sitepackages = True install_command = pip install {opts} {packages} deps = - -rrequirements.txt -r../../requirements.txt + -rrequirements.txt + -r../../requirements.txt whitelist_externals = pytest From 88d114fe41a41511c23e5b3c084455a00e715e69 Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Thu, 3 Jun 2021 06:51:39 -0700 Subject: [PATCH 11/27] Update requirements.txt --- tests/flask/requirements.txt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/flask/requirements.txt b/tests/flask/requirements.txt index 2a2a57a8..7d01ba49 100644 --- a/tests/flask/requirements.txt +++ b/tests/flask/requirements.txt @@ -1,4 +1,17 @@ -../.. +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 flask pytest pytest-xdist From d3d4af02c4fbcaab7dc8b3493d51188adde9aa6c Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Thu, 3 Jun 2021 07:01:36 -0700 Subject: [PATCH 12/27] Update tox.ini --- tests/flask/tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/flask/tox.ini b/tests/flask/tox.ini index 8d6bdf76..d438f1b0 100644 --- a/tests/flask/tox.ini +++ b/tests/flask/tox.ini @@ -8,7 +8,6 @@ install_command = pip install {opts} {packages} deps = -rrequirements.txt - -r../../requirements.txt whitelist_externals = pytest From 7446f48169ecfc379379037decb90fd4e440cf01 Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Thu, 3 Jun 2021 07:05:57 -0700 Subject: [PATCH 13/27] Update requirements.txt --- tests/flask/requirements.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/flask/requirements.txt b/tests/flask/requirements.txt index 7d01ba49..811823d7 100644 --- a/tests/flask/requirements.txt +++ b/tests/flask/requirements.txt @@ -1,16 +1,16 @@ -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-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 flask pytest From 2dbdc150e0d2e420b46d2eb016b421764da5396c Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Thu, 3 Jun 2021 07:10:03 -0700 Subject: [PATCH 14/27] Update requirements.txt --- tests/flask/requirements.txt | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/tests/flask/requirements.txt b/tests/flask/requirements.txt index 811823d7..96c436e5 100644 --- a/tests/flask/requirements.txt +++ b/tests/flask/requirements.txt @@ -1,17 +1,14 @@ opentelemetry-api==1.1.0 +opentelemetry-instrumentation +opentelemetry-exporter-zipkin 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-instrumentation-flask +opentelemetry-instrumentation-requests +opentelemetry-instrumentation-wsgi opentelemetry-util-http +google +protobuf +pyyaml flask pytest pytest-xdist From 2129b8d1954e2ee51204c0ea73874fa1c6e2083f Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Thu, 3 Jun 2021 07:27:10 -0700 Subject: [PATCH 15/27] Update tox.ini --- tests/flask/tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/flask/tox.ini b/tests/flask/tox.ini index d438f1b0..f8902042 100644 --- a/tests/flask/tox.ini +++ b/tests/flask/tox.ini @@ -1,3 +1,4 @@ + [tox] skipsdist = true envlist = py3{7,8,9} @@ -24,7 +25,6 @@ setenv = HT_ENABLE_CONSOLE_SPAN_EXPORTER=True commands = - pip freeze pytest -rPx test_flask_9.py pytest -rPx test_flask_1.py pytest -rPx test_flask_2.py From 90fb40e8be33ed1f7d818cef41e6c392c876f23e Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Thu, 3 Jun 2021 07:34:54 -0700 Subject: [PATCH 16/27] Update merge.yml --- .github/workflows/merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 6adaa392..cdf7555a 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -40,7 +40,7 @@ jobs: - name: Install pip run: | sudo apt-get install python3-pip - sudo pip install --upgrade pip +# sudo pip install --upgrade pip - name: Install pip build run: python3 -m pip install --upgrade build From 3a0bdd7a9bc8738803e057e9e6cb864b50b32185 Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Thu, 3 Jun 2021 07:45:26 -0700 Subject: [PATCH 17/27] Update dev-requirements.txt --- dev-requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index a63a07c1..bb8c4a61 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,8 +1,8 @@ google>=3.0.0 pyyaml -pytest==6.2.3 +pytest>=6.2.3 protobuf>=3.15.8 -tox==3.23.0 +tox>=3.23.0 pylint==2.8.2 pdoc3==0.9.2 flask From 36a6c0c3be0660f37e55a47563fc6eb8b143d76e Mon Sep 17 00:00:00 2001 From: rcbjBlueMars Date: Thu, 3 Jun 2021 08:05:24 -0700 Subject: [PATCH 18/27] REstoring correct module dependencies. --- tests/flask/requirements.txt | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/tests/flask/requirements.txt b/tests/flask/requirements.txt index 96c436e5..2a2a57a8 100644 --- a/tests/flask/requirements.txt +++ b/tests/flask/requirements.txt @@ -1,14 +1,4 @@ -opentelemetry-api==1.1.0 -opentelemetry-instrumentation -opentelemetry-exporter-zipkin -opentelemetry-exporter-otlp==1.1.0 -opentelemetry-instrumentation-flask -opentelemetry-instrumentation-requests -opentelemetry-instrumentation-wsgi -opentelemetry-util-http -google -protobuf -pyyaml +../.. flask pytest pytest-xdist From 328b2178d0e1fcb2832e9fda384e8aed26a6e664 Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Thu, 3 Jun 2021 23:13:06 -0700 Subject: [PATCH 19/27] Update merge.yml --- .github/workflows/merge.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index cdf7555a..ba97ff50 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -21,8 +21,7 @@ jobs: strategy: matrix: -# python-version: ["3.7", "3.8", "3.9"] - python-version: ["3.7"] + python-version: ["3.7", "3.8", "3.9"] steps: - name: Run apt-get update run: sudo apt-get update From 3913177afea3224a6e948de7ac7408108a0f379e Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Thu, 3 Jun 2021 23:16:56 -0700 Subject: [PATCH 20/27] Update requirements.txt --- tests/flask/requirements.txt | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tests/flask/requirements.txt b/tests/flask/requirements.txt index 2a2a57a8..5a19fe8e 100644 --- a/tests/flask/requirements.txt +++ b/tests/flask/requirements.txt @@ -1,4 +1,20 @@ -../.. +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 flask pytest pytest-xdist From 05faceb73ebe5159ab1cc8120621114ad6a6de19 Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Thu, 3 Jun 2021 23:25:28 -0700 Subject: [PATCH 21/27] Update requirements.txt --- tests/flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/flask/requirements.txt b/tests/flask/requirements.txt index 5a19fe8e..eadee7ff 100644 --- a/tests/flask/requirements.txt +++ b/tests/flask/requirements.txt @@ -15,6 +15,6 @@ opentelemetry-util-http google>=3.0.0 pyyaml protobuf>=3.15.8 -flask +flask>=1.1.0,<2.0.0 pytest pytest-xdist From cc7ff1d2950ceed00bedafda0bb7321ea1809282 Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Fri, 4 Jun 2021 00:25:15 -0700 Subject: [PATCH 22/27] Update merge.yml --- .github/workflows/merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index ba97ff50..10e8fbe4 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -34,7 +34,7 @@ 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 + python`echo ${{ matrix.python-version }} | sed 's/\.//g'` --version - name: Install pip run: | From e2ff833f6c9298bf4860fcba43f211d8eee15d29 Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Fri, 4 Jun 2021 00:38:46 -0700 Subject: [PATCH 23/27] Update merge.yml --- .github/workflows/merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 10e8fbe4..0fda3949 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -34,7 +34,7 @@ jobs: sudo apt install software-properties-common sudo add-apt-repository ppa:deadsnakes/ppa -y sudo apt-get install python${{ matrix.python-version }} - python`echo ${{ matrix.python-version }} | sed 's/\.//g'` --version + python${{ matrix.python-version }} --version - name: Install pip run: | From f4e3aa02f1962b3dc6cf9873ec23df51f80ba46f Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Fri, 4 Jun 2021 00:59:14 -0700 Subject: [PATCH 24/27] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f2ace2a3..608a8522 100644 --- a/Makefile +++ b/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} From 2b85efd6067ce952a7b32f156ceb7330b0c77ef8 Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Fri, 4 Jun 2021 01:03:26 -0700 Subject: [PATCH 25/27] Update merge.yml --- .github/workflows/merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 0fda3949..f05b302c 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -66,7 +66,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 From ac9aaf067c4b3d8559c90ab7fcaa6065f95a5416 Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Fri, 4 Jun 2021 01:20:06 -0700 Subject: [PATCH 26/27] Update merge.yml --- .github/workflows/merge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index f05b302c..e1f78868 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -34,6 +34,7 @@ jobs: sudo apt install software-properties-common sudo add-apt-repository ppa:deadsnakes/ppa -y sudo apt-get install python${{ matrix.python-version }} + sudo apt-get install python3-all python${{ matrix.python-version }} --version - name: Install pip From 0f342a454c8143c890eb27e762c303720bfe4683 Mon Sep 17 00:00:00 2001 From: "Robert C. Broeckelmann Jr" <9321971+rcbjBlueMars@users.noreply.github.com> Date: Fri, 4 Jun 2021 01:40:29 -0700 Subject: [PATCH 27/27] Update merge.yml --- .github/workflows/merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index e1f78868..a4471b5b 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -48,7 +48,7 @@ jobs: - 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