From 2348112f6f164ef1ca8f0c8c5b02f29cc4e2ae8d Mon Sep 17 00:00:00 2001 From: Min Xia Date: Wed, 16 Oct 2024 17:48:15 -0700 Subject: [PATCH 1/2] Make EC2 canary use the new SDK version released --- .github/workflows/java-ec2-default-test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java-ec2-default-test.yml b/.github/workflows/java-ec2-default-test.yml index 270b89930..b5ac13f50 100644 --- a/.github/workflows/java-ec2-default-test.yml +++ b/.github/workflows/java-ec2-default-test.yml @@ -112,8 +112,9 @@ jobs: # Reusing the adot-main-build-staging-jar bucket to store the python wheel file echo GET_ADOT_JAR_COMMAND="aws s3 cp s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar ./adot.jar" >> $GITHUB_ENV elif [ "${{ env.OTEL_SOURCE }}" == "maven" ]; then - echo "Latest version for Maven is: 1.32.3" - echo GET_ADOT_JAR_COMMAND="wget -O adot.jar https://repo1.maven.org/maven2/software/amazon/opentelemetry/aws-opentelemetry-agent/1.32.3/aws-opentelemetry-agent-1.32.3.jar" >> $GITHUB_ENV + echo "Latest version for Maven is: 1.32.4" + echo GET_ADOT_JAR_COMMAND="wget -O adot.jar https://repo1.maven.org/maven2/software/amazon/opentelemetry/aws-opentelemetry-agent/1.32.4/aws-opentelemetry-agent-1.32.4.jar" >> + $GITHUB_ENV else echo GET_ADOT_JAR_COMMAND="wget -O adot.jar https://github.com/aws-observability/aws-otel-java-instrumentation/releases/latest/download/aws-opentelemetry-agent.jar" >> $GITHUB_ENV fi From 8e7a6c20d68301855324609248f3467f64073b35 Mon Sep 17 00:00:00 2001 From: Min Xia Date: Thu, 24 Oct 2024 11:36:39 -0700 Subject: [PATCH 2/2] Fix Lambda Canary Test --- .../node/lambda/aws-sdk-call-log.mustache | 2 +- .../node/lambda/aws-sdk-call-metric.mustache | 12 ++-- .../node/lambda/lambda-invoke-log.mustache | 2 +- .../node/lambda/lambda-invoke-metric.mustache | 6 +- .../node/lambda/lambda-invoke-trace.mustache | 4 +- .../python/lambda/aws-sdk-call-log.mustache | 2 +- .../lambda/aws-sdk-call-metric.mustache | 12 ++-- .../python/lambda/aws-sdk-call-trace.mustache | 65 ------------------- .../python/lambda/lambda-invoke-log.mustache | 2 +- .../lambda/lambda-invoke-metric.mustache | 6 +- .../lambda/lambda-invoke-trace.mustache | 4 +- 11 files changed, 26 insertions(+), 91 deletions(-) delete mode 100644 validator/src/main/resources/expected-data-template/python/lambda/aws-sdk-call-trace.mustache diff --git a/validator/src/main/resources/expected-data-template/node/lambda/aws-sdk-call-log.mustache b/validator/src/main/resources/expected-data-template/node/lambda/aws-sdk-call-log.mustache index 7ee9de180..3981762fa 100644 --- a/validator/src/main/resources/expected-data-template/node/lambda/aws-sdk-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/node/lambda/aws-sdk-call-log.mustache @@ -1,7 +1,7 @@ [{ "Environment": "^lambda:default$", "PlatformType": "^AWS:Lambda$", - "Operation": "^{{serviceName}}/Handler", + "Operation": "^{{serviceName}}/FunctionHandler", "Service": "^{{serviceName}}$", "RemoteService": "AWS::S3", "RemoteOperation": "ListBuckets", diff --git a/validator/src/main/resources/expected-data-template/node/lambda/aws-sdk-call-metric.mustache b/validator/src/main/resources/expected-data-template/node/lambda/aws-sdk-call-metric.mustache index a9feeb3f7..ced234c2f 100644 --- a/validator/src/main/resources/expected-data-template/node/lambda/aws-sdk-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/node/lambda/aws-sdk-call-metric.mustache @@ -4,7 +4,7 @@ dimensions: - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Service value: {{serviceName}} @@ -18,7 +18,7 @@ dimensions: - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Service value: {{serviceName}} @@ -80,7 +80,7 @@ dimensions: - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Service value: {{serviceName}} @@ -94,7 +94,7 @@ dimensions: - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Service value: {{serviceName}} @@ -156,7 +156,7 @@ dimensions: - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Service value: {{serviceName}} @@ -170,7 +170,7 @@ dimensions: - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/node/lambda/lambda-invoke-log.mustache b/validator/src/main/resources/expected-data-template/node/lambda/lambda-invoke-log.mustache index 1f9e41284..c36fdabd8 100644 --- a/validator/src/main/resources/expected-data-template/node/lambda/lambda-invoke-log.mustache +++ b/validator/src/main/resources/expected-data-template/node/lambda/lambda-invoke-log.mustache @@ -1,6 +1,6 @@ [{ "Environment": "^lambda:default$", - "Operation": "^{{serviceName}}/Handler", + "Operation": "^{{serviceName}}/FunctionHandler", "PlatformType": "^AWS:Lambda$", "Service": "^{{serviceName}}$", "Lambda.Function.Name": "^{{serviceName}}$" diff --git a/validator/src/main/resources/expected-data-template/node/lambda/lambda-invoke-metric.mustache b/validator/src/main/resources/expected-data-template/node/lambda/lambda-invoke-metric.mustache index 8c4c183bd..ca4d5042e 100644 --- a/validator/src/main/resources/expected-data-template/node/lambda/lambda-invoke-metric.mustache +++ b/validator/src/main/resources/expected-data-template/node/lambda/lambda-invoke-metric.mustache @@ -18,7 +18,7 @@ value: {{serviceName}} - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Environment value: lambda:default @@ -43,7 +43,7 @@ value: {{serviceName}} - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Environment value: lambda:default @@ -68,7 +68,7 @@ value: {{serviceName}} - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Environment value: lambda:default diff --git a/validator/src/main/resources/expected-data-template/node/lambda/lambda-invoke-trace.mustache b/validator/src/main/resources/expected-data-template/node/lambda/lambda-invoke-trace.mustache index 193baa9b5..d9e078065 100644 --- a/validator/src/main/resources/expected-data-template/node/lambda/lambda-invoke-trace.mustache +++ b/validator/src/main/resources/expected-data-template/node/lambda/lambda-invoke-trace.mustache @@ -2,12 +2,12 @@ "name": "^{{serviceName}}$", "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^{{serviceName}}/Handler$", + "aws.local.operation": "^{{serviceName}}/FunctionHandler$", "aws.local.environment": "^lambda:default$" }, "metadata": { "default": { - "faas.id": "arn:aws:lambda:{{region}}:{{accountId}}:function:{{serviceName}}", + "faas.id": "arn:aws:lambda:{{region}}:{{accountId}}:function:{{serviceName}}$", } }, "subsegments": [ diff --git a/validator/src/main/resources/expected-data-template/python/lambda/aws-sdk-call-log.mustache b/validator/src/main/resources/expected-data-template/python/lambda/aws-sdk-call-log.mustache index 7ee9de180..dcbf62d28 100644 --- a/validator/src/main/resources/expected-data-template/python/lambda/aws-sdk-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/python/lambda/aws-sdk-call-log.mustache @@ -1,7 +1,7 @@ [{ "Environment": "^lambda:default$", "PlatformType": "^AWS:Lambda$", - "Operation": "^{{serviceName}}/Handler", + "Operation": "^{{serviceName}}/FunctionHandler$", "Service": "^{{serviceName}}$", "RemoteService": "AWS::S3", "RemoteOperation": "ListBuckets", diff --git a/validator/src/main/resources/expected-data-template/python/lambda/aws-sdk-call-metric.mustache b/validator/src/main/resources/expected-data-template/python/lambda/aws-sdk-call-metric.mustache index a9feeb3f7..ced234c2f 100644 --- a/validator/src/main/resources/expected-data-template/python/lambda/aws-sdk-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/python/lambda/aws-sdk-call-metric.mustache @@ -4,7 +4,7 @@ dimensions: - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Service value: {{serviceName}} @@ -18,7 +18,7 @@ dimensions: - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Service value: {{serviceName}} @@ -80,7 +80,7 @@ dimensions: - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Service value: {{serviceName}} @@ -94,7 +94,7 @@ dimensions: - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Service value: {{serviceName}} @@ -156,7 +156,7 @@ dimensions: - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Service value: {{serviceName}} @@ -170,7 +170,7 @@ dimensions: - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/python/lambda/aws-sdk-call-trace.mustache b/validator/src/main/resources/expected-data-template/python/lambda/aws-sdk-call-trace.mustache deleted file mode 100644 index 75050a440..000000000 --- a/validator/src/main/resources/expected-data-template/python/lambda/aws-sdk-call-trace.mustache +++ /dev/null @@ -1,65 +0,0 @@ -[{ - "name": "^{{serviceName}}$", - "http": { - "request": { - "url": "^{{endpoint}}/aws-sdk-call\\?ip=(([0-9]{1,3}.){3}[0-9]{1,3})&testingId={{testingId}}$", - "method": "^GET$" - }, - "response": { - "status": "^200$" - } - }, - "aws": { - "account_id": "^{{accountId}}$" - }, - "annotations": { - "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET aws-sdk-call$", - "aws.local.environment": "^ec2:default$" - }, - "metadata": { - "default": { - "EC2.InstanceId": "^{{instanceId}}$", - "PlatformType": "^AWS::EC2$", - "otel.resource.host.image.id": "^{{instanceAmi}}$", - "otel.resource.host.type": "^([a-z0-9]+\\.[a-z0-9]+)$", - "aws.span.kind": "^LOCAL_ROOT$" - } - }, - "subsegments": [ - { - "name": "^S3$", - "http": { - "response": { - "status": "^404$" - } - }, - "aws": { - "operation": "^GetBucketLocation$" - }, - "annotations": { - "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET aws-sdk-call$", - "aws.remote.service": "^AWS::S3$", - "aws.remote.operation": "^GetBucketLocation$", - "aws.remote.resource.type": "^AWS::S3::Bucket$", - "aws.remote.resource.identifier": "^e2e-test-bucket-name-{{testingId}}$", - "aws.local.environment": "^ec2:default$" - }, - "metadata": { - "default": { - "EC2.InstanceId": "^{{instanceId}}$", - "PlatformType": "^AWS::EC2$", - "aws.span.kind": "^CLIENT$" - } - }, - "namespace": "^aws$" - } - ] -}, -{ - "name": "^S3$", - "aws": { - "operation": "^GetBucketLocation$" - } -}] \ No newline at end of file diff --git a/validator/src/main/resources/expected-data-template/python/lambda/lambda-invoke-log.mustache b/validator/src/main/resources/expected-data-template/python/lambda/lambda-invoke-log.mustache index 1f9e41284..af3c3ceaf 100644 --- a/validator/src/main/resources/expected-data-template/python/lambda/lambda-invoke-log.mustache +++ b/validator/src/main/resources/expected-data-template/python/lambda/lambda-invoke-log.mustache @@ -1,6 +1,6 @@ [{ "Environment": "^lambda:default$", - "Operation": "^{{serviceName}}/Handler", + "Operation": "^{{serviceName}}/FunctionHandler$", "PlatformType": "^AWS:Lambda$", "Service": "^{{serviceName}}$", "Lambda.Function.Name": "^{{serviceName}}$" diff --git a/validator/src/main/resources/expected-data-template/python/lambda/lambda-invoke-metric.mustache b/validator/src/main/resources/expected-data-template/python/lambda/lambda-invoke-metric.mustache index 8c4c183bd..ca4d5042e 100644 --- a/validator/src/main/resources/expected-data-template/python/lambda/lambda-invoke-metric.mustache +++ b/validator/src/main/resources/expected-data-template/python/lambda/lambda-invoke-metric.mustache @@ -18,7 +18,7 @@ value: {{serviceName}} - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Environment value: lambda:default @@ -43,7 +43,7 @@ value: {{serviceName}} - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Environment value: lambda:default @@ -68,7 +68,7 @@ value: {{serviceName}} - name: Operation - value: {{serviceName}}/Handler + value: {{serviceName}}/FunctionHandler - name: Environment value: lambda:default diff --git a/validator/src/main/resources/expected-data-template/python/lambda/lambda-invoke-trace.mustache b/validator/src/main/resources/expected-data-template/python/lambda/lambda-invoke-trace.mustache index 193baa9b5..d9e078065 100644 --- a/validator/src/main/resources/expected-data-template/python/lambda/lambda-invoke-trace.mustache +++ b/validator/src/main/resources/expected-data-template/python/lambda/lambda-invoke-trace.mustache @@ -2,12 +2,12 @@ "name": "^{{serviceName}}$", "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^{{serviceName}}/Handler$", + "aws.local.operation": "^{{serviceName}}/FunctionHandler$", "aws.local.environment": "^lambda:default$" }, "metadata": { "default": { - "faas.id": "arn:aws:lambda:{{region}}:{{accountId}}:function:{{serviceName}}", + "faas.id": "arn:aws:lambda:{{region}}:{{accountId}}:function:{{serviceName}}$", } }, "subsegments": [