Skip to content

Commit e2390a5

Browse files
committed
Revert "chore(instrumnetation-gprc): require manual invocation of buf when updating protos"
This reverts commit fa49f91.
1 parent 341844a commit e2390a5

File tree

9 files changed

+46
-238
lines changed

9 files changed

+46
-238
lines changed

experimental/packages/opentelemetry-instrumentation-grpc/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@
77
"repository": "open-telemetry/opentelemetry-js",
88
"scripts": {
99
"prepublishOnly": "npm run compile",
10+
"precompile": "npm run protos:generate",
1011
"compile": "tsc --build",
1112
"clean": "tsc --build --clean",
12-
"test": "nyc mocha test/**/*.test.ts",
13+
"test": "npm run protos:generate && nyc mocha test/**/*.test.ts",
1314
"tdd": "npm run test -- --watch-extensions ts --watch",
1415
"lint": "eslint . --ext .ts",
1516
"lint:fix": "eslint . --ext .ts --fix",
1617
"version": "node ../../../scripts/version-update.js",
1718
"watch": "tsc --build --watch",
1819
"prewatch": "node ../../../scripts/version-update.js",
1920
"peer-api-check": "node ../../../scripts/peer-api-check.js",
20-
"re-generate-protos": "npx -y @bufbuild/buf@1.53.0 generate",
21+
"protos:generate": "cd test/fixtures && buf generate",
2122
"align-api-deps": "node ../../../scripts/align-api-deps.js"
2223
},
2324
"keywords": [
@@ -45,6 +46,7 @@
4546
"access": "public"
4647
},
4748
"devDependencies": {
49+
"@bufbuild/buf": "1.53.0",
4850
"@grpc/grpc-js": "^1.7.1",
4951
"@grpc/proto-loader": "^0.7.10",
5052
"@opentelemetry/api": "1.9.0",
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/proto

experimental/packages/opentelemetry-instrumentation-grpc/buf.gen.yaml renamed to experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.gen.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: v1
22
plugins:
33
- plugin: buf.build/community/timostamm-protobuf-ts:v2.9.0
4-
out: test/generated
4+
out: ../../test/proto/ts/fixtures
55
opt:
66
- long_type_string
77
- generate_dependencies

experimental/packages/opentelemetry-instrumentation-grpc/test/generated/test/fixtures/grpc-test.client.ts

Lines changed: 0 additions & 96 deletions
This file was deleted.

experimental/packages/opentelemetry-instrumentation-grpc/test/generated/test/fixtures/grpc-test.ts

Lines changed: 0 additions & 138 deletions
This file was deleted.

experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-protobuf-ts.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ instrumentation.disable();
2121

2222
import { GrpcTransport } from '@protobuf-ts/grpc-transport';
2323
import * as grpc from '@grpc/grpc-js';
24-
import { GrpcTesterClient } from './generated/test/fixtures/grpc-test.client';
24+
import { GrpcTesterClient } from './proto/ts/fixtures/grpc-test.client';
2525
import {
2626
InMemorySpanExporter,
2727
NodeTracerProvider,

package-lock.json

Lines changed: 39 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)