chore: add a test for common scenarios (#31)

Author: mosheshaham-dash0

.github/workflows/build.yml

@@ -23,10 +23,10 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build binaries
-        run: make build/lrap_x86_64 build/lrap_aarch64
+        run: make build/dash0_x86_64 build/dash0_aarch64
       - uses: actions/upload-artifact@v4
         with:
           name: rust-binaries
           path: |
-            build/lrap_x86_64
-            build/lrap_aarch64
+            build/dash0_x86_64
+            build/dash0_aarch64

.github/workflows/publish.yml

@@ -31,7 +31,7 @@ jobs:
           name: rust-binaries
           path: build
       - name: Ensure binaries are executable and fresh
-        run: chmod +x build/lrap_x86_64 build/lrap_aarch64 && touch build/lrap_x86_64 build/lrap_aarch64
+        run: chmod +x build/dash0_x86_64 build/dash0_aarch64 && touch build/dash0_x86_64 build/dash0_aarch64
       - uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ vars.AWS_ROLE_ARN }}
@@ -57,7 +57,7 @@ jobs:
           name: rust-binaries
           path: build
       - name: Ensure binaries are executable and fresh
-        run: chmod +x build/lrap_x86_64 build/lrap_aarch64 && touch build/lrap_x86_64 build/lrap_aarch64
+        run: chmod +x build/dash0_x86_64 build/dash0_aarch64 && touch build/dash0_x86_64 build/dash0_aarch64
       - uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ vars.AWS_ROLE_ARN }}
@@ -80,7 +80,7 @@ jobs:
           name: rust-binaries
           path: build
       - name: Ensure binaries are executable and fresh
-        run: chmod +x build/lrap_x86_64 build/lrap_aarch64 && touch build/lrap_x86_64 build/lrap_aarch64
+        run: chmod +x build/dash0_x86_64 build/dash0_aarch64 && touch build/dash0_x86_64 build/dash0_aarch64
       - uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ vars.AWS_ROLE_ARN }}
@@ -103,7 +103,7 @@ jobs:
           name: rust-binaries
           path: build
       - name: Ensure binaries are executable and fresh
-        run: chmod +x build/lrap_x86_64 build/lrap_aarch64 && touch build/lrap_x86_64 build/lrap_aarch64
+        run: chmod +x build/dash0_x86_64 build/dash0_aarch64 && touch build/dash0_x86_64 build/dash0_aarch64
       - uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ vars.AWS_ROLE_ARN }}

CONTRIBUTING.md

@@ -20,4 +20,4 @@ This package uses  *Make* to build binary executables for *aarch64* and *x86_64*
 ### Building and Deploying the Extension Layer
 
 With the dependencies installed, run `make` in the base directory 
-to compile the binaries.  The executables and  are copied into `build/`. The extension entrypoint script (`opt/entrypoint`) is copied to `build/extensions/lrap`
+to compile the binaries.  The executables and  are copied into `build/`. The extension entrypoint script (`opt/entrypoint`) is copied to `build/extensions/dash0`

Makefile

@@ -1,7 +1,7 @@
-ZIP_NAME_PYTHON = layer-lrap-python.zip
-ZIP_NAME_NODE = layer-lrap-node.zip
-ZIP_NAME_JAVA = layer-lrap-java.zip
-ZIP_NAME_MANUAL = layer-lrap-manual.zip
+ZIP_NAME_PYTHON = layer-dash0-python.zip
+ZIP_NAME_NODE = layer-dash0-node.zip
+ZIP_NAME_JAVA = layer-dash0-java.zip
+ZIP_NAME_MANUAL = layer-dash0-manual.zip
 LAYER_NAME_PREFIX ?=
 LAYER_NAME_PYTHON = $(LAYER_NAME_PREFIX)dash0-extension-python
 LAYER_NAME_NODE = $(LAYER_NAME_PREFIX)dash0-extension-node
@@ -12,7 +12,7 @@ LAMBDA_LAYER_MARKER_NODE := .lambda-layer-node
 LAMBDA_LAYER_MARKER_JAVA := .lambda-layer-java
 LAMBDA_LAYER_MARKER_MANUAL := .lambda-layer-manual
 CARGO_FEATURES :=
-PYTHON_DEPS_IMAGE := lrap-python-deps
+PYTHON_DEPS_IMAGE := dash0-python-deps
 
 # Docker/ECR image settings
 AWS_ACCOUNT_ID := $(shell aws sts get-caller-identity --query Account --output text)
@@ -51,17 +51,17 @@ clean-build:
 clean-cargo:
 	@cargo clean
 
-build/lrap_x86_64: $(RS_FILES) Cargo.toml
+build/dash0_x86_64: $(RS_FILES) Cargo.toml
 	@echo Building Rust application for x86_64
 	@mkdir -p build
 	@cross build --release --target x86_64-unknown-linux-musl ${CARGO_FEATURES}
-	@cp target/x86_64-unknown-linux-musl/release/aws-lambda-runtime-api-proxy-rs build/lrap_x86_64
+	@cp target/x86_64-unknown-linux-musl/release/aws-lambda-runtime-api-proxy-rs build/dash0_x86_64
 
-build/lrap_aarch64: $(RS_FILES) Cargo.toml
+build/dash0_aarch64: $(RS_FILES) Cargo.toml
 	@echo Building Rust application for aarch64
 	@mkdir -p build
 	@cross build --release --target aarch64-unknown-linux-musl ${CARGO_FEATURES}
-	@cp target/aarch64-unknown-linux-musl/release/aws-lambda-runtime-api-proxy-rs build/lrap_aarch64
+	@cp target/aarch64-unknown-linux-musl/release/aws-lambda-runtime-api-proxy-rs build/dash0_aarch64
 
 PYTHON_DISTRO_SRC := $(shell find opt/python/distro/src -type f)
 NODE_DISTRO_SRC := $(shell find opt/node/distro/src -type f)
@@ -77,28 +77,28 @@ build/python: opt/python/distro/requirements.txt opt/python/Dockerfile $(PYTHON_
 
 
 
-build/$(ZIP_NAME_PYTHON): build/lrap_x86_64 build/lrap_aarch64 opt/entrypoint opt/shared.sh opt/python/wrapper opt/python/otel_wrapper.py build/python
+build/$(ZIP_NAME_PYTHON): build/dash0_x86_64 build/dash0_aarch64 opt/entrypoint opt/shared.sh opt/python/wrapper opt/python/otel_wrapper.py build/python
 	@rm -f build/$(ZIP_NAME_PYTHON)
 	@rm -rf build/stage-python
 	@mkdir -p build/stage-python/extensions
-	@cp build/lrap_x86_64 build/stage-python/
-	@cp build/lrap_aarch64 build/stage-python/
-	@cp opt/entrypoint build/stage-python/extensions/lrap
+	@cp build/dash0_x86_64 build/stage-python/
+	@cp build/dash0_aarch64 build/stage-python/
+	@cp opt/entrypoint build/stage-python/extensions/dash0
 	@cp opt/shared.sh build/stage-python/shared.sh
 	@cp opt/python/wrapper build/stage-python/wrapper
 	@cp -r build/python build/stage-python/python
 	@cp opt/python/otel_wrapper.py build/stage-python/python/otel_wrapper.py
 	@cd build/stage-python && zip -r ../$(ZIP_NAME_PYTHON) *
 
 
-build/$(ZIP_NAME_NODE): build/lrap_x86_64 build/lrap_aarch64 opt/entrypoint opt/shared.sh opt/node/package.json opt/node/wrapper opt/node/webpack.config.mjs opt/node/init.mjs $(NODE_DISTRO_SRC)
+build/$(ZIP_NAME_NODE): build/dash0_x86_64 build/dash0_aarch64 opt/entrypoint opt/shared.sh opt/node/package.json opt/node/wrapper opt/node/webpack.config.mjs opt/node/init.mjs $(NODE_DISTRO_SRC)
 	@echo Building Node.js layer
 	@rm -f build/$(ZIP_NAME_NODE)
 	@rm -rf build/stage-node
 	@mkdir -p build/stage-node/extensions
-	@cp build/lrap_x86_64 build/stage-node/
-	@cp build/lrap_aarch64 build/stage-node/
-	@cp opt/entrypoint build/stage-node/extensions/lrap
+	@cp build/dash0_x86_64 build/stage-node/
+	@cp build/dash0_aarch64 build/stage-node/
+	@cp opt/entrypoint build/stage-node/extensions/dash0
 	@cp opt/shared.sh build/stage-node/shared.sh
 	@cp opt/node/wrapper build/stage-node/wrapper
 	@bash opt/node/scripts/build-aws-sdk-tarball.sh
@@ -124,30 +124,30 @@ $(JAVA_DISTRO_JAR): $(JAVA_DISTRO_SRC)
 	@echo Building Java distro
 	@cd opt/java/opentelemetry-java-distro && ./gradlew clean -Pversion=1.0.0-SNAPSHOT assemble -x javadoc
 
-build/$(ZIP_NAME_JAVA): build/lrap_x86_64 build/lrap_aarch64 opt/entrypoint opt/shared.sh opt/java/wrapper $(JAVA_DISTRO_JAR)
+build/$(ZIP_NAME_JAVA): build/dash0_x86_64 build/dash0_aarch64 opt/entrypoint opt/shared.sh opt/java/wrapper $(JAVA_DISTRO_JAR)
 	@echo Building Java layer
 	@rm -f build/$(ZIP_NAME_JAVA)
 	@rm -rf build/stage-java
 	@mkdir -p build/stage-java/extensions
 	@mkdir -p build/stage-java/java/lib
-	@cp build/lrap_x86_64 build/stage-java/
-	@cp build/lrap_aarch64 build/stage-java/
-	@cp opt/entrypoint build/stage-java/extensions/lrap
+	@cp build/dash0_x86_64 build/stage-java/
+	@cp build/dash0_aarch64 build/stage-java/
+	@cp opt/entrypoint build/stage-java/extensions/dash0
 	@cp opt/shared.sh build/stage-java/shared.sh
 	@cp opt/java/wrapper build/stage-java/wrapper
 	@cp $(JAVA_DISTRO_JAR) build/stage-java/java/lib/dash0-opentelemetry.jar
 	@cp $(JAVA_CLASSPATH_LIBS_DIR)/*.jar build/stage-java/java/lib/
 	@cd build/stage-java && zip -r ../$(ZIP_NAME_JAVA) *
 
 
-build/$(ZIP_NAME_MANUAL): build/lrap_x86_64 build/lrap_aarch64 opt/entrypoint opt/shared.sh opt/manual/wrapper
+build/$(ZIP_NAME_MANUAL): build/dash0_x86_64 build/dash0_aarch64 opt/entrypoint opt/shared.sh opt/manual/wrapper
 	@echo Building Manual layer
 	@rm -f build/$(ZIP_NAME_MANUAL)
 	@rm -rf build/stage-manual
 	@mkdir -p build/stage-manual/extensions
-	@cp build/lrap_x86_64 build/stage-manual/
-	@cp build/lrap_aarch64 build/stage-manual/
-	@cp opt/entrypoint build/stage-manual/extensions/lrap
+	@cp build/dash0_x86_64 build/stage-manual/
+	@cp build/dash0_aarch64 build/stage-manual/
+	@cp opt/entrypoint build/stage-manual/extensions/dash0
 	@cp opt/shared.sh build/stage-manual/shared.sh
 	@cp opt/manual/wrapper build/stage-manual/wrapper
 	@cd build/stage-manual && zip -r ../$(ZIP_NAME_MANUAL) *
@@ -225,7 +225,7 @@ ensure-buildx:
 
 # Build and push Docker image for Python extension to ECR
 # Usage: make docker-python VERSION=1.0.0
-docker-python: build/lrap_x86_64 build/lrap_aarch64 build/python ensure-buildx
+docker-python: build/dash0_x86_64 build/dash0_aarch64 build/python ensure-buildx
 	@echo "Creating ECR repository $(ECR_REPO_PYTHON) if it doesn't exist..."
 	@aws ecr describe-repositories --repository-names $(ECR_REPO_PYTHON) 2>/dev/null || \
 		aws ecr create-repository --repository-name $(ECR_REPO_PYTHON) --no-cli-pager
@@ -241,7 +241,7 @@ docker-python: build/lrap_x86_64 build/lrap_aarch64 build/python ensure-buildx
 
 # Build and push Docker image for Node.js extension to ECR
 # Usage: make docker-node VERSION=1.0.0
-docker-node: build/lrap_x86_64 build/lrap_aarch64 ensure-buildx
+docker-node: build/dash0_x86_64 build/dash0_aarch64 ensure-buildx
 	@echo "Building Node.js SDK..."
 	@bash opt/node/scripts/build-aws-sdk-tarball.sh
 	@cd opt/node && npm install && npm run build
@@ -260,7 +260,7 @@ docker-node: build/lrap_x86_64 build/lrap_aarch64 ensure-buildx
 
 # Build and push Docker image for Java extension to ECR
 # Usage: make docker-java VERSION=1.0.0
-docker-java: build/lrap_x86_64 build/lrap_aarch64 $(JAVA_DISTRO_JAR) ensure-buildx
+docker-java: build/dash0_x86_64 build/dash0_aarch64 $(JAVA_DISTRO_JAR) ensure-buildx
 	@echo "Creating ECR repository $(ECR_REPO_JAVA) if it doesn't exist..."
 	@aws ecr describe-repositories --repository-names $(ECR_REPO_JAVA) 2>/dev/null || \
 		aws ecr create-repository --repository-name $(ECR_REPO_JAVA) --no-cli-pager

README.md

@@ -46,6 +46,8 @@ See the release page for the latest ARNs of the extension layers for each runtim
 
 * `DASH0_LOGS_INSTRUMENTATION_ENABLED` - When set to `true`, logs won't be collected from the Telemetry API, to prevent duplicates from the OTEL instrumentation. Default: `false`.
 
+* `DASH0_DATASET` - When set, the extension adds a `Dash0-Dataset` header to all OTLP export requests, routing telemetry to the specified dataset in the Dash0 backend.
+
 ### Secret Masking
 
 The extension automatically masks sensitive data in traces payloads. By default, any JSON key matching these patterns (case-insensitive) will have its value replaced with `****`:

integration-tests/iac/lambdas/python/consumer_error.py

@@ -0,0 +1,6 @@
+import json
+
+
+def handler(event, context):
+    print(f"Received event: {json.dumps(event)}")
+    raise RuntimeError("Intentional error for retry testing")

integration-tests/iac/lib/python-tracing-scenarios-stack.ts

@@ -218,46 +218,51 @@ export class PythonTracingScenariosStack extends cdk.NestedStack {
       }));
 
       // Scenario 5: Lambda > EventBridge > Lambda
-      const eventBus = new events.EventBus(this, `TracingTestEventBus-${runtimeName}`, {
-        eventBusName: `${prefix}tracing-test-event-bus-${runtimeName}`,
-      });
-
-      const eventBridgeConsumer = new lambda.Function(this, `EventBridgeConsumerLambda-${runtimeName}`, {
-        functionName: `${prefix}tracing-eventbridge-consumer-${runtimeName}`,
-        runtime,
-        handler: 'consumer.handler',
-        code: pythonCode,
-        layers: [props.layer],
-        role,
-        timeout: cdk.Duration.seconds(10),
-        logGroup: props.logGroup,
-        environment: baseEnvironment,
-      });
-
-      new events.Rule(this, `TracingTestEventBridgeRule-${runtimeName}`, {
-        ruleName: `${prefix}tracing-test-eventbridge-rule-${runtimeName}`,
-        eventBus,
-        eventPattern: {
-          source: ['tracing-tests.producer'],
-          detailType: ['TestMessage'],
-        },
-        targets: [new events_targets.LambdaFunction(eventBridgeConsumer)],
-      });
-
-      const eventBridgeProducer = new lambda.Function(this, `EventBridgeProducerLambda-${runtimeName}`, {
-        functionName: `${prefix}tracing-eventbridge-producer-${runtimeName}`,
-        runtime,
-        handler: 'eventbridge_producer.handler',
-        code: pythonCode,
-        layers: [props.layer],
-        role,
-        timeout: cdk.Duration.seconds(10),
-        logGroup: props.logGroup,
-        environment: {
-          ...baseEnvironment,
-          EVENT_BUS_NAME: eventBus.eventBusName,
-        },
-      });
+      for (const withError of [false, true]) {
+        const errorSuffix = withError ? '-error' : '';
+        const errorIdSuffix = withError ? 'Error' : '';
+
+        const eventBus = new events.EventBus(this, `TracingTestEventBus${errorIdSuffix}-${runtimeName}`, {
+          eventBusName: `${prefix}tracing-test-event-bus${errorSuffix}-${runtimeName}`,
+        });
+
+        const eventBridgeConsumer = new lambda.Function(this, `EventBridgeConsumerLambda${errorIdSuffix}-${runtimeName}`, {
+          functionName: `${prefix}tracing-eventbridge-consumer${errorSuffix}-${runtimeName}`,
+          runtime,
+          handler: withError ? 'consumer_error.handler' : 'consumer.handler',
+          code: pythonCode,
+          layers: [props.layer],
+          role,
+          timeout: cdk.Duration.seconds(10),
+          logGroup: props.logGroup,
+          environment: baseEnvironment,
+        });
+
+        new events.Rule(this, `TracingTestEventBridgeRule${errorIdSuffix}-${runtimeName}`, {
+          ruleName: `${prefix}tracing-test-eventbridge-rule${errorSuffix}-${runtimeName}`,
+          eventBus,
+          eventPattern: {
+            source: ['tracing-tests.producer'],
+            detailType: ['TestMessage'],
+          },
+          targets: [new events_targets.LambdaFunction(eventBridgeConsumer)],
+        });
+
+        const eventBridgeProducer = new lambda.Function(this, `EventBridgeProducerLambda${errorIdSuffix}-${runtimeName}`, {
+          functionName: `${prefix}tracing-eventbridge-producer${errorSuffix}-${runtimeName}`,
+          runtime,
+          handler: 'eventbridge_producer.handler',
+          code: pythonCode,
+          layers: [props.layer],
+          role,
+          timeout: cdk.Duration.seconds(10),
+          logGroup: props.logGroup,
+          environment: {
+            ...baseEnvironment,
+            EVENT_BUS_NAME: eventBus.eventBusName,
+          },
+        });
+      }
 
       // Scenario 6: Lambda > API Gateway > Lambda
       const apiGatewayConsumer = new lambda.Function(this, `ApiGatewayConsumerLambda-${runtimeName}`, {