-
Notifications
You must be signed in to change notification settings - Fork 878
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'otel_main' into add_metric_annotation_instrument_merge_…
…main
- Loading branch information
Showing
2,404 changed files
with
74,839 additions
and
49,154 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| #!/bin/bash -e | ||
|
|
||
| # shellcheck disable=SC2044 | ||
| for file in $(find instrumentation -name "*Module.java"); do | ||
|
|
||
| if ! grep -q "extends InstrumentationModule" "$file"; then | ||
| continue | ||
| fi | ||
|
|
||
| if [[ "$file" != *"/javaagent/src/"* ]]; then | ||
| continue | ||
| fi | ||
|
|
||
| # shellcheck disable=SC2001 | ||
| module_name=$(echo "$file" | sed 's#.*/\([^/]*\)/javaagent/src/.*#\1#') | ||
| # shellcheck disable=SC2001 | ||
| simple_module_name=$(echo "$module_name" | sed 's/-[0-9.]*$//') | ||
|
|
||
| if [[ "$simple_module_name" == *jaxrs* ]]; then | ||
| # TODO these need some work still | ||
| continue | ||
| fi | ||
| if [[ "$simple_module_name" == *jaxws* ]]; then | ||
| # TODO these need some work still | ||
| continue | ||
| fi | ||
| if [[ "$simple_module_name" == jdbc ]]; then | ||
| # TODO split jdbc-datasource out into separate instrumentation? | ||
| continue | ||
| fi | ||
| if [[ "$simple_module_name" == kafka-clients ]]; then | ||
| # TODO split kafka client metrics out into separate instrumentation? | ||
| continue | ||
| fi | ||
| if [[ "$simple_module_name" == quarkus-resteasy-reactive ]]; then | ||
| # TODO module is missing a base version | ||
| continue | ||
| fi | ||
|
|
||
| if [ "$module_name" == "$simple_module_name" ]; then | ||
| expected="super\(\n? *\"$simple_module_name\"" | ||
| else | ||
| expected="super\(\n? *\"$simple_module_name\",\n? *\"$module_name\"" | ||
| fi | ||
|
|
||
| echo "$module_name" | ||
|
|
||
| matches=$(perl -0 -ne "print if /$expected/" "$file" | wc -l) | ||
| if [ "$matches" == 0 ]; then | ||
| echo "Expected to find $expected in $file" | ||
| exit 1 | ||
| fi | ||
|
|
||
| done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| #!/bin/bash -e | ||
|
|
||
| # all missing version coverage should be documented in supported-libraries.md | ||
|
|
||
| if grep -r --include build.gradle.kts latestDepTestLibrary instrumentation \ | ||
| | grep -v :+\" \ | ||
| | grep -v "// see .* module" \ | ||
| | grep -v "// see test suite below" \ | ||
| | grep -v "// no longer applicable" \ | ||
| | grep -v "// related dependency" \ | ||
| | grep -v "// native on-by-default instrumentation after this version" \ | ||
| | grep -v "// documented limitation" \ | ||
| | grep -v "instrumentation/jaxrs-client/jaxrs-client-2.0-testing/build.gradle.kts"; then | ||
|
|
||
| echo | ||
| echo "Found an undocumented latestDepTestLibrary (see above)." | ||
| echo | ||
| echo "See .gith/scripts/check-latest-dep-test-overrides.sh in this repository" | ||
| echo "and add one of the required comments." | ||
| exit 1 | ||
| fi |
6 changes: 0 additions & 6 deletions
6
.github/scripts/find-instrumentation-with-upper-version-limits.sh
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| #!/bin/bash -e | ||
|
|
||
| grep -Po "val stableVersion = \"\K[0-9]+.[0-9]+.[0-9]+" version.gradle.kts | ||
| grep "val stableVersion = " version.gradle.kts | grep -Eo "[0-9]+.[0-9]+.[0-9]+" |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.