Skip to content
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

Updated E2E DotNet Operation after route template fix #306

Merged
merged 11 commits into from
Nov 22, 2024
Merged

Updated E2E DotNet Operation after route template fix #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ea7bfb4
Updated E2E DotNet Operation after route template fix
AsakerMohd Oct 30, 2024
3cf3afa
Merge branch 'main' into dotnetE2ERouteFix
AsakerMohd Oct 30, 2024
5afec92
Merge branch 'main' into dotnetE2ERouteFix
AsakerMohd Nov 21, 2024
13417d3
Revert "Set dotnet E2E test target for dotnet sdk v1.3.2 and cloudwat…
AsakerMohd Nov 21, 2024
40636fc
Revert "Set dotnet E2E nuget test target for dotnet sdk v1.3.2 (#310)"
AsakerMohd Nov 21, 2024
d690cf1
Revert "Set EKS addon to v2.2.1-eksbuild.1 for dotnet E2E test (#313)"
AsakerMohd Nov 21, 2024
cf3fbe9
temporary branch change
AsakerMohd Nov 21, 2024
0f23492
added missing metric changes
AsakerMohd Nov 21, 2024
7397ae2
updated more validations and tests
AsakerMohd Nov 21, 2024
851341b
final change 🤞
AsakerMohd Nov 21, 2024
171ef6d
Revert "temporary branch change"
AsakerMohd Nov 21, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-ec2-default-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
echo GET_ADOT_DISTRO_COMMAND="aws s3 cp s3://adot-autoinstrumentation-dotnet-staging/${{ env.ADOT_DISTRO_NAME }} ./${{ env.ADOT_DISTRO_NAME }} && unzip -d dotnet-distro ${{ env.ADOT_DISTRO_NAME }}" >> $GITHUB_ENV
else
# After Release will switch to latest tag instead of hard code version for canary purpose
echo GET_ADOT_DISTRO_COMMAND="wget -O aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip https://github.com/aws-observability/aws-otel-dotnet-instrumentation/releases/download/v1.3.2/aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip && unzip -d dotnet-distro aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip" >> $GITHUB_ENV
echo GET_ADOT_DISTRO_COMMAND="wget -O aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip https://github.com/aws-observability/aws-otel-dotnet-instrumentation/releases/latest/download/aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip && unzip -d dotnet-distro aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip" >> $GITHUB_ENV
fi

- name: Set Get CW Agent command environment variable
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-eks-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
uses: ./.github/workflows/actions/execute_and_retry
with:
pre-command: "mkdir enablement-script && cd enablement-script"
command: "wget https://raw.githubusercontent.com/aws-observability/application-signals-demo/dotnet-sdk-1_3_2/scripts/eks/appsignals/enable-app-signals.sh
command: "wget https://raw.githubusercontent.com/aws-observability/application-signals-demo/main/scripts/eks/appsignals/enable-app-signals.sh
&& wget https://raw.githubusercontent.com/aws-observability/application-signals-demo/main/scripts/eks/appsignals/clean-app-signals.sh"
cleanup: "rm -f enable-app-signals.sh && rm -f clean-app-signals.sh"
post-command: "chmod +x enable-app-signals.sh && chmod +x clean-app-signals.sh"
Expand Down
4 changes: 2 additions & 2 deletions terraform/dotnet/ec2/nuget/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ resource "null_resource" "main_service_setup" {
export OTEL_RESOURCE_ATTRIBUTES=service.name=dotnet-sample-application-${var.test_id}

cd ./asp_frontend_service
dotnet add package AWS.Distro.OpenTelemetry.AutoInstrumentation --version 1.3.2
dotnet add package AWS.Distro.OpenTelemetry.AutoInstrumentation --prerelease
dotnet build --runtime linux-x64
dos2unix bin/Debug/netcoreapp8.0/linux-x64/adot-launch.sh
nohup sh bin/Debug/netcoreapp8.0/linux-x64/adot-launch.sh dotnet bin/Debug/netcoreapp8.0/linux-x64/asp_frontend_service.dll &
Expand Down Expand Up @@ -236,7 +236,7 @@ resource "null_resource" "remote_service_setup" {
export OTEL_RESOURCE_ATTRIBUTES=service.name=dotnet-sample-remote-application-${var.test_id}
export ASPNETCORE_URLS=http://0.0.0.0:8081

dotnet add package AWS.Distro.OpenTelemetry.AutoInstrumentation --version 1.3.2
dotnet add package AWS.Distro.OpenTelemetry.AutoInstrumentation --prerelease
dotnet build --runtime linux-x64
dos2unix bin/Debug/netcoreapp8.0/linux-x64/adot-launch.sh
nohup sh bin/Debug/netcoreapp8.0/linux-x64/adot-launch.sh dotnet bin/Debug/netcoreapp8.0/linux-x64/asp_remote_service.dll &
Expand Down
2 changes: 1 addition & 1 deletion terraform/dotnet/k8s/deploy/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ resource "null_resource" "deploy" {
[ ! -e dotnet-remote-service-depl.yaml ] || rm dotnet-remote-service-depl.yaml

echo "LOG: Getting latest helm chart release URL"
latest_version_url=$(curl -s https://api.github.com/repos/aws-observability/helm-charts/releases/182005608 | grep "tarball_url" | cut -d '"' -f 4)
latest_version_url=$(curl -s https://api.github.com/repos/aws-observability/helm-charts/releases/latest | grep "tarball_url" | cut -d '"' -f 4)
echo "LOG: The latest helm chart version url is $latest_version_url"
echo "LOG: Downloading and unpacking the helm chart repo"
curl -L $latest_version_url -o aws-observability-helm-charts-latest.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion validator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-log.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"EC2.InstanceId": "^{{instanceId}}$",
"Environment": "^ec2:{{platformInfo}}$",
"PlatformType": "^AWS::EC2$",
"Operation": "GET /aws-sdk-call",
"Operation": "GET aws-sdk-call",
"Version": "^1$",
"RemoteService": "AWS::S3",
"RemoteOperation": "GetBucketLocation",
Expand Down
12 changes: 6 additions & 6 deletions ...tor/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-metric.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
dimensions:
-
name: Operation
value: GET /aws-sdk-call
value: GET aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -80,7 +80,7 @@
dimensions:
-
name: Operation
value: GET /aws-sdk-call
value: GET aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -154,7 +154,7 @@
dimensions:
-
name: Operation
value: GET /aws-sdk-call
value: GET aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -205,7 +205,7 @@
dimensions:
-
name: Operation
value: GET /aws-sdk-call
value: GET aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -279,7 +279,7 @@
dimensions:
-
name: Operation
value: GET /aws-sdk-call
value: GET aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -330,7 +330,7 @@
dimensions:
-
name: Operation
value: GET /aws-sdk-call
value: GET aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand Down
2 changes: 1 addition & 1 deletion ...ator/src/main/resources/expected-data-template/dotnet/ec2/asg/aws-sdk-call-trace.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
},
"annotations": {
"aws.local.service": "^{{serviceName}}$",
"aws.local.operation": "^GET /aws-sdk-call$",
"aws.local.operation": "^GET aws-sdk-call$",
"aws.remote.service": "^AWS::S3$",
"aws.remote.operation": "^GetBucketLocation$",
"aws.local.environment": "^ec2:{{platformInfo}}$",
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/resources/expected-data-template/dotnet/ec2/asg/outgoing-http-call-log.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"EC2.InstanceId": "^{{instanceId}}$",
"Environment": "^ec2:{{platformInfo}}$",
"PlatformType": "^AWS::EC2$",
"Operation": "GET /outgoing-http-call",
"Operation": "GET outgoing-http-call",
"Version": "^1$",
"RemoteService": "aws.amazon.com:443",
"RemoteOperation": "GET /",
Expand Down
6 changes: 3 additions & 3 deletions ...c/main/resources/expected-data-template/dotnet/ec2/asg/outgoing-http-call-metric.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
dimensions:
-
name: Operation
value: GET /outgoing-http-call
value: GET outgoing-http-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -105,7 +105,7 @@
dimensions:
-
name: Operation
value: GET /outgoing-http-call
value: GET outgoing-http-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -181,7 +181,7 @@
dimensions:
-
name: Operation
value: GET /outgoing-http-call
value: GET outgoing-http-call
-
name: Service
value: {{serviceName}}
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/resources/expected-data-template/dotnet/ec2/asg/outgoing-http-call-trace.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"annotations": {
"aws.local.service": "^{{serviceName}}$",
"aws.local.operation": "^GET /outgoing-http-call$",
"aws.local.operation": "^GET outgoing-http-call$",
"aws.remote.service": "^aws.amazon.com:443$",
"aws.remote.operation": "^GET /$",
"aws.local.environment": "^ec2:{{platformInfo}}$"
Expand Down
2 changes: 1 addition & 1 deletion ...ator/src/main/resources/expected-data-template/dotnet/ec2/asg/remote-service-log.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"EC2.InstanceId": "^{{instanceId}}$",
"Environment": "^ec2:{{platformInfo}}$",
"PlatformType": "^AWS::EC2$",
"Operation": "GET /remote-service",
"Operation": "GET remote-service",
"Version": "^1$",
"RemoteService": "{{remoteServiceDeploymentName}}",
"RemoteOperation": "GET /healthcheck",
Expand Down
6 changes: 3 additions & 3 deletions ...r/src/main/resources/expected-data-template/dotnet/ec2/asg/remote-service-metric.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
dimensions:
-
name: Operation
value: GET /remote-service
value: GET remote-service
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -127,7 +127,7 @@
dimensions:
-
name: Operation
value: GET /remote-service
value: GET remote-service
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -236,7 +236,7 @@
dimensions:
-
name: Operation
value: GET /remote-service
value: GET remote-service
-
name: Service
value: {{serviceName}}
Expand Down
2 changes: 1 addition & 1 deletion ...or/src/main/resources/expected-data-template/dotnet/ec2/asg/remote-service-trace.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"annotations": {
"aws.local.service": "^{{serviceName}}$",
"aws.local.operation": "^GET /remote-service$",
"aws.local.operation": "^GET remote-service$",
"aws.remote.service": "^{{remoteServiceDeploymentName}}$",
"aws.remote.operation": "^GET /healthcheck$",
"aws.local.environment": "^ec2:{{platformInfo}}$"
Expand Down
4 changes: 2 additions & 2 deletions ...or/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-log.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"EC2.InstanceId": "^{{instanceId}}$",
"Environment": "^ec2:default$",
"PlatformType": "^AWS::EC2$",
"Operation": "GET /aws-sdk-call",
"Operation": "GET aws-sdk-call",
"Version": "^1$",
"Telemetry.Source": "^LocalRootSpan$",
"Host": "^ip(-[0-9]{1,3}){4}.*$"
Expand All @@ -11,7 +11,7 @@
"EC2.InstanceId": "^{{instanceId}}$",
"Environment": "^ec2:default$",
"PlatformType": "^AWS::EC2$",
"Operation": "GET /aws-sdk-call",
"Operation": "GET aws-sdk-call",
"Version": "^1$",
"RemoteService": "AWS::S3",
"RemoteOperation": "GetBucketLocation",
Expand Down
18 changes: 9 additions & 9 deletions ...src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-metric.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
dimensions:
-
name: Operation
value: GET /aws-sdk-call
value: GET aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand All @@ -29,7 +29,7 @@
dimensions:
-
name: Operation
value: GET /aws-sdk-call
value: GET aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -80,7 +80,7 @@
dimensions:
-
name: Operation
value: GET /aws-sdk-call
value: GET aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -140,7 +140,7 @@
dimensions:
-
name: Operation
value: GET /aws-sdk-call
value: GET aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand All @@ -154,7 +154,7 @@
dimensions:
-
name: Operation
value: GET /aws-sdk-call
value: GET aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -205,7 +205,7 @@
dimensions:
-
name: Operation
value: GET /aws-sdk-call
value: GET aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -265,7 +265,7 @@
dimensions:
-
name: Operation
value: GET /aws-sdk-call
value: GET aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand All @@ -279,7 +279,7 @@
dimensions:
-
name: Operation
value: GET /aws-sdk-call
value: GET aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -331,7 +331,7 @@
dimensions:
-
name: Operation
value: GET /aws-sdk-call
value: GET aws-sdk-call
-
name: Service
value: {{serviceName}}
Expand Down
4 changes: 2 additions & 2 deletions .../src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-trace.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"annotations": {
"aws.local.service": "^{{serviceName}}$",
"aws.local.operation": "^GET /aws-sdk-call$",
"aws.local.operation": "^GET aws-sdk-call$",
"aws.local.environment": "^ec2:default$"
},
"metadata": {
Expand All @@ -31,7 +31,7 @@
},
"annotations": {
"aws.local.service": "^{{serviceName}}$",
"aws.local.operation": "^GET /aws-sdk-call$",
"aws.local.operation": "^GET aws-sdk-call$",
"aws.remote.service": "^AWS::S3$",
"aws.remote.operation": "^GetBucketLocation$",
"aws.local.environment": "^ec2:default$",
Expand Down
4 changes: 2 additions & 2 deletions .../main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-log.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"EC2.InstanceId": "^{{instanceId}}$",
"Environment": "^ec2:default$",
"PlatformType": "^AWS::EC2$",
"Operation": "GET /outgoing-http-call",
"Operation": "GET outgoing-http-call",
"Version": "^1$",
"Telemetry.Source": "^LocalRootSpan$",
"Host": "^ip(-[0-9]{1,3}){4}.*$"
Expand All @@ -11,7 +11,7 @@
"EC2.InstanceId": "^{{instanceId}}$",
"Environment": "^ec2:default$",
"PlatformType": "^AWS::EC2$",
"Operation": "GET /outgoing-http-call",
"Operation": "GET outgoing-http-call",
"Version": "^1$",
"RemoteService": "aws.amazon.com:443",
"RemoteOperation": "GET /",
Expand Down
12 changes: 6 additions & 6 deletions ...in/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-metric.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
dimensions:
-
name: Operation
value: GET /outgoing-http-call
value: GET outgoing-http-call
-
name: Service
value: {{serviceName}}
Expand All @@ -29,7 +29,7 @@
dimensions:
-
name: Operation
value: GET /outgoing-http-call
value: GET outgoing-http-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -91,7 +91,7 @@
dimensions:
-
name: Operation
value: GET /outgoing-http-call
value: GET outgoing-http-call
-
name: Service
value: {{serviceName}}
Expand All @@ -105,7 +105,7 @@
dimensions:
-
name: Operation
value: GET /outgoing-http-call
value: GET outgoing-http-call
-
name: Service
value: {{serviceName}}
Expand Down Expand Up @@ -167,7 +167,7 @@
dimensions:
-
name: Operation
value: GET /outgoing-http-call
value: GET outgoing-http-call
-
name: Service
value: {{serviceName}}
Expand All @@ -181,7 +181,7 @@
dimensions:
-
name: Operation
value: GET /outgoing-http-call
value: GET outgoing-http-call
-
name: Service
value: {{serviceName}}
Expand Down
Loading