Skip to content

New - bump upstream versions #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cleverchuk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

New - bump upstream versions #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/HostIdResourceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {}
Expand All @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion ...com/solarwinds/opentelemetry/extensions/config/provider/LogExporterComponentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
5 changes: 4 additions & 1 deletion .../solarwinds/opentelemetry/extensions/config/provider/MetricExporterComponentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());

Expand Down
5 changes: 4 additions & 1 deletion ...om/solarwinds/opentelemetry/extensions/config/provider/SpanExporterComponentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
Loading