Skip to content

Commit bc7a959

Browse files
committed
fixes
1 parent 3932c61 commit bc7a959

5 files changed

Lines changed: 21 additions & 4 deletions

File tree

.github/workflows/auto-update-semconv.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ jobs:
8282
- name: Apply formatting
8383
run: ./gradlew spotlessApply
8484

85+
- name: Generate API diffs
86+
run: ./gradlew jApiCmp
87+
8588
- name: Use CLA approved bot
8689
run: .github/scripts/use-cla-approved-bot.sh
8790

@@ -99,6 +102,7 @@ jobs:
99102
git checkout -b $branch
100103
git add -u
101104
git add semconv**/src/main/java
105+
git add docs/apidiffs/
102106
git commit -m "$message"
103107
git push --set-upstream origin $branch
104108
pr_url=$(gh pr create --title "$message" \

buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,14 @@
2323
*/
2424
package io.opentelemetry.semconv.incubating;
2525

26+
import static io.opentelemetry.api.common.AttributeKey.booleanArrayKey;
2627
import static io.opentelemetry.api.common.AttributeKey.booleanKey;
28+
import static io.opentelemetry.api.common.AttributeKey.doubleArrayKey;
2729
import static io.opentelemetry.api.common.AttributeKey.doubleKey;
30+
import static io.opentelemetry.api.common.AttributeKey.longArrayKey;
2831
import static io.opentelemetry.api.common.AttributeKey.longKey;
29-
import static io.opentelemetry.api.common.AttributeKey.stringKey;
3032
import static io.opentelemetry.api.common.AttributeKey.stringArrayKey;
33+
import static io.opentelemetry.api.common.AttributeKey.stringKey;
3134

3235
import static io.opentelemetry.semconv.AttributeKeyTemplate.stringArrayKeyTemplate;
3336
import static io.opentelemetry.semconv.AttributeKeyTemplate.stringKeyTemplate;

buildscripts/templates/registry/java/SemanticAttributes.java.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,14 @@
2222
*/
2323
package io.opentelemetry.semconv;
2424

25+
import static io.opentelemetry.api.common.AttributeKey.booleanArrayKey;
2526
import static io.opentelemetry.api.common.AttributeKey.booleanKey;
27+
import static io.opentelemetry.api.common.AttributeKey.doubleArrayKey;
2628
import static io.opentelemetry.api.common.AttributeKey.doubleKey;
29+
import static io.opentelemetry.api.common.AttributeKey.longArrayKey;
2730
import static io.opentelemetry.api.common.AttributeKey.longKey;
28-
import static io.opentelemetry.api.common.AttributeKey.stringKey;
2931
import static io.opentelemetry.api.common.AttributeKey.stringArrayKey;
32+
import static io.opentelemetry.api.common.AttributeKey.stringKey;
3033

3134
import static io.opentelemetry.semconv.AttributeKeyTemplate.stringArrayKeyTemplate;
3235
import static io.opentelemetry.semconv.AttributeKeyTemplate.stringKeyTemplate;
Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
Comparing source compatibility of opentelemetry-semconv-1.39.0-SNAPSHOT.jar against opentelemetry-semconv-1.39.0.jar
2-
No changes.
1+
Comparing source compatibility of opentelemetry-semconv-1.40.0-SNAPSHOT.jar against opentelemetry-semconv-1.39.0.jar
2+
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.semconv.SchemaUrls (not serializable)
3+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4+
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String V1_40_0
5+
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.semconv.ServiceAttributes (not serializable)
6+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
7+
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.api.common.AttributeKey<java.lang.String> SERVICE_INSTANCE_ID
8+
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.api.common.AttributeKey<java.lang.String> SERVICE_NAMESPACE

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/PprofIncubatingAttributes.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.semconv.incubating;
77

88
import static io.opentelemetry.api.common.AttributeKey.booleanKey;
9+
import static io.opentelemetry.api.common.AttributeKey.longArrayKey;
910
import static io.opentelemetry.api.common.AttributeKey.stringArrayKey;
1011
import static io.opentelemetry.api.common.AttributeKey.stringKey;
1112

0 commit comments

Comments
 (0)