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.

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

Fix trace validation error follow up fix #626

Merged
merged 1 commit into from
Dec 1, 2023
Merged

Fix trace validation error follow up fix #626

merged 1 commit into from
Dec 1, 2023

Conversation

harrryr
Copy link
Contributor

@harrryr harrryr commented Dec 1, 2023

Issue #, if available:
Follow up on this #617.
The previous PR applied two separate filter expressions while searching for xray traces, which returned any traces matching either conditions. Need to change the logic so that traces matching both conditions are returned.

Description of changes:
Combined the two filter expressions into one.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@harrryr harrryr requested a review from a team as a code owner December 1, 2023 21:47
@codecov-commenter
Copy link

codecov-commenter commented Dec 1, 2023

Codecov Report

Attention: 102 lines in your changes are missing coverage. Please review.

Comparison is base (09e6487) 85.71% compared to head (ddcd125) 50.73%.
Report is 163 commits behind head on main.

Files Patch % Lines
...ent/providers/AwsAppSignalsCustomizerProvider.java 24.00% 35 Missing and 3 partials ⚠️
...gent/providers/AwsSpanMetricsProcessorBuilder.java 0.00% 20 Missing ⚠️
...ders/AttributePropagatingSpanProcessorBuilder.java 0.00% 16 Missing ⚠️
...viders/AwsMetricAttributesSpanExporterBuilder.java 0.00% 11 Missing ⚠️
...try/javaagent/providers/AwsSpanProcessingUtil.java 90.16% 1 Missing and 5 partials ⚠️
...vaagent/providers/AwsMetricAttributeGenerator.java 96.89% 2 Missing and 3 partials ⚠️
...y/javaagent/providers/AwsSpanMetricsProcessor.java 91.48% 0 Missing and 4 partials ⚠️
...t/providers/AttributePropagatingSpanProcessor.java 94.59% 2 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@              Coverage Diff              @@
##               main     #626       +/-   ##
=============================================
- Coverage     85.71%   50.73%   -34.99%     
- Complexity       19      264      +245     
=============================================
  Files             3       39       +36     
  Lines            49     1301     +1252     
  Branches          5      141      +136     
=============================================
+ Hits             42      660      +618     
- Misses            3      609      +606     
- Partials          4       32       +28     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@PaurushGarg PaurushGarg merged commit b082f92 into aws-observability:main Dec 1, 2023
4 checks passed
PaurushGarg added a commit that referenced this pull request Dec 15, 2023
* E2E Test: Ensure the use of IMDSv2 in EC2 instances (#621)

* Add e2e canary to public preview regions (#623)

* Fix trace validation error follow up fix (#626)

* Fix Terrform Destroy Error on EKS Canary (#628)

* fix-e2e-eks-terraform-destroy-error

* Add region as parameter to terraform destroy

* Bump nebula.release from 17.2.2 to 18.0.6 (#631)

Bumps nebula.release from 17.2.2 to 18.0.6.

---
updated-dependencies:
- dependency-name: nebula.release
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump actions/setup-java from 3 to 4 (#629)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump hashicorp/setup-terraform from 2 to 3 (#586)

Bumps [hashicorp/setup-terraform](https://github.com/hashicorp/setup-terraform) from 2 to 3.
- [Release notes](https://github.com/hashicorp/setup-terraform/releases)
- [Changelog](https://github.com/hashicorp/setup-terraform/blob/main/CHANGELOG.md)
- [Commits](hashicorp/setup-terraform@v2...v3)

---
updated-dependencies:
- dependency-name: hashicorp/setup-terraform
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump rust from 1.73 to 1.74 (#611)

Bumps rust from 1.73 to 1.74.

---
updated-dependencies:
- dependency-name: rust
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump actions/setup-node from 3 to 4 (#574)

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump tempfile from 3.8.0 to 3.8.1 in /tools/cp-utility (#585)

Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.8.0 to 3.8.1.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/commits)

---
updated-dependencies:
- dependency-name: tempfile
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Provide aws-region for the e2e test in worklow (#643)

* Provide aws-region for the e2e test in worklow

* Update region to us-east-1 and add concurrency

* Revert "Provide aws-region for the e2e test in worklow (#643)" (#645)

This reverts commit 44b5b68.

* E2E Testing: Add concurrency tag to test in main build and nightly build (#646)

* Use aws-region in the workflow (#649)

* Add Retry Mechanism to E2E EKS Terraform Deployment (#634)

* Add Retry Mechanism to E2E EKS Terraform Deployment

* Add Extra Comments

* Call Test APIs First before Validation

* Add clean-app-signals to retry logic

* Change App Signal Download Directory and modify if statement for validation

* Modify while loop and refactor code

* Dynamic input RPM link by region setting (#647)

* Dynamic input RPM link by region setting

* Remove unneeded env variable

* Fix an issue in echo shell command

* Revert previous wrong 'fix' regarding variable call

* Add Retry Mechanism to E2E EC2 Terraform Deployment (#635)

* Add Retry Mechanism to E2E EC2 Terraform Deployment

* Add Extra Comments

* Refactor code

* Change App Signals Directory (#650)

* change dep config to compileOnly to fix high cardinality metrics (#651)

* E2E Testing: Fix EKS test candidate image override (#652)

This change checks if there is an adot image passed to the workflow and patches the App Signals deployment to update the image and restarts the cloudwatch pods.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Mahad Janjua <[email protected]>
Co-authored-by: Harry <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Vasi Vasireddy <[email protected]>
Co-authored-by: XinRan Zhang <[email protected]>
Co-authored-by: Mengyi Zhou (bjrara) <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants