diff --git a/Makefile b/Makefile index 04906c6a..7f23460c 100644 --- a/Makefile +++ b/Makefile @@ -229,3 +229,10 @@ docker-prune: take-five: @echo waiting for robots to finish work ... @sleep 5 + +.PHONY: copy-local-otel-tar +copy-local-otel-tar: + cp ../supergraph-demo-opentelemetry/dist/js/supergraph-demo-opentelemetry-v0.0.0.tgz ./gateway/ + cp ../supergraph-demo-opentelemetry/dist/js/supergraph-demo-opentelemetry-v0.0.0.tgz ./subgraphs/products + cp ../supergraph-demo-opentelemetry/dist/js/supergraph-demo-opentelemetry-v0.0.0.tgz ./subgraphs/inventory + cp ../supergraph-demo-opentelemetry/dist/js/supergraph-demo-opentelemetry-v0.0.0.tgz ./subgraphs/users diff --git a/docker-compose.otel-collector.yml b/docker-compose.otel-collector.yml index cedb920e..5db7c106 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.42.0 + image: otel/opentelemetry-collector:0.44.0 command: ["--config=/conf/collector-config.yml"] volumes: - ./opentelemetry/collector-config.yml:/conf/collector-config.yml diff --git a/docker-compose.router-otel.yml b/docker-compose.router-otel.yml index aab3160f..27670586 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.42.0 + image: otel/opentelemetry-collector:0.44.0 command: ["--config=/conf/collector-config.yml"] volumes: - ./opentelemetry/collector-config.yml:/conf/collector-config.yml diff --git a/gateway/package.json b/gateway/package.json index ff2174cf..fb3fee68 100644 --- a/gateway/package.json +++ b/gateway/package.json @@ -9,7 +9,7 @@ "dependencies": { "@apollo/gateway": "0.48.0", "apollo-server": "3.6.3", - "supergraph-demo-opentelemetry": "0.0.4", + "supergraph-demo-opentelemetry": "0.2.1", "graphql": "15.8.0" }, "keywords": [], diff --git a/renovate.json b/renovate.json index 06ff20e9..6a303371 100644 --- a/renovate.json +++ b/renovate.json @@ -13,7 +13,6 @@ "workarounds:all" ], "packageRules": [ - { "automerge": true, "excludePackageNames":"otel/opentelemetry-collector", "matchUpdateTypes": ["minor", "patch", "pin", "digest"]}, - { "automerge": false, "matchPackageNames":"otel/opentelemetry-collector", "matchUpdateTypes": ["minor", "patch", "pin", "digest"]} + { "automerge": true, "matchUpdateTypes": ["minor", "patch", "pin", "digest"]} ] } diff --git a/subgraphs/inventory/package.json b/subgraphs/inventory/package.json index 68b9dd1b..0455f267 100644 --- a/subgraphs/inventory/package.json +++ b/subgraphs/inventory/package.json @@ -9,7 +9,7 @@ "dependencies": { "@apollo/subgraph": "0.3.0", "apollo-server": "3.6.3", - "supergraph-demo-opentelemetry": "0.0.4", + "supergraph-demo-opentelemetry": "0.2.1", "graphql": "15.8.0" }, "keywords": [], diff --git a/subgraphs/products/package.json b/subgraphs/products/package.json index 1fc25dcd..7f5d4d94 100644 --- a/subgraphs/products/package.json +++ b/subgraphs/products/package.json @@ -9,7 +9,7 @@ "dependencies": { "@apollo/subgraph": "0.3.0", "apollo-server": "3.6.3", - "supergraph-demo-opentelemetry": "0.0.4", + "supergraph-demo-opentelemetry": "0.2.1", "graphql": "15.8.0" }, "keywords": [], diff --git a/subgraphs/users/package.json b/subgraphs/users/package.json index 588850ad..bcbca19e 100644 --- a/subgraphs/users/package.json +++ b/subgraphs/users/package.json @@ -9,7 +9,7 @@ "dependencies": { "@apollo/subgraph": "0.3.0", "apollo-server": "3.6.3", - "supergraph-demo-opentelemetry": "0.0.4", + "supergraph-demo-opentelemetry": "0.2.1", "graphql": "15.8.0" }, "keywords": [],