fix: change process.environ to semantic conventions (#30)

Author: mosheshaham-dash0

Makefile

@@ -77,27 +77,29 @@ 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/python/wrapper opt/python/otel_wrapper.py build/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
 	@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 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/node/package.json opt/node/wrapper opt/node/webpack.config.mjs opt/node/init.mjs $(NODE_DISTRO_SRC)
+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)
 	@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 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
 	@cd opt/node && npm install && npm run build
@@ -122,7 +124,7 @@ $(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/java/wrapper $(JAVA_DISTRO_JAR)
+build/$(ZIP_NAME_JAVA): build/lrap_x86_64 build/lrap_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
@@ -131,20 +133,22 @@ build/$(ZIP_NAME_JAVA): build/lrap_x86_64 build/lrap_aarch64 opt/entrypoint opt/
 	@cp build/lrap_x86_64 build/stage-java/
 	@cp build/lrap_aarch64 build/stage-java/
 	@cp opt/entrypoint build/stage-java/extensions/lrap
+	@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/manual/wrapper
+build/$(ZIP_NAME_MANUAL): build/lrap_x86_64 build/lrap_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 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) *
 

integration-tests/iac/lib/integration-tests-stack.ts

@@ -70,15 +70,17 @@ function createLambdas(
               DASH0_ENDPOINT: "https://ingress.eu-west-1.aws.dash0-dev.com:4318",
               DASH0_EXTENSION_LOG_LEVEL: "info",
               DASH0_SEND_ON_INVOCATION_END: invocationEnd,
-              DASH0_MASK_RULES: '[".*masked_field.*"]',
-              MASKED_FIELD: "sensitive information",
             };
             if (traced === "false") {
               environment["DASH0_DISABLE_AUTO_INSTRUMENTATION"] = "true";
             }
             if (scenario === "timeout") {
               environment["SLEEP_DURATION_MS"] = "20000";
             }
+            if (runtime.family === lambda.RuntimeFamily.NODEJS) {
+              environment["DASH0_MASK_RULES"] = '[".*masked_field.*"]';
+              environment["MASKED_FIELD"] = 'sensitive information';
+            }
 
             const functionName = `${prefix}${runtimeName}-${scenario}-${traced}-invocation-end-${invocationEnd}-${architecture.name}`;
             const handler = overrides?.handler ?? `${scenario}.handler`;

integration-tests/tests/src/test-node-success.test.ts

@@ -56,7 +56,7 @@ const verifySuccessInvocation = async (functionName: string, invocationEnd: bool
             expect(spanAttributes['faas.invocation_id'].stringValue).toEqual(invocationId);
 
             const resourceAttributes = getAttributesMap(lambdaResource!.attributes);
-            expect(JSON.parse(resourceAttributes['process.environ'].stringValue)['MASKED_FIELD']).toEqual('****');
+            expect(resourceAttributes['process.environment_variable.MASKED_FIELD'].stringValue).toEqual('****');
             checkResourceAttributes(lambdaResource!.attributes, functionName);
 
             traceId = span.traceId;

integration-tests/tests/src/test-python-success.test.ts

@@ -54,6 +54,8 @@ const verifySuccessInvocation = async (functionName: string, invocationEnd: bool
             expect(spanAttributes['faas.invocation_id'].stringValue).toEqual(invocationId);
 
             checkResourceAttributes(lambdaResource!.attributes, functionName);
+            const resourceAttributes = getAttributesMap(lambdaResource!.attributes);
+            expect(resourceAttributes['process.environment_variable.DASH0_TOKEN'].stringValue).toEqual('****');
 
             traceId = span.traceId;
             parentSpanId = span.spanId;

opt/docker/Dockerfile.java

@@ -27,7 +27,8 @@
 # Copy entrypoint script (Lambda extension entry point)
 COPY opt/entrypoint /opt/extensions/lrap
 
-# Copy wrapper script
+# Copy shared script and wrapper script
+COPY opt/shared.sh /opt/shared.sh
 COPY opt/java/wrapper /opt/wrapper
 
 # Copy Java agent JAR (built locally from opt/java/opentelemetry-java-distro)

opt/docker/Dockerfile.node

@@ -26,7 +26,8 @@ COPY build/lrap_aarch64 /opt/lrap_aarch64
 # Copy entrypoint script (Lambda extension entry point)
 COPY opt/entrypoint /opt/extensions/lrap
 
-# Copy wrapper script
+# Copy shared script and wrapper script
+COPY opt/shared.sh /opt/shared.sh
 COPY opt/node/wrapper /opt/wrapper
 
 # Copy bundled Node.js SDK (webpack output)

opt/docker/Dockerfile.python

@@ -44,7 +44,8 @@ COPY build/lrap_aarch64 /opt/lrap_aarch64
 # Copy entrypoint script (Lambda extension entry point)
 COPY opt/entrypoint /opt/extensions/lrap
 
-# Copy wrapper script
+# Copy shared script and wrapper script
+COPY opt/shared.sh /opt/shared.sh
 COPY opt/python/wrapper /opt/wrapper
 
 # Copy Python SDK and dependencies

opt/java/opentelemetry-java-distro/agent/build.gradle

@@ -125,14 +125,6 @@ tasks {
     def javaagentLibs = "$buildDir/isolated/javaagentLibs"
     into(javaagentLibs)
 
-    doLast {
-      def file = file("${javaagentLibs}/inst/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider")
-      def lines = file.readLines()
-      def newLines = lines.findAll { !it.contains("io.opentelemetry.contrib.aws.resource.Ec2ResourceProvider") }
-      file.newWriter().withWriter { w ->
-        w << newLines.join(System.getProperty("line.separator"))
-      }
-    }
   }
 
   // 3. the relocated and isolated javaagent libs are merged together with the bootstrap libs (which undergo relocation