Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python …

…into response_backcompat_mixin

* 'main' of https://github.com/Azure/azure-sdk-for-python:
  [rest] add backcompat mixin to rest requests (Azure#20599)
  [EventHubs] Stress test refactor (Azure#20389)

sdk/core/azure-core/azure/core/rest/_helpers.py

@@ -35,13 +35,11 @@
     Union,
     Mapping,
     Sequence,
-    List,
     Tuple,
     IO,
     Any,
     Dict,
     Iterable,
-    cast,
     MutableMapping,
 )
 import xml.etree.ElementTree as ET

sdk/eventhub/azure-eventhub/stress/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: stress-test-addons
+  repository: https://stresstestcharts.blob.core.windows.net/helm/
+  version: 0.1.6
+digest: sha256:b97697ef5f303eec43e9a94fca8e312d20b8aed71318250499344aeca9880d31
+generated: "2021-08-24T11:24:15.375395-07:00"

sdk/eventhub/azure-eventhub/stress/Chart.yaml

@@ -0,0 +1,13 @@
+apiVersion: v2
+name: python-eventhubs-stress-test
+description: python event hubs stress test.
+version: 0.1.2
+appVersion: v0.2
+annotations:
+  stressTest: 'true'
+  namespace: python-eventhubs-stress-test-ns
+
+dependencies:
+- name: stress-test-addons
+  version: 0.1.6
+  repository: https://stresstestcharts.blob.core.windows.net/helm/

sdk/eventhub/azure-eventhub/stress/Dockerfile

@@ -0,0 +1,10 @@
+# syntax=docker/dockerfile:1
+
+FROM python:3.8-slim-buster
+
+WORKDIR /app
+
+COPY ./scripts /app/stress/scripts
+
+WORKDIR /app/stress/scripts
+RUN pip3 install -r dev_requirement.txt

sdk/eventhub/azure-eventhub/stress/parameters.json

@@ -0,0 +1,5 @@
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": { }
+}

sdk/eventhub/azure-eventhub/stress/app_insights_metric.py → sdk/eventhub/azure-eventhub/stress/scripts/app_insights_metric.py

@@ -2,9 +2,6 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
-
-import os
-
 from opencensus.ext.azure import metrics_exporter
 from opencensus.stats import aggregation as aggregation_module
 from opencensus.stats import measure as measure_module
@@ -26,7 +23,7 @@ def __init__(self, test_name, test_description=None):
         self.desc = test_description
 
         events_measure_name = "The number of events handled by " + self.name
-        events_measure_desc = "The number of events handled by " + self.desc if self.desc else None
+        events_measure_desc = "The number of events handled by" + self.desc if self.desc else None
         memory_measure_name = "memory usage percentage for " + self.name
         memory_measure_desc = "memory usage percentage for " + self.desc if self.desc else None
         cpu_measure_name = "cpu usage percentage for " + self.name

sdk/eventhub/azure-eventhub/stress/azure_eventhub_consumer_stress_async.py → sdk/eventhub/azure-eventhub/stress/scripts/azure_eventhub_consumer_stress_async.py

@@ -11,6 +11,7 @@
 import logging
 from collections import defaultdict
 from functools import partial
+from dotenv import load_dotenv
 
 from azure.identity.aio import ClientSecretCredential
 from azure.eventhub.aio import EventHubConsumerClient
@@ -22,6 +23,9 @@
 from process_monitor import ProcessMonitor
 from app_insights_metric import AzureMonitorMetric
 
+ENV_FILE = os.environ.get('ENV_FILE')
+load_dotenv(dotenv_path=ENV_FILE, override=True)
+
 
 def parse_starting_position(args):
     starting_position = None
@@ -39,25 +43,26 @@ def parse_starting_position(args):
 
 
 parser = argparse.ArgumentParser()
-parser.add_argument("--link_credit", default=3000, type=int)
-parser.add_argument("--output_interval", type=float, default=1000)
-parser.add_argument("--duration", help="Duration in seconds of the test", type=int, default=30)
-parser.add_argument("--consumer_group", help="Consumer group name", default="$default")
+parser.add_argument("--link_credit", default=int(os.environ.get("LINK_CREDIT", 3000)), type=int)
+parser.add_argument("--output_interval", type=float, default=int(os.environ.get("OUTPUT_INTERVAL", 5000)))
+parser.add_argument("--duration", help="Duration in seconds of the test", type=int, default=int(os.environ.get("DURATION", 999999999)))
+parser.add_argument("--consumer_group", help="Consumer group name", default=os.environ.get("CONSUMER_GROUP", "$default"))
 parser.add_argument("--auth_timeout", help="Authorization Timeout", type=float, default=60)
-parser.add_argument("--starting_offset", help="Starting offset", type=str)
+parser.add_argument("--starting_offset", help="Starting offset", type=str, default=os.environ.get("STARTING_OFFSET", "-1"))
 parser.add_argument("--starting_sequence_number", help="Starting sequence number", type=int)
-parser.add_argument("--starting_datetime", help="Starting datetime string, should be format of YYYY-mm-dd HH:mm:ss", type=str)
+parser.add_argument("--starting_datetime", help="Starting datetime string, should be format of YYYY-mm-dd HH:mm:ss")
 parser.add_argument("--partitions", help="Number of partitions. 0 means to get partitions from eventhubs", type=int, default=0)
 parser.add_argument("--recv_partition_id", help="Receive from a specific partition if this is set", type=int)
-parser.add_argument("--max_batch_size", type=int, default=0,
+parser.add_argument("--max_batch_size", type=int, default=int(os.environ.get("MAX_BATCH_SIZE", 0)),
                     help="Call EventHubConsumerClient.receive_batch() if not 0, otherwise call receive()")
 parser.add_argument("--max_wait_time", type=float, default=0,
                     help="max_wait_time of EventHubConsumerClient.receive_batch() or EventHubConsumerClient.receive()")
+
 parser.add_argument("--track_last_enqueued_event_properties", action="store_true")
 parser.add_argument("--load_balancing_interval", help="time duration in seconds between two load balance", type=float, default=10)
 parser.add_argument("--conn_str", help="EventHub connection string",
-                    default=os.environ.get('EVENT_HUB_PERF_32_CONN_STR'))
-parser.add_argument("--eventhub", help="Name of EventHub")
+                    default=os.environ.get('EVENT_HUB_CONN_STR'))
+parser.add_argument("--eventhub", help="Name of EventHub", default=os.environ.get('EVENT_HUB_NAME'))
 parser.add_argument("--address", help="Address URI to the EventHub entity")
 parser.add_argument("--sas_policy", help="Name of the shared access policy to authenticate with")
 parser.add_argument("--sas_key", help="Shared access key")

sdk/eventhub/azure-eventhub/stress/azure_eventhub_consumer_stress_sync.py → sdk/eventhub/azure-eventhub/stress/scripts/azure_eventhub_consumer_stress_sync.py

@@ -11,6 +11,7 @@
 import logging
 from collections import defaultdict
 from functools import partial
+from dotenv import load_dotenv
 
 from azure.identity import ClientSecretCredential
 from azure.eventhub.extensions.checkpointstoreblob import BlobCheckpointStore
@@ -20,6 +21,9 @@
 from process_monitor import ProcessMonitor
 from app_insights_metric import AzureMonitorMetric
 
+ENV_FILE = os.environ.get('ENV_FILE')
+load_dotenv(dotenv_path=ENV_FILE, override=True)
+
 
 def parse_starting_position(args):
     starting_position = None
@@ -37,26 +41,26 @@ def parse_starting_position(args):
 
 
 parser = argparse.ArgumentParser()
-parser.add_argument("--link_credit", default=3000, type=int)
-parser.add_argument("--output_interval", type=float, default=1000)
-parser.add_argument("--duration", help="Duration in seconds of the test", type=int, default=30)
-parser.add_argument("--consumer_group", help="Consumer group name", default="$default")
+parser.add_argument("--link_credit", default=int(os.environ.get("LINK_CREDIT", 3000)), type=int)
+parser.add_argument("--output_interval", type=float, default=int(os.environ.get("OUTPUT_INTERVAL", 5000)))
+parser.add_argument("--duration", help="Duration in seconds of the test", type=int, default=int(os.environ.get("DURATION", 999999999)))
+parser.add_argument("--consumer_group", help="Consumer group name", default=os.environ.get("CONSUMER_GROUP", "$default"))
 parser.add_argument("--auth_timeout", help="Authorization Timeout", type=float, default=60)
-parser.add_argument("--starting_offset", help="Starting offset", type=str)
+parser.add_argument("--starting_offset", help="Starting offset", type=str, default=os.environ.get("STARTING_OFFSET", "-1"))
 parser.add_argument("--starting_sequence_number", help="Starting sequence number", type=int)
 parser.add_argument("--starting_datetime", help="Starting datetime string, should be format of YYYY-mm-dd HH:mm:ss")
 parser.add_argument("--partitions", help="Number of partitions. 0 means to get partitions from eventhubs", type=int, default=0)
 parser.add_argument("--recv_partition_id", help="Receive from a specific partition if this is set", type=int)
-parser.add_argument("--max_batch_size", type=int, default=0,
+parser.add_argument("--max_batch_size", type=int, default=int(os.environ.get("MAX_BATCH_SIZE", 0)),
                     help="Call EventHubConsumerClient.receive_batch() if not 0, otherwise call receive()")
 parser.add_argument("--max_wait_time", type=float, default=0,
                     help="max_wait_time of EventHubConsumerClient.receive_batch() or EventHubConsumerClient.receive()")
 
 parser.add_argument("--track_last_enqueued_event_properties", action="store_true")
 parser.add_argument("--load_balancing_interval", help="time duration in seconds between two load balance", type=float, default=10)
 parser.add_argument("--conn_str", help="EventHub connection string",
-                    default=os.environ.get('EVENT_HUB_PERF_32_CONN_STR'))
-parser.add_argument("--eventhub", help="Name of EventHub")
+                    default=os.environ.get('EVENT_HUB_CONN_STR'))
+parser.add_argument("--eventhub", help="Name of EventHub", default=os.environ.get('EVENT_HUB_NAME'))
 parser.add_argument("--address", help="Address URI to the EventHub entity")
 parser.add_argument("--sas-policy", help="Name of the shared access policy to authenticate with")
 parser.add_argument("--sas-key", help="Shared access key")
@@ -82,7 +86,14 @@ def parse_starting_position(args):
 
 args = parser.parse_args()
 starting_position = parse_starting_position(args)
-LOGGER = get_logger(args.log_filename, "stress_receive_sync", level=logging.INFO, print_console=args.print_console)
+print_console = args.print_console or (os.environ.get("PRINT_CONSOLE") == "1")
+
+LOGGER = get_logger(
+    args.log_filename,
+    "stress_receive_sync",
+    level=logging.INFO,
+    print_console=print_console
+)
 LOG_PER_COUNT = args.output_interval
 
 start_time = time.perf_counter()
@@ -105,7 +116,6 @@ def on_event_received(process_monitor, partition_context, event):
     recv_cnt_map[partition_context.partition_id] += 1 if event else 0
     if recv_cnt_map[partition_context.partition_id] % LOG_PER_COUNT == 0:
         total_time_elapsed = time.perf_counter() - start_time
-
         partition_previous_time = recv_time_map.get(partition_context.partition_id)
         partition_current_time = time.perf_counter()
         recv_time_map[partition_context.partition_id] = partition_current_time
@@ -213,7 +223,11 @@ def create_client(args):
 
 def run(args):
 
-    with ProcessMonitor("monitor_{}".format(args.log_filename), "consumer_stress_sync", print_console=args.print_console) as process_monitor:
+    with ProcessMonitor(
+        "monitor_{}".format(args.log_filename),
+        "consumer_stress_sync",
+        print_console=print_console
+    ) as process_monitor:
         kwargs_dict = {
             "prefetch": args.link_credit,
             "partition_id": str(args.recv_partition_id) if args.recv_partition_id else None,

sdk/eventhub/azure-eventhub/stress/azure_eventhub_producer_stress.py → sdk/eventhub/azure-eventhub/stress/scripts/azure_eventhub_producer_stress.py

@@ -9,6 +9,7 @@
 import time
 import asyncio
 from argparse import ArgumentParser
+from dotenv import load_dotenv
 
 from azure.eventhub import EventHubProducerClient, EventData, EventHubSharedKeyCredential, TransportType
 from azure.eventhub.exceptions import EventHubError
@@ -20,6 +21,8 @@
 from process_monitor import ProcessMonitor
 from app_insights_metric import AzureMonitorMetric
 
+ENV_FILE = os.environ.get('ENV_FILE')
+
 
 def handle_exception(error, ignore_send_failure, stress_logger, azure_monitor_metric):
     err_msg = "Sync send failed due to error: {}".format(repr(error))
@@ -89,9 +92,9 @@ async def stress_send_list_async(producer: EventHubProducerClientAsync, args, st
 class StressTestRunner(object):
     def __init__(self, argument_parser):
         self.argument_parser = argument_parser
-        self.argument_parser.add_argument("-m", "--method", required=True)
-        self.argument_parser.add_argument("--output_interval", type=float, default=1000)
-        self.argument_parser.add_argument("--duration", help="Duration in seconds of the test", type=int, default=30)
+        self.argument_parser.add_argument("-m", "--method", default="stress_send_list_sync")
+        self.argument_parser.add_argument("--output_interval", type=float, default=int(os.environ.get("OUTPUT_INTERVAL", 5000)))
+        self.argument_parser.add_argument("--duration", help="Duration in seconds of the test", type=int, default=int(os.environ.get("DURATION", 999999999)))
         self.argument_parser.add_argument(
             "--partitions",
             help="Number of partitions. 0 means to get partitions from eventhubs",
@@ -109,9 +112,9 @@ def __init__(self, argument_parser):
             type=str
         )
         self.argument_parser.add_argument("--conn_str", help="EventHub connection string",
-                                          default=os.environ.get('EVENT_HUB_PERF_32_CONN_STR'))
+                                          default=os.environ.get('EVENT_HUB_CONN_STR'))
         parser.add_argument("--auth_timeout", help="Authorization Timeout", type=float, default=60)
-        self.argument_parser.add_argument("--eventhub", help="Name of EventHub")
+        self.argument_parser.add_argument("--eventhub", help="Name of EventHub", default=os.environ.get('EVENT_HUB_NAME'))
         self.argument_parser.add_argument(
             "--transport_type",
             help="Transport type, 0 means AMQP, 1 means AMQP over WebSocket",
@@ -412,6 +415,7 @@ async def run_test_method_parallel_async(self, test_method, worker, logger, proc
 
 
 if __name__ == '__main__':
+    load_dotenv(dotenv_path=ENV_FILE, override=True)
     parser = ArgumentParser()
     runner = StressTestRunner(parser)
     runner.run()

sdk/eventhub/azure-eventhub/stress/scripts/dev_requirement.txt

@@ -0,0 +1,9 @@
+psutil
+azure-eventhub
+azure-eventhub-checkpointstoreblob
+azure-eventhub-checkpointstoreblob-aio
+azure-servicebus==0.50.3
+azure-storage-blob
+azure-identity
+opencensus-ext-azure
+python-dotenv

sdk/eventhub/azure-eventhub/stress/logger.py → sdk/eventhub/azure-eventhub/stress/scripts/logger.py

@@ -3,7 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-import os
 import sys
 import logging
 from logging.handlers import RotatingFileHandler

sdk/eventhub/azure-eventhub/stress/templates/network_loss.yaml

@@ -0,0 +1,31 @@
+apiVersion: chaos-mesh.org/v1alpha1
+kind: NetworkChaos
+metadata:
+  name: '{{ .Release.Name }}-{{ .Release.Revision }}'
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    experiment.chaos-mesh.org/pause: 'true'
+  labels:
+    scenario: 'stress'
+    release: '{{ .Release.Name }}'
+    revision: '{{ .Release.Revision }}'
+spec:
+  scheduler:
+    cron: '@every 30s'
+  duration: '10s'
+  action: loss
+  direction: to
+  externalTargets:
+    - 'eh-stress-{{ .Release.Name }}-{{ .Release.Revision }}.servicebus.windows.net'
+  mode: one
+  selector:
+    labelSelectors:
+      testInstance: "eventhub-{{ .Release.Name }}-{{ .Release.Revision }}"
+      chaos: 'true'
+    namespaces:
+      - {{ .Release.Namespace }}
+    podPhaseSelectors:
+      - 'Running'
+  loss:
+    loss: '100'
+    correlation: '100'

sdk/eventhub/azure-eventhub/stress/templates/testjob.yaml

@@ -0,0 +1,16 @@
+{{- include "stress-test-addons.deploy-job-template.from-pod" (list . "stress.python-eh-stress") -}}
+{{- define "stress.python-eh-stress" -}}
+metadata:
+  labels:
+    testName: "deploy-python-eh-stress"
+    testInstance: "eventhub-{{ .Release.Name }}-{{ .Release.Revision }}"
+    chaos: "true"
+spec:
+  containers:
+    - name: python-eh-stress
+      image: {{ default "stresstestregistry.azurecr.io/python" .Values.repository }}/stress:{{ default "v2" .Values.tag }}
+      command: ['bash', '-c', 'python3 azure_eventhub_producer_stress.py & python3 azure_eventhub_consumer_stress_sync.py']
+      {{- include "stress-test-addons.container-env" . | nindent 6 }}
+      # async test command
+      # command: ['bash', '-c', 'python3 azure_eventhub_producer_stress.py -m stress_send_list_async & python3 azure_eventhub_consumer_stress_async.py']
+{{- end -}}