Merge branch 'v1.12' into perf-1

dapr · Jul 29, 2024 · c6de31f · c6de31f
2 parents 8bf63e5 + 83d13b9
commit c6de31f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/website-v1-12.yml b/.github/workflows/website-v1-12.yml
@@ -1,6 +1,7 @@
 name: Azure Static Web App v1.12
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - v1.12

diff --git a/daprdocs/content/en/operations/configuration/configuration-overview.md b/daprdocs/content/en/operations/configuration/configuration-overview.md
@@ -89,11 +89,12 @@ set `samplingRate : "0"` in the configuration. The valid range of samplingRate i
 The OpenTelemetry (otel) endpoint can also be configured via an environment variables. The presence of the OTEL_EXPORTER_OTLP_ENDPOINT environment variable
 turns on tracing for the sidecar.
 
-| Environment Variable | Description |
-|----------------------|-------------|
+| Environment Variable | Description                                                     |
+|----------------------|-----------------------------------------------------------------|
 | `OTEL_EXPORTER_OTLP_ENDPOINT` | Sets the Open Telemetry (OTEL) server address, turns on tracing |
 | `OTEL_EXPORTER_OTLP_INSECURE` | Sets the connection to the endpoint as unencrypted (true/false) |
-| `OTEL_EXPORTER_OTLP_PROTOCOL` | Transport protocol (`grpc`, `http/protobuf`, `http/json`) |
+| `OTEL_EXPORTER_OTLP_PROTOCOL` | Transport protocol (`grpc`, `http/protobuf`, `http/json`)       |
+| `OTEL_SERVICE_NAME` | Optional override to specify the service name used in traces    |
 
 See [Observability distributed tracing]({{< ref "tracing-overview.md" >}}) for more information.