Skip to content

Commit cd082f0

Browse files
sabrennersabrenner
committed
Merge branch 'main' of github.com:DataDog/system-tests into sabrenner/add-openai-llmobs-tests
2 parents e20610d + 13d1b9f commit cd082f0

File tree

152 files changed

+1522
-770
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+1522
-770
lines changed

‎.github/actions/pull_images/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ runs:
3939

4040
- name: clean-up
4141
shell: bash
42-
if: inputs.library == 'php' # PHP use heavy images
42+
if: inputs.library == 'php' || inputs.library == 'ruby' || inputs.library == 'golang' # PHP/ruby/golang use heavy images
4343
run: sudo rm -rf /usr/local/lib/android
4444

4545
#retry

‎.github/workflows/debug-harness.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,18 @@ on:
2323
description: How many jobs
2424
default: "10"
2525
type: string
26+
dev_or_prod:
27+
description: Run scenario against last release (prod) or last commit on main (dev)?
28+
default: "prod"
29+
type: string
2630

2731
env:
2832
LIBRARY: ${{ (github.event_name == 'workflow_dispatch' && inputs.library) || 'php' }}
2933
WEBLOG: ${{ (github.event_name == 'workflow_dispatch' && inputs.weblog) || 'apache-mod-8.1' }}
3034
SCENARIO: ${{ (github.event_name == 'workflow_dispatch' && inputs.scenario) || 'DEBUGGER_EXPRESSION_LANGUAGE' }}
3135
JOB_COUNT: ${{ (github.event_name == 'workflow_dispatch' && inputs.job_count) || '10' }}
3236
AGENT_IMAGE: ${{ (github.event_name == 'workflow_dispatch' && inputs.agent_image) || 'datadog/agent:latest' }}
37+
DEV_OR_PROD: ${{ (github.event_name == 'workflow_dispatch' && inputs.dev_or_prod) || 'prod' }}
3338

3439
jobs:
3540
generate-matrix:
@@ -51,6 +56,9 @@ jobs:
5156
run: echo "${{ secrets.GITHUB_TOKEN }}" > "$RUNNER_TEMP/github_token.txt"
5257
- name: Select agent image
5358
run: echo ${{ env.AGENT_IMAGE }} > binaries/agent-image
59+
- name: Get dev artifact
60+
if: env.DEV_OR_PROD == 'dev'
61+
run: ./utils/scripts/load-binary.sh ${{ env.LIBRARY }}
5462
- name: Build weblog
5563
id: build
5664
run: SYSTEM_TEST_BUILD_ATTEMPTS=3 ./build.sh ${{ env.LIBRARY }} -i weblog -w ${{ env.WEBLOG }} -s --github-token-file "$RUNNER_TEMP/github_token.txt"

‎.github/workflows/system-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ jobs:
249249
needs:
250250
- compute_parameters
251251
- build_end_to_end
252-
if: ${{ always() && needs.build_end_to_end.result != 'failure' && needs.compute_parameters.outputs.endtoend_defs_parallel_enable == 'true' }}
252+
if: ${{ always() && needs.build_end_to_end.result != 'failure' && needs.compute_parameters.result != 'failure' && needs.compute_parameters.outputs.endtoend_defs_parallel_enable == 'true' }}
253253
strategy:
254254
matrix:
255255
job: ${{ fromJson(needs.compute_parameters.outputs.endtoend_defs_parallel_jobs) }}

‎.promptfoo/local_cursor_provider.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class ResponseParsingError(Exception):
5757
def _raise_invalid_format_error() -> None:
5858
"""Helper function to raise invalid format error."""
5959
raise InvalidYAMLFormatError(
60-
"Invalid YAML format - expected a list of prompt-output pairs " "or a 'responses' key containing the list"
60+
"Invalid YAML format - expected a list of prompt-output pairs or a 'responses' key containing the list"
6161
)
6262

6363

‎lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails-bundle-deploy/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ ENV LANG en_US.UTF-8
3030
ENV LANGUAGE en_US:en
3131

3232
# Upgrade RubyGems and Bundler
33-
RUN gem update --system 3.4.1
34-
RUN gem install bundler -v '~> 2.3.26'
33+
RUN gem update --system 3.4.22
34+
RUN gem install bundler -v '~> 2.4.22'
3535
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
3636
ENV BUNDLE_SILENCE_ROOT_WARNING 1
3737

‎lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails-conflict/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ ENV LANG en_US.UTF-8
3030
ENV LANGUAGE en_US:en
3131

3232
# Upgrade RubyGems and Bundler
33-
RUN gem update --system 3.4.1
34-
RUN gem install bundler -v '~> 2.3.26'
33+
RUN gem update --system 3.4.22
34+
RUN gem install bundler -v '~> 2.4.22'
3535
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
3636
ENV BUNDLE_SILENCE_ROOT_WARNING 1
3737

‎lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails-explicit/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ ENV LANG en_US.UTF-8
3030
ENV LANGUAGE en_US:en
3131

3232
# Upgrade RubyGems and Bundler
33-
RUN gem update --system 3.4.1
34-
RUN gem install bundler -v '~> 2.3.26'
33+
RUN gem update --system 3.4.22
34+
RUN gem install bundler -v '~> 2.4.22'
3535
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
3636
ENV BUNDLE_SILENCE_ROOT_WARNING 1
3737

‎lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails-explicit/Dockerfile.lib_init_validator‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ ENV LANG en_US.UTF-8
4141
ENV LANGUAGE en_US:en
4242

4343
# Upgrade RubyGems and Bundler
44-
RUN gem update --system 3.4.1
45-
RUN gem install bundler -v '~> 2.3.26'
44+
RUN gem update --system 3.4.22
45+
RUN gem install bundler -v '~> 2.4.22'
4646
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
4747
ENV BUNDLE_SILENCE_ROOT_WARNING 1
4848

‎lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails-gemsrb/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ ENV LANG en_US.UTF-8
3030
ENV LANGUAGE en_US:en
3131

3232
# Upgrade RubyGems and Bundler
33-
RUN gem update --system 3.4.1
34-
RUN gem install bundler -v '~> 2.3.26'
33+
RUN gem update --system 3.4.22
34+
RUN gem install bundler -v '~> 2.4.22'
3535
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
3636
ENV BUNDLE_SILENCE_ROOT_WARNING 1
3737

‎lib-injection/build/docker/ruby/dd-lib-ruby-init-test-rails-gemsrb/Dockerfile.lib_init_validator‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ ENV LANG en_US.UTF-8
4141
ENV LANGUAGE en_US:en
4242

4343
# Upgrade RubyGems and Bundler
44-
RUN gem update --system 3.4.1
45-
RUN gem install bundler -v '~> 2.3.26'
44+
RUN gem update --system 3.4.22
45+
RUN gem install bundler -v '~> 2.4.22'
4646
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
4747
ENV BUNDLE_SILENCE_ROOT_WARNING 1
4848

0 commit comments

Comments
 (0)