open-telemetry
/
opentelemetry-java
mirror of https://github.com/open-telemetry/opentelemetry-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove autoconfigure otlp protocol experimental properties (#3718) 

* Remove autoconfigure otel.experimental.exporter.otlp.protocol and otel.experimental.exporter.otlp.{signal}.protocol properties

* Add entry to changelog
This commit is contained in:
jack-berg 2021-10-10 22:05:52 -05:00 committed by GitHub
parent efbdb55601
commit 95949e0713
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -2,6 +2,12 @@
## Version 1.8.0 (unreleased):
### Auto-configuration (alpha)
- BREAKING CHANGE: Remove deprecated `otel.experimental.exporter.otlp.protocol`,
`otel.experimental.exporter.otlp.{signal}.protocol` properties. Please use
`otel.exporter.otlp.protocol`, `otel.exporter.otlp.{signal}.protocol` instead.
---
## Version 1.7.0 (2021-10-08):

3
sdk-extensions/autoconfigure/README.md
View File

@ -68,9 +68,6 @@ The [OpenTelemetry Protocol (OTLP)](https://github.com/open-telemetry/openteleme
| otel.exporter.otlp.protocol | OTEL_EXPORTER_OTLP_PROTOCOL | The transport protocol to use on OTLP trace and metrics requests. Options include `grpc` and `http/protobuf`. Default is `grpc`. |
| otel.exporter.otlp.traces.protocol | OTEL_EXPORTER_OTLP_TRACES_PROTOCOL | The transport protocol to use on OTLP trace requests. Options include `grpc` and `http/protobuf`. Default is `grpc`. |
| otel.exporter.otlp.metrics.protocol | OTEL_EXPORTER_OTLP_METRICS_PROTOCOL | The transport protocol to use on OTLP metrics requests. Options include `grpc` and `http/protobuf`. Default is `grpc`. |
| otel.experimental.exporter.otlp.protocol | OTEL_EXPERIMENTAL_EXPORTER_OTLP_PROTOCOL | **DEPRECATED for removal in 1.8.0.** The transport protocol to use on OTLP trace and metrics requests. Options include `grpc` and `http/protobuf`. Default is `grpc`. |
| otel.experimental.exporter.otlp.traces.protocol | OTEL_EXPERIMENTAL_EXPORTER_OTLP_TRACES_PROTOCOL | **DEPRECATED for removal in 1.8.0.** The transport protocol to use on OTLP trace requests. Options include `grpc` and `http/protobuf`. Default is `grpc`. |
| otel.experimental.exporter.otlp.metrics.protocol | OTEL_EXPERIMENTAL_EXPORTER_OTLP_METRICS_PROTOCOL | **DEPRECATED for removal in 1.8.0.** The transport protocol to use on OTLP metrics requests. Options include `grpc` and `http/protobuf`. Default is `grpc`. |
To configure the service name for the OTLP exporter, add the `service.name` key
to the OpenTelemetry Resource ([see below](#opentelemetry-resource)), e.g. `OTEL_RESOURCE_ATTRIBUTES=service.name=myservice`.

6
sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/OtlpConfigUtil.java
View File

@ -31,12 +31,6 @@ final class OtlpConfigUtil {
if (protocol == null) {
protocol = config.getString("otel.exporter.otlp.protocol");
}
if (protocol == null) {
protocol = config.getString("otel.experimental.exporter.otlp." + dataType + ".protocol");
}
if (protocol == null) {
protocol = config.getString("otel.experimental.exporter.otlp.protocol");
}
return (protocol == null) ? PROTOCOL_GRPC : protocol;
}

27
sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/OtlpConfigUtilTest.java
View File

@ -38,7 +38,7 @@ class OtlpConfigUtilTest {
OtlpConfigUtil.getOtlpProtocol(
DATA_TYPE_TRACES,
DefaultConfigProperties.createForTest(
ImmutableMap.of("otel.experimental.exporter.otlp.protocol", "foo"))))
ImmutableMap.of("otel.exporter.otlp.protocol", "foo"))))
.isEqualTo("foo");
assertThat(
@ -46,30 +46,9 @@ class OtlpConfigUtilTest {
DATA_TYPE_TRACES,
DefaultConfigProperties.createForTest(
ImmutableMap.of(
"otel.experimental.exporter.otlp.protocol", "foo",
"otel.experimental.exporter.otlp.traces.protocol", "bar"))))
"otel.exporter.otlp.protocol", "foo",
"otel.exporter.otlp.traces.protocol", "bar"))))
.isEqualTo("bar");
assertThat(
OtlpConfigUtil.getOtlpProtocol(
DATA_TYPE_TRACES,
DefaultConfigProperties.createForTest(
ImmutableMap.of(
"otel.experimental.exporter.otlp.protocol", "foo",
"otel.experimental.exporter.otlp.traces.protocol", "bar",
"otel.exporter.otlp.protocol", "baz"))))
.isEqualTo("baz");
assertThat(
OtlpConfigUtil.getOtlpProtocol(
DATA_TYPE_TRACES,
DefaultConfigProperties.createForTest(
ImmutableMap.of(
"otel.experimental.exporter.otlp.protocol", "foo",
"otel.experimental.exporter.otlp.traces.protocol", "bar",
"otel.exporter.otlp.protocol", "baz",
"otel.exporter.otlp.traces.protocol", "qux"))))
.isEqualTo("qux");
}
@Test