Skip to content

Commit 8a4d48e

Browse files
jmsundarclaude
andauthored
feat: [DEVOPS-2394] awss3exporter + CX endpoint unify + cx-js drop (#1)
Co-authored-by: Claude Haiku 4.5 <noreply@anthropic.com>
1 parent 7cda4ae commit 8a4d48e

21 files changed

Lines changed: 2004 additions & 1310 deletions

File tree

ci-scripts/build_nodejs_layer.sh

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,9 @@ if [ -z "${OPENTELEMETRY_JS_CONTRIB_PATH:-}" ]; then
88
fi
99
OPENTELEMETRY_JS_CONTRIB_PATH=$(realpath "$OPENTELEMETRY_JS_CONTRIB_PATH")
1010

11-
if [ -z "${OPENTELEMETRY_JS_PATH:-}" ]; then
12-
echo "OPENTELEMETRY_JS_PATH is not set"
13-
exit 1
14-
fi
15-
OPENTELEMETRY_JS_PATH=$(realpath "$OPENTELEMETRY_JS_PATH")
16-
17-
1811
CWD=$(pwd)
1912

2013
echo "OPENTELEMETRY_JS_CONTRIB_PATH=$OPENTELEMETRY_JS_CONTRIB_PATH"
21-
echo "OPENTELEMETRY_JS_PATH=$OPENTELEMETRY_JS_PATH"
2214
echo "CWD=$CWD"
2315

2416
npm cache clean --force
@@ -69,38 +61,12 @@ rm -f opentelemetry-instrumentation-aws-sdk-*.tgz
6961
npm install --ignore-scripts && npm run compile && npm pack --ignore-scripts
7062
popd > /dev/null
7163

72-
# Prepare opentelemetry-js
73-
pushd "$OPENTELEMETRY_JS_PATH" > /dev/null
74-
npm install
75-
# Generate version files in opentelemetry-js (required for TypeScript compilation)
76-
npx nx run-many -t version
77-
popd > /dev/null
78-
79-
# Build sdk-logs
80-
pushd "$OPENTELEMETRY_JS_PATH/experimental/packages/sdk-logs" > /dev/null
81-
npm install && npm run compile
82-
popd > /dev/null
83-
84-
# Build opentelemetry-instrumentation
85-
pushd "$OPENTELEMETRY_JS_PATH/experimental/packages/opentelemetry-instrumentation" > /dev/null
86-
rm -f opentelemetry-instrumentation-*.tgz
87-
npm install && npm run compile && npm pack
88-
ls -lah opentelemetry-instrumentation-*.tgz
89-
popd > /dev/null
90-
91-
# Build opentelemetry-sdk-trace-base
92-
# pushd $OPENTELEMETRY_JS_PATH/packages/opentelemetry-sdk-trace-base
93-
# rm -f opentelemetry-sdk-trace-base-*.tgz
94-
# npm install && npm run compile && npm pack
95-
# popd > /dev/null
96-
9764
# Install forked libraries in cx-wrapper
9865
pushd "./nodejs/packages/cx-wrapper" > /dev/null
9966
npm install \
10067
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-lambda/opentelemetry-instrumentation-aws-lambda-*.tgz \
10168
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-mongodb/opentelemetry-instrumentation-mongodb-*.tgz \
102-
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-sdk/opentelemetry-instrumentation-aws-sdk-*.tgz \
103-
"${OPENTELEMETRY_JS_PATH}"/experimental/packages/opentelemetry-instrumentation/opentelemetry-instrumentation-*.tgz
69+
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-sdk/opentelemetry-instrumentation-aws-sdk-*.tgz
10470
popd > /dev/null
10571

10672
# Build cx-wrapper
@@ -115,7 +81,6 @@ npm install \
11581
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-lambda/opentelemetry-instrumentation-aws-lambda-*.tgz \
11682
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-mongodb/opentelemetry-instrumentation-mongodb-*.tgz \
11783
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-sdk/opentelemetry-instrumentation-aws-sdk-*.tgz \
118-
"${OPENTELEMETRY_JS_PATH}"/experimental/packages/opentelemetry-instrumentation/opentelemetry-instrumentation-*.tgz \
11984
"${CWD}"/nodejs/packages/cx-wrapper/cx-wrapper-*.tgz
12085
popd > /dev/null
12186

collector/go.mod

Lines changed: 101 additions & 49 deletions
Large diffs are not rendered by default.

collector/go.sum

Lines changed: 492 additions & 323 deletions
Large diffs are not rendered by default.

collector/lambdacomponents/default.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
"github.com/open-telemetry/opentelemetry-lambda/collector/processor/decoupleprocessor"
3030
"go.opentelemetry.io/collector/exporter"
3131
"go.opentelemetry.io/collector/exporter/debugexporter"
32-
"go.opentelemetry.io/collector/exporter/loggingexporter"
3332
"go.opentelemetry.io/collector/exporter/otlpexporter"
3433
"go.opentelemetry.io/collector/exporter/otlphttpexporter"
3534
"go.opentelemetry.io/collector/extension"
@@ -48,18 +47,17 @@ import (
4847
func Components(extensionID string) (otelcol.Factories, error) {
4948
var errs []error
5049

51-
receivers, err := receiver.MakeFactoryMap(
50+
receivers, err := otelcol.MakeFactoryMap[receiver.Factory](
5251
otlpreceiver.NewFactory(),
5352
telemetryapireceiver.NewFactory(extensionID),
5453
)
5554
if err != nil {
5655
errs = append(errs, err)
5756
}
5857

59-
exporters, err := exporter.MakeFactoryMap(
58+
exporters, err := otelcol.MakeFactoryMap[exporter.Factory](
6059
awss3exporter.NewFactory(),
6160
debugexporter.NewFactory(),
62-
loggingexporter.NewFactory(),
6361
otlpexporter.NewFactory(),
6462
otlphttpexporter.NewFactory(),
6563
prometheusremotewriteexporter.NewFactory(),
@@ -68,7 +66,7 @@ func Components(extensionID string) (otelcol.Factories, error) {
6866
errs = append(errs, err)
6967
}
7068

71-
processors, err := processor.MakeFactoryMap(
69+
processors, err := otelcol.MakeFactoryMap[processor.Factory](
7270
attributesprocessor.NewFactory(),
7371
filterprocessor.NewFactory(),
7472
memorylimiterprocessor.NewFactory(),
@@ -83,7 +81,7 @@ func Components(extensionID string) (otelcol.Factories, error) {
8381
errs = append(errs, err)
8482
}
8583

86-
extensions, err := extension.MakeFactoryMap(
84+
extensions, err := otelcol.MakeFactoryMap[extension.Factory](
8785
sigv4authextension.NewFactory(),
8886
headerssetterextension.NewFactory(),
8987
)

collector/lambdacomponents/exporter/logging.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@
1414
// See the License for the specific language governing permissions and
1515
// limitations under the License.
1616

17+
// loggingexporter was removed after v0.110.0; replaced by debugexporter.
1718
package exporter
1819

1920
import (
2021
"go.opentelemetry.io/collector/exporter"
21-
"go.opentelemetry.io/collector/exporter/loggingexporter"
22+
"go.opentelemetry.io/collector/exporter/debugexporter"
2223
)
2324

2425
func init() {
2526
Factories = append(Factories, func(extensionId string) exporter.Factory {
26-
return loggingexporter.NewFactory()
27+
return debugexporter.NewFactory()
2728
})
2829
}

0 commit comments

Comments
 (0)