From 4b681f4f911b6980de37272b9d6c6ffb71e93354 Mon Sep 17 00:00:00 2001
From: Marc Pichler <marc.pichler@dynatrace.com>
Date: Tue, 13 Jun 2023 09:55:57 +0200
Subject: [PATCH] fix(instrumentation-grpc): update buf and add ts_nocheck
 option

---
 .../package.json                              |  5 +++--
 .../test/fixtures/buf.gen.ts.yaml             |  8 -------
 .../test/fixtures/buf.gen.yaml                | 22 +++++++++----------
 .../test/fixtures/buf.lock                    |  8 +++++++
 .../test/fixtures/buf.yaml                    |  8 ++++---
 .../tsconfig.json                             |  1 -
 6 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.gen.ts.yaml
 create mode 100644 experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.lock

diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json
index 23b1db4bde4..00536cc6630 100644
--- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json
+++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json
@@ -19,7 +19,7 @@
     "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
     "prewatch": "node ../../../scripts/version-update.js",
     "peer-api-check": "node ../../../scripts/peer-api-check.js",
-    "protos:generate": "cd test/ && buf generate --template fixtures/buf.gen.ts.yaml"
+    "protos:generate": "cd test/fixtures && buf generate"
   },
   "keywords": [
     "opentelemetry",
@@ -46,10 +46,11 @@
     "access": "public"
   },
   "devDependencies": {
-    "@bufbuild/buf": "^1.15.0-1",
+    "@bufbuild/buf": "1.21.0-1",
     "@protobuf-ts/grpc-transport": "2.9.0",
     "@protobuf-ts/runtime-rpc": "2.9.0",
     "@protobuf-ts/runtime": "2.9.0",
+    "@protobuf-ts/plugin": "2.9.0",
     "@grpc/grpc-js": "^1.7.1",
     "@grpc/proto-loader": "^0.7.3",
     "@opentelemetry/api": "1.4.1",
diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.gen.ts.yaml b/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.gen.ts.yaml
deleted file mode 100644
index 026e84d6693..00000000000
--- a/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.gen.ts.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-version: v1
-plugins:
-  - remote: buf.build/timostamm/plugins/protobuf-ts:v2.2.2-1
-    out: ../test/proto/ts
-    opt:
-      - long_type_string
-      - generate_dependencies
-
diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.gen.yaml b/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.gen.yaml
index 2043cd79290..d4e280d5bbb 100644
--- a/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.gen.yaml
+++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.gen.yaml
@@ -1,13 +1,11 @@
 version: v1
-deps:
-  - buf.build/googleapis/googleapis
-  - buf.build/grpc-ecosystem/grpc-gateway
-breaking:
-  use:
-    - FILE
-lint:
-  use:
-    - DEFAULT
-  ignore:
-    - buf.build/googleapis/googleapis
-    - buf.build/grpc-ecosystem/grpc-gateway
+plugins:
+  - name: ts
+    out: ../../test/proto/ts/fixtures
+    opt:
+      - long_type_string
+      - generate_dependencies
+      - ts_nocheck
+    path: ../../node_modules/.bin/protoc-gen-ts
+    strategy: all
+
diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.lock b/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.lock
new file mode 100644
index 00000000000..65d8f1f75c5
--- /dev/null
+++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.lock
@@ -0,0 +1,8 @@
+# Generated by buf. DO NOT EDIT.
+version: v1
+deps:
+  - remote: buf.build
+    owner: googleapis
+    repository: googleapis
+    commit: cc916c31859748a68fd229a3c8d7a2e8
+    digest: shake256:469b049d0eb04203d5272062636c078decefc96fec69739159c25d85349c50c34c7706918a8b216c5c27f76939df48452148cff8c5c3ae77fa6ba5c25c1b8bf8
diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.yaml b/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.yaml
index 1a5194568a9..dc977e439a7 100644
--- a/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.yaml
+++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.yaml
@@ -1,7 +1,9 @@
 version: v1
-breaking:
-  use:
-    - FILE
 lint:
   use:
     - DEFAULT
+breaking:
+  use:
+    - FILE
+deps:
+  - buf.build/googleapis/googleapis
diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-grpc/tsconfig.json
index b2817c43f11..8f10d906d19 100644
--- a/experimental/packages/opentelemetry-instrumentation-grpc/tsconfig.json
+++ b/experimental/packages/opentelemetry-instrumentation-grpc/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
-    "noImplicitOverride": false,
     "outDir": "build",
     "rootDir": "."
   },