Skip to content

Commit 2b7b27b

Browse files
opentelemetrybottrasklaurit
authored
Update the OpenTelemetry SDK version to 1.26.0 (#8427)
Co-authored-by: Trask Stalnaker <[email protected]> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 897031c commit 2b7b27b

File tree

14 files changed

+101
-83
lines changed

14 files changed

+101
-83
lines changed

‎dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ val dependencyVersions = hashMapOf<String, String>()
1212
rootProject.extra["versions"] = dependencyVersions
1313

1414
// this line is managed by .github/scripts/update-sdk-version.sh
15-
val otelSdkVersion = "1.25.0"
15+
val otelSdkVersion = "1.26.0"
1616
val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
1717

1818
// Need both BOM and groovy jars

‎examples/distro/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ subprojects {
2727
ext {
2828
versions = [
2929
// this line is managed by .github/scripts/update-sdk-version.sh
30-
opentelemetrySdk : "1.25.0",
30+
opentelemetrySdk : "1.26.0",
3131

3232
// these lines are managed by .github/scripts/update-version.sh
3333
opentelemetryJavaagent : "1.26.0-SNAPSHOT",

‎instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private static void mapLogRecord(LogRecordBuilder builder, LogRecord logRecord)
6666
// time
6767
// TODO (trask) use getInstant() for more precision on Java 9
6868
long timestamp = logRecord.getMillis();
69-
builder.setEpoch(timestamp, TimeUnit.MILLISECONDS);
69+
builder.setTimestamp(timestamp, TimeUnit.MILLISECONDS);
7070

7171
// level
7272
Level level = logRecord.getLevel();

‎instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/OpenTelemetryAppender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public void append(LogEvent event) {
158158

159159
Instant timestamp = event.getInstant();
160160
if (timestamp != null) {
161-
builder.setEpoch(
161+
builder.setTimestamp(
162162
TimeUnit.MILLISECONDS.toNanos(timestamp.getEpochMillisecond())
163163
+ timestamp.getNanoOfMillisecond(),
164164
TimeUnit.NANOSECONDS);

‎instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/OpenTelemetryAppenderConfigTest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
2020
import io.opentelemetry.sdk.logs.SdkLoggerProvider;
2121
import io.opentelemetry.sdk.logs.data.LogRecordData;
22-
import io.opentelemetry.sdk.logs.export.InMemoryLogRecordExporter;
2322
import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor;
2423
import io.opentelemetry.sdk.resources.Resource;
24+
import io.opentelemetry.sdk.testing.exporter.InMemoryLogRecordExporter;
2525
import io.opentelemetry.sdk.trace.SdkTracerProvider;
2626
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
2727
import java.time.Instant;
@@ -81,7 +81,7 @@ void initializeWithBuilder() {
8181
.setMessage(new FormattedMessage("log message 1", (Object) null))
8282
.build());
8383

84-
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogItems();
84+
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
8585
assertThat(logDataList)
8686
.satisfiesExactly(logRecordData -> assertThat(logDataList.get(0)).hasBody("log message 1"));
8787
}
@@ -90,7 +90,7 @@ void initializeWithBuilder() {
9090
void logNoSpan() {
9191
logger.info("log message 1");
9292

93-
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogItems();
93+
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
9494
assertThat(logDataList).hasSize(1);
9595
assertThat(logDataList.get(0))
9696
.hasResource(resource)
@@ -107,7 +107,7 @@ void logWithSpan() {
107107

108108
Span span2 = runWithSpan("span2", () -> logger.info("log message 3"));
109109

110-
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogItems();
110+
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
111111
assertThat(logDataList).hasSize(3);
112112
assertThat(logDataList.get(0).getSpanContext()).isEqualTo(span1.getSpanContext());
113113
assertThat(logDataList.get(1).getSpanContext()).isEqualTo(SpanContext.getInvalid());
@@ -129,7 +129,7 @@ void logWithExtras() {
129129
Instant start = Instant.now();
130130
logger.info("log message 1", new IllegalStateException("Error!"));
131131

132-
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogItems();
132+
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
133133
assertThat(logDataList).hasSize(1);
134134
assertThat(logDataList.get(0))
135135
.hasResource(resource)
@@ -142,7 +142,7 @@ void logWithExtras() {
142142
equalTo(SemanticAttributes.EXCEPTION_MESSAGE, "Error!"),
143143
satisfies(SemanticAttributes.EXCEPTION_STACKTRACE, v -> v.contains("logWithExtras")));
144144

145-
assertThat(logDataList.get(0).getEpochNanos())
145+
assertThat(logDataList.get(0).getTimestampEpochNanos())
146146
.isGreaterThanOrEqualTo(TimeUnit.MILLISECONDS.toNanos(start.toEpochMilli()))
147147
.isLessThanOrEqualTo(TimeUnit.MILLISECONDS.toNanos(Instant.now().toEpochMilli()));
148148
}
@@ -157,7 +157,7 @@ void logContextData() {
157157
ThreadContext.clearMap();
158158
}
159159

160-
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogItems();
160+
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
161161
assertThat(logDataList).hasSize(1);
162162
assertThat(logDataList.get(0))
163163
.hasResource(resource)
@@ -175,7 +175,7 @@ void logStringMapMessage() {
175175
message.put("key2", "val2");
176176
logger.info(message);
177177

178-
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogItems();
178+
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
179179
assertThat(logDataList).hasSize(1);
180180
assertThat(logDataList.get(0))
181181
.hasResource(resource)
@@ -192,7 +192,7 @@ void logStringMapMessageWithSpecialAttribute() {
192192
message.put("message", "val2");
193193
logger.info(message);
194194

195-
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogItems();
195+
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
196196
assertThat(logDataList).hasSize(1);
197197
assertThat(logDataList.get(0))
198198
.hasResource(resource)
@@ -208,7 +208,7 @@ void testCaptureMarkerAttribute() {
208208

209209
logger.info(marker, "Message");
210210

211-
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogItems();
211+
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
212212
LogRecordData logData = logDataList.get(0);
213213
assertThat(logData.getAttributes().get(stringKey("log4j.marker"))).isEqualTo(markerName);
214214
}
@@ -220,7 +220,7 @@ void logStructuredDataMessage() {
220220
message.put("key2", "val2");
221221
logger.info(message);
222222

223-
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogItems();
223+
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
224224
assertThat(logDataList).hasSize(1);
225225
assertThat(logDataList.get(0))
226226
.hasResource(resource)

‎instrumentation/logback/logback-appender-1.0/library/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ dependencies {
3737
}
3838

3939
testImplementation("io.opentelemetry:opentelemetry-sdk-logs")
40+
testImplementation("io.opentelemetry:opentelemetry-sdk-logs-testing")
4041
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
4142
}
4243

@@ -64,6 +65,7 @@ testing {
6465
implementation(project(":instrumentation:logback:logback-appender-1.0:library"))
6566
implementation("io.opentelemetry:opentelemetry-api-logs")
6667
implementation("io.opentelemetry:opentelemetry-sdk-logs")
68+
implementation("io.opentelemetry:opentelemetry-sdk-logs-testing")
6769
implementation("io.opentelemetry:opentelemetry-sdk-testing")
6870

6971
if (latestDepTest) {

‎instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private void mapLoggingEvent(LogRecordBuilder builder, ILoggingEvent loggingEven
9292

9393
// time
9494
long timestamp = loggingEvent.getTimeStamp();
95-
builder.setEpoch(timestamp, TimeUnit.MILLISECONDS);
95+
builder.setTimestamp(timestamp, TimeUnit.MILLISECONDS);
9696

9797
// level
9898
Level level = loggingEvent.getLevel();

‎instrumentation/logback/logback-appender-1.0/library/src/slf4j2ApiTest/java/io/opentelemetry/instrumentation/logback/appender/v1_0/Slf4j2Test.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
1313
import io.opentelemetry.sdk.logs.SdkLoggerProvider;
1414
import io.opentelemetry.sdk.logs.data.LogRecordData;
15-
import io.opentelemetry.sdk.logs.export.InMemoryLogRecordExporter;
1615
import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor;
1716
import io.opentelemetry.sdk.resources.Resource;
17+
import io.opentelemetry.sdk.testing.exporter.InMemoryLogRecordExporter;
1818
import java.util.Arrays;
1919
import java.util.List;
2020
import org.junit.jupiter.api.BeforeAll;
@@ -56,7 +56,7 @@ void setup() {
5656
void keyValue() {
5757
logger.atInfo().setMessage("log message 1").addKeyValue("key", "value").log();
5858

59-
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogItems();
59+
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
6060
assertThat(logDataList).hasSize(1);
6161
LogRecordData logData = logDataList.get(0);
6262
assertThat(logData.getResource()).isEqualTo(resource);
@@ -79,7 +79,7 @@ void multipleMarkers() {
7979
.addMarker(MarkerFactory.getMarker(markerName2))
8080
.log();
8181

82-
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogItems();
82+
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
8383
assertThat(logDataList).hasSize(1);
8484
LogRecordData logData = logDataList.get(0);
8585
assertThat(logData.getResource()).isEqualTo(resource);

‎instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/OpenTelemetryAppenderConfigTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
1717
import io.opentelemetry.sdk.logs.SdkLoggerProvider;
1818
import io.opentelemetry.sdk.logs.data.LogRecordData;
19-
import io.opentelemetry.sdk.logs.export.InMemoryLogRecordExporter;
2019
import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor;
2120
import io.opentelemetry.sdk.resources.Resource;
21+
import io.opentelemetry.sdk.testing.exporter.InMemoryLogRecordExporter;
2222
import io.opentelemetry.sdk.trace.SdkTracerProvider;
2323
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
2424
import java.time.Instant;
@@ -67,7 +67,7 @@ void setup() {
6767
void logNoSpan() {
6868
logger.info("log message 1");
6969

70-
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogItems();
70+
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
7171
assertThat(logDataList).hasSize(1);
7272
LogRecordData logData = logDataList.get(0);
7373
assertThat(logData.getResource()).isEqualTo(resource);
@@ -84,7 +84,7 @@ void logWithSpan() {
8484

8585
Span span2 = runWithSpan("span2", () -> logger.info("log message 3"));
8686

87-
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogItems();
87+
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
8888
assertThat(logDataList).hasSize(3);
8989
assertThat(logDataList.get(0).getSpanContext()).isEqualTo(span1.getSpanContext());
9090
assertThat(logDataList.get(1).getSpanContext()).isEqualTo(SpanContext.getInvalid());
@@ -108,13 +108,13 @@ void logWithExtras() {
108108
Marker marker = MarkerFactory.getMarker(markerName);
109109
logger.info(marker, "log message 1", new IllegalStateException("Error!"));
110110

111-
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogItems();
111+
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
112112
assertThat(logDataList).hasSize(1);
113113
LogRecordData logData = logDataList.get(0);
114114
assertThat(logData.getResource()).isEqualTo(resource);
115115
assertThat(logData.getInstrumentationScopeInfo()).isEqualTo(instrumentationScopeInfo);
116116
assertThat(logData.getBody().asString()).isEqualTo("log message 1");
117-
assertThat(logData.getEpochNanos())
117+
assertThat(logData.getTimestampEpochNanos())
118118
.isGreaterThanOrEqualTo(TimeUnit.MILLISECONDS.toNanos(start.toEpochMilli()))
119119
.isLessThanOrEqualTo(TimeUnit.MILLISECONDS.toNanos(Instant.now().toEpochMilli()));
120120
assertThat(logData.getSeverity()).isEqualTo(Severity.INFO);
@@ -157,7 +157,7 @@ void logContextData() {
157157
MDC.clear();
158158
}
159159

160-
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogItems();
160+
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
161161
assertThat(logDataList).hasSize(1);
162162
LogRecordData logData = logDataList.get(0);
163163
assertThat(logData.getResource()).isEqualTo(resource);

‎instrumentation/opentelemetry-api/opentelemetry-api-logs-1.23/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/bridge/ApplicationLogRecordBuilder.java

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,27 @@ class ApplicationLogRecordBuilder implements LogRecordBuilder {
2525

2626
@Override
2727
@CanIgnoreReturnValue
28-
public LogRecordBuilder setEpoch(long l, TimeUnit timeUnit) {
29-
agentLogRecordBuilder.setEpoch(l, timeUnit);
28+
public LogRecordBuilder setTimestamp(long l, TimeUnit timeUnit) {
29+
agentLogRecordBuilder.setTimestamp(l, timeUnit);
3030
return this;
3131
}
3232

3333
@Override
3434
@CanIgnoreReturnValue
35-
public LogRecordBuilder setEpoch(Instant instant) {
36-
agentLogRecordBuilder.setEpoch(instant);
35+
public LogRecordBuilder setTimestamp(Instant instant) {
36+
agentLogRecordBuilder.setTimestamp(instant);
37+
return this;
38+
}
39+
40+
@Override
41+
public LogRecordBuilder setObservedTimestamp(long l, TimeUnit timeUnit) {
42+
agentLogRecordBuilder.setObservedTimestamp(l, timeUnit);
43+
return this;
44+
}
45+
46+
@Override
47+
public LogRecordBuilder setObservedTimestamp(Instant instant) {
48+
agentLogRecordBuilder.setObservedTimestamp(instant);
3749
return this;
3850
}
3951

0 commit comments

Comments
 (0)