Skip to content

use serverless-specific wheel in layer#762

Merged
emmettbutler merged 12 commits intomainfrom
emmett.butler/serverless-wheels
Apr 1, 2026
Merged

use serverless-specific wheel in layer#762
emmettbutler merged 12 commits intomainfrom
emmett.butler/serverless-wheels

Conversation

@emmettbutler
Copy link
Copy Markdown
Contributor

@emmettbutler emmettbutler commented Mar 30, 2026 •
edited
Loading

What does this PR do?

Motivation

Testing Guidelines

DataDog/dd-trace-py#17201

Additional Notes

Types of Changes

  • Bug fix
  • New feature
  • Breaking change
  • Misc (docs, refactoring, dependency upgrade, etc.)

Check all that apply

  • This PR's description is comprehensive
  • This PR contains breaking changes that are documented in the description
  • This PR introduces new APIs or parameters that are documented and unlikely to change in the foreseeable future
  • This PR impacts documentation, and it has been updated (or a ticket has been logged)
  • This PR's changes are covered by the automated tests
  • This PR collects user input/sensitive content into Datadog
  • This PR passes the integration tests (ask a Datadog member to run the tests)

@emmettbutler emmettbutler requested review from a team as code owners March 30, 2026 17:48
@emmettbutler emmettbutler marked this pull request as draft March 30, 2026 17:48
@litianningdatadog
Copy link
Copy Markdown

litianningdatadog commented Mar 30, 2026

@emmettbutler , could you

  1. fill in the PR comment
  2. confirm ddtrace_serverless wheel is already being published to S3 by the upstream pipeline before merging
  3. move this into "ready to review" status

@emmettbutler emmettbutler mentioned this pull request Mar 30, 2026
Merged
@emmettbutler emmettbutler marked this pull request as ready for review April 1, 2026 18:51
@emmettbutler emmettbutler merged commit c6c307e into main Apr 1, 2026
103 of 104 checks passed
@emmettbutler emmettbutler deleted the emmett.butler/serverless-wheels branch April 1, 2026 18:59
@florentinl florentinl mentioned this pull request Apr 2, 2026
Closed
brettlangdon added a commit that referenced this pull request Apr 2, 2026
@brettlangdon
Revert "use serverless-specific wheel in layer (#762)"
b76f2d8 
This reverts commit c6c307e.
@brettlangdon brettlangdon mentioned this pull request Apr 2, 2026
Merged
11 tasks
brettlangdon added a commit that referenced this pull request Apr 2, 2026
@brettlangdon
ci: revert PRs #762 and #775 (#776)
a3f0640 
* Revert "more complete backward compatibility (#775)"

This reverts commit 332e731.

* Revert "use serverless-specific wheel in layer (#762)"

This reverts commit c6c307e.
emmettbutler added a commit that referenced this pull request Apr 2, 2026
@emmettbutler
Revert "ci: revert PRs #762 and #775 (#776)"
429b26d 
This reverts commit a3f0640.
emmettbutler added a commit that referenced this pull request Apr 2, 2026
@emmettbutler
Add ability to use ddtrace_serverless wheels in layer build (#777)
8051f44 
* Revert "ci: revert PRs #762 and #775 (#776)"

This reverts commit a3f0640.

* try a different way of checking success

* refactor to only do docker build once

* oh yeah

* catch error code

* bite the proverbial bullet

* *shakes fist* ....bash!!!

* more handling

* debug output

* construct basename when given a wheel directly

* handle dotslash in basename
gh-worker-dd-mergequeue-cf854d bot pushed a commit to DataDog/dd-trace-py that referenced this pull request Apr 3, 2026
@emmettbutler
perf: use serverless-specific wheel in layer (#17201)
1377578 
## Description

This change splits the wheel build/validate/upload jobs into "regular" and "serverless" branches, for the purpose of allowing datadog-lambda-python to use custom-built wheels.

## Testing

CI passes

## Risks

Risk mitigated by keeping the existing wheel upload path working as usual while refactoring it.

## Additional Notes

Depended on by DataDog/datadog-lambda-python#762 and DataDog/serverless-tools#101

Co-authored-by: emmett.butler <emmett.butler@datadoghq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@purple4reina purple4reina purple4reina approved these changes

@litianningdatadog litianningdatadog Awaiting requested review from litianningdatadog litianningdatadog is a code owner automatically assigned from DataDog/serverless-aws

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@emmettbutler @litianningdatadog @purple4reina