Merge branch 'open-telemetry:main' into feature/cel-sampler

Author: dol

.github/workflows/codeql.yml

@@ -6,6 +6,9 @@ on:
       - main
       - release/*
   pull_request:
+    branches:
+      - main
+      - release/*
   # TODO (trask) adding this to the merge queue causes the merge queue to fail
   # see related issues
   # - https://github.com/github/codeql-action/issues/1572
@@ -20,36 +23,48 @@ permissions:
 
 jobs:
   analyze:
+    name: Analyze (${{ matrix.language }})
     permissions:
       contents: read
       actions: read  # for github/codeql-action/init to get workflow details
       security-events: write  # for github/codeql-action/analyze to upload SARIF results
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - language: actions
+          - language: java
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up Java 17
+        if: matrix.language == 'java'
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           distribution: temurin
           java-version: 17
 
       - name: Set up gradle
+        if: matrix.language == 'java'
         uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
         with:
-          languages: java, actions
+          languages: ${{ matrix.language }}
           # using "latest" helps to keep up with the latest Kotlin support
           # see https://github.com/github/codeql-action/issues/1555#issuecomment-1452228433
           tools: latest
 
       - name: Assemble
+        if: matrix.language == 'java'
         # --no-build-cache is required for codeql to analyze all modules
         # --no-daemon is required for codeql to observe the compilation
         # (see https://docs.github.com/en/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis#specifying-build-commands)
         run: ./gradlew assemble --no-build-cache --no-daemon
 
       - name: Perform CodeQL analysis
         uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
+        with:
+          category: "/language:${{matrix.language}}"

CONTRIBUTING.md

@@ -40,8 +40,8 @@ In order to build and test this whole repository you need JDK 11+.
 
 For developers testing code changes before a release is complete, there are
 snapshot builds of the `main` branch. They are available from
-the Sonatype OSS snapshots repository at `https://oss.sonatype.org/content/repositories/snapshots/`
-([browse](https://oss.sonatype.org/content/repositories/snapshots/io/opentelemetry/contrib/))
+the Sonatype snapshot repository at `https://central.sonatype.com/repository/maven-snapshots/`
+([browse](https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/opentelemetry/contrib/)).
 
 #### Building from source
 

RELEASING.md

@@ -7,8 +7,8 @@ The version is specified in [version.gradle.kts](version.gradle.kts).
 ## Snapshot builds
 
 Every successful CI build of the main branch automatically executes `./gradlew publishToSonatype`
-as the last step, which publishes a snapshot build to
-[Sonatype OSS snapshots repository](https://oss.sonatype.org/content/repositories/snapshots/io/opentelemetry/contrib/).
+as the last step, which publishes a snapshot build to the
+[Sonatype snapshot repository](https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/opentelemetry/contrib/).
 
 ## Release cadence
 

buildSrc/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
   implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.4")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.2.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
-  implementation("org.owasp:dependency-check-gradle:12.1.1")
+  implementation("org.owasp:dependency-check-gradle:12.1.3")
 }
 
 spotless {

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -135,7 +135,7 @@ testing {
     dependencies {
       implementation(project(project.path))
 
-      implementation(enforcedPlatform("org.junit:junit-bom:5.13.0"))
+      implementation(enforcedPlatform("org.junit:junit-bom:5.13.1"))
       implementation(enforcedPlatform("org.testcontainers:testcontainers-bom:1.21.1"))
       implementation(enforcedPlatform("com.google.guava:guava-bom:33.4.8-jre"))
       implementation(enforcedPlatform("com.linecorp.armeria:armeria-bom:1.32.5"))

disk-buffering/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
   id("com.github.johnrengelman.shadow")
   id("me.champeau.jmh") version "0.7.3"
   id("ru.vyarus.animalsniffer") version "2.0.1"
-  id("com.squareup.wire") version "5.3.2"
+  id("com.squareup.wire") version "5.3.3"
 }
 
 description = "Exporter implementations that store signals on disk"
@@ -20,7 +20,7 @@ dependencies {
   implementation("io.opentelemetry:opentelemetry-api-incubator")
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")
-  signature("com.toasttab.android:gummy-bears-api-21:0.6.1:coreLib@signature")
+  signature("com.toasttab.android:gummy-bears-api-21:0.12.0:coreLib@signature")
   testImplementation("org.mockito:mockito-inline")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
 

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/LogRecordDataMapper.java

@@ -64,6 +64,9 @@ private static void addExtrasToProtoBuilder(LogRecordData source, LogRecord.Buil
     target.trace_id(ByteStringMapper.getInstance().stringToProto(spanContext.getTraceId()));
     target.dropped_attributes_count(
         source.getTotalAttributeCount() - source.getAttributes().size());
+    if (source.getEventName() != null) {
+      target.event_name(source.getEventName());
+    }
   }
 
   public LogRecordData mapToSdk(
@@ -99,6 +102,7 @@ private static void addExtrasToSdkItemBuilder(
     target.setTotalAttributeCount(source.dropped_attributes_count + attributes.size());
     target.setResource(resource);
     target.setInstrumentationScopeInfo(scopeInfo);
+    target.setEventName(source.event_name);
   }
 
   private static AnyValue bodyToAnyValue(Value<?> body) {

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/models/LogRecordDataImpl.java

@@ -46,6 +46,10 @@ public ExtendedAttributes getExtendedAttributes() {
   @Nullable
   public abstract Value<?> getBodyValue();
 
+  @Override
+  @Nullable
+  public abstract String getEventName();
+
   @AutoValue.Builder
   public abstract static class Builder {
     public abstract Builder setResource(Resource value);
@@ -68,6 +72,8 @@ public abstract static class Builder {
 
     public abstract Builder setTotalAttributeCount(Integer value);
 
+    public abstract Builder setEventName(String value);
+
     public abstract LogRecordDataImpl build();
   }
 }

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/LogRecordDataMapperTest.java

@@ -31,6 +31,7 @@ class LogRecordDataMapperTest {
           .setTimestampEpochNanos(100L)
           .setObservedTimestampEpochNanos(200L)
           .setTotalAttributeCount(3)
+          .setEventName("my.event.name")
           .build();
 
   @Test

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/ProtoLogsDataMapperTest.java

@@ -37,6 +37,7 @@ class ProtoLogsDataMapperTest {
           .setTimestampEpochNanos(100L)
           .setObservedTimestampEpochNanos(200L)
           .setTotalAttributeCount(3)
+          .setEventName("")
           .build();
 
   private static final LogRecordData OTHER_LOG_RECORD =
@@ -51,6 +52,7 @@ class ProtoLogsDataMapperTest {
           .setTimestampEpochNanos(100L)
           .setObservedTimestampEpochNanos(200L)
           .setTotalAttributeCount(3)
+          .setEventName("")
           .build();
 
   private static final LogRecordData LOG_RECORD_WITH_DIFFERENT_SCOPE_SAME_RESOURCE =
@@ -65,6 +67,7 @@ class ProtoLogsDataMapperTest {
           .setTimestampEpochNanos(100L)
           .setObservedTimestampEpochNanos(200L)
           .setTotalAttributeCount(3)
+          .setEventName("")
           .build();
 
   private static final LogRecordData LOG_RECORD_WITH_DIFFERENT_RESOURCE =
@@ -79,6 +82,22 @@ class ProtoLogsDataMapperTest {
           .setTimestampEpochNanos(100L)
           .setObservedTimestampEpochNanos(200L)
           .setTotalAttributeCount(3)
+          .setEventName("")
+          .build();
+
+  private static final LogRecordData LOG_RECORD_WITH_EVENT_NAME =
+      LogRecordDataImpl.builder()
+          .setResource(TestData.RESOURCE_FULL)
+          .setSpanContext(TestData.SPAN_CONTEXT)
+          .setInstrumentationScopeInfo(TestData.INSTRUMENTATION_SCOPE_INFO_FULL)
+          .setAttributes(TestData.ATTRIBUTES)
+          .setBodyValue(Value.of("Log body"))
+          .setSeverity(Severity.DEBUG)
+          .setSeverityText("Log severity text")
+          .setTimestampEpochNanos(100L)
+          .setObservedTimestampEpochNanos(200L)
+          .setTotalAttributeCount(3)
+          .setEventName("test.event.name")
           .build();
 
   @Test
@@ -160,6 +179,19 @@ void verifyMultipleLogsWithDifferentResource() {
     assertThat(mapFromProto(proto)).containsExactlyInAnyOrderElementsOf(signals);
   }
 
+  @Test
+  void verifyLogWithEventName() {
+    List<LogRecordData> signals = Collections.singletonList(LOG_RECORD_WITH_EVENT_NAME);
+
+    LogsData result = mapToProto(signals);
+
+    List<ResourceLogs> resourceLogsList = result.resource_logs;
+    LogRecord firstLog = resourceLogsList.get(0).scope_logs.get(0).log_records.get(0);
+
+    assertEquals("test.event.name", firstLog.event_name);
+    assertThat(mapFromProto(result)).containsExactlyInAnyOrderElementsOf(signals);
+  }
+
   private static LogsData mapToProto(Collection<LogRecordData> signals) {
     return ProtoLogsDataMapper.getInstance().toProto(signals);
   }