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.

Sign up for GitHub

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

Jump to bottom

Update the OpenTelemetry SDK version to 1.38.0 #11335

Merged
merged 5 commits into from
May 15, 2024
Merged

Update the OpenTelemetry SDK version to 1.38.0 #11335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d0c8dc4
Update the OpenTelemetry SDK version to 1.38.0
opentelemetrybot May 10, 2024
295d1ac
fix compile error
laurit May 13, 2024
824b8ee
fix test compile error
laurit May 13, 2024
a711268
bridging for 1.38
laurit May 13, 2024
4fbab75
fix tests
laurit May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ val dependencyVersions = hashMapOf<String, String>()
rootProject.extra["versions"] = dependencyVersions

// this line is managed by .github/scripts/update-sdk-version.sh
val otelSdkVersion = "1.37.0"
val otelSdkVersion = "1.38.0"
val otelContribVersion = "1.35.0-alpha"
val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")

Expand Down
2 changes: 1 addition & 1 deletion examples/distro/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ subprojects {
ext {
versions = [
// this line is managed by .github/scripts/update-sdk-version.sh
opentelemetrySdk : "1.37.0",
opentelemetrySdk : "1.38.0",

// these lines are managed by .github/scripts/update-version.sh
opentelemetryJavaagent : "2.4.0-SNAPSHOT",
Expand Down
2 changes: 1 addition & 1 deletion examples/extension/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ version '1.0'
ext {
versions = [
// this line is managed by .github/scripts/update-sdk-version.sh
opentelemetrySdk : "1.37.0",
opentelemetrySdk : "1.38.0",

// these lines are managed by .github/scripts/update-version.sh
opentelemetryJavaagent : "2.4.0-SNAPSHOT",
Expand Down
18 changes: 15 additions & 3 deletions ...lemetry/javaagent/instrumentation/opentelemetryapi/v1_27/ApplicationOpenTelemetry127.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,22 @@ public ContextPropagators getPropagators() {
}

private static ApplicationMeterFactory getMeterFactory() {
// this class is defined in opentelemetry-api-1.37
// this class is defined in opentelemetry-api-1.38
ApplicationMeterFactory meterFactory =
getMeterFactory(
"io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.ApplicationMeterFactory137Incubator");
"io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.incubator.metrics.ApplicationMeterFactory138Incubator");
if (meterFactory == null) {
// this class is defined in opentelemetry-api-1.38
meterFactory =
getMeterFactory(
"io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.metrics.ApplicationMeterFactory138");
}
if (meterFactory == null) {
// this class is defined in opentelemetry-api-1.37
meterFactory =
getMeterFactory(
"io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.ApplicationMeterFactory137");
}
if (meterFactory == null) {
// this class is defined in opentelemetry-api-1.32
meterFactory =
Expand All @@ -83,7 +95,7 @@ private static ApplicationMeterFactory getMeterFactory() {
// this class is defined in opentelemetry-api-1.31
meterFactory =
getMeterFactory(
"io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics.ApplicationMeterFactory131");
"io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics.ApplicationMeterFactory131");
}
if (meterFactory == null) {
meterFactory = new ApplicationMeterFactory115();
Expand Down
4 changes: 2 additions & 2 deletions ...penTelemetryApiInstrumentationModule.java → ...penTelemetryApiInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31;
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator;

import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
import static java.util.Collections.singletonList;
Expand All @@ -17,7 +17,7 @@
@AutoService(InstrumentationModule.class)
public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule {
public OpenTelemetryApiInstrumentationModule() {
super("opentelemetry-api", "opentelemetry-api-1.31");
super("opentelemetry-api", "opentelemetry-api-1.31", "opentelemetry-api-incubator-1.31");
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...i/v1_31/OpenTelemetryInstrumentation.java → ...cubator/OpenTelemetryInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31;
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator;

import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.none;

import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics.ApplicationMeterFactory131;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics.ApplicationMeterFactory131;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
Expand Down
2 changes: 1 addition & 1 deletion ...s/ApplicationDoubleCounterBuilder131.java → ...s/ApplicationDoubleCounterBuilder131.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;

import application.io.opentelemetry.api.common.AttributeKey;
import application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleCounterBuilder;
Expand Down
5 changes: 2 additions & 3 deletions ...ics/ApplicationDoubleGaugeBuilder131.java → ...ics/ApplicationDoubleGaugeBuilder131.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;

import application.io.opentelemetry.api.common.AttributeKey;
import application.io.opentelemetry.api.common.Attributes;
Expand Down Expand Up @@ -31,8 +31,7 @@ public LongGaugeBuilder ofLongs() {

@Override
public DoubleGauge build() {
io.opentelemetry.api.incubator.metrics.DoubleGauge agentDoubleGauge =
((io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) agentBuilder).build();
io.opentelemetry.api.metrics.DoubleGauge agentDoubleGauge = agentBuilder.build();
return new DoubleGauge() {

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...ApplicationDoubleHistogramBuilder131.java → ...ApplicationDoubleHistogramBuilder131.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;

import application.io.opentelemetry.api.common.AttributeKey;
import application.io.opentelemetry.api.metrics.LongHistogramBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...icationDoubleUpDownCounterBuilder131.java → ...icationDoubleUpDownCounterBuilder131.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;

import application.io.opentelemetry.api.common.AttributeKey;
import application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleUpDownCounterBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...ics/ApplicationLongCounterBuilder131.java → ...ics/ApplicationLongCounterBuilder131.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;

import application.io.opentelemetry.api.common.AttributeKey;
import application.io.opentelemetry.api.metrics.DoubleCounterBuilder;
Expand Down
5 changes: 2 additions & 3 deletions ...trics/ApplicationLongGaugeBuilder131.java → ...trics/ApplicationLongGaugeBuilder131.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;

import application.io.opentelemetry.api.common.AttributeKey;
import application.io.opentelemetry.api.common.Attributes;
Expand All @@ -25,8 +25,7 @@ final class ApplicationLongGaugeBuilder131 extends ApplicationLongGaugeBuilder

@Override
public LongGauge build() {
io.opentelemetry.api.incubator.metrics.LongGauge agentLongGauge =
((io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder) agentBuilder).build();
io.opentelemetry.api.metrics.LongGauge agentLongGauge = agentBuilder.build();
return new LongGauge() {
@Override
public void set(long value) {
Expand Down
2 changes: 1 addition & 1 deletion ...s/ApplicationLongHistogramBuilder131.java → ...s/ApplicationLongHistogramBuilder131.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;

import application.io.opentelemetry.api.common.AttributeKey;
import application.io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...plicationLongUpDownCounterBuilder131.java → ...plicationLongUpDownCounterBuilder131.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;

import application.io.opentelemetry.api.common.AttributeKey;
import application.io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...pi/v1_31/metrics/ApplicationMeter131.java → ...ncubator/metrics/ApplicationMeter131.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;

import application.io.opentelemetry.api.metrics.DoubleGaugeBuilder;
import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...1/metrics/ApplicationMeterFactory131.java → ...r/metrics/ApplicationMeterFactory131.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;

import io.opentelemetry.api.metrics.Meter;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationMeter;
Expand Down
2 changes: 1 addition & 1 deletion ...nstrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationMeter132Incubator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_32.incubator.metrics;

import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics.ApplicationMeter131;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics.ApplicationMeter131;

class ApplicationMeter132Incubator extends ApplicationMeter131 {

Expand Down
4 changes: 2 additions & 2 deletions ...lemetry/javaagent/instrumentation/opentelemetryapi/v1_32/metrics/ApplicationMeter132.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_15.metrics.ApplicationMeter115;

class ApplicationMeter132 extends ApplicationMeter115 {
public class ApplicationMeter132 extends ApplicationMeter115 {

private final io.opentelemetry.api.metrics.Meter agentMeter;

ApplicationMeter132(io.opentelemetry.api.metrics.Meter agentMeter) {
public ApplicationMeter132(io.opentelemetry.api.metrics.Meter agentMeter) {
super(agentMeter);
this.agentMeter = agentMeter;
}
Expand Down
11 changes: 11 additions & 0 deletions instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@ configurations.configureEach {
if (name.endsWith("testRuntimeClasspath", true) || name.endsWith("testCompileClasspath", true)) {
resolutionStrategy {
force("io.opentelemetry:opentelemetry-api:1.37.0")
force("io.opentelemetry:opentelemetry-api-incubator:1.37.0-alpha")
}
if (name.startsWith("incubatorTest")) {
resolutionStrategy {
force("io.opentelemetry:opentelemetry-api-incubator:1.37.0-alpha")
}
} else if (name.startsWith("oldAndNewIncubatorTest")) {
resolutionStrategy {
force("io.opentelemetry:opentelemetry-api-incubator:1.37.0-alpha")
force("io.opentelemetry:opentelemetry-extension-incubator:1.32.0-alpha")
}
}
}
}
Expand Down
38 changes: 38 additions & 0 deletions ...strumentation/opentelemetryapi/v1_37/incubator/OpenTelemetryApiInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator;

import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
import static java.util.Collections.singletonList;

import com.google.auto.service.AutoService;
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import java.util.List;
import net.bytebuddy.matcher.ElementMatcher;

@AutoService(InstrumentationModule.class)
public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule {
public OpenTelemetryApiInstrumentationModule() {
super("opentelemetry-api", "opentelemetry-api-1.37", "opentelemetry-api-incubator-1.37");
}

@Override
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
// skip instrumentation when opentelemetry-api-incubator is not present
return hasClassesNamed("application.io.opentelemetry.api.incubator.metrics.DoubleGauge");
}

@Override
public boolean isIndyModule() {
return false;
}

@Override
public List<TypeInstrumentation> typeInstrumentations() {
return singletonList(new OpenTelemetryInstrumentation());
}
}
40 changes: 40 additions & 0 deletions ...aagent/instrumentation/opentelemetryapi/v1_37/incubator/OpenTelemetryInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator;

import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.none;

import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.ApplicationMeterFactory137;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;

public class OpenTelemetryInstrumentation implements TypeInstrumentation {

@Override
public ElementMatcher<TypeDescription> typeMatcher() {
return named("application.io.opentelemetry.api.GlobalOpenTelemetry");
}

@Override
public void transform(TypeTransformer transformer) {
transformer.applyAdviceToMethod(
none(), OpenTelemetryInstrumentation.class.getName() + "$InitAdvice");
}

@SuppressWarnings({"ReturnValueIgnored", "unused"})
public static class InitAdvice {
@Advice.OnMethodEnter
public static void init() {
// the sole purpose of this advice is to ensure that ApplicationMeterFactory137
// is recognized as helper class and injected into class loader
ApplicationMeterFactory137.class.getName();
}
}
}
2 changes: 1 addition & 1 deletion ...s/ApplicationDoubleCounterBuilder137.java → ...s/ApplicationDoubleCounterBuilder137.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.metrics;
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics;

import application.io.opentelemetry.api.common.AttributeKey;
import application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleCounterBuilder;
Expand Down
5 changes: 2 additions & 3 deletions ...ics/ApplicationDoubleGaugeBuilder137.java → ...ics/ApplicationDoubleGaugeBuilder137.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.metrics;
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics;

import application.io.opentelemetry.api.common.AttributeKey;
import application.io.opentelemetry.api.common.Attributes;
Expand Down Expand Up @@ -31,8 +31,7 @@ public LongGaugeBuilder ofLongs() {

@Override
public DoubleGauge build() {
io.opentelemetry.api.incubator.metrics.DoubleGauge agentDoubleGauge =
((io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) agentBuilder).build();
io.opentelemetry.api.metrics.DoubleGauge agentDoubleGauge = agentBuilder.build();
return new DoubleGauge() {

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...ApplicationDoubleHistogramBuilder137.java → ...ApplicationDoubleHistogramBuilder137.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.metrics;
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics;

import application.io.opentelemetry.api.common.AttributeKey;
import application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder;
Expand Down
Loading
Loading