From 271e096f919f7f2759eac0b3bdad5fa4e92f9179 Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Wed, 20 May 2026 16:02:15 -0400 Subject: [PATCH 1/3] delete unused benchmark.yml workflow --- .github/workflows/benchmark.yml | 64 --------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 .github/workflows/benchmark.yml diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml deleted file mode 100644 index 2ec4bc2b..00000000 --- a/.github/workflows/benchmark.yml +++ /dev/null @@ -1,64 +0,0 @@ -# This workflow runs the NH agent benchmarks (and benchmarks with the standard OpenTelemetry agent and without an agent as the baselines). -name: Benchmark - -on: # add cron schedule if you plan to run it periodically. - workflow_dispatch: - inputs: - container-logs: - description: Type 'app|collector|all' if verbose logging is needed. - required: false - default: 'none' - agent-type: - description: The benchmark will run with the NH agent by default, type AO to run with the AO agent. - required: false - default: 'NH' - -jobs: - run-overhead-tests: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - # check out the branch `benchmark-results` for staging the benchmark data and summary. - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - with: - ref: benchmark-results - path: benchmark-results - - name: copy results from benchmark-results branch - run: | - cp -r benchmark-results/benchmark/results/ benchmark/ - - name: Log in to registry - # These two secrets `secrets.GP_USERNAME` and `secrets.GP_TOKEN` are Github's PAT (Personal Access Token), - # which are used to download private packages from Github Packages (in our case, the test collector docker image). - # Currently the PAT is set up under the trace-build service account and just requires read:packages access to the Librato org. - # (Check out this document about how to create a PAT: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token) - run: echo "${{ secrets.GP_TOKEN }}" | docker login ghcr.io -u ${{ secrets.GP_USERNAME }} --password-stdin - - name: run tests - uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3.5.0 - with: - arguments: test - build-root-directory: benchmark - env: - GP_USERNAME: ${{ secrets.GP_USERNAME }} - GP_TOKEN: ${{ secrets.GP_TOKEN }} - SOLARWINDS_SERVICE_KEY: ${{ secrets.SW_APM_SERVICE_KEY }} - APPOPTICS_SERVICE_KEY: ${{ secrets.SW_APM_SERVICE_KEY }} - AGENT_TYPE: ${{ github.event.inputs.agent-type }} - CONTAINER_LOGS: ${{ github.event.inputs.container-logs }} - - name: inspect the results dir - if: always() - working-directory: benchmark - run: ls -lR results - - name: copy results back to benchmark-results branch - if: always() - run: | - rsync -aR benchmark/./results/ benchmark-results/benchmark/ - rsync -aR benchmark/./build/reports benchmark-results/benchmark/ - rsync -aR benchmark/build/test-results benchmark-results/benchmark/ - - name: commit updated results - if: always() - run: | - cd benchmark-results - git config --global user.name "${{ secrets.GP_USERNAME }}" - git add benchmark/ - git commit -m "update test result data" - git push origin From 569a468b9a98953cd6a9d2cc76f1dfacf586c8ad Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Wed, 20 May 2026 16:30:12 -0400 Subject: [PATCH 2/3] fix style issue --- .../instrumentation/feature/test/ContextPropagationTest.java | 2 +- .../feature/test/ProfilingSpanProcessorTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/feature-tests/src/test/java/com/solarwinds/opentelemetry/instrumentation/feature/test/ContextPropagationTest.java b/testing/feature-tests/src/test/java/com/solarwinds/opentelemetry/instrumentation/feature/test/ContextPropagationTest.java index 9142f6a6..882ef536 100644 --- a/testing/feature-tests/src/test/java/com/solarwinds/opentelemetry/instrumentation/feature/test/ContextPropagationTest.java +++ b/testing/feature-tests/src/test/java/com/solarwinds/opentelemetry/instrumentation/feature/test/ContextPropagationTest.java @@ -32,7 +32,7 @@ class ContextPropagationTest { static final AgentInstrumentationExtension testing = AgentInstrumentationExtension.create(); @Test - void verifyTraceContextPropagatesViaW3CHeaders() { + void verifyTraceContextPropagatesViaW3cHeaders() { testing.runWithSpan( "service-a", () -> { diff --git a/testing/feature-tests/src/test/java/com/solarwinds/opentelemetry/instrumentation/feature/test/ProfilingSpanProcessorTest.java b/testing/feature-tests/src/test/java/com/solarwinds/opentelemetry/instrumentation/feature/test/ProfilingSpanProcessorTest.java index 1055a1f2..9d73a6d8 100644 --- a/testing/feature-tests/src/test/java/com/solarwinds/opentelemetry/instrumentation/feature/test/ProfilingSpanProcessorTest.java +++ b/testing/feature-tests/src/test/java/com/solarwinds/opentelemetry/instrumentation/feature/test/ProfilingSpanProcessorTest.java @@ -51,7 +51,7 @@ void verifyProfilesIsCollected() { () -> { try { Thread.sleep(2000); - } catch (InterruptedException ignore) { + } catch (InterruptedException ignored) { } }); From 2d529eeae49555ba090cb0b68cfff3bf87e44e32 Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Wed, 20 May 2026 23:44:28 -0400 Subject: [PATCH 3/3] explicitly set propagators because solarwinds one is being overwritten in test agent. --- testing/feature-tests/build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testing/feature-tests/build.gradle.kts b/testing/feature-tests/build.gradle.kts index d294d863..7b3ba851 100644 --- a/testing/feature-tests/build.gradle.kts +++ b/testing/feature-tests/build.gradle.kts @@ -29,6 +29,10 @@ tasks.named("compileTestJava") { dependsOn(project(":solarwinds-otel-sdk").tasks.named("shadowJar")) } +tasks.withType().configureEach { + jvmArgs("-Dotel.propagators=tracecontext,baggage,solarwinds") +} + swoJava { minJavaVersionSupported.set(JavaVersion.VERSION_17) }