[Draft; don't merge] v1 as frontend of v2 #2607

darccio · 2024-03-11T20:46:14Z

What does this PR do?

Turns the current v1 a frontend of v2, wrapping the new API while keeping the original behaviour.

Motivation

Simplify internal testing and future migration to v2.

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.

For Datadog employees:

If this PR touches code that handles credentials of any kind, such as Datadog API keys, I've requested a review from @DataDog/security-design-and-guidance.
This PR doesn't touch any of that.

Unsure? Have a question? Request a review!

…ounterparts Some functions have been adapted if v2 changed the API. Type aliases are the preferred way to convert types unless introducing an alias may leak v2 details. We kept some types as they would expose v2 types, using manual conversion for these in the frontend functions that require them. We kept as much tests as possible, but some were removed because they were asserting internal working no longer accessible, as v1 is an external user of v2.

…ir v2 counterparts The original API is kept as is, wrapping around v2 equivalent code and configs, maintaining the behaviour expected by the package's tests.

…terparts The conversion turned the API to a pure transparent frontend, with exported functions calling their v2 versions.

…parts The conversion turned the API to a pure transparent frontend, with exported functions calling their v2 versions, including the types as v2 aliases.

The conversion turned the API to a pure transparent frontend, with exported functions calling their v2 versions.

…2 counterparts The conversion turned the API to a pure transparent frontend, with exported functions calling their v2 versions. Option types have been aliased, and contrib types have been used as wrappers to embed their v2 versions.

…ion for tests expecting v1's mocktracer.Span

…-contained in v1

This reverts commit bd92328. Let's keep our v2 behavior and update the tests in dd-source to accomodate

…ror in TestFilterNilOptionsOnStart

…atsdAddress

datadog-datadog-prod-us1 · 2025-02-13T15:01:46Z

Datadog Report

Branch report: vits
Commit report: d8f493e
Test service: dd-trace-go

❌ 15 Failed (0 Known Flaky), 1580 Passed, 24 Skipped, 1m 55.25s Total Time

❌ Failed Tests (15)

This report shows up to 5 failed tests.

TestDeprecatedContext - gopkg.in/DataDog/dd-trace-go.v1/contrib/confluentinc/confluent-kafka-go/kafka - Details

Expand for error

 Failed
 
 === RUN   TestDeprecatedContext
     kafka_test.go:308: 
         	Error Trace:	/home/runner/work/dd-trace-go/dd-trace-go/contrib/confluentinc/confluent-kafka-go/kafka/kafka_test.go:308
         	Error:      	Not equal: 
         	            	expected: 0x345d8151a3e9a178
         	            	actual  : 0x24572853e01f16df
         	Test:       	TestDeprecatedContext
     kafka_test.go:310: 
 ...

TestDeprecatedContext - gopkg.in/DataDog/dd-trace-go.v1/contrib/confluentinc/confluent-kafka-go/kafka.v2 - Details

Expand for error

 Failed
 
 === RUN   TestDeprecatedContext
     kafka_test.go:308: 
         	Error Trace:	/home/runner/work/dd-trace-go/dd-trace-go/contrib/confluentinc/confluent-kafka-go/kafka.v2/kafka_test.go:308
         	Error:      	Not equal: 
         	            	expected: 0x6968263f43716aab
         	            	actual  : 0x3433f9af4095f416
         	Test:       	TestDeprecatedContext
     kafka_test.go:310: 
 ...

TestObserver_Query - gopkg.in/DataDog/dd-trace-go.v1/contrib/gocql/gocql - Details
Expand for error
```
 Failed
 
 === RUN   TestObserver_Query
 --- FAIL: TestObserver_Query (0.14s)
```

TestObserver_Query/default - gopkg.in/DataDog/dd-trace-go.v1/contrib/gocql/gocql - Details

Expand for error

 Failed
 
 === RUN   TestObserver_Query/default
 2025/02/13 16:12:48 gocql: unable to dial control conn 127.0.0.1:9043: dial tcp 127.0.0.1:9043: connect: connection refused
     observer_test.go:154: 
         	Error Trace:	/home/runner/work/dd-trace-go/dd-trace-go/contrib/gocql/gocql/observer_test.go:154
         	Error:      	Not equal: 
         	            	expected: int(1)
         	            	actual  : float64(1)
         	Test:       	TestObserver_Query/default
 ...

TestObserver_Query/error - gopkg.in/DataDog/dd-trace-go.v1/contrib/gocql/gocql - Details

Expand for error

 Failed
 
 === RUN   TestObserver_Query/error
 2025/02/13 16:12:48 gocql: unable to dial control conn 127.0.0.1:9043: dial tcp 127.0.0.1:9043: connect: connection refused
     observer_test.go:154: 
         	Error Trace:	/home/runner/work/dd-trace-go/dd-trace-go/contrib/gocql/gocql/observer_test.go:154
         	Error:      	Not equal: 
         	            	expected: int(0)
         	            	actual  : float64(0)
         	Test:       	TestObserver_Query/error
 ...

darccio · 2025-02-13T16:30:21Z

Benchmarks available at: #2607 (comment)

darccio added 30 commits February 14, 2024 21:07

wip

f406a87

ddtrace/tracer: remove unused code after conversion

7a97334

Merge remote-tracking branch 'origin/main' into vits

6119ca9

go.mod: upgrade dd-trace-go & fix tests

f6dc6b7

go.mod: upgrade dd-trace-go

26eebd4

ddtrace/opentelemetry: use all exported functions as frontend for the…

0a4f483

…ir v2 counterparts The original API is kept as is, wrapping around v2 equivalent code and configs, maintaining the behaviour expected by the package's tests.

ddtrace/opentelemetry: remove unused code after conversion

a96ebd3

datastreams: use all exported functions as frontend for their v2 coun…

4454b85

…terparts The conversion turned the API to a pure transparent frontend, with exported functions calling their v2 versions.

ddtrace/tracer: fix failing tests (to be squashed)

c26938d

profiler: use all exported functions as frontend for their v2 counter…

f2b2c7d

…parts The conversion turned the API to a pure transparent frontend, with exported functions calling their v2 versions, including the types as v2 aliases.

appsec: use all exported functions as frontend for their v2 counterparts

655a99a

The conversion turned the API to a pure transparent frontend, with exported functions calling their v2 versions.

ddtrace/tracer: fix failing tests (to be squashed)

acb90a8

contrib: remove unused code after conversion

ddd3268

internal: remove unused code after conversion

e453783

profiler/internal: remove unused code after conversion

112d10a

internal/traceprof: remove unused code after conversion

688e227

contrib: fix failing tests (pending to squash)

55ca241

ddtrace/tracer: remove failing tests (pending to squash)

e31e95e

internal/log: pass logger to v2

5a15bca

internal/version: v1.999.0-rc.1

7cbe4ab

internal/apps/setup-smoke-test: recover

9aabf03

profiler/upload: fix copyright header

5710cef

ddtrace/mocktracer: add MockspanV2Adapter to allow transparent operat…

8bfcb1d

…ion for tests expecting v1's mocktracer.Span

ddtrace/tracer: gracefully handle nil Span in ContextWithSpan

7eb723f

ddtrace/tracer: revert ContextWithSpan and SpanFromContext to be self…

de3213d

…-contained in v1

contrib/gorilla/mux: fix tests and mock v1 mockspan behaviour

6a6f979

internal/version: v1.999.0-rc.3

a0bbf07

ddtrace: support v1 behaviour for mock spans

c2a6279

hannahkm and others added 25 commits November 19, 2024 15:17

fix(ddtrace/tracer): account for MockspanV2Adapter in SetUser()

bd92328

Revert "fix(ddtrace/tracer): account for MockspanV2Adapter in SetUser()"

1543ccf

This reverts commit bd92328. Let's keep our v2 behavior and update the tests in dd-source to accomodate

fix(ddtrace/tracer): temporary workaround for tracer.SetUser

9da18a2

chore(ddtracer/tracer): add test for mockspan support in SetUser

2afbc4a

release: v1.999.0-beta.12

a3a4704

release: v1.999.0-beta.13

effbed6

release: v1.999.0-beta.14

a5052df

hack(profiler): filter nil options on the shim

7e63654

release: v1.999.0-beta.15

b1bf144

chore(profiler): add extra assertion to ensure we get the expected er…

a30b5c4

…ror in TestFilterNilOptionsOnStart

internal/version: v1.999.0-beta.16

80bbee4

Merge branch 'main' into vits

16a38ee

chore: clean up unneeded code

48b7034

fix(contrib): small adaptations and bugs squashed

e5bac06

Merge branch 'main' into vits

f0fb594

Merge from main into vits

d3b6c33

chore(internal/exectracetest): go mod tidy

057e1a1

chore: upgrade to latest dd-trace-go v2-dev

dcf1093

fix(ddtrace/tracer): use v2.WithDogstatsdAddr instead of v2.WithDogst…

3b85006

…atsdAddress

chore: upgrade to latest dd-trace-go v2-dev

6d47673

feat: upgrade to dd-trace-go v2.0.0-rc.2

18fe13d

Merge remote-tracking branch 'origin' into vits

00bcb50

chore: merge main

53e12c3

chore(go.mod): update to dd-trace-go/v2 potential rc.3

8b06256

Merge remote-tracking branch 'origin' into vits

074d9c8

darccio added 2 commits February 13, 2025 16:59

fix(contrib/net/http): mirror all ServeConfig fields in TraceAndServe

4a33f10

chore(go.mod): update to dd-trace-go/v2 potential rc.3

fc2f06b

chore: upgrade to dd-trace-go/[email protected]

4c1c6f1

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Draft; don't merge] v1 as frontend of v2 #2607

[Draft; don't merge] v1 as frontend of v2 #2607

darccio commented Mar 11, 2024

datadog-datadog-prod-us1 bot commented Feb 13, 2025 •

edited

Loading

darccio commented Feb 13, 2025

[Draft; don't merge] v1 as frontend of v2 #2607

Are you sure you want to change the base?

[Draft; don't merge] v1 as frontend of v2 #2607

Conversation

darccio commented Mar 11, 2024

What does this PR do?

Motivation

Reviewer's Checklist

datadog-datadog-prod-us1 bot commented Feb 13, 2025 • edited Loading

Datadog Report

❌ Failed Tests (15)

darccio commented Feb 13, 2025

datadog-datadog-prod-us1 bot commented Feb 13, 2025 •

edited

Loading