Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions .github/scripts/check-javaagent-suppression-keys.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash -e

# shellcheck disable=SC2044
for file in $(find instrumentation -name "*Module.java"); do

if ! grep -q "extends InstrumentationModule" "$file"; then
Expand All @@ -11,9 +10,7 @@ for file in $(find instrumentation -name "*Module.java"); do
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
Expand Down
2 changes: 0 additions & 2 deletions .github/scripts/check-package-names.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash -e

# shellcheck disable=SC2001

for dir in $(find instrumentation -name "*.java" | grep library/src/main/java | sed 's#/[^/]*$##' | sort -u); do

module_name=$(echo "$dir" | sed 's#.*/\([^/]*\)/library/src/main/java/.*#\1#')
Expand Down
1 change: 0 additions & 1 deletion .github/scripts/diff-suppression-keys-with-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ curl https://raw.githubusercontent.com/open-telemetry/opentelemetry.io/main/cont

comm -3 \
<(
# shellcheck disable=SC2016 # "Expressions don't expand in single quotes"
sed -n '/----------------------/,${p;/^$/q}' agent-config.md \
| sed '1d;$d' \
| cut -d '|' -f 3 \
Expand Down
2 changes: 0 additions & 2 deletions .github/scripts/generate-release-contributors.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ from=$(git log --reverse --pretty=format:"%cI" "$from_version..HEAD" | head -1)
# get the last commit on main that was included in the release
to=$(git merge-base origin/main HEAD | xargs git log -1 --pretty=format:"%cI")

# shellcheck disable=SC2016 # "Expressions don't expand in single quotes"
contributors1=$(gh api graphql --paginate -F q="repo:$GITHUB_REPOSITORY is:pr base:main is:merged merged:$from..$to" -f query='
query($q: String!, $endCursor: String) {
search(query: $q, type: ISSUE, first: 100, after: $endCursor) {
Expand Down Expand Up @@ -53,7 +52,6 @@ query($q: String!, $endCursor: String) {

# this query captures authors of issues which have had PRs in the current range reference the issue
# but not necessarily through closingIssuesReferences (e.g. addressing just a part of an issue)
# shellcheck disable=SC2016 # "Expressions don't expand in single quotes"
contributors2=$(gh api graphql --paginate -F q="repo:$GITHUB_REPOSITORY is:pr base:main is:merged merged:$from..$to" -f query='
query($q: String!, $endCursor: String) {
search(query: $q, type: ISSUE, first: 100, after: $endCursor) {
Expand Down
1 change: 0 additions & 1 deletion .github/scripts/static-import-semconv-constants.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash -e

# shellcheck disable=SC2044
for file in $(find instrumentation instrumentation-api -name '*Test.java'); do
echo "Processing $file"

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/build-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ jobs:
muzzle:
uses: ./.github/workflows/reusable-muzzle.yml

shell-script-check:
uses: ./.github/workflows/reusable-shell-script-check.yml

link-check:
uses: ./.github/workflows/reusable-link-check.yml

Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/build-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ jobs:
with:
cache-read-only: true

shell-script-check:
uses: ./.github/workflows/reusable-shell-script-check.yml

# this is not a required check to avoid blocking pull requests if external links break
markdown-check:
# release branches are excluded because the README.md javaagent download link has to be updated
Expand All @@ -66,7 +63,6 @@ jobs:
needs:
- common
- muzzle
- shell-script-check
- markdown-lint-check
runs-on: ubuntu-latest
if: always()
Expand All @@ -77,7 +73,6 @@ jobs:
!startsWith(github.base_ref, 'release/') &&
(
needs.muzzle.result != 'success' ||
needs.shell-script-check.result != 'success' ||
needs.markdown-lint-check.result != 'success'
)
)
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ jobs:
if: "!startsWith(github.ref_name, 'release/')"
uses: ./.github/workflows/reusable-muzzle.yml

shell-script-check:
# release branches are excluded to avoid unnecessary maintenance if new shell checks are added
if: "!startsWith(github.ref_name, 'release/')"
uses: ./.github/workflows/reusable-shell-script-check.yml

link-check:
# release branches are excluded to avoid unnecessary maintenance if external links break
# (and also because the README.md javaagent download link has to be updated on release branches
Expand Down
19 changes: 0 additions & 19 deletions .github/workflows/reusable-shell-script-check.yml

This file was deleted.

1 change: 0 additions & 1 deletion instrumentation-docs/ci-collect.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

set -euo pipefail

# shellcheck source=instrumentation-docs/instrumentations.sh
source "$(dirname "$0")/instrumentations.sh"

# Collect standard and colima tasks (without testLatestDeps)
Expand Down
1 change: 0 additions & 1 deletion instrumentation-docs/collect.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

set -euo pipefail

# shellcheck source=instrumentation-docs/instrumentations.sh
source "$(dirname "$0")/instrumentations.sh"

readonly TELEMETRY_DIR_NAME=".telemetry"
Expand Down
3 changes: 0 additions & 3 deletions instrumentation-docs/instrumentations.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ set -euo pipefail

# This file is sourced by collect.sh and ci-collect.sh

# shellcheck disable=SC2034
readonly INSTRUMENTATIONS=(
# <module path (colon-separated)> : <javaagent|library> : [ gradle-task-suffix ]
"activej-http-6.0:javaagent:test"
Expand Down Expand Up @@ -222,7 +221,6 @@ readonly INSTRUMENTATIONS=(

# Some instrumentation test suites don't run ARM, so we use colima to run them in an x86_64
# container.
# shellcheck disable=SC2034
readonly COLIMA_INSTRUMENTATIONS=(
"elasticsearch:elasticsearch-rest-5.0:javaagent:test"
"elasticsearch:elasticsearch-rest-5.0:javaagent:testStableSemconv"
Expand All @@ -236,7 +234,6 @@ readonly COLIMA_INSTRUMENTATIONS=(

# Some instrumentation test suites need to run with -PtestLatestDeps=true to collect
# metrics telemetry or test against latest library versions.
# shellcheck disable=SC2034
readonly TEST_LATEST_DEPS_INSTRUMENTATIONS=(
"kafka:kafka-clients:kafka-clients-0.11:javaagent:test"
"kafka:kafka-clients:kafka-clients-0.11:javaagent:testExperimental"
Expand Down
Loading