coralogix
diff --git a/‎.github/workflows/test.yml‎
Lines changed: 84 additions & 1 deletion b/‎.github/workflows/test.yml‎
Lines changed: 84 additions & 1 deletion
diff --git a/‎instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py‎
Lines changed: 10 additions & 0 deletions b/‎instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py‎
Lines changed: 2 additions & 1 deletion b/‎instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/tests/__init__.py‎ b/‎instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/tests/__init__.py‎
@@ -9,6 +9,89 @@ env:
   CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2
 
 jobs:
+  build:
+    env:
+      # We use these variables to convert between tox and GHA version literals
+      py37: 3.7
+      py38: 3.8
+      py39: 3.9
+      py310: "3.10"
+      py311: "3.11"
+      pypy3: "pypy3.7"
+      RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false  # ensures the entire test matrix is run, even if one permutation fails
+      matrix:
+        python-version: [ py37, py38, py39, py310, py311, pypy3 ]
+        package: ["instrumentation", "distro", "exporter", "sdkextension", "propagator", "resource"]
+        os: [ ubuntu-20.04 ]
+    steps:
+      - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v2
+      - name: Set up Python ${{ env[matrix.python-version] }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env[matrix.python-version] }}
+      - name: Install tox
+        run: pip install tox==3.27.1 tox-factor
+      - name: Cache tox environment
+        # Preserves .tox directory between runs for faster installs
+        uses: actions/cache@v1
+        with:
+          path: |
+            .tox
+            ~/.cache/pip
+          key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
+      - name: run tox
+        run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- --benchmark-json=${{ env.RUN_MATRIX_COMBINATION }}-benchmark.json
+  #     - name: Find and merge ${{ matrix.package }} benchmarks
+  #       # TODO: Add at least one benchmark to every package type to remove this (#249)
+  #       if: matrix.package == 'sdkextension' || matrix.package == 'propagator'
+  #       run: >-
+  #         mkdir -p benchmarks;
+  #         jq -s '.[0].benchmarks = ([.[].benchmarks] | add)
+  #         | if .[0].benchmarks == null then null else .[0] end'
+  #         **/**/tests/*${{ matrix.package }}*-benchmark.json > benchmarks/output_${{ matrix.package }}.json
+  #     - name: Upload all benchmarks under same key as an artifact
+  #       if: ${{ success() }}
+  #       uses: actions/upload-artifact@v2
+  #       with:
+  #         name: benchmarks
+  #         path: benchmarks/output_${{ matrix.package }}.json
+  # combine-benchmarks:
+  #   runs-on: ubuntu-latest
+  #   needs: build
+  #   if: ${{ always() }}
+  #   name: Combine benchmarks from previous build job
+  #   steps:
+  #     - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
+  #       uses: actions/checkout@v2
+  #     - name: Download all benchmarks as artifact using key
+  #       uses: actions/download-artifact@v2
+  #       with:
+  #         name: benchmarks
+  #         path: benchmarks
+  #     - name: Find and merge all benchmarks
+  #       run: >-
+  #         jq -s '.[0].benchmarks = ([.[].benchmarks] | add)
+  #         | if .[0].benchmarks == null then null else .[0] end'
+  #         benchmarks/output_*.json > output.json;
+  #     - name: Report on benchmark results
+  #       uses: benchmark-action/github-action-benchmark@v1
+  #       with:
+  #         name: OpenTelemetry Python Benchmarks - Python ${{ env[matrix.python-version ]}} - ${{ matrix.package }}
+  #         tool: pytest
+  #         output-file-path: output.json
+  #         github-token: ${{ secrets.GITHUB_TOKEN }}
+  #         max-items-in-chart: 100
+  #         # Alert with a commit comment on possible performance regression
+  #         alert-threshold: 200%
+  #         fail-on-alert: true
+  #         # Make a commit on `gh-pages` with benchmarks from previous step
+  #         auto-push: ${{ github.ref == 'refs/heads/main' }}
+  #         gh-pages-branch: gh-pages
+  #         benchmark-data-dir-path: benchmarks
   misc:
     strategy:
       fail-fast: false
@@ -24,7 +107,7 @@ jobs:
         with:
           python-version: "3.10"
       - name: Install tox
-        run: pip install tox
+        run: pip install tox==3.27.1
       - name: Install libsnappy-dev
         if: ${{ matrix.tox-environment == 'lint' }}
         run: sudo apt-get install -y libsnappy-dev
 
@@ -510,6 +510,16 @@ def __init__(
             unit="By",
             description="Measures the size of HTTP request messages (compressed).",
         )
+        self.server_response_size_histogram = self.meter.create_histogram(
+            name=MetricInstruments.HTTP_SERVER_RESPONSE_SIZE,
+            unit="By",
+            description="measures the size of HTTP response messages (compressed).",
+        )
+        self.server_request_size_histogram = self.meter.create_histogram(
+            name=MetricInstruments.HTTP_SERVER_REQUEST_SIZE,
+            unit="By",
+            description="Measures the size of HTTP request messages (compressed).",
+        )
         self.active_requests_counter = self.meter.create_up_down_counter(
             name=MetricInstruments.HTTP_SERVER_ACTIVE_REQUESTS,
             unit="requests",
 
@@ -234,6 +234,7 @@ def _patched_api_call(self, original_func, instance, args, kwargs):
                     attributes["rpc.request.payload"] = limit_string_size(self.payload_size_limit,json.dumps(body, default=str))
             elif call_context.service == "events" and call_context.operation == "PutEvents":
                 call_context.span_kind = SpanKind.PRODUCER
+                attributes["rpc.request.payload"] = limit_string_size(self.payload_size_limit, json.dumps(call_context.params, default=str))
             else:
                 attributes["rpc.request.payload"] = limit_string_size(self.payload_size_limit, json.dumps(call_context.params, default=str))
         except Exception as ex:
@@ -483,7 +484,7 @@ def set(
         val = {"DataType": "String", "StringValue": value}
         carrier[key] = val
 
-def limit_string_size(s: str, max_size: int) -> str:
+def limit_string_size(max_size: int, s: str) -> str:
     if len(s) > max_size:
         return s[:max_size]
     else: