Skip to content

Commit 731cf7a

Browse files
authored
Remove import-in-the-middle fork and bump version (#76)
`import-in-the-middle` forked version is not needed anymore because the upstream version contains the changes from our fork.
2 parents ab5d663 + 31ffa8f commit 731cf7a

6 files changed

Lines changed: 507 additions & 280 deletions

File tree

ci-scripts/build_nodejs_layer.sh

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,11 @@ if [ -z "${OPENTELEMETRY_JS_PATH:-}" ]; then
1414
fi
1515
OPENTELEMETRY_JS_PATH=$(realpath "$OPENTELEMETRY_JS_PATH")
1616

17-
if [ -z "${IITM_PATH:-}" ]; then
18-
echo "IITM_PATH is not set"
19-
exit 1
20-
fi
21-
IITM_PATH=$(realpath "$IITM_PATH")
2217

2318
CWD=$(pwd)
2419

2520
echo "OPENTELEMETRY_JS_CONTRIB_PATH=$OPENTELEMETRY_JS_CONTRIB_PATH"
2621
echo "OPENTELEMETRY_JS_PATH=$OPENTELEMETRY_JS_PATH"
27-
echo "IITM_PATH=$IITM_PATH"
2822
echo "CWD=$CWD"
2923

3024
npm cache clean --force
@@ -100,20 +94,13 @@ popd > /dev/null
10094
# npm install && npm run compile && npm pack
10195
# popd > /dev/null
10296

103-
# Build import-in-the-middle
104-
pushd "$IITM_PATH" > /dev/null
105-
rm -f import-in-the-middle-*.tgz
106-
npm install && npm pack
107-
popd > /dev/null
108-
10997
# Install forked libraries in cx-wrapper
11098
pushd "./nodejs/packages/cx-wrapper" > /dev/null
11199
npm install \
112100
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-lambda/opentelemetry-instrumentation-aws-lambda-*.tgz \
113101
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-mongodb/opentelemetry-instrumentation-mongodb-*.tgz \
114102
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-sdk/opentelemetry-instrumentation-aws-sdk-*.tgz \
115-
"${OPENTELEMETRY_JS_PATH}"/experimental/packages/opentelemetry-instrumentation/opentelemetry-instrumentation-*.tgz \
116-
"${IITM_PATH}"/import-in-the-middle-*.tgz
103+
"${OPENTELEMETRY_JS_PATH}"/experimental/packages/opentelemetry-instrumentation/opentelemetry-instrumentation-*.tgz
117104
popd > /dev/null
118105

119106
# Build cx-wrapper
@@ -129,7 +116,6 @@ npm install \
129116
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-mongodb/opentelemetry-instrumentation-mongodb-*.tgz \
130117
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-sdk/opentelemetry-instrumentation-aws-sdk-*.tgz \
131118
"${OPENTELEMETRY_JS_PATH}"/experimental/packages/opentelemetry-instrumentation/opentelemetry-instrumentation-*.tgz \
132-
"${IITM_PATH}"/import-in-the-middle-*.tgz \
133119
"${CWD}"/nodejs/packages/cx-wrapper/cx-wrapper-*.tgz
134120
popd > /dev/null
135121

dev/build-nodejs.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ if [ -z "${OPENTELEMETRY_JS_PATH:-}" ]; then
2020
export OPENTELEMETRY_JS_PATH="$ROOT_DIR/opentelemetry-js"
2121
fi
2222

23-
if [ -z "${IITM_PATH:-}" ]; then
24-
export IITM_PATH="$ROOT_DIR/import-in-the-middle"
25-
fi
2623

2724
if [ ! -d "$OPENTELEMETRY_JS_CONTRIB_PATH" ]; then
2825
git clone git@github.com:coralogix/opentelemetry-js-contrib.git "$OPENTELEMETRY_JS_CONTRIB_PATH" -b coralogix-autoinstrumentation
@@ -32,10 +29,6 @@ if [ ! -d "$OPENTELEMETRY_JS_PATH" ]; then
3229
git clone git@github.com:coralogix/opentelemetry-js.git "$OPENTELEMETRY_JS_PATH" -b coralogix-autoinstrumentation
3330
fi
3431

35-
if [ ! -d "$IITM_PATH" ]; then
36-
git clone git@github.com:coralogix/import-in-the-middle.git "$IITM_PATH" -b coralogix-autoinstrumentation
37-
fi
38-
3932
"$ROOT_DIR/ci-scripts/build_nodejs_layer.sh"
4033

4134
# Useful for using the layer locally

0 commit comments

Comments
 (0)