From 8a43ae567444e88a2bdee770d414e678a7914bdd Mon Sep 17 00:00:00 2001 From: Alice Gibbons Date: Thu, 28 Sep 2023 17:24:17 -0600 Subject: [PATCH 1/2] Jaeger otlp updates (#3771) Signed-off-by: Alice Gibbons Signed-off-by: shruthiragu <115894437+shruthiragu@users.noreply.github.com> --- .../otel-collector/open-telemetry-collector-jaeger.md | 2 +- .../open-telemetry-collector-jaeger.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daprdocs/content/en/operations/observability/tracing/otel-collector/open-telemetry-collector-jaeger.md b/daprdocs/content/en/operations/observability/tracing/otel-collector/open-telemetry-collector-jaeger.md index 50a3e194362..6ee6727beb5 100644 --- a/daprdocs/content/en/operations/observability/tracing/otel-collector/open-telemetry-collector-jaeger.md +++ b/daprdocs/content/en/operations/observability/tracing/otel-collector/open-telemetry-collector-jaeger.md @@ -74,7 +74,7 @@ To push traces to your Jaeger instance, install the OpenTelemetry Collector on y 1. Download and inspect the [`open-telemetry-collector-jaeger.yaml`](/docs/open-telemetry-collector/open-telemetry-collector-jaeger.yaml) file. -1. In the data section of the `otel-collector-conf` ConfigMap, update the `jaeger.endpoint` value to reflect the endpoint of your Jaeger collector Kubernetes service object. +1. In the data section of the `otel-collector-conf` ConfigMap, update the `otlp/jaeger.endpoint` value to reflect the endpoint of your Jaeger collector Kubernetes service object. 1. Deploy the OpenTelemetry Collector into the same namespace where your Dapr-enabled applications are running: diff --git a/daprdocs/static/docs/open-telemetry-collector/open-telemetry-collector-jaeger.yaml b/daprdocs/static/docs/open-telemetry-collector/open-telemetry-collector-jaeger.yaml index 7a09513c9c0..d8c0fe2934e 100644 --- a/daprdocs/static/docs/open-telemetry-collector/open-telemetry-collector-jaeger.yaml +++ b/daprdocs/static/docs/open-telemetry-collector/open-telemetry-collector-jaeger.yaml @@ -30,8 +30,8 @@ data: # https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter # for full lists of trace exporters that you can use, and how to # configure them. - jaeger: - endpoint: "jaeger-collector.observability.svc.cluster.local:14250" + otlp/jaeger: + endpoint: "jaeger-collector.observability.svc.cluster.local:4317" tls: insecure: true service: @@ -40,7 +40,7 @@ data: traces: receivers: [otlp] # List your exporter here. - exporters: [jaeger,logging] + exporters: [otlp/jaeger,logging] --- apiVersion: v1 kind: Service From 7d909063abca5dacefa9aebe4df4486801b70f4b Mon Sep 17 00:00:00 2001 From: shruthiragu <115894437+shruthiragu@users.noreply.github.com> Date: Tue, 3 Oct 2023 14:53:30 -0700 Subject: [PATCH 2/2] Updated app ports in JS and Go Pubsub Quickstart (#3579) Updated app ports in Javascript and Go Pubsub Quickstart documentation and fixed typo in actors-timers-reminders building block Signed-off-by: Shruthi Parthasarathy Signed-off-by: shruthiragu <115894437+shruthiragu@users.noreply.github.com> --- .../building-blocks/actors/actors-timers-reminders.md | 2 +- .../en/getting-started/quickstarts/pubsub-quickstart.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daprdocs/content/en/developing-applications/building-blocks/actors/actors-timers-reminders.md b/daprdocs/content/en/developing-applications/building-blocks/actors/actors-timers-reminders.md index e889e6317aa..8168aa39b8b 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/actors/actors-timers-reminders.md +++ b/daprdocs/content/en/developing-applications/building-blocks/actors/actors-timers-reminders.md @@ -137,7 +137,7 @@ Refer [api spec]({{< ref "actors_api.md#invoke-reminder" >}}) for more details. ## Error handling -When an actor's method completes successfully, the runtime will contineu to invoke the method at the specified timer or reminder schedule. However, if the method throws an exception, the runtime catches it and logs the error message in the Dapr sidecar logs, without retrying. +When an actor's method completes successfully, the runtime will continue to invoke the method at the specified timer or reminder schedule. However, if the method throws an exception, the runtime catches it and logs the error message in the Dapr sidecar logs, without retrying. To allow actors to recover from failures and retry after a crash or restart, you can persist an actor's state by configuring a state store, like Redis or Azure Cosmos DB. diff --git a/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md b/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md index 2dc3003e4a5..db7ed35f047 100644 --- a/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md +++ b/daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md @@ -235,7 +235,7 @@ Verify you have the following files included in the service directory: Run the `order-processor` subscriber service alongside a Dapr sidecar. ```bash -dapr run --app-port 5001 --app-id order-processing --app-protocol http --dapr-http-port 3501 --resources-path ../../../components -- npm run start +dapr run --app-port 5002 --app-id order-processing --app-protocol http --dapr-http-port 3501 --resources-path ../../../components -- npm run start ``` In the `order-processor` subscriber, we're subscribing to the Redis instance called `orderpubsub` [(as defined in the `pubsub.yaml` component)]({{< ref "#pubsubyaml-component-file" >}}) and topic `orders`. This enables your app code to talk to the Redis component instance through the Dapr sidecar. @@ -706,7 +706,7 @@ go build . Run the `order-processor` subscriber service alongside a Dapr sidecar. ```bash -dapr run --app-port 6002 --app-id order-processor-sdk --app-protocol http --dapr-http-port 3501 --resources-path ../../../components -- go run . +dapr run --app-port 6005 --app-id order-processor-sdk --app-protocol http --dapr-http-port 3501 --resources-path ../../../components -- go run . ``` In the `order-processor` subscriber, we're subscribing to the Redis instance called `orderpubsub` [(as defined in the `pubsub.yaml` component)]({{< ref "#pubsubyaml-component-file" >}}) and topic `orders`. This enables your app code to talk to the Redis component instance through the Dapr sidecar.