diff --git a/dapr-distributed-calendar/kubernetes-deploy.sh b/dapr-distributed-calendar/kubernetes-deploy.sh index 613f5ab..2fa3df4 100755 --- a/dapr-distributed-calendar/kubernetes-deploy.sh +++ b/dapr-distributed-calendar/kubernetes-deploy.sh @@ -4,14 +4,14 @@ kubectl create namespace 12-factor-app # install OTel Operator -kubectl create namespace opentelemetry helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts helm repo update helm install my-opentelemetry-operator open-telemetry/opentelemetry-operator \ + --set "manager.collectorImage.repository=otel/opentelemetry-collector-contrib" \ --set admissionWebhooks.certManager.enabled=false \ - --set admissionWebhooks.certManager.autoGenerateCert.enabled=true \ - --set manager.featureGates='operator.autoinstrumentation.go' \ --namespace opentelemetry \ + --version 0.66.0 \ + --create-namespace \ --wait # create OTel collector and instrumentation diff --git a/dapr-distributed-calendar/otel/otel-collector-values.yaml b/dapr-distributed-calendar/otel/otel-collector-values.yaml index 0b2ef62..d48cb3e 100644 --- a/dapr-distributed-calendar/otel/otel-collector-values.yaml +++ b/dapr-distributed-calendar/otel/otel-collector-values.yaml @@ -1,4 +1,4 @@ -apiVersion: opentelemetry.io/v1alpha1 +apiVersion: opentelemetry.io/v1beta1 kind: OpenTelemetryCollector metadata: name: otel-dapr @@ -6,12 +6,12 @@ metadata: annotations: dapr_collector_demo: "true" spec: - config: | + config: receivers: otlp: protocols: - grpc: - http: + grpc: {} + http: {} prometheus: config: scrape_configs: @@ -34,7 +34,7 @@ spec: debug: verbosity: detailed otlp/jaeger: - endpoint: jaeger-collector.observability:4317 + endpoint: simplest-collector.observability:4317 tls: insecure: true prometheus: