chore: rename proto to otlp-transformer

open-telemetry · Feb 28, 2022 · 204fcc2 · 204fcc2
1 parent d022e1b
commit 204fcc2
Show file tree

Hide file tree

Showing 28 changed files with 8 additions and 15 deletions.
diff --git a/.github/workflows/peer-api.yaml b/.github/workflows/peer-api.yaml
@@ -27,4 +27,4 @@ jobs:
 
       - name: Check API dependency semantics (experimental)
         working-directory: experimental
-        run: lerna exec --ignore propagation-validation-server --ignore @opentelemetry/selenium-tests --ignore @opentelemetry/api-metrics-wip --ignore @opentelemetry/proto "node ../../../scripts/peer-api-check.js"
+        run: lerna exec --ignore propagation-validation-server --ignore @opentelemetry/selenium-tests --ignore @opentelemetry/api-metrics-wip --ignore @opentelemetry/otlp-transformer "node ../../../scripts/peer-api-check.js"
diff --git a/.gitmodules b/.gitmodules
@@ -10,6 +10,3 @@
 [submodule "experimental/packages/opentelemetry-exporter-metrics-otlp-proto/protos"]
 	path = experimental/packages/opentelemetry-exporter-metrics-otlp-proto/protos
 	url = https://github.com/open-telemetry/opentelemetry-proto.git
-[submodule "experimental/packages/proto/opentelemetry-proto"]
-	path = experimental/packages/proto/opentelemetry-proto
-	url = https://github.com/open-telemetry/opentelemetry-proto
diff --git a/experimental/packages/proto/.eslintignore → ...l/packages/otlp-transformer/.eslintignore b/experimental/packages/proto/.eslintignore → ...l/packages/otlp-transformer/.eslintignore
diff --git a/experimental/packages/proto/.eslintrc.js → ...al/packages/otlp-transformer/.eslintrc.js b/experimental/packages/proto/.eslintrc.js → ...al/packages/otlp-transformer/.eslintrc.js
diff --git a/experimental/packages/proto/.gitignore → ...ntal/packages/otlp-transformer/.gitignore b/experimental/packages/proto/.gitignore → ...ntal/packages/otlp-transformer/.gitignore
diff --git a/experimental/packages/proto/README.md → ...ental/packages/otlp-transformer/README.md b/experimental/packages/proto/README.md → ...ental/packages/otlp-transformer/README.md
@@ -24,7 +24,7 @@ npm install \
 This module exports functions to serialize traces and metrics from the OpenTelemetry SDK into protocol buffers which can be sent over HTTP to the OpenTelemetry collector or a compatible receiver.
 
 ```typescript
-import { createExportTraceServiceRequest, createExportMetricsServiceRequest } from "@opentelemetry/proto";
+import { createExportTraceServiceRequest, createExportMetricsServiceRequest } from "@opentelemetry/otlp-transformer";
 
 const serializedSpans = createExportTraceServiceRequest(readableSpans);
 const serializedMetrics = createExportMetricsServiceRequest(readableMetrics);
@@ -39,7 +39,7 @@ Any RPC implementation compatible with `grpc` or `@grpc/grpc-js` may be used, bu
 ```typescript
 import type { RPCImpl } from 'protobufjs';
 import { makeGenericClientConstructor, credentials } from '@gprc/grpc-js';
-import { MetricServiceClient, TraceServiceClient } from "@opentelemetry/proto";
+import { MetricServiceClient, TraceServiceClient } from "@opentelemetry/otlp-transformer";
 
 // Construct a RPC Implementation according to protobufjs docs
 const GrpcClientConstructor = makeGenericClientConstructor({});
@@ -102,8 +102,8 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
 [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions
 [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE
 [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat
-[npm-url]: https://www.npmjs.com/package/@opentelemetry/proto
-[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fproto.svg
+[npm-url]: https://www.npmjs.com/package/@opentelemetry/otlp-transformer
+[npm-img]: https://badge.fury.io/js/%40opentelemetry%otlp-transformer.svg
 
 [sdk]: https://github.com/open-telemetry/opentelemetry-js
 [otlp]: https://github.com/open-telemetry/opentelemetry-proto

diff --git a/experimental/packages/proto/descriptor.json → ...packages/otlp-transformer/descriptor.json b/experimental/packages/proto/descriptor.json → ...packages/otlp-transformer/descriptor.json
diff --git a/experimental/packages/proto/karma.conf.js → ...l/packages/otlp-transformer/karma.conf.js b/experimental/packages/proto/karma.conf.js → ...l/packages/otlp-transformer/karma.conf.js
diff --git a/experimental/packages/proto/package.json → ...al/packages/otlp-transformer/package.json b/experimental/packages/proto/package.json → ...al/packages/otlp-transformer/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@opentelemetry/proto",
+  "name": "@opentelemetry/otlp-transformer",
   "private": true,
   "publishConfig": {
     "access": "restricted"
@@ -11,12 +11,9 @@
   "repository": "open-telemetry/opentelemetry-js",
   "scripts": {
     "compile": "tsc --build tsconfig.all.json",
-    "precompile": "npm run generate:json",
-    "generate:json": "pbjs -t json -o descriptor.json opentelemetry-proto/opentelemetry/**/*.proto",
-    "clean": "tsc --build --clean tsconfig.all.json && rimraf src/generated",
+    "clean": "tsc --build --clean tsconfig.all.json",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
-    "submodule": "git submodule sync --recursive && git submodule update --init --recursive",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
     "test:browser": "nyc karma start --single-run",

diff --git a/...tal/packages/proto/src/common/internal.ts → ...s/otlp-transformer/src/common/internal.ts b/...tal/packages/proto/src/common/internal.ts → ...s/otlp-transformer/src/common/internal.ts
diff --git a/...mental/packages/proto/src/common/types.ts → ...ages/otlp-transformer/src/common/types.ts b/...mental/packages/proto/src/common/types.ts → ...ages/otlp-transformer/src/common/types.ts
diff --git a/experimental/packages/proto/src/index.ts → ...al/packages/otlp-transformer/src/index.ts b/experimental/packages/proto/src/index.ts → ...al/packages/otlp-transformer/src/index.ts
diff --git a/...ental/packages/proto/src/metrics/index.ts → ...ges/otlp-transformer/src/metrics/index.ts b/...ental/packages/proto/src/metrics/index.ts → ...ges/otlp-transformer/src/metrics/index.ts
diff --git a/...al/packages/proto/src/metrics/internal.ts → .../otlp-transformer/src/metrics/internal.ts b/...al/packages/proto/src/metrics/internal.ts → .../otlp-transformer/src/metrics/internal.ts
diff --git a/...ental/packages/proto/src/metrics/types.ts → ...ges/otlp-transformer/src/metrics/types.ts b/...ental/packages/proto/src/metrics/types.ts → ...ges/otlp-transformer/src/metrics/types.ts
diff --git a/...imental/packages/proto/src/trace/index.ts → ...kages/otlp-transformer/src/trace/index.ts b/...imental/packages/proto/src/trace/index.ts → ...kages/otlp-transformer/src/trace/index.ts
diff --git a/...ntal/packages/proto/src/trace/internal.ts → ...es/otlp-transformer/src/trace/internal.ts b/...ntal/packages/proto/src/trace/internal.ts → ...es/otlp-transformer/src/trace/internal.ts
diff --git a/...imental/packages/proto/src/trace/types.ts → ...kages/otlp-transformer/src/trace/types.ts b/...imental/packages/proto/src/trace/types.ts → ...kages/otlp-transformer/src/trace/types.ts
diff --git a/...mental/packages/proto/test/common.test.ts → ...ages/otlp-transformer/test/common.test.ts b/...mental/packages/proto/test/common.test.ts → ...ages/otlp-transformer/test/common.test.ts
diff --git a/...ntal/packages/proto/test/index-webpack.ts → ...es/otlp-transformer/test/index-webpack.ts b/...ntal/packages/proto/test/index-webpack.ts → ...es/otlp-transformer/test/index-webpack.ts
diff --git a/...ental/packages/proto/test/metrics.test.ts → ...ges/otlp-transformer/test/metrics.test.ts b/...ental/packages/proto/test/metrics.test.ts → ...ges/otlp-transformer/test/metrics.test.ts
diff --git a/...imental/packages/proto/test/trace.test.ts → ...kages/otlp-transformer/test/trace.test.ts b/...imental/packages/proto/test/trace.test.ts → ...kages/otlp-transformer/test/trace.test.ts
diff --git a/...rimental/packages/proto/tsconfig.all.json → ...ckages/otlp-transformer/tsconfig.all.json b/...rimental/packages/proto/tsconfig.all.json → ...ckages/otlp-transformer/tsconfig.all.json
diff --git a/...rimental/packages/proto/tsconfig.esm.json → ...ckages/otlp-transformer/tsconfig.esm.json b/...rimental/packages/proto/tsconfig.esm.json → ...ckages/otlp-transformer/tsconfig.esm.json
diff --git a/...ntal/packages/proto/tsconfig.esm2015.json → ...es/otlp-transformer/tsconfig.esm2015.json b/...ntal/packages/proto/tsconfig.esm2015.json → ...es/otlp-transformer/tsconfig.esm2015.json
diff --git a/experimental/packages/proto/tsconfig.json → ...l/packages/otlp-transformer/tsconfig.json b/experimental/packages/proto/tsconfig.json → ...l/packages/otlp-transformer/tsconfig.json
diff --git a/experimental/packages/proto/opentelemetry-proto b/experimental/packages/proto/opentelemetry-proto
diff --git a/experimental/tsconfig.json b/experimental/tsconfig.json
@@ -39,7 +39,7 @@
       "path": "packages/opentelemetry-sdk-node"
     },
     {
-      "path": "packages/proto"
+      "path": "packages/otlp-transformer"
     },
     {
       "path": "backwards-compatability/node10"