Commit 64df541
committed
Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java into config-provider
File tree
310 files changed
+9351
-3402
lines changed- .github/workflows
- api
- all
- src
- main/java/io/opentelemetry/api
- baggage/propagation
- common
- internal
- logs
- metrics
- trace
- test/java/io/opentelemetry/api
- logs
- metrics
- trace
- incubator
- src
- main
- java/io/opentelemetry/api/incubator
- config
- events
- logs
- metrics
- trace
- resources/META-INF/native-image/io.opentelemetry/opentelemetry-api
- test/java/io/opentelemetry/api/incubator
- config
- internal
- events
- logs
- metrics
- trace
- testing-internal
- src/main/java/io/opentelemetry/api/testing/internal
- buildSrc
- src/main/kotlin
- dependencyManagement
- docs/apidiffs
- 1.42.0_vs_1.41.0
- current_vs_latest
- exporters
- common/src/main/java/io/opentelemetry/exporter/internal
- grpc
- http
- logging-otlp
- src
- main
- java/io/opentelemetry/exporter/logging/otlp
- internal
- logs
- writer
- resources/META-INF/services
- test
- java/io/opentelemetry/exporter/logging/otlp
- internal
- writer
- resources
- logging/src/main/java/io/opentelemetry/exporter/logging
- otlp
- all/src/main/java/io/opentelemetry/exporter/otlp/internal
- common/src
- jmh/java/io/opentelemetry/exporter/internal/otlp
- main/java/io/opentelemetry/exporter/internal/otlp
- logs
- test/java/io/opentelemetry/exporter/internal/otlp
- profiles/src
- main/java/io/opentelemetry/exporter/otlp/profiles
- test/java/io/opentelemetry/exporter/otlp/profiles
- testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal
- prometheus/src/test
- java/io/opentelemetry/exporter/prometheus
- resources
- sender
- grpc-managed-channel/src/main/java/io/opentelemetry/exporter/sender/grpc/managedchannel/internal
- okhttp/src
- main/java/io/opentelemetry/exporter/sender/okhttp/internal
- test/java/io/opentelemetry/exporter/sender/okhttp/internal
- zipkin/src/main/java/io/opentelemetry/exporter/zipkin
- extensions/trace-propagators
- src
- main
- java/io/opentelemetry/extension/trace/propagation
- internal
- resources/META-INF/services
- test/java/io/opentelemetry/extension/trace/propagation
- gradle/wrapper
- integration-tests
- graal-incubating
- src/test/java/io/opentelemetry/integrationtests/graal
- graal/src/test/java/io/opentelemetry/integrationtests/graal
- otlp/src/main
- java/io/opentelemetry/integrationtest
- resources
- perf-harness/src/test/resources
- sdk-extensions
- autoconfigure-spi/src/main/java/io/opentelemetry/sdk/autoconfigure/spi/internal
- autoconfigure/src
- main/java/io/opentelemetry/sdk/autoconfigure
- internal
- testFullConfig/java/io/opentelemetry/sdk/autoconfigure
- test/java/io/opentelemetry/sdk/autoconfigure
- incubator
- src
- main/java/io/opentelemetry/sdk/extension/incubator/fileconfig
- test
- java/io/opentelemetry/sdk/extension/incubator/fileconfig
- component
- resources/META-INF/services
- jaeger-remote-sampler
- src
- main
- java/io/opentelemetry/sdk/extension/trace/jaeger/sampler
- internal
- resources/META-INF/services
- test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler
- sdk
- logs/src
- main/java/io/opentelemetry/sdk/logs
- data
- internal
- test/java/io/opentelemetry/sdk/logs
- data
- internal
- metrics
- src
- jmh/java/io/opentelemetry/sdk/metrics
- main/java/io/opentelemetry/sdk/metrics/internal
- debug
- view
- test/java/io/opentelemetry/sdk/metrics/internal/view
- testing
- src
- main/java/io/opentelemetry/sdk/testing
- assertj
- logs
- test/java/io/opentelemetry/sdk/testing
- assertj
- junit4
- junit5
- trace/src
- jmh/resources
- main/java/io/opentelemetry/sdk/trace
- internal
- samplers
- test/java/io/opentelemetry/sdk/trace
- internal
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
310 files changed
+9351
-3402
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
124 | 124 | | |
125 | 125 | | |
126 | 126 | | |
127 | | - | |
| 127 | + | |
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
5 | 66 | | |
6 | 67 | | |
7 | 68 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
146 | 146 | | |
147 | 147 | | |
148 | 148 | | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
149 | 156 | | |
150 | 157 | | |
151 | 158 | | |
| |||
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
| 19 | + | |
18 | 20 | | |
19 | 21 | | |
20 | 22 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| |||
Lines changed: 26 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
Lines changed: 18 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
0 commit comments