Commit 7f5d704
authored
Support DD_METRICS_OTEL_ENABLED feature-flag (#10685)
Support DD_METRICS_OTEL_ENABLED feature-flag
Merge branch 'master' into mcculls/otel-metrics-enabled-flag
Co-authored-by: stuart.mcculloch <stuart.mcculloch@datadoghq.com>1 parent 969d21d commit 7f5d704
3 files changed
Lines changed: 4 additions & 5 deletions
File tree
- dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src
- main/java/datadog/trace/instrumentation/opentelemetry147
- test/groovy
- opentelemetry147/metrics
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
13 | 14 | | |
14 | 15 | | |
15 | 16 | | |
| |||
31 | 32 | | |
32 | 33 | | |
33 | 34 | | |
34 | | - | |
35 | | - | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| |||
Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | | - | |
47 | | - | |
| 46 | + | |
48 | 47 | | |
49 | 48 | | |
50 | 49 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
| 27 | + | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| |||
0 commit comments