Skip to content

Commit e7a46a5

Browse files
committed
use 1.56
1 parent a690f48 commit e7a46a5

File tree

17 files changed

+55
-55
lines changed

17 files changed

+55
-55
lines changed

.fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ targets:
828828
target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.52:javaagent'
829829
- type: gradle
830830
path: ./
831-
target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.55:javaagent'
831+
target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.56:javaagent'
832832
- type: gradle
833833
path: ./
834834
target: ':instrumentation:pekko:pekko-actor-1.0:javaagent'

instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/ApplicationOpenTelemetry.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class ApplicationOpenTelemetry implements OpenTelemetry {
1919
public static final OpenTelemetry INSTANCE;
2020

2121
static {
22-
OpenTelemetry instance = getOpenTelemetry155();
22+
OpenTelemetry instance = getOpenTelemetry156();
2323
if (instance == null) {
2424
instance = getOpenTelemetry127();
2525
}
@@ -56,12 +56,12 @@ public ContextPropagators getPropagators() {
5656
}
5757

5858
@Nullable
59-
private static OpenTelemetry getOpenTelemetry155() {
59+
private static OpenTelemetry getOpenTelemetry156() {
6060
try {
61-
// this class is defined in opentelemetry-api-1.55
61+
// this class is defined in opentelemetry-api-1.56
6262
Class<?> clazz =
6363
Class.forName(
64-
"io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.incubator.ApplicationOpenTelemetry155Incubator");
64+
"io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.incubator.ApplicationOpenTelemetry156Incubator");
6565
return (OpenTelemetry) clazz.getField("INSTANCE").get(null);
6666
} catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException exception) {
6767
return null;

instrumentation/opentelemetry-api/opentelemetry-api-1.55/javaagent/build.gradle.kts renamed to instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
dependencies {
6-
compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "v1_55"))
6+
compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "v1_56"))
77
compileOnly("io.opentelemetry:opentelemetry-api-incubator")
88

99
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55;
6+
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static java.util.Collections.singletonList;
@@ -20,7 +20,7 @@
2020
public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule
2121
implements ExperimentalInstrumentationModule {
2222
public OpenTelemetryApiInstrumentationModule() {
23-
super("opentelemetry-api", "opentelemetry-api-1.55");
23+
super("opentelemetry-api", "opentelemetry-api-1.56");
2424
}
2525

2626
@Override
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55;
6+
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56;
77

88
import static net.bytebuddy.matcher.ElementMatchers.named;
99
import static net.bytebuddy.matcher.ElementMatchers.none;
1010

1111
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1212
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
13-
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.incubator.ApplicationOpenTelemetry155Incubator;
14-
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.incubator.config.ApplicationConfigProvider155Incubator;
15-
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.incubator.config.ApplicationDeclarativeConfigProperties155Incubator;
13+
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.incubator.ApplicationOpenTelemetry156Incubator;
14+
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.incubator.config.ApplicationConfigProvider156Incubator;
15+
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.incubator.config.ApplicationDeclarativeConfigProperties156Incubator;
1616
import net.bytebuddy.asm.Advice;
1717
import net.bytebuddy.description.type.TypeDescription;
1818
import net.bytebuddy.matcher.ElementMatcher;
@@ -36,9 +36,9 @@ public static class InitAdvice {
3636
public static void init() {
3737
// the sole purpose of this advice is to ensure that the classes are
3838
// recognized as helper class and injected into class loader
39-
ApplicationOpenTelemetry155Incubator.class.getName();
40-
ApplicationDeclarativeConfigProperties155Incubator.class.getName();
41-
ApplicationConfigProvider155Incubator.class.getName();
39+
ApplicationOpenTelemetry156Incubator.class.getName();
40+
ApplicationDeclarativeConfigProperties156Incubator.class.getName();
41+
ApplicationConfigProvider156Incubator.class.getName();
4242
}
4343
}
4444
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.common;
6+
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.common;
77

88
import application.io.opentelemetry.common.ComponentLoader;
99

10-
public class ApplicationComponentLoader155 implements ComponentLoader {
10+
public class ApplicationComponentLoader156 implements ComponentLoader {
1111

1212
private final io.opentelemetry.common.ComponentLoader componentLoader;
1313

14-
public ApplicationComponentLoader155(io.opentelemetry.common.ComponentLoader componentLoader) {
14+
public ApplicationComponentLoader156(io.opentelemetry.common.ComponentLoader componentLoader) {
1515
this.componentLoader = componentLoader;
1616
}
1717

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.incubator;
6+
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.incubator;
77

88
import application.io.opentelemetry.api.OpenTelemetry;
99
import application.io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
1010
import application.io.opentelemetry.api.incubator.config.ConfigProvider;
1111
import io.opentelemetry.api.GlobalOpenTelemetry;
1212
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.ApplicationOpenTelemetry127;
13-
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.incubator.config.ApplicationConfigProvider155Incubator;
13+
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.incubator.config.ApplicationConfigProvider156Incubator;
1414
import javax.annotation.Nullable;
1515

16-
public class ApplicationOpenTelemetry155Incubator extends ApplicationOpenTelemetry127
16+
public class ApplicationOpenTelemetry156Incubator extends ApplicationOpenTelemetry127
1717
implements ExtendedOpenTelemetry {
1818

1919
// Accessed with reflection
@@ -24,19 +24,19 @@ public class ApplicationOpenTelemetry155Incubator extends ApplicationOpenTelemet
2424
private final ConfigProvider configProvider;
2525

2626
@Nullable
27-
private static ApplicationOpenTelemetry155Incubator create() {
27+
private static ApplicationOpenTelemetry156Incubator create() {
2828
io.opentelemetry.api.OpenTelemetry openTelemetry = GlobalOpenTelemetry.get();
2929
if (openTelemetry instanceof io.opentelemetry.api.incubator.ExtendedOpenTelemetry) {
30-
return new ApplicationOpenTelemetry155Incubator(
30+
return new ApplicationOpenTelemetry156Incubator(
3131
((io.opentelemetry.api.incubator.ExtendedOpenTelemetry) openTelemetry)
3232
.getConfigProvider());
3333
}
3434
return null;
3535
}
3636

37-
public ApplicationOpenTelemetry155Incubator(
37+
public ApplicationOpenTelemetry156Incubator(
3838
io.opentelemetry.api.incubator.config.ConfigProvider configProvider) {
39-
this.configProvider = new ApplicationConfigProvider155Incubator(configProvider);
39+
this.configProvider = new ApplicationConfigProvider156Incubator(configProvider);
4040
}
4141

4242
@Override
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.incubator;
6+
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.incubator;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static java.util.Collections.singletonList;
@@ -19,7 +19,7 @@
1919
public class OpenTelemetryApiIncubatorInstrumentationModule extends InstrumentationModule
2020
implements ExperimentalInstrumentationModule {
2121
public OpenTelemetryApiIncubatorInstrumentationModule() {
22-
super("opentelemetry-api", "opentelemetry-api-1.55", "opentelemetry-api-incubator-1.55");
22+
super("opentelemetry-api", "opentelemetry-api-1.56", "opentelemetry-api-incubator-1.56");
2323
}
2424

2525
@Override
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.incubator;
6+
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.incubator;
77

88
import static net.bytebuddy.matcher.ElementMatchers.named;
99
import static net.bytebuddy.matcher.ElementMatchers.none;
1010

1111
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1212
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
13-
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.incubator.config.ApplicationConfigProvider155Incubator;
14-
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.incubator.config.ApplicationDeclarativeConfigProperties155Incubator;
13+
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.incubator.config.ApplicationConfigProvider156Incubator;
14+
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.incubator.config.ApplicationDeclarativeConfigProperties156Incubator;
1515
import net.bytebuddy.asm.Advice;
1616
import net.bytebuddy.description.type.TypeDescription;
1717
import net.bytebuddy.matcher.ElementMatcher;
@@ -35,9 +35,9 @@ public static class InitAdvice {
3535
public static void init() {
3636
// the sole purpose of this advice is to ensure that the classes are
3737
// recognized as helper class and injected into class loader
38-
ApplicationOpenTelemetry155Incubator.class.getName();
39-
ApplicationDeclarativeConfigProperties155Incubator.class.getName();
40-
ApplicationConfigProvider155Incubator.class.getName();
38+
ApplicationOpenTelemetry156Incubator.class.getName();
39+
ApplicationDeclarativeConfigProperties156Incubator.class.getName();
40+
ApplicationConfigProvider156Incubator.class.getName();
4141
}
4242
}
4343
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.incubator.config;
6+
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_56.incubator.config;
77

88
import application.io.opentelemetry.api.incubator.config.ConfigProvider;
99
import application.io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
1010
import javax.annotation.Nullable;
1111

12-
public class ApplicationConfigProvider155Incubator implements ConfigProvider {
12+
public class ApplicationConfigProvider156Incubator implements ConfigProvider {
1313

1414
private final DeclarativeConfigProperties declarativeConfigProperties;
1515

16-
public ApplicationConfigProvider155Incubator(
16+
public ApplicationConfigProvider156Incubator(
1717
io.opentelemetry.api.incubator.config.ConfigProvider configProvider) {
1818
this.declarativeConfigProperties =
19-
new ApplicationDeclarativeConfigProperties155Incubator(
19+
new ApplicationDeclarativeConfigProperties156Incubator(
2020
configProvider.getInstrumentationConfig());
2121
}
2222

0 commit comments

Comments
 (0)