Merge branch 'open-telemetry:main' into add/trace-based-testing-examples

open-telemetry · May 25, 2023 · b7a8a24 · b7a8a24
2 parents c447305 + 774d880
commit b7a8a24
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.licenserc.json b/.licenserc.json
@@ -19,7 +19,12 @@
       "# Copyright The OpenTelemetry Authors",
       "# SPDX-License-Identifier: Apache-2.0"
     ],
-    "**/*.{ex,exs,rb,yaml,yml,sh,yamllint}": [
+    "**/*.sh": [
+      "#!/bin/sh",
+      "# Copyright The OpenTelemetry Authors",
+      "# SPDX-License-Identifier: Apache-2.0"
+    ],
+    "**/*.{ex,exs,rb,yaml,yml,yamllint}": [
       "# Copyright The OpenTelemetry Authors",
       "# SPDX-License-Identifier: Apache-2.0"
     ],

diff --git a/ide-gen-proto.sh b/ide-gen-proto.sh
@@ -1,6 +1,6 @@
+#!/bin/sh
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
-#!/bin/sh
 
 
 # This script is used to generate protobuf files for all services.

diff --git a/src/loadgenerator/requirements.txt b/src/loadgenerator/requirements.txt
@@ -30,7 +30,7 @@ opentelemetry-util-http==0.38b0
 protobuf==4.22.3
 psutil==5.9.5
 pyzmq==25.0.2
-requests==2.29.0
+requests==2.31.0
 roundrobin==0.0.4
 six==1.16.0
 typing-extensions==4.5.0