diff --git a/custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/HostIdResourceUtil.java b/custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/HostIdResourceUtil.java index 51b8ea12..d4e9ead2 100644 --- a/custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/HostIdResourceUtil.java +++ b/custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/HostIdResourceUtil.java @@ -21,12 +21,12 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; +import io.opentelemetry.semconv.ServiceAttributes; import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; import io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes; import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; import io.opentelemetry.semconv.incubating.K8sIncubatingAttributes; import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; public final class HostIdResourceUtil { private HostIdResourceUtil() {} @@ -45,7 +45,7 @@ public static Attributes createAttribute() { builder.put(HostIncubatingAttributes.HOST_ID, hostId.getHerokuDynoId()); builder.put(AttributeKey.stringKey("sw.uams.client.id"), hostId.getUamsClientId()); builder.put(AttributeKey.stringKey("uuid"), hostId.getUuid()); - builder.put(ServiceIncubatingAttributes.SERVICE_INSTANCE_ID, hostId.getUuid()); + builder.put(ServiceAttributes.SERVICE_INSTANCE_ID, hostId.getUuid()); HostId.K8sMetadata k8sMetadata = hostId.getK8sMetadata(); if (k8sMetadata != null) { diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index f520a7e3..cbc16874 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -2,15 +2,15 @@ plugins { `java-platform` } -val otelAgentVersion = "2.25.0" -val otelSdkVersion = "1.59.0" +val otelAgentVersion = "2.26.0" +val otelSdkVersion = "1.60.1" val mockitoVersion = "5.2.0" val byteBuddyVersion = "1.18.4" val opentelemetryJavaagentAlpha = "$otelAgentVersion-alpha" val opentelemetryAlpha = "$otelSdkVersion-alpha" -val opentelemetrySemconv = "1.37.0" +val opentelemetrySemconv = "1.40.0" val opentelemetrySemconvAlpha = "$opentelemetrySemconv-alpha" val autoservice = "1.1.1" diff --git a/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/LogExporterComponentProvider.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/LogExporterComponentProvider.java index 10d49808..8b41296d 100644 --- a/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/LogExporterComponentProvider.java +++ b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/LogExporterComponentProvider.java @@ -23,6 +23,7 @@ import com.solarwinds.joboe.config.ConfigProperty; import com.solarwinds.joboe.config.ProxyConfig; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; +import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter; import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpDeclarativeConfigUtil; @@ -62,7 +63,9 @@ public LogRecordExporter create(DeclarativeConfigProperties config) { builder::setClientTls, builder::setRetryPolicy, builder::setMemoryMode, - true); + true, + builder::setInternalTelemetryVersion, + () -> builder.setMeterProvider(MeterProvider::noop)); ProxyConfig proxyConfig = (ProxyConfig) ConfigManager.getConfig(ConfigProperty.AGENT_PROXY); if (proxyConfig != null) { diff --git a/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/MetricExporterComponentProvider.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/MetricExporterComponentProvider.java index 5e2825e1..74620069 100644 --- a/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/MetricExporterComponentProvider.java +++ b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/MetricExporterComponentProvider.java @@ -24,6 +24,7 @@ import com.solarwinds.joboe.config.ProxyConfig; import com.solarwinds.opentelemetry.extensions.DelegatingMetricExporter; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; +import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter; import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpDeclarativeConfigUtil; @@ -64,7 +65,9 @@ public MetricExporter create(DeclarativeConfigProperties config) { builder::setClientTls, builder::setRetryPolicy, builder::setMemoryMode, - true); + true, + builder::setInternalTelemetryVersion, + () -> builder.setMeterProvider(MeterProvider::noop)); builder.setAggregationTemporalitySelector(AggregationTemporalitySelector.deltaPreferred()); diff --git a/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SpanExporterComponentProvider.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SpanExporterComponentProvider.java index a0c8bec1..cb0effe3 100644 --- a/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SpanExporterComponentProvider.java +++ b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SpanExporterComponentProvider.java @@ -23,6 +23,7 @@ import com.solarwinds.joboe.config.ConfigProperty; import com.solarwinds.joboe.config.ProxyConfig; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; +import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter; import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpDeclarativeConfigUtil; @@ -62,7 +63,9 @@ public SpanExporter create(DeclarativeConfigProperties config) { builder::setClientTls, builder::setRetryPolicy, builder::setMemoryMode, - true); + true, + builder::setInternalTelemetryVersion, + () -> builder.setMeterProvider(MeterProvider::noop)); ProxyConfig proxyConfig = (ProxyConfig) ConfigManager.getConfig(ConfigProperty.AGENT_PROXY); if (proxyConfig != null) {