bump to otel 1.0

Signed-off-by: Phil Prasek <prasek@gmail.com>
apollographql · Feb 11, 2022 · 48d178c · 48d178c
1 parent fe71467
commit 48d178c
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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": [],