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.

Sign up for GitHub

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

Jump to bottom

v2: merge main into v2 again #2937

Merged
merged 61 commits into from
Oct 31, 2024
Merged

v2: merge main into v2 again #2937

merged 61 commits into from
Oct 31, 2024

Commits on Oct 18, 2024

  1. Fix: Support custom propagators in startup log (#2925)

    @mtoffl01
    mtoffl01 authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    f65cab8 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. contrib/jackc/pgx.v5: wrap previous tracer (#2932) 

    Co-authored-by: Dario Castañé <[email protected]>
    @rarguelloF @darccio
    rarguelloF and darccio authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    1366f6b View commit details
    Browse the repository at this point in the history

  2. contrib/net/http: refactor tracing (#2921) 

    Co-authored-by: Dario Castañé <[email protected]>
    @rarguelloF @darccio
    rarguelloF and darccio authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    020a9da View commit details
    Browse the repository at this point in the history

  3. contrib/confluentinc/confluent-kafka-go: split tracing code (#2907) 

    Co-authored-by: Dario Castañé <[email protected]>
    @rarguelloF @darccio
    rarguelloF and darccio authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    2cae09f View commit details
    Browse the repository at this point in the history

  4. merge pt2: fix kafka

    @hannahkm
    hannahkm committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    576ecef View commit details
    Browse the repository at this point in the history

  5. fix various type issues

    @hannahkm
    hannahkm committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    46b8e10 View commit details
    Browse the repository at this point in the history

  6. fix more type and import issues

    @hannahkm
    hannahkm committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    f46380e View commit details
    Browse the repository at this point in the history

  7. easy type fixes

    @hannahkm
    hannahkm committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    9fa6680 View commit details
    Browse the repository at this point in the history

  8. remove call to deleted option

    @hannahkm
    hannahkm committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    d06af26 View commit details
    Browse the repository at this point in the history

  9. another call to options

    @hannahkm
    hannahkm committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    8c9279e View commit details
    Browse the repository at this point in the history

  10. remove internal calls 1/n

    @hannahkm
    hannahkm committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    2c54fc9 View commit details
    Browse the repository at this point in the history

  11. import and options fixes

    @hannahkm
    hannahkm committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    ed1c61c View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. internal/appsec: better docs (#2935) 

    Signed-off-by: Eliott Bouhana <[email protected]>
    @eliottness
    eliottness authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    d48348e View commit details
    Browse the repository at this point in the history

  2. [godfathering] contrib/dimfeld/httptreemux.v5: failing tests for path… 

    … variable replacement (#2938)

Co-authored-by: Max Thomson <[email protected]>
    @darccio @MNThomson
    darccio and MNThomson authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    e104e1e View commit details
    Browse the repository at this point in the history

  3. [serverless] Inject trace context into SQS/SNS/EventBridge (#2917) 

    Co-authored-by: Dario Castañé <[email protected]>
    @nhulston @darccio
    nhulston and darccio authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    a118199 View commit details
    Browse the repository at this point in the history

  4. contrib/log/slog: fix WithAttrs and WithGroup implementation (#2857) 

    Co-authored-by: Dario Castañé <[email protected]>
    @rarguelloF @darccio
    rarguelloF and darccio authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    e73b3d1 View commit details
    Browse the repository at this point in the history

  5. internal/civisibility: removes importing contrib packages from tests (#… 

    …2940)
    @tonyredondo
    tonyredondo authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    48e3a66 View commit details
    Browse the repository at this point in the history

  6. remove internal kafka directory

    @hannahkm
    hannahkm committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    f787fb7 View commit details
    Browse the repository at this point in the history

  7. fix more internal kafka links

    @hannahkm
    hannahkm committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    61ac0b0 View commit details
    Browse the repository at this point in the history

  8. clean up kafka package

    @hannahkm
    hannahkm committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    e770614 View commit details
    Browse the repository at this point in the history

  9. fix broken kafka test

    @hannahkm
    hannahkm committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    05625d5 View commit details
    Browse the repository at this point in the history

  10. merge + conflict resolve

    @hannahkm
    hannahkm committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    6a5284c View commit details
    Browse the repository at this point in the history

  11. workflows test on beta 3

    @hannahkm
    hannahkm committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    91012f0 View commit details
    Browse the repository at this point in the history

  12. clean up imports

    @hannahkm
    hannahkm committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    69c8f2b View commit details
    Browse the repository at this point in the history

  13. edit toolchain

    @hannahkm
    hannahkm committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    38b22a0 View commit details
    Browse the repository at this point in the history

  14. remove contrib from test files

    @hannahkm
    hannahkm committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    a853d8a View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. update mod to latest commit

    @hannahkm
    hannahkm committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    71223be View commit details
    Browse the repository at this point in the history

  2. test against new system test branch

    @hannahkm
    hannahkm committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    9e564cf View commit details
    Browse the repository at this point in the history

  3. Revert "remove contrib from test files" 

    This reverts commit a853d8a.
    @hannahkm
    hannahkm committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    a588c11 View commit details
    Browse the repository at this point in the history

  4. update refs to hannah branch

    @hannahkm
    hannahkm committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    11b5baf View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. fix: allow go.work to be usable in Go 1.22 (#2945)

    @darccio
    darccio authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    00c300f View commit details
    Browse the repository at this point in the history

  2. revert to og testing branch, mod tidy

    @hannahkm
    hannahkm committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    287927c View commit details
    Browse the repository at this point in the history

  3. remove replace from smoke test mod

    @hannahkm
    hannahkm committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    5cb7b5b View commit details
    Browse the repository at this point in the history

  4. update smoke test mod name

    @hannahkm
    hannahkm committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    12ca1dc View commit details
    Browse the repository at this point in the history

  5. go mod tidy

    @hannahkm
    hannahkm committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    31f0edd View commit details
    Browse the repository at this point in the history

  6. align go mod w v2dev

    @hannahkm
    hannahkm committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    f576f28 View commit details
    Browse the repository at this point in the history

  7. mark branch as merged

    @hannahkm
    hannahkm committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    aca9aca View commit details
    Browse the repository at this point in the history

  8. revert for wrong commit hash 

    This reverts commit f576f28.
    @hannahkm
    hannahkm committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    e94fb8a View commit details
    Browse the repository at this point in the history

  9. create replace for smoke tests

    @hannahkm
    hannahkm committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    424d1d8 View commit details
    Browse the repository at this point in the history

  10. add smoke tests to work file

    @hannahkm
    hannahkm committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    55e20e9 View commit details
    Browse the repository at this point in the history

  11. fix integration enabled test

    @hannahkm
    hannahkm committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    21b44e6 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. mocktracer and error code fixes

    @hannahkm
    hannahkm committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    07f6de4 View commit details
    Browse the repository at this point in the history

  2. fix goroutine leak in mocktracer

    @hannahkm
    hannahkm committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    91218a6 View commit details
    Browse the repository at this point in the history

  3. fix roundtripper test

    @hannahkm
    hannahkm committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    e39240a View commit details
    Browse the repository at this point in the history

  4. fix and clean slog

    @hannahkm
    hannahkm committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    46a0800 View commit details
    Browse the repository at this point in the history

  5. fix restful test

    @hannahkm
    hannahkm committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    09bf8cf View commit details
    Browse the repository at this point in the history

  6. fix kafka 

    CONFIRM FIXES ARE ACTUALLY CORRECT
    @hannahkm
    hannahkm committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    7f20d0c View commit details
    Browse the repository at this point in the history

  7. fix kafkav2 

    CONFIRM FIXES ARE ACTUALLY CORRECT
    @hannahkm
    hannahkm committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    6d6775e View commit details
    Browse the repository at this point in the history

  8. fix gqlgen tests

    @hannahkm
    hannahkm committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    6dfa49e View commit details
    Browse the repository at this point in the history

  9. fix appsec contrib tests

    @hannahkm
    hannahkm committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    b770e1c View commit details
    Browse the repository at this point in the history

  10. update traceproftest mod

    @hannahkm
    hannahkm committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    1426e57 View commit details
    Browse the repository at this point in the history

  11. easy test fixes

    @hannahkm
    hannahkm committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    1eb3756 View commit details
    Browse the repository at this point in the history

  12. contrib test fixes

    @hannahkm
    hannahkm committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    e6b61b2 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. move common func to options

    @hannahkm
    hannahkm committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    9e23b52 View commit details
    Browse the repository at this point in the history

  2. fix debug stack tests

    @hannahkm
    hannahkm committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    af792a7 View commit details
    Browse the repository at this point in the history

  3. Revert "fix debug stack tests" 

    fix does not work as expected, broke other tests
    @hannahkm
    hannahkm committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    b147c72 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. remove error stack if debug stack off

    @hannahkm
    hannahkm committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    8445590 View commit details
    Browse the repository at this point in the history

  2. merge 1.69.1-rc.4 with v2 (#2953)

    @hannahkm
    hannahkm authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    729a1be View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. fix civisibility tests

    @hannahkm
    hannahkm committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    39065cb View commit details
    Browse the repository at this point in the history

  2. remove todo

    @hannahkm
    hannahkm committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    564e172 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. fix kafka tests with mockspans

    @hannahkm
    hannahkm committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    af4994b View commit details
    Browse the repository at this point in the history