Skip to content

Commit 64df541

Browse files
committed
Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java into config-provider
2 parents 0389e1c + a6a9acb commit 64df541

File tree

310 files changed

+9351
-3402
lines changed

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

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
name: publish-snapshots${{ (github.ref_name != 'main' || github.repository != 'open-telemetry/opentelemetry-java') && ' (skipped)' || '' }}
125125
# intentionally not blocking snapshot publishing on markdown-link-check or misspell-check
126126
needs: build
127-
runs-on: ubuntu-22.04
127+
runs-on: ubuntu-24.04
128128
steps:
129129
- uses: actions/checkout@v4
130130

.github/workflows/gradle-wrapper-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v4
1515

16-
- uses: gradle/actions/wrapper-validation@v4.0.0
16+
- uses: gradle/actions/wrapper-validation@v4.1.0

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44

55
jobs:
66
release:
7-
runs-on: ubuntu-22.04
7+
runs-on: ubuntu-24.04
88
outputs:
99
version: ${{ steps.create-github-release.outputs.version }}
1010
steps:

CHANGELOG.md

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,67 @@
22

33
## Unreleased
44

5+
## Version 1.42.1 (2024-09-10)
6+
7+
### API
8+
9+
* Revert `java-test-fixtures` plugin to remove test dependencies from `pom.xml`.
10+
([#6695](https://github.com/open-telemetry/opentelemetry-java/pull/6695))
11+
12+
## Version 1.42.0 (2024-09-06)
13+
14+
### API
15+
16+
* BREAKING: Stabilize log support for AnyValue bodies. Rename `AnyValue` to `Value`, promote
17+
from `opentelemetry-api-incubator` to `opentelemetry-api`, change package
18+
from `io.opentelemetry.api.incubator.logs` to `io.opentelemetry.api.common`.
19+
([#6591](https://github.com/open-telemetry/opentelemetry-java/pull/6591))
20+
* Noop implementations detect when `opentelemetry-api-incubator` is present and return extended noop
21+
implementations.
22+
([#6617](https://github.com/open-telemetry/opentelemetry-java/pull/6617))%
23+
24+
### SDK
25+
26+
#### Traces
27+
28+
* Added experimental support for SpanProcessor OnEnding callback
29+
([#6367](https://github.com/open-telemetry/opentelemetry-java/pull/6367))
30+
* Remove final modifier from SdkTracer.tracerEnabled
31+
([#6687](https://github.com/open-telemetry/opentelemetry-java/pull/6687))
32+
33+
#### Exporters
34+
35+
* Suppress zipkin exporter instrumentation
36+
([#6552](https://github.com/open-telemetry/opentelemetry-java/pull/6552))
37+
* OTLP exporters return status code exceptions via CompletableResultCode in GrpcExporter and
38+
HttpExporter.
39+
([#6645](https://github.com/open-telemetry/opentelemetry-java/pull/6645))
40+
* Align GrpcSender contract with HttpSender
41+
([#6658](https://github.com/open-telemetry/opentelemetry-java/pull/6658))
42+
43+
#### Extensions
44+
45+
* Add autoconfigure support for ns and us durations
46+
([#6654](https://github.com/open-telemetry/opentelemetry-java/pull/6654))
47+
* Add declarative configuration ComponentProvider support for resources
48+
([#6625](https://github.com/open-telemetry/opentelemetry-java/pull/6625))
49+
* Add declarative configuration ComponentProvider support for processors
50+
([#6623](https://github.com/open-telemetry/opentelemetry-java/pull/6623))
51+
* Add declarative configuration ComponentProvider support for samplers
52+
([#6494](https://github.com/open-telemetry/opentelemetry-java/pull/6494))
53+
* Add declarative configuration ComponentProvider support for propagators
54+
([#6624](https://github.com/open-telemetry/opentelemetry-java/pull/6624))
55+
* Add declarative configuration missing pieces
56+
([#6677](https://github.com/open-telemetry/opentelemetry-java/pull/6677))
57+
* Change jaeger remote sampler autoconfigure property from `pollingInterval` to `pollingIntervalMs`
58+
to match spec.
59+
([#6672](https://github.com/open-telemetry/opentelemetry-java/pull/6672))
60+
61+
#### Testing
62+
63+
* Add asserts for log record body fields
64+
([#6509](https://github.com/open-telemetry/opentelemetry-java/pull/6509))
65+
566
## Version 1.41.0 (2024-08-09)
667

768
### API

CONTRIBUTING.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,13 @@ uses [google-java-format](https://github.com/google/google-java-format) library:
146146
synchronized (lock) { ... }
147147
}
148148
```
149+
* Don't
150+
use [gradle test fixtures](https://docs.gradle.org/current/userguide/java_testing.html#sec:java_test_fixtures) (
151+
i.e. `java-test-fixtures` plugin) to reuse code for internal testing. The test fixtures plugin has
152+
side effects where test dependencies are added to the `pom.xml` and publishes an
153+
extra `*-test-fixtures.jar` artifact which is unnecessary for internal testing. Instead, create a
154+
new `*:testing-internal` module and omit the `otel.java-conventions`. For example,
155+
see [/exporters/otlp/testing-internal](./exporters/otlp/testing-internal).
149156

150157
If you notice any practice being applied in the project consistently that isn't listed here, please
151158
consider a pull request to add it.

README.md

Lines changed: 35 additions & 35 deletions
Large diffs are not rendered by default.

api/all/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ dependencies {
1515

1616
annotationProcessor("com.google.auto.value:auto-value")
1717

18+
testImplementation(project(":api:testing-internal"))
19+
1820
testImplementation("edu.berkeley.cs.jqf:jqf-fuzz")
1921
testImplementation("com.google.guava:guava-testlib")
2022
}

api/all/src/main/java/io/opentelemetry/api/baggage/propagation/Parser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
/**
1414
* Implements single-pass Baggage parsing in accordance with https://w3c.github.io/baggage/ Key /
15-
* value are restricted in accordance with https://www.ietf.org/rfc/rfc2616.txt
15+
* value are restricted in accordance with https://www.ietf.org/rfc/rfc2616.txt.
1616
*
1717
* <p>Note: following aspects are not specified in RFC: - some invalid elements (key or value) -
1818
* parser will include valid ones, disregard invalid - empty "value" is regarded as invalid - meta -
19-
* anything besides element terminator (comma)
19+
* anything besides element terminator (comma).
2020
*/
2121
class Parser {
2222

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.api.common;
7+
8+
/**
9+
* Key-value pair of {@link String} key and {@link Value} value.
10+
*
11+
* @see Value#of(KeyValue...)
12+
* @since 1.42.0
13+
*/
14+
public interface KeyValue {
15+
16+
/** Returns a {@link KeyValue} for the given {@code key} and {@code value}. */
17+
static KeyValue of(String key, Value<?> value) {
18+
return KeyValueImpl.create(key, value);
19+
}
20+
21+
/** Returns the key. */
22+
String getKey();
23+
24+
/** Returns the value. */
25+
Value<?> getValue();
26+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.api.common;
7+
8+
import com.google.auto.value.AutoValue;
9+
10+
@AutoValue
11+
abstract class KeyValueImpl implements KeyValue {
12+
13+
KeyValueImpl() {}
14+
15+
static KeyValueImpl create(String key, Value<?> value) {
16+
return new AutoValue_KeyValueImpl(key, value);
17+
}
18+
}

0 commit comments

Comments
 (0)