diff --git a/docker-compose.otel-collector.yml b/docker-compose.otel-collector.yml index e79cd20db..cedb920ef 100644 --- a/docker-compose.otel-collector.yml +++ b/docker-compose.otel-collector.yml @@ -34,7 +34,7 @@ services: build: ./subgraphs/pandas collector: container_name: collector - image: otel/opentelemetry-collector:0.44.0 + image: otel/opentelemetry-collector:0.42.0 command: ["--config=/conf/collector-config.yml"] volumes: - ./opentelemetry/collector-config.yml:/conf/collector-config.yml @@ -42,6 +42,7 @@ services: - "9464:9464" - "4317:4317" - "55681:55681" + - "55679:55679" depends_on: - zipkin zipkin: diff --git a/docker-compose.router-otel.yml b/docker-compose.router-otel.yml index eef319550..aab3160f7 100644 --- a/docker-compose.router-otel.yml +++ b/docker-compose.router-otel.yml @@ -31,7 +31,7 @@ services: build: ./subgraphs/pandas collector: container_name: collector - image: otel/opentelemetry-collector:0.44.0 + image: otel/opentelemetry-collector:0.42.0 command: ["--config=/conf/collector-config.yml"] volumes: - ./opentelemetry/collector-config.yml:/conf/collector-config.yml @@ -39,6 +39,7 @@ services: - "9464:9464" - "4317:4317" - "55681:55681" + - "55679:55679" depends_on: - zipkin zipkin: diff --git a/opentelemetry/collector-config.yml b/opentelemetry/collector-config.yml index 789d6f1ff..1871f4f94 100644 --- a/opentelemetry/collector-config.yml +++ b/opentelemetry/collector-config.yml @@ -3,6 +3,10 @@ receivers: protocols: grpc: http: + cors: + allowed_origins: + - http://* + - https://* exporters: zipkin: @@ -13,7 +17,12 @@ exporters: processors: batch: +extensions: + zpages: + endpoint: 0.0.0.0:55679 + service: + extensions: [zpages] pipelines: traces: receivers: [otlp] diff --git a/renovate.json b/renovate.json index 507ba83fb..06ff20e98 100644 --- a/renovate.json +++ b/renovate.json @@ -13,6 +13,7 @@ "workarounds:all" ], "packageRules": [ - { "automerge": true, "automergeType": "pr", "matchUpdateTypes": ["minor", "patch", "pin", "digest"]} + { "automerge": true, "excludePackageNames":"otel/opentelemetry-collector", "matchUpdateTypes": ["minor", "patch", "pin", "digest"]}, + { "automerge": false, "matchPackageNames":"otel/opentelemetry-collector", "matchUpdateTypes": ["minor", "patch", "pin", "digest"]} ] }