chore: bump otel api to 1.27.0 and instrumentation to 0.48 (#24)

wrn14897 · web-flow · commit e14db622f862 · 2024-10-31T15:40:36.000-07:00
diff --git a/DEVELOPING.md b/DEVELOPING.md
@@ -30,7 +30,7 @@ In the smoke-tests directory there exists a `docker-compose.yml` to run in Docke
 Because each example uses the same port, either comment out the other apps in the docker-compose file, or specify the app to run:
 
 ```bash
-cd smoke-tests && docker-compose up --build app-sdk-grpc
+cd smoke-tests && docker compose up --build app-sdk-grpc
 ```
 
 ## Testing
diff --git a/Makefile b/Makefile
@@ -93,14 +93,14 @@ smoke:
 	@echo ""
 	@echo "+++ Temporary Placeholder."
 	@echo ""
-	cd smoke-tests && docker-compose up --build app-sdk-grpc
+	cd smoke-tests && docker compose up --build app-sdk-grpc
 
 #: placeholder for smoke tests, tear down the app
 unsmoke:
 	@echo ""
 	@echo "+++ Spinning down the smokers."
 	@echo ""
-	cd smoke-tests && docker-compose down --volumes
+	cd smoke-tests && docker compose down --volumes
 
 EXAMPLE_SERVICE_NAME ?= otel-python-example
 run_example: export OTEL_SERVICE_NAME := $(EXAMPLE_SERVICE_NAME)
diff --git a/examples/README.md b/examples/README.md
@@ -32,5 +32,5 @@ We have the HONEYCOMB_API_ENDPOINT set to an OpenTelemetry Collector. This can b
 Because each example uses the same port, either comment out the other apps in the docker-compose file, or specify the app and protocol to run:
 
 ```bash
-cd smoke-tests && docker-compose up --build app-sdk-grpc
+cd smoke-tests && docker compose up --build app-sdk-grpc
 ```
diff --git a/examples/hello-world-django/pyproject.toml b/examples/hello-world-django/pyproject.toml
@@ -9,8 +9,8 @@ readme = "README.md"
 python = "^3.11"
 django = "^5.0.1"
 hyperdx-opentelemetry = {path = "../../", develop = true}
-opentelemetry-api = "1.22.0"
-opentelemetry-instrumentation = "0.43b0"
+opentelemetry-api = "1.27.0"
+opentelemetry-instrumentation = "0.48b0"
 
 [build-system]
 requires = ["poetry-core"]
diff --git a/examples/hello-world-flask/Dockerfile b/examples/hello-world-flask/Dockerfile
@@ -1,4 +1,4 @@
-# to be run with docker-compose in smoke-tests directory
+# to be run with docker compose in smoke-tests directory
 FROM python:3.10-slim
 
 WORKDIR /app
diff --git a/examples/hello-world-flask/pyproject.toml b/examples/hello-world-flask/pyproject.toml
@@ -10,8 +10,8 @@ python = "^3.10"
 flask = "2.2.5"
 Werkzeug = "2.2.2"
 hyperdx-opentelemetry = {path = "../../", develop = true}
-opentelemetry-api = "1.22.0"
-opentelemetry-instrumentation-flask = "0.43b0"
+opentelemetry-api = "1.27.0"
+opentelemetry-instrumentation-flask = "0.48b0"
 
 [build-system]
 requires = ["poetry-core"]
diff --git a/examples/hello-world/Dockerfile b/examples/hello-world/Dockerfile
@@ -1,4 +1,4 @@
-# to be run with docker-compose in smoke-tests directory
+# to be run with docker compose in smoke-tests directory
 FROM python:3.10-slim
 
 WORKDIR /app
@@ -25,4 +25,4 @@ RUN cd ./examples/hello-world && poetry install
 
 # From this point forward, we're operating on the example app.
 WORKDIR /app/examples/hello-world
-CMD ["python", "app.py"]
+CMD ["python", "app.py"]
diff --git a/examples/hello-world/pyproject.toml b/examples/hello-world/pyproject.toml
@@ -8,7 +8,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.10"
 hyperdx-opentelemetry = {path = "../../", develop = true}
-opentelemetry-api = "1.22.0"
+opentelemetry-api = "1.27.0"
 
 [build-system]
 requires = ["poetry-core"]
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,17 +1,17 @@
 [tool.poetry]
 name = "hyperdx-opentelemetry"
-version = "0.1.0"
+version = "0.2.0"
 description = "HyperDX OpenTelemetry Distro for Python"
 authors = ["HyperDX <support@hyperdx.io>"]
 readme = "README.md"
 packages = [{include = "hyperdx", from = "src" }]
 
 [tool.poetry.dependencies]
-python = "^3.7, >= 3.7.2"
-opentelemetry-api = "1.22.0"
-opentelemetry-sdk = "1.22.0"
-opentelemetry-exporter-otlp = "1.22.0"
-opentelemetry-instrumentation = "0.43b0"
+python = ">= 3.8"
+opentelemetry-api = "1.27.0"
+opentelemetry-sdk = "1.27.0"
+opentelemetry-exporter-otlp = "1.27.0"
+opentelemetry-instrumentation = "0.48b0"
 
 [tool.poetry.group.dev.dependencies]
 coverage = ">=6.5,<8.0"
diff --git a/smoke-tests/smoke-sdk-grpc-flask.bats b/smoke-tests/smoke-sdk-grpc-flask.bats
@@ -9,7 +9,7 @@ TRACER_NAME="hello_world_flask_tracer"
 METER_NAME="hello_world_flask_meter"
 
 setup_file() {
-	docker-compose up --build --detach collector ${CONTAINER_NAME}
+	docker compose up --build --detach collector ${CONTAINER_NAME}
 	wait_for_ready_app ${CONTAINER_NAME}
 	curl --silent localhost:5000
 	wait_for_traces
@@ -18,16 +18,16 @@ setup_file() {
 
 teardown_file() {
  	cp collector/data.json collector/data-results/data-${CONTAINER_NAME}.json
-	docker-compose stop ${CONTAINER_NAME}
-	docker-compose restart collector
+	docker compose stop ${CONTAINER_NAME}
+	docker compose restart collector
 	wait_for_flush
 }
 
 # TESTS
 
 @test "Auto instrumentation produces a flask span" {
   result=$(span_names_for "opentelemetry.instrumentation.flask")
-  assert_equal "$result" '"/"'
+  assert_equal "$result" '"GET /"'
 }
 
 @test "Manual instrumentation produces parent and child spans with names of spans" {
@@ -49,4 +49,4 @@ teardown_file() {
 @test "Manual instrumentation produces metrics" {
     result=$(metric_names_for ${METER_NAME})
     assert_equal "$result" '"bee_counter"'
-}
+}
diff --git a/smoke-tests/smoke-sdk-grpc.bats b/smoke-tests/smoke-sdk-grpc.bats
@@ -10,17 +10,17 @@ METER_NAME="hello_world_meter"
 
 setup_file() {
 	echo "# 🚧" >&3
-	docker-compose up --build --detach collector
+	docker compose up --build --detach collector
 	wait_for_ready_collector ${COLLECTOR_NAME}
-	docker-compose up --build --detach ${CONTAINER_NAME}
+	docker compose up --build --detach ${CONTAINER_NAME}
 	wait_for_traces
 	wait_for_metrics
 }
 
 teardown_file() {
 	cp collector/data.json collector/data-results/data-${CONTAINER_NAME}.json
-	docker-compose stop ${CONTAINER_NAME}
-	docker-compose restart collector
+	docker compose stop ${CONTAINER_NAME}
+	docker compose restart collector
 	wait_for_flush
 }
 
@@ -45,4 +45,4 @@ teardown_file() {
 @test "Manual instrumentation produces metrics" {
     result=$(metric_names_for ${METER_NAME})
     assert_equal "$result" '"sheep"'
-}
+}
diff --git a/smoke-tests/smoke-sdk-http-flask.bats b/smoke-tests/smoke-sdk-http-flask.bats
@@ -9,7 +9,7 @@ TRACER_NAME="hello_world_flask_tracer"
 METER_NAME="hello_world_flask_meter"
 
 setup_file() {
-	docker-compose up --build --detach collector ${CONTAINER_NAME}
+	docker compose up --build --detach collector ${CONTAINER_NAME}
 	wait_for_ready_app ${CONTAINER_NAME}
 	curl --silent localhost:5000
 	wait_for_traces
@@ -18,16 +18,16 @@ setup_file() {
 
 teardown_file() {
  	cp collector/data.json collector/data-results/data-${CONTAINER_NAME}.json
-	docker-compose stop ${CONTAINER_NAME}
-	docker-compose restart collector
+	docker compose stop ${CONTAINER_NAME}
+	docker compose restart collector
 	wait_for_flush
 }
 
 # TESTS
 
 @test "Auto instrumentation produces a flask span" {
   result=$(span_names_for "opentelemetry.instrumentation.flask")
-  assert_equal "$result" '"/"'
+  assert_equal "$result" '"GET /"'
 }
 
 @test "Manual instrumentation produces parent and child spans with names of spans" {
@@ -49,4 +49,4 @@ teardown_file() {
 @test "Manual instrumentation produces metrics" {
     result=$(metric_names_for ${METER_NAME})
     assert_equal "$result" '"bee_counter"'
-}
+}
diff --git a/smoke-tests/smoke-sdk-http.bats b/smoke-tests/smoke-sdk-http.bats
@@ -10,17 +10,17 @@ METER_NAME="hello_world_meter"
 
 setup_file() {
 	echo "# 🚧" >&3
-	docker-compose up --build --detach collector
+	docker compose up --build --detach collector
 	wait_for_ready_collector ${COLLECTOR_NAME}
-	docker-compose up --build --detach ${CONTAINER_NAME}
+	docker compose up --build --detach ${CONTAINER_NAME}
 	wait_for_traces
 	wait_for_metrics
 }
 
 teardown_file() {
 	cp collector/data.json collector/data-results/data-${CONTAINER_NAME}.json
-	docker-compose stop ${CONTAINER_NAME}
-	docker-compose restart collector
+	docker compose stop ${CONTAINER_NAME}
+	docker compose restart collector
 	wait_for_flush
 }
 
@@ -45,4 +45,4 @@ teardown_file() {
 @test "Manual instrumentation produces metrics" {
     result=$(metric_names_for ${METER_NAME})
     assert_equal "$result" '"sheep"'
-}
+}
diff --git a/smoke-tests/test_helpers/utilities.bash b/smoke-tests/test_helpers/utilities.bash
@@ -100,7 +100,7 @@ wait_for_ready_collector() {
 	MAX_RETRIES=10
 	echo -n "# 🍿 Setting up ${COLLECTOR}" >&3
 	NEXT_WAIT_TIME=0
-	until [ $NEXT_WAIT_TIME -eq $MAX_RETRIES ] || [[ $(docker-compose logs ${COLLECTOR} | grep "Everything is ready. Begin running and processing data.") ]]
+	until [ $NEXT_WAIT_TIME -eq $MAX_RETRIES ] || [[ $(docker compose logs ${COLLECTOR} | grep "Everything is ready. Begin running and processing data.") ]]
 	do
 		echo -n " ... $(( NEXT_WAIT_TIME++ ))s" >&3
 		sleep $NEXT_WAIT_TIME
@@ -118,7 +118,7 @@ wait_for_ready_app() {
 	MAX_RETRIES=10
 	echo -n "# 🍿 Setting up ${CONTAINER}" >&3
 	NEXT_WAIT_TIME=0
-	until [ $NEXT_WAIT_TIME -eq $MAX_RETRIES ] || [[ $(docker-compose logs ${CONTAINER} | grep "Running on http:") ]]
+	until [ $NEXT_WAIT_TIME -eq $MAX_RETRIES ] || [[ $(docker compose logs ${CONTAINER} | grep "Running on http:") ]]
 	do
 		echo -n " ... $(( NEXT_WAIT_TIME++ ))s" >&3
 		sleep $NEXT_WAIT_TIME
@@ -143,4 +143,4 @@ assert_equal() {
 		} >&2 # output error to STDERR
 		return 1
 	fi
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# to be run with docker-compose in smoke-tests directory`
	`1`	`+# to be run with docker compose in smoke-tests directory`
`2`	`2`	`FROM python:3.10-slim`
`3`	`3`
`4`	`4`	`WORKDIR /app`