From 070faf45e243bf5a8d8a92c4fa62f235f12db06d Mon Sep 17 00:00:00 2001
From: Daniel Dyla <dyladan@users.noreply.github.com>
Date: Mon, 28 Feb 2022 13:09:35 -0500
Subject: [PATCH] chore: rename proto to otlp-transformer

---
 .gitmodules                                                | 3 ---
 .../packages/{proto => otlp-transformer}/.eslintignore     | 0
 .../packages/{proto => otlp-transformer}/.eslintrc.js      | 0
 .../packages/{proto => otlp-transformer}/.gitignore        | 0
 .../packages/{proto => otlp-transformer}/README.md         | 0
 .../packages/{proto => otlp-transformer}/descriptor.json   | 0
 .../packages/{proto => otlp-transformer}/karma.conf.js     | 0
 .../packages/{proto => otlp-transformer}/package.json      | 7 ++-----
 .../{proto => otlp-transformer}/src/common/internal.ts     | 0
 .../{proto => otlp-transformer}/src/common/types.ts        | 0
 .../packages/{proto => otlp-transformer}/src/index.ts      | 0
 .../{proto => otlp-transformer}/src/metrics/index.ts       | 0
 .../{proto => otlp-transformer}/src/metrics/internal.ts    | 0
 .../{proto => otlp-transformer}/src/metrics/types.ts       | 0
 .../{proto => otlp-transformer}/src/trace/index.ts         | 0
 .../{proto => otlp-transformer}/src/trace/internal.ts      | 0
 .../{proto => otlp-transformer}/src/trace/types.ts         | 0
 .../{proto => otlp-transformer}/test/common.test.ts        | 0
 .../{proto => otlp-transformer}/test/index-webpack.ts      | 0
 .../{proto => otlp-transformer}/test/metrics.test.ts       | 0
 .../{proto => otlp-transformer}/test/trace.test.ts         | 0
 .../packages/{proto => otlp-transformer}/tsconfig.all.json | 0
 .../packages/{proto => otlp-transformer}/tsconfig.esm.json | 0
 .../{proto => otlp-transformer}/tsconfig.esm2015.json      | 0
 .../packages/{proto => otlp-transformer}/tsconfig.json     | 0
 experimental/packages/proto/opentelemetry-proto            | 1 -
 experimental/tsconfig.json                                 | 2 +-
 27 files changed, 3 insertions(+), 10 deletions(-)
 rename experimental/packages/{proto => otlp-transformer}/.eslintignore (100%)
 rename experimental/packages/{proto => otlp-transformer}/.eslintrc.js (100%)
 rename experimental/packages/{proto => otlp-transformer}/.gitignore (100%)
 rename experimental/packages/{proto => otlp-transformer}/README.md (100%)
 rename experimental/packages/{proto => otlp-transformer}/descriptor.json (100%)
 rename experimental/packages/{proto => otlp-transformer}/karma.conf.js (100%)
 rename experimental/packages/{proto => otlp-transformer}/package.json (84%)
 rename experimental/packages/{proto => otlp-transformer}/src/common/internal.ts (100%)
 rename experimental/packages/{proto => otlp-transformer}/src/common/types.ts (100%)
 rename experimental/packages/{proto => otlp-transformer}/src/index.ts (100%)
 rename experimental/packages/{proto => otlp-transformer}/src/metrics/index.ts (100%)
 rename experimental/packages/{proto => otlp-transformer}/src/metrics/internal.ts (100%)
 rename experimental/packages/{proto => otlp-transformer}/src/metrics/types.ts (100%)
 rename experimental/packages/{proto => otlp-transformer}/src/trace/index.ts (100%)
 rename experimental/packages/{proto => otlp-transformer}/src/trace/internal.ts (100%)
 rename experimental/packages/{proto => otlp-transformer}/src/trace/types.ts (100%)
 rename experimental/packages/{proto => otlp-transformer}/test/common.test.ts (100%)
 rename experimental/packages/{proto => otlp-transformer}/test/index-webpack.ts (100%)
 rename experimental/packages/{proto => otlp-transformer}/test/metrics.test.ts (100%)
 rename experimental/packages/{proto => otlp-transformer}/test/trace.test.ts (100%)
 rename experimental/packages/{proto => otlp-transformer}/tsconfig.all.json (100%)
 rename experimental/packages/{proto => otlp-transformer}/tsconfig.esm.json (100%)
 rename experimental/packages/{proto => otlp-transformer}/tsconfig.esm2015.json (100%)
 rename experimental/packages/{proto => otlp-transformer}/tsconfig.json (100%)
 delete mode 160000 experimental/packages/proto/opentelemetry-proto

diff --git a/.gitmodules b/.gitmodules
index b712cf278f7..2a5d6c4ac7f 100644
--- 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 b/experimental/packages/otlp-transformer/.eslintignore
similarity index 100%
rename from experimental/packages/proto/.eslintignore
rename to experimental/packages/otlp-transformer/.eslintignore
diff --git a/experimental/packages/proto/.eslintrc.js b/experimental/packages/otlp-transformer/.eslintrc.js
similarity index 100%
rename from experimental/packages/proto/.eslintrc.js
rename to experimental/packages/otlp-transformer/.eslintrc.js
diff --git a/experimental/packages/proto/.gitignore b/experimental/packages/otlp-transformer/.gitignore
similarity index 100%
rename from experimental/packages/proto/.gitignore
rename to experimental/packages/otlp-transformer/.gitignore
diff --git a/experimental/packages/proto/README.md b/experimental/packages/otlp-transformer/README.md
similarity index 100%
rename from experimental/packages/proto/README.md
rename to experimental/packages/otlp-transformer/README.md
diff --git a/experimental/packages/proto/descriptor.json b/experimental/packages/otlp-transformer/descriptor.json
similarity index 100%
rename from experimental/packages/proto/descriptor.json
rename to experimental/packages/otlp-transformer/descriptor.json
diff --git a/experimental/packages/proto/karma.conf.js b/experimental/packages/otlp-transformer/karma.conf.js
similarity index 100%
rename from experimental/packages/proto/karma.conf.js
rename to experimental/packages/otlp-transformer/karma.conf.js
diff --git a/experimental/packages/proto/package.json b/experimental/packages/otlp-transformer/package.json
similarity index 84%
rename from experimental/packages/proto/package.json
rename to experimental/packages/otlp-transformer/package.json
index f7b33159184..8cc6ade8d72 100644
--- a/experimental/packages/proto/package.json
+++ b/experimental/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/experimental/packages/proto/src/common/internal.ts b/experimental/packages/otlp-transformer/src/common/internal.ts
similarity index 100%
rename from experimental/packages/proto/src/common/internal.ts
rename to experimental/packages/otlp-transformer/src/common/internal.ts
diff --git a/experimental/packages/proto/src/common/types.ts b/experimental/packages/otlp-transformer/src/common/types.ts
similarity index 100%
rename from experimental/packages/proto/src/common/types.ts
rename to experimental/packages/otlp-transformer/src/common/types.ts
diff --git a/experimental/packages/proto/src/index.ts b/experimental/packages/otlp-transformer/src/index.ts
similarity index 100%
rename from experimental/packages/proto/src/index.ts
rename to experimental/packages/otlp-transformer/src/index.ts
diff --git a/experimental/packages/proto/src/metrics/index.ts b/experimental/packages/otlp-transformer/src/metrics/index.ts
similarity index 100%
rename from experimental/packages/proto/src/metrics/index.ts
rename to experimental/packages/otlp-transformer/src/metrics/index.ts
diff --git a/experimental/packages/proto/src/metrics/internal.ts b/experimental/packages/otlp-transformer/src/metrics/internal.ts
similarity index 100%
rename from experimental/packages/proto/src/metrics/internal.ts
rename to experimental/packages/otlp-transformer/src/metrics/internal.ts
diff --git a/experimental/packages/proto/src/metrics/types.ts b/experimental/packages/otlp-transformer/src/metrics/types.ts
similarity index 100%
rename from experimental/packages/proto/src/metrics/types.ts
rename to experimental/packages/otlp-transformer/src/metrics/types.ts
diff --git a/experimental/packages/proto/src/trace/index.ts b/experimental/packages/otlp-transformer/src/trace/index.ts
similarity index 100%
rename from experimental/packages/proto/src/trace/index.ts
rename to experimental/packages/otlp-transformer/src/trace/index.ts
diff --git a/experimental/packages/proto/src/trace/internal.ts b/experimental/packages/otlp-transformer/src/trace/internal.ts
similarity index 100%
rename from experimental/packages/proto/src/trace/internal.ts
rename to experimental/packages/otlp-transformer/src/trace/internal.ts
diff --git a/experimental/packages/proto/src/trace/types.ts b/experimental/packages/otlp-transformer/src/trace/types.ts
similarity index 100%
rename from experimental/packages/proto/src/trace/types.ts
rename to experimental/packages/otlp-transformer/src/trace/types.ts
diff --git a/experimental/packages/proto/test/common.test.ts b/experimental/packages/otlp-transformer/test/common.test.ts
similarity index 100%
rename from experimental/packages/proto/test/common.test.ts
rename to experimental/packages/otlp-transformer/test/common.test.ts
diff --git a/experimental/packages/proto/test/index-webpack.ts b/experimental/packages/otlp-transformer/test/index-webpack.ts
similarity index 100%
rename from experimental/packages/proto/test/index-webpack.ts
rename to experimental/packages/otlp-transformer/test/index-webpack.ts
diff --git a/experimental/packages/proto/test/metrics.test.ts b/experimental/packages/otlp-transformer/test/metrics.test.ts
similarity index 100%
rename from experimental/packages/proto/test/metrics.test.ts
rename to experimental/packages/otlp-transformer/test/metrics.test.ts
diff --git a/experimental/packages/proto/test/trace.test.ts b/experimental/packages/otlp-transformer/test/trace.test.ts
similarity index 100%
rename from experimental/packages/proto/test/trace.test.ts
rename to experimental/packages/otlp-transformer/test/trace.test.ts
diff --git a/experimental/packages/proto/tsconfig.all.json b/experimental/packages/otlp-transformer/tsconfig.all.json
similarity index 100%
rename from experimental/packages/proto/tsconfig.all.json
rename to experimental/packages/otlp-transformer/tsconfig.all.json
diff --git a/experimental/packages/proto/tsconfig.esm.json b/experimental/packages/otlp-transformer/tsconfig.esm.json
similarity index 100%
rename from experimental/packages/proto/tsconfig.esm.json
rename to experimental/packages/otlp-transformer/tsconfig.esm.json
diff --git a/experimental/packages/proto/tsconfig.esm2015.json b/experimental/packages/otlp-transformer/tsconfig.esm2015.json
similarity index 100%
rename from experimental/packages/proto/tsconfig.esm2015.json
rename to experimental/packages/otlp-transformer/tsconfig.esm2015.json
diff --git a/experimental/packages/proto/tsconfig.json b/experimental/packages/otlp-transformer/tsconfig.json
similarity index 100%
rename from experimental/packages/proto/tsconfig.json
rename to experimental/packages/otlp-transformer/tsconfig.json
diff --git a/experimental/packages/proto/opentelemetry-proto b/experimental/packages/proto/opentelemetry-proto
deleted file mode 160000
index f8c59fe6b06..00000000000
--- a/experimental/packages/proto/opentelemetry-proto
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f8c59fe6b063397714034d9727f08aca1a5b99b3
diff --git a/experimental/tsconfig.json b/experimental/tsconfig.json
index dd0418db6e3..54a089b0bb4 100644
--- 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"