Skip to content

feat: [DEVOPS-2394] awss3exporter + CX endpoint unify + cx-js drop #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmsundar merged 1 commit into from
Apr 17, 2026
Merged

feat: [DEVOPS-2394] awss3exporter + CX endpoint unify + cx-js drop #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 1 addition & 36 deletions ci-scripts/build_nodejs_layer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,9 @@ if [ -z "${OPENTELEMETRY_JS_CONTRIB_PATH:-}" ]; then
fi
OPENTELEMETRY_JS_CONTRIB_PATH=$(realpath "$OPENTELEMETRY_JS_CONTRIB_PATH")

if [ -z "${OPENTELEMETRY_JS_PATH:-}" ]; then
echo "OPENTELEMETRY_JS_PATH is not set"
exit 1
fi
OPENTELEMETRY_JS_PATH=$(realpath "$OPENTELEMETRY_JS_PATH")


CWD=$(pwd)

echo "OPENTELEMETRY_JS_CONTRIB_PATH=$OPENTELEMETRY_JS_CONTRIB_PATH"
echo "OPENTELEMETRY_JS_PATH=$OPENTELEMETRY_JS_PATH"
echo "CWD=$CWD"

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

# Prepare opentelemetry-js
pushd "$OPENTELEMETRY_JS_PATH" > /dev/null
npm install
# Generate version files in opentelemetry-js (required for TypeScript compilation)
npx nx run-many -t version
popd > /dev/null

# Build sdk-logs
pushd "$OPENTELEMETRY_JS_PATH/experimental/packages/sdk-logs" > /dev/null
npm install && npm run compile
popd > /dev/null

# Build opentelemetry-instrumentation
pushd "$OPENTELEMETRY_JS_PATH/experimental/packages/opentelemetry-instrumentation" > /dev/null
rm -f opentelemetry-instrumentation-*.tgz
npm install && npm run compile && npm pack
ls -lah opentelemetry-instrumentation-*.tgz
popd > /dev/null

# Build opentelemetry-sdk-trace-base
# pushd $OPENTELEMETRY_JS_PATH/packages/opentelemetry-sdk-trace-base
# rm -f opentelemetry-sdk-trace-base-*.tgz
# npm install && npm run compile && npm pack
# popd > /dev/null

# Install forked libraries in cx-wrapper
pushd "./nodejs/packages/cx-wrapper" > /dev/null
npm install \
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-lambda/opentelemetry-instrumentation-aws-lambda-*.tgz \
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-mongodb/opentelemetry-instrumentation-mongodb-*.tgz \
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-sdk/opentelemetry-instrumentation-aws-sdk-*.tgz \
"${OPENTELEMETRY_JS_PATH}"/experimental/packages/opentelemetry-instrumentation/opentelemetry-instrumentation-*.tgz
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-sdk/opentelemetry-instrumentation-aws-sdk-*.tgz
popd > /dev/null

# Build cx-wrapper
Expand All @@ -115,7 +81,6 @@ npm install \
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-lambda/opentelemetry-instrumentation-aws-lambda-*.tgz \
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-mongodb/opentelemetry-instrumentation-mongodb-*.tgz \
"${OPENTELEMETRY_JS_CONTRIB_PATH}"/packages/instrumentation-aws-sdk/opentelemetry-instrumentation-aws-sdk-*.tgz \
"${OPENTELEMETRY_JS_PATH}"/experimental/packages/opentelemetry-instrumentation/opentelemetry-instrumentation-*.tgz \
"${CWD}"/nodejs/packages/cx-wrapper/cx-wrapper-*.tgz
popd > /dev/null

Expand Down
150 changes: 101 additions & 49 deletions collector/go.mod
View file
Open in desktop

Large diffs are not rendered by default.

815 changes: 492 additions & 323 deletions collector/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions collector/lambdacomponents/default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"github.com/open-telemetry/opentelemetry-lambda/collector/processor/decoupleprocessor"
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/exporter/debugexporter"
"go.opentelemetry.io/collector/exporter/loggingexporter"
"go.opentelemetry.io/collector/exporter/otlpexporter"
"go.opentelemetry.io/collector/exporter/otlphttpexporter"
"go.opentelemetry.io/collector/extension"
Expand All @@ -48,18 +47,17 @@ import (
func Components(extensionID string) (otelcol.Factories, error) {
var errs []error

receivers, err := receiver.MakeFactoryMap(
receivers, err := otelcol.MakeFactoryMap[receiver.Factory](
otlpreceiver.NewFactory(),
telemetryapireceiver.NewFactory(extensionID),
)
if err != nil {
errs = append(errs, err)
}

exporters, err := exporter.MakeFactoryMap(
exporters, err := otelcol.MakeFactoryMap[exporter.Factory](
awss3exporter.NewFactory(),
debugexporter.NewFactory(),
loggingexporter.NewFactory(),
otlpexporter.NewFactory(),
otlphttpexporter.NewFactory(),
prometheusremotewriteexporter.NewFactory(),
Expand All @@ -68,7 +66,7 @@ func Components(extensionID string) (otelcol.Factories, error) {
errs = append(errs, err)
}

processors, err := processor.MakeFactoryMap(
processors, err := otelcol.MakeFactoryMap[processor.Factory](
attributesprocessor.NewFactory(),
filterprocessor.NewFactory(),
memorylimiterprocessor.NewFactory(),
Expand All @@ -83,7 +81,7 @@ func Components(extensionID string) (otelcol.Factories, error) {
errs = append(errs, err)
}

extensions, err := extension.MakeFactoryMap(
extensions, err := otelcol.MakeFactoryMap[extension.Factory](
sigv4authextension.NewFactory(),
headerssetterextension.NewFactory(),
)
Expand Down
5 changes: 3 additions & 2 deletions collector/lambdacomponents/exporter/logging.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// loggingexporter was removed after v0.110.0; replaced by debugexporter.
package exporter

import (
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/exporter/loggingexporter"
"go.opentelemetry.io/collector/exporter/debugexporter"
)

func init() {
Factories = append(Factories, func(extensionId string) exporter.Factory {
return loggingexporter.NewFactory()
return debugexporter.NewFactory()
})
}
Loading