Update to OpenTelemetry 1.28.0

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java

@@ -236,7 +236,7 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
     }
 
     // TODO (trask) add this method to AutoConfigurationCustomizer upstream?
-    ((AutoConfiguredOpenTelemetrySdkBuilder) autoConfiguration).registerShutdownHook(false);
+    ((AutoConfiguredOpenTelemetrySdkBuilder) autoConfiguration).disableShutdownHook();
 
     QuickPulse quickPulse;
     if (configuration.preview.liveMetrics.enabled) {
@@ -648,7 +648,7 @@ private static SdkLoggerProviderBuilder configureLogging(
               .setScheduleDelay(getBatchProcessorDelay())
               .build();
 
-      builder.addLogRecordProcessor(new TimestampingLogRecordProcessor(batchLogProcessor));
+      builder.addLogRecordProcessor(batchLogProcessor);
     }
 
     return builder;

buildSrc/build.gradle.kts

@@ -34,7 +34,7 @@ dependencies {
 
   implementation("org.owasp:dependency-check-gradle:8.3.1")
 
-  implementation("io.opentelemetry.instrumentation:gradle-plugins:1.27.0-alpha")
+  implementation("io.opentelemetry.instrumentation:gradle-plugins:1.28.0-alpha")
 
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:3.1.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:1.6.0")

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.27.0"
-val otelInstrumentationAlphaVersion = "1.27.0-alpha"
-val otelInstrumentationVersion = "1.27.0"
+val otelVersion = "1.28.0"
+val otelInstrumentationAlphaVersion = "1.28.0-alpha"
+val otelInstrumentationVersion = "1.28.0"
 val otelContribAlphaVersion = "1.18.0-alpha"
 
 rootProject.extra["otelVersion"] = otelVersion

smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsControllerSpansEnabledTest.java

@@ -34,7 +34,7 @@ void doMostBasicTest() throws Exception {
 
     Envelope rdEnvelope2 = getRequestEnvelope(rdList, "message process");
     Envelope rddEnvelope1 = getDependencyEnvelope(rddList, "HelloController.sendMessage");
-    Envelope rddEnvelope2 = getDependencyEnvelope(rddList, "message send");
+    Envelope rddEnvelope2 = getDependencyEnvelope(rddList, "message publish");
     Envelope rddEnvelope3 = getDependencyEnvelope(rddList, "GET /");
 
     assertThat(rdEnvelope1.getSampleRate()).isNull();
@@ -65,7 +65,7 @@ void doMostBasicTest() throws Exception {
     assertThat(rdd1.getProperties()).isEmpty();
     assertThat(rdd1.getSuccess()).isTrue();
 
-    assertThat(rdd2.getName()).isEqualTo("message send");
+    assertThat(rdd2.getName()).isEqualTo("message publish");
     assertThat(rdd2.getData()).isNull();
     assertThat(rdd2.getType()).isEqualTo("Queue Message | jms");
     assertThat(rdd2.getTarget()).isEqualTo("message");

smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsTest.java

@@ -40,7 +40,7 @@ void doMostBasicTest() throws Exception {
     assertThat(testing.mockedIngestion.getCountForType("EventData")).isZero();
 
     Envelope rdEnvelope2 = getRequestEnvelope(rdList, "message process");
-    Envelope rddEnvelope1 = getDependencyEnvelope(rddList, "message send");
+    Envelope rddEnvelope1 = getDependencyEnvelope(rddList, "message publish");
     Envelope rddEnvelope2 = getDependencyEnvelope(rddList, "GET /");
 
     assertThat(rdEnvelope1.getSampleRate()).isNull();
@@ -61,7 +61,7 @@ void doMostBasicTest() throws Exception {
         .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
     assertThat(rd1.getSuccess()).isTrue();
 
-    assertThat(rdd1.getName()).isEqualTo("message send");
+    assertThat(rdd1.getName()).isEqualTo("message publish");
     assertThat(rdd1.getData()).isNull();
     assertThat(rdd1.getType()).isEqualTo("Queue Message | jms");
     assertThat(rdd1.getTarget()).isEqualTo("message");

smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaControllerSpansEnabledTest.java

@@ -41,7 +41,7 @@ void doMostBasicTest() throws Exception {
 
     Envelope rdEnvelope2 = getRequestEnvelope(rdList, "mytopic process");
     Envelope rddEnvelope1 = getDependencyEnvelope(rddList, "HelloController.sendMessage");
-    Envelope rddEnvelope2 = getDependencyEnvelope(rddList, "mytopic send");
+    Envelope rddEnvelope2 = getDependencyEnvelope(rddList, "mytopic publish");
     Envelope rddEnvelope3 = getDependencyEnvelope(rddList, "GET /");
 
     assertThat(rdEnvelope1.getSampleRate()).isNull();
@@ -72,7 +72,7 @@ void doMostBasicTest() throws Exception {
     assertThat(rdd1.getProperties()).isEmpty();
     assertThat(rdd1.getSuccess()).isTrue();
 
-    assertThat(rdd2.getName()).isEqualTo("mytopic send");
+    assertThat(rdd2.getName()).isEqualTo("mytopic publish");
     assertThat(rdd2.getData()).isNull();
     assertThat(rdd2.getType()).isEqualTo("Queue Message | kafka");
     assertThat(rdd2.getTarget()).isEqualTo("mytopic");

smoke-tests/apps/Kafka/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/KafkaTest.java

@@ -57,7 +57,7 @@ void doMostBasicTest() throws Exception {
     }
 
     Envelope rdEnvelope2 = getRequestEnvelope(rdList, "mytopic process");
-    Envelope rddEnvelope1 = getDependencyEnvelope(rddList, "mytopic send");
+    Envelope rddEnvelope1 = getDependencyEnvelope(rddList, "mytopic publish");
     Envelope rddEnvelope2 = getDependencyEnvelope(rddList, "GET /");
 
     assertThat(rdEnvelope1.getSampleRate()).isNull();
@@ -78,7 +78,7 @@ void doMostBasicTest() throws Exception {
         .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
     assertThat(rd1.getSuccess()).isTrue();
 
-    assertThat(rdd1.getName()).isEqualTo("mytopic send");
+    assertThat(rdd1.getName()).isEqualTo("mytopic publish");
     assertThat(rdd1.getData()).isNull();
     assertThat(rdd1.getType()).isEqualTo("Queue Message | kafka");
     assertThat(rdd1.getTarget()).isEqualTo("mytopic");

smoke-tests/apps/Logback/src/main/resources/logback.xml

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="true">
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
   </appender>
 
   <logger name="smoketestapp">
     <level value="trace"/>
   </logger>
 
   <root>
-    <appender-ref ref="STDOUT"/>
+    <appender-ref ref="CONSOLE"/>
   </root>
 </configuration>

smoke-tests/apps/SpringCloudStream/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringCloudStreamControllerSpansEnabledTest.java

@@ -77,7 +77,7 @@ void doMostBasicTest() throws Exception {
     assertThat(rdd1.getProperties()).isEmpty();
     assertThat(rdd1.getSuccess()).isTrue();
 
-    assertThat(rdd2.getName()).isEqualTo("greetings send");
+    assertThat(rdd2.getName()).isEqualTo("greetings publish");
     assertThat(rdd2.getData()).isNull();
     assertThat(rdd2.getType()).isEqualTo("Queue Message | kafka");
     assertThat(rdd2.getTarget()).isEqualTo("greetings");

smoke-tests/apps/SpringCloudStream/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringCloudStreamTest.java

@@ -63,7 +63,7 @@ void doMostBasicTest() throws Exception {
         .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
     assertThat(rd1.getSuccess()).isTrue();
 
-    assertThat(rdd1.getName()).isEqualTo("greetings send");
+    assertThat(rdd1.getName()).isEqualTo("greetings publish");
     assertThat(rdd1.getData()).isNull();
     assertThat(rdd1.getType()).isEqualTo("Queue Message | kafka");
     assertThat(rdd1.getTarget()).isEqualTo("greetings");