Update semantic convention constants generator script and template

Fixes open-telemetry#3042.
dynatrace-oss-contrib · Mar 19, 2021 · 8cc1215 · 8cc1215
1 parent aac9284
commit 8cc1215
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/buildscripts/semantic-convention/generate.sh b/buildscripts/semantic-convention/generate.sh
@@ -4,7 +4,8 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 ROOT_DIR="${SCRIPT_DIR}/../../"
 
 # freeze the spec version to make SemanticAttributes generation reproducible
-SPEC_VERSION=v1.1.0
+SPEC_VERSION=a44d863edcdef63b0adce7b47df001933b7a158a # = v1.1.0 + number->int update; bump to v1.2.0 once released
+GENERATOR_VERSION=0.3.1
 
 cd ${SCRIPT_DIR}
 
@@ -22,7 +23,7 @@ docker run --rm \
   -v ${SCRIPT_DIR}/opentelemetry-specification/semantic_conventions/trace:/source \
   -v ${SCRIPT_DIR}/templates:/templates \
   -v ${ROOT_DIR}/semconv/src/main/java/io/opentelemetry/semconv/trace/attributes/:/output \
-  otel/semconvgen \
+  otel/semconvgen:${GENERATOR_VERSION} \
   -f /source code \
   --template /templates/SemanticAttributes.java.j2 \
   --output /output/SemanticAttributes.java \
@@ -33,7 +34,7 @@ docker run --rm \
   -v ${SCRIPT_DIR}/opentelemetry-specification/semantic_conventions/resource:/source \
   -v ${SCRIPT_DIR}/templates:/templates \
   -v ${ROOT_DIR}/semconv/src/main/java/io/opentelemetry/semconv/resource/attributes/:/output \
-  otel/semconvgen \
+  otel/semconvgen:${GENERATOR_VERSION} \
   -f /source code \
   --template /templates/SemanticAttributes.java.j2 \
   --output /output/ResourceAttributes.java \

diff --git a/buildscripts/semantic-convention/templates/SemanticAttributes.java.j2 b/buildscripts/semantic-convention/templates/SemanticAttributes.java.j2
@@ -11,7 +11,7 @@
     List<String>
   {%- elif type == "boolean" -%}
     boolean
-  {%- elif type == "number" -%}
+  {%- elif type == "int" -%}
     long
   {%- else -%}
     {{type}}
@@ -24,7 +24,7 @@
     stringArrayKey
   {%- elif type == "boolean" -%}
     booleanKey
-  {%- elif type == "number" -%}
+  {%- elif type == "int" -%}
     longKey
   {%- else -%}
     {{lowerFirst(type)}}Key