Skip to content
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.

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

Update to OTel 1.26.0 #3069

Merged
merged 3 commits into from
May 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import io.opentelemetry.javaagent.bootstrap.InternalLogger;
import io.opentelemetry.javaagent.bootstrap.JavaagentFileHolder;
import io.opentelemetry.javaagent.tooling.LoggingCustomizer;
import io.opentelemetry.javaagent.tooling.config.EarlyInitAgentConfig;
import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
Expand Down Expand Up @@ -72,7 +73,7 @@ public String name() {
}

@Override
public void init() {
public void init(EarlyInitAgentConfig earlyConfig) {
try {
if (DEBUG_SIGNED_JAR_ACCESS) {
JarVerifierClassFileTransformer transformer = new JarVerifierClassFileTransformer();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,13 @@ public InstrumentationScopeInfo getInstrumentationScopeInfo() {
}

@Override
public long getEpochNanos() {
return delegate.getEpochNanos();
public long getTimestampEpochNanos() {
return delegate.getTimestampEpochNanos();
}

@Override
public long getObservedTimestampEpochNanos() {
return delegate.getObservedTimestampEpochNanos();
}

@Override
Expand Down Expand Up @@ -80,8 +85,11 @@ public String toString() {
+ "instrumentationScopeInfo="
+ getInstrumentationScopeInfo()
+ ", "
+ "epochNanos="
+ getEpochNanos()
+ "timestampEpochNanos="
+ getTimestampEpochNanos()
+ ", "
+ "observedTimestampEpochNanos="
+ getObservedTimestampEpochNanos()
+ ", "
+ "attributes="
+ getAttributes()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ private TelemetryItem createMessageTelemetryItem(LogRecordData log, @Nullable Lo

// set standard properties
setOperationTags(telemetryBuilder, log);
setTime(telemetryBuilder, log.getEpochNanos());
setTime(telemetryBuilder, log.getTimestampEpochNanos());
setItemCount(telemetryBuilder, log, itemCount);

// update tags
Expand Down Expand Up @@ -144,7 +144,7 @@ private TelemetryItem createExceptionTelemetryItem(

// set standard properties
setOperationTags(telemetryBuilder, log);
setTime(telemetryBuilder, log.getEpochNanos());
setTime(telemetryBuilder, log.getTimestampEpochNanos());
setItemCount(telemetryBuilder, log, itemCount);

// update tags
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,15 @@ public InstrumentationScopeInfo getInstrumentationScopeInfo() {
}

@Override
public long getEpochNanos() {
public long getTimestampEpochNanos() {
return Instant.now().getEpochSecond();
}

@Override
public long getObservedTimestampEpochNanos() {
return getTimestampEpochNanos();
}

@Override
public SpanContext getSpanContext() {
return SpanContext.create(
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies {

implementation("org.owasp:dependency-check-gradle:8.2.1")

implementation("io.opentelemetry.instrumentation:gradle-plugins:1.25.1-alpha")
implementation("io.opentelemetry.instrumentation:gradle-plugins:1.26.0-alpha")

implementation("net.ltgt.gradle:gradle-errorprone-plugin:3.1.0")
implementation("net.ltgt.gradle:gradle-nullaway-plugin:1.5.0")
Expand Down
6 changes: 3 additions & 3 deletions dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ data class DependencySet(val group: String, val version: String, val modules: Li
val dependencyVersions = hashMapOf<String, String>()
rootProject.extra["versions"] = dependencyVersions

val otelVersion = "1.25.0"
val otelInstrumentationAlphaVersion = "1.25.1-alpha"
val otelInstrumentationVersion = "1.25.1"
val otelVersion = "1.26.0"
val otelInstrumentationAlphaVersion = "1.26.0-alpha"
val otelInstrumentationVersion = "1.26.0"
val otelContribAlphaVersion = "1.18.0-alpha"

rootProject.extra["otelVersion"] = otelVersion
Expand Down