Skip to content

Commit

Permalink
Bump OpenTelemetry from 1.26.0 to 1.30.0 (#9950) (#9980)
Browse files Browse the repository at this point in the history
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit b90a888)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
  • Loading branch information
reta authored Sep 12, 2023
1 parent 90a517e commit 8bb6806
Show file tree
Hide file tree
Showing 24 changed files with 29 additions and 218 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Added

### Dependencies
- Bump OpenTelemetry from 1.26.0 to 1.30.1 ([#9950](https://github.com/opensearch-project/OpenSearch/pull/9950))
- Bump `org.apache.commons:commons-compress` from 1.23.0 to 1.24.0 ([#9973](https://github.com/opensearch-project/OpenSearch/pull/9973))
- Bump JNA version from 5.5 to 5.13 ([#9963](https://github.com/opensearch-project/OpenSearch/pull/9963))

Expand Down
3 changes: 1 addition & 2 deletions buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,4 @@ jzlib = 1.1.3
resteasy = 6.2.4.Final

# opentelemetry dependencies
opentelemetry = 1.26.0

opentelemetry = 1.30.1
22 changes: 18 additions & 4 deletions plugins/telemetry-otel/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ dependencies {
api "io.opentelemetry:opentelemetry-sdk-metrics:${versions.opentelemetry}"
api "io.opentelemetry:opentelemetry-exporter-logging:${versions.opentelemetry}"
api "io.opentelemetry:opentelemetry-semconv:${versions.opentelemetry}-alpha"
api "io.opentelemetry:opentelemetry-sdk-logs:${versions.opentelemetry}-alpha"
api "io.opentelemetry:opentelemetry-api-logs:${versions.opentelemetry}-alpha"
api "io.opentelemetry:opentelemetry-sdk-logs:${versions.opentelemetry}"
testImplementation "io.opentelemetry:opentelemetry-sdk-testing:${versions.opentelemetry}"
}

Expand All @@ -50,11 +49,26 @@ thirdPartyAudit {
'io.opentelemetry.api.events.EventEmitterProvider',
'io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder',
'io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder',
'io.opentelemetry.extension.incubator.metrics.HistogramAdviceConfigurer',
'io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties',
'io.opentelemetry.sdk.autoconfigure.spi.logs.ConfigurableLogRecordExporterProvider',
'io.opentelemetry.sdk.autoconfigure.spi.metrics.ConfigurableMetricExporterProvider',
'io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider'
'io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider',
'io.opentelemetry.extension.incubator.metrics.DoubleCounterAdviceConfigurer',
'io.opentelemetry.extension.incubator.metrics.DoubleGauge',
'io.opentelemetry.extension.incubator.metrics.DoubleGaugeAdviceConfigurer',
'io.opentelemetry.extension.incubator.metrics.DoubleHistogramAdviceConfigurer',
'io.opentelemetry.extension.incubator.metrics.DoubleUpDownCounterAdviceConfigurer',
'io.opentelemetry.extension.incubator.metrics.ExtendedDoubleCounterBuilder',
'io.opentelemetry.extension.incubator.metrics.ExtendedDoubleGaugeBuilder',
'io.opentelemetry.extension.incubator.metrics.ExtendedDoubleUpDownCounterBuilder',
'io.opentelemetry.extension.incubator.metrics.ExtendedLongCounterBuilder',
'io.opentelemetry.extension.incubator.metrics.ExtendedLongGaugeBuilder',
'io.opentelemetry.extension.incubator.metrics.ExtendedLongUpDownCounterBuilder',
'io.opentelemetry.extension.incubator.metrics.LongCounterAdviceConfigurer',
'io.opentelemetry.extension.incubator.metrics.LongGauge',
'io.opentelemetry.extension.incubator.metrics.LongGaugeAdviceConfigurer',
'io.opentelemetry.extension.incubator.metrics.LongHistogramAdviceConfigurer',
'io.opentelemetry.extension.incubator.metrics.LongUpDownCounterAdviceConfigurer'
)
}

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a32dfbd7f01de6711fd0e970f8d4b4c0405056d6

This file was deleted.

202 changes: 0 additions & 202 deletions plugins/telemetry-otel/licenses/opentelemetry-api-logs-LICENSE.txt

This file was deleted.

Empty file.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
58f665ff01ce6b964cdf0b8cb5cd1c196dfe94ce

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
58f1a09e89955e6145babf8bcdf80c95174eb817

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4d15a9ea26e8e6ea93287a9f4ee02d91e5a74392

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8e437ba87004bb63069d04fb06beae65b98dd13a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5985d0950746ad12b49cc42c063f26ddfbcaaacb

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b12825541c5dae52a0fb35045c1b36df3ca8f632

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4c5531fbc44178a7bcfeb7021ae80e70a7c43458

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8e8f7a97a4896a81846553275b9d61885be7ef50

0 comments on commit 8bb6806

Please sign in to comment.