Skip to content

v2: merge main into v2 again#2937

Merged
hannahkm merged 61 commits intov2-devfrom
hannah/merge-v2
Oct 31, 2024
Merged

v2: merge main into v2 again#2937
hannahkm merged 61 commits intov2-devfrom
hannah/merge-v2

Conversation

@hannahkm
Copy link
Copy Markdown
Contributor

@hannahkm hannahkm commented Oct 21, 2024

What does this PR do?

merge main into v2-dev

Motivation

more conflicts :(

Reviewer's Checklist

  • Changed code has unit tests for its functionality at or near 100% coverage.
  • System-Tests covering this feature have been added and enabled with the va.b.c-dev version tag.
  • There is a benchmark for any new code, or changes to existing code.
  • If this interacts with the agent in a new way, a system test has been added.
  • Add an appropriate team label so this PR gets put in the right place for the release notes.
  • Non-trivial go.mod changes, e.g. adding new modules, are reviewed by @DataDog/dd-trace-go-guild.

Unsure? Have a question? Request a review!

@github-actions github-actions Bot added the apm:ecosystem contrib/* related feature requests or bugs label Oct 21, 2024
hannahkm and others added 19 commits October 21, 2024 16:21
@hannahkm
easy type fixes
9fa6680
@hannahkm
remove call to deleted option
d06af26
@hannahkm
another call to options
8c9279e
@hannahkm
remove internal calls 1/n
2c54fc9
@hannahkm
import and options fixes
ed1c61c
@eliottness
internal/appsec: better docs (#2935)
d48348e 
Signed-off-by: Eliott Bouhana <eliott.bouhana@datadoghq.com>
@darccio @MNThomson
[godfathering] contrib/dimfeld/httptreemux.v5: failing tests for path…
e104e1e 
… variable replacement (#2938)

Co-authored-by: Max Thomson <git@mnt.dev>
@nhulston @darccio
[serverless] Inject trace context into SQS/SNS/EventBridge (#2917)
a118199 
Co-authored-by: Dario Castañé <dario.castane@datadoghq.com>
@rarguelloF @darccio
contrib/log/slog: fix WithAttrs and WithGroup implementation (#2857)
e73b3d1 
Co-authored-by: Dario Castañé <dario.castane@datadoghq.com>
@tonyredondo
internal/civisibility: removes importing contrib packages from tests (#…
48e3a66 
…2940)
@hannahkm
remove internal kafka directory
f787fb7
@hannahkm
fix more internal kafka links
61ac0b0
@hannahkm
clean up kafka package
e770614
@hannahkm
fix broken kafka test
05625d5
@hannahkm
merge + conflict resolve
6a5284c
@hannahkm
workflows test on beta 3
91012f0
@hannahkm
clean up imports
69c8f2b
@hannahkm
edit toolchain
38b22a0
@hannahkm
remove contrib from test files
a853d8a
@hannahkm hannahkm marked this pull request as ready for review October 31, 2024 14:19
@hannahkm hannahkm requested review from a team as code owners October 31, 2024 14:19
@hannahkm hannahkm merged commit 69a858e into v2-dev Oct 31, 2024
@hannahkm hannahkm deleted the hannah/merge-v2 branch October 31, 2024 14:19
darccio added a commit that referenced this pull request May 5, 2025
@darccio
fix(ddtrace/tracer): return early in SetTag for byte slice values (in…
a759a42 
…troduced in #2937)
@darccio darccio added the v2.0 label Jun 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@datadog-datadog-prod-us1 datadog-datadog-prod-us1[bot] datadog-datadog-prod-us1[bot] left review comments

@romainkomorn-exdatadog romainkomorn-exdatadog Awaiting requested review from romainkomorn-exdatadog romainkomorn-exdatadog is a code owner automatically assigned from DataDog/ci-app-libraries

Assignees

No one assigned

Labels

apm:ecosystem contrib/* related feature requests or bugs v2.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@hannahkm @darccio @mtoffl01 @rarguelloF @eliottness @nhulston @tonyredondo