diff --git a/.github/workflows/dotnet-ec2-default-test.yml b/.github/workflows/dotnet-ec2-default-test.yml index e8d070f74..9d09da3cd 100644 --- a/.github/workflows/dotnet-ec2-default-test.yml +++ b/.github/workflows/dotnet-ec2-default-test.yml @@ -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.2.0/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 diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-log.mustache index b510ed01d..06f8fadda 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-log.mustache @@ -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}.*$" diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-metric.mustache index e5e9a531d..ea61b697a 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-metric.mustache @@ -15,7 +15,7 @@ dimensions: - name: Operation - value: GET aws-sdk-call + value: GET /aws-sdk-call - name: Service value: {{serviceName}} @@ -140,7 +140,7 @@ dimensions: - name: Operation - value: GET aws-sdk-call + value: GET /aws-sdk-call - name: Service value: {{serviceName}} @@ -265,7 +265,7 @@ dimensions: - name: Operation - value: GET aws-sdk-call + value: GET /aws-sdk-call - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-trace.mustache index ebca0f425..385f1b713 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/aws-sdk-call-trace.mustache @@ -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": { diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-log.mustache index 9ae7b0492..848e84902 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-log.mustache @@ -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}.*$" diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-metric.mustache index 685b88814..748e05178 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-metric.mustache @@ -15,7 +15,7 @@ dimensions: - name: Operation - value: GET outgoing-http-call + value: GET /outgoing-http-call - name: Service value: {{serviceName}} @@ -91,7 +91,7 @@ dimensions: - name: Operation - value: GET outgoing-http-call + value: GET /outgoing-http-call - name: Service value: {{serviceName}} @@ -167,7 +167,7 @@ dimensions: - name: Operation - value: GET outgoing-http-call + value: GET /outgoing-http-call - name: Service value: {{serviceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-trace.mustache index 5255f2684..af1885d7e 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/outgoing-http-call-trace.mustache @@ -11,7 +11,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET outgoing-http-call$", + "aws.local.operation": "^GET /outgoing-http-call$", "aws.local.environment": "^ec2:default$" }, "metadata": { diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-log.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-log.mustache index c383be95c..cd457dc7b 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-log.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-log.mustache @@ -2,7 +2,7 @@ "EC2.InstanceId": "^{{instanceId}}$", "Environment": "^ec2:default$", "PlatformType": "^AWS::EC2$", - "Operation": "GET remote-service", + "Operation": "GET /remote-service", "Version": "^1$", "Telemetry.Source": "^LocalRootSpan$", "Host": "^ip(-[0-9]{1,3}){4}.*$" diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-metric.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-metric.mustache index d23fdb65b..4b1f0ad9c 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-metric.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-metric.mustache @@ -4,7 +4,7 @@ dimensions: - name: Operation - value: GET remote-service + value: GET /remote-service - name: Service value: {{serviceName}} @@ -41,7 +41,7 @@ value: ec2:default - name: Operation - value: GET healthcheck + value: GET /healthcheck - name: Service value: {{remoteServiceName}} @@ -113,7 +113,7 @@ dimensions: - name: Operation - value: GET remote-service + value: GET /remote-service - name: Service value: {{serviceName}} @@ -150,7 +150,7 @@ value: ec2:default - name: Operation - value: GET healthcheck + value: GET /healthcheck - name: Service value: {{remoteServiceName}} @@ -222,7 +222,7 @@ dimensions: - name: Operation - value: GET remote-service + value: GET /remote-service - name: Service value: {{serviceName}} @@ -259,7 +259,7 @@ value: ec2:default - name: Operation - value: GET healthcheck + value: GET /healthcheck - name: Service value: {{remoteServiceName}} diff --git a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-trace.mustache b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-trace.mustache index 4c93c6720..15687c87f 100644 --- a/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-trace.mustache +++ b/validator/src/main/resources/expected-data-template/dotnet/ec2/default/remote-service-trace.mustache @@ -11,7 +11,7 @@ }, "annotations": { "aws.local.service": "^{{serviceName}}$", - "aws.local.operation": "^GET remote-service$", + "aws.local.operation": "^GET /remote-service$", "aws.local.environment": "^ec2:default$" }, "metadata": { @@ -60,7 +60,7 @@ }, "annotations": { "aws.local.service": "^{{remoteServiceName}}$", - "aws.local.operation": "^GET healthcheck$", + "aws.local.operation": "^GET /healthcheck$", "aws.local.environment": "^ec2:default$" }, "metadata": {