Update to OTel 1.26.0 (#3069)

microsoft · May 12, 2023 · 55ef539 · 55ef539
1 parent d4d8517
commit 55ef539
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 12 deletions.
diff --git a/.../src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java b/.../src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java
@@ -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;
@@ -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();

diff --git a/...n/java/com/microsoft/applicationinsights/agent/internal/processors/DelegatingLogData.java b/...n/java/com/microsoft/applicationinsights/agent/internal/processors/DelegatingLogData.java
@@ -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
@@ -80,8 +85,11 @@ public String toString() {
         + "instrumentationScopeInfo="
         + getInstrumentationScopeInfo()
         + ", "
-        + "epochNanos="
-        + getEpochNanos()
+        + "timestampEpochNanos="
+        + getTimestampEpochNanos()
+        + ", "
+        + "observedTimestampEpochNanos="
+        + getObservedTimestampEpochNanos()
         + ", "
         + "attributes="
         + getAttributes()

diff --git a/.../src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/LogDataMapper.java b/.../src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/LogDataMapper.java
@@ -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
@@ -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

diff --git a/.../test/java/com/azure/monitor/opentelemetry/exporter/implementation/utils/MockLogData.java b/.../test/java/com/azure/monitor/opentelemetry/exporter/implementation/utils/MockLogData.java
@@ -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(

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -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")

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -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