Flatten weaver pkg into semconv

open-telemetry · Oct 18, 2024 · a9d4f9e · a9d4f9e
1 parent e45e055
commit a9d4f9e
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 195 deletions.
diff --git a/Makefile b/Makefile
@@ -273,7 +273,7 @@ semconv-generate: $(SEMCONVKIT)
 	docker run --rm \
 		-u $(DOCKER_USER) \
 		--env HOME=/tmp/weaver \
-		--mount 'type=bind,source=$(PWD)/semconv/weaver,target=/home/weaver/templates,readonly' \
+		--mount 'type=bind,source=$(PWD)/semconv,target=/home/weaver/templates/registry/go,readonly' \
 		--mount 'type=bind,source=$(PWD)/semconv/${TAG},target=/home/weaver/target' \
 		--mount 'type=bind,source=$(HOME)/.weaver,target=/tmp/weaver/.weaver' \
 		$(WEAVER_CONTAINER) registry generate \

diff --git a/.../weaver/registry/go/attribute_group.go.j2 → semconv/attribute_group.go.j2 b/.../weaver/registry/go/attribute_group.go.j2 → semconv/attribute_group.go.j2
diff --git a/semconv/weaver/registry/go/helpers.j2 → semconv/helpers.j2 b/semconv/weaver/registry/go/helpers.j2 → semconv/helpers.j2
diff --git a/semconv/weaver/registry/go/metric.go.j2 → semconv/metric.go.j2 b/semconv/weaver/registry/go/metric.go.j2 → semconv/metric.go.j2
diff --git a/semconv/metric_template.j2 b/semconv/metric_template.j2
diff --git a/semconv/template.j2 b/semconv/template.j2
diff --git a/semconv/weaver/registry/go/weaver.yaml → semconv/weaver.yaml b/semconv/weaver/registry/go/weaver.yaml → semconv/weaver.yaml