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

ci: move aws_lambda, datastreams, and opentelemetry suites to gitlab #12518

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
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
25 changes: 0 additions & 25 deletions .circleci/config.templ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ machine_executor: &machine_executor
command: |
pyenv global 3.9.4

contrib_job_large: &contrib_job_large
executor: ddtrace_dev
parallelism: 10

contrib_job: &contrib_job
executor: ddtrace_dev
parallelism: 2
Expand Down Expand Up @@ -390,27 +386,6 @@ jobs:
run_agent_checks: false
docker_services: "pygoat"

aws_lambda:
<<: *machine_executor
steps:
- run_test:
pattern: 'aws_lambda'
snapshot: true

datastreams:
<<: *contrib_job_small
steps:
- run_test:
pattern: "datastreams"

opentelemetry:
parallelism: 4
<<: *machine_executor
steps:
- run_test:
pattern: 'opentelemetry'
snapshot: true

botocore:
<<: *machine_executor
parallelism: 6
Expand Down
1 change: 1 addition & 0 deletions .gitlab/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
DD_POOL_TRACE_CHECK_FAILURES: true
DD_DISABLE_ERROR_RESPONSES: true
ENABLED_CHECKS: trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service
SNAPSHOT_IGNORED_ATTRS: span_id,trace_id,parent_id,duration,start,metrics.system.pid,metrics.system.process_id,metrics.process_id,meta.runtime-id,meta._dd.p.tid,meta.pathway.hash,metrics._dd.tracer_kr,meta._dd.parent_id,meta.kafka.cluster_id
mongo:
name: registry.ddbuild.io/images/mirror/mongo:6.0.5
alias: mongo
Expand Down
6 changes: 3 additions & 3 deletions tests/opentelemetry/test_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def _subprocess_task(parent_span_context, errors):
try:
ctx = opentelemetry.trace.set_span_in_context(opentelemetry.trace.NonRecordingSpan(parent_span_context))
with ot_tracer.start_as_current_span("task", context=ctx):
time.sleep(0.02)
time.sleep(1.02)
except AssertionError as e:
errors.put(e)
finally:
Expand All @@ -91,7 +91,7 @@ def _subprocess_task(parent_span_context, errors):
ot_tracer._tracer.flush()


@pytest.mark.snapshot(ignores=["meta.tracestate"])
@pytest.mark.snapshot(ignores=["meta.tracestate", "_dd.parent_id"])
def test_otel_trace_across_fork(oteltracer):
errors = multiprocessing.Queue()
with oteltracer.start_as_current_span("root") as root:
Expand All @@ -105,7 +105,7 @@ def test_otel_trace_across_fork(oteltracer):
assert errors.empty(), errors.get()


@pytest.mark.snapshot(wait_for_num_traces=1, ignores=["meta.tracestate"])
@pytest.mark.snapshot(wait_for_num_traces=1, ignores=["meta.tracestate", "_dd.parent_id"])
@pytest.mark.parametrize("decision", [MANUAL_KEEP_KEY, MANUAL_DROP_KEY], ids=["manual.keep", "manual.drop"])
def test_sampling_decisions_across_processes(oteltracer, decision):
# sampling decision in the subprocess task should be the same as the parent
Expand Down
4 changes: 3 additions & 1 deletion tests/opentelemetry/test_trace.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,9 @@ def otel_flask_app_env(flask_wsgi_application):
"with_opentelemetry_instrument",
],
)
@pytest.mark.snapshot(ignores=["metrics.net.peer.port", "meta.traceparent", "meta.tracestate", "meta.flask.version"])
@pytest.mark.snapshot(
ignores=["metrics.net.peer.port", "meta.traceparent", "meta.tracestate", "meta.flask.version", "_dd.parent_id"]
)
def test_distributed_trace_with_flask_app(flask_client, oteltracer): # noqa:F811
with oteltracer.start_as_current_span("test-otel-distributed-trace") as span:
headers = {}
Expand Down
Loading