Skip to content

Commit

Permalink
Merge branch 'main' into release-v148
Browse files Browse the repository at this point in the history
  • Loading branch information
yurishkuro authored Aug 14, 2023
2 parents 8b40125 + 54ec466 commit d7ebd16
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 2 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ lint:
./scripts/updateLicenses.sh > $(FMT_LOG)
./scripts/import-order-cleanup.sh stdout > $(IMPORT_LOG)
@[ ! -s "$(FMT_LOG)" -a ! -s "$(IMPORT_LOG)" ] || (echo "License check or import ordering failures, run 'make fmt'" | cat - $(FMT_LOG) $(IMPORT_LOG) && false)
./scripts/check-semconv-version.sh

.PHONY: build-examples
build-examples:
Expand Down
4 changes: 2 additions & 2 deletions cmd/collector/app/handler/otlp_receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"go.opentelemetry.io/collector/pdata/ptrace"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/otlpreceiver"
"go.opentelemetry.io/otel"
noopmetric "go.opentelemetry.io/otel/metric/noop"
"go.opentelemetry.io/otel/trace"
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
Expand Down Expand Up @@ -75,7 +75,7 @@ func startOTLPReceiver(
otlpReceiverSettings := receiver.CreateSettings{
TelemetrySettings: component.TelemetrySettings{
Logger: logger,
TracerProvider: otel.GetTracerProvider(), // TODO we may always want no-op here, not the global default
TracerProvider: trace.NewNoopTracerProvider(),
MeterProvider: noopmetric.NewMeterProvider(), // TODO wire this with jaegerlib metrics?
},
}
Expand Down
23 changes: 23 additions & 0 deletions scripts/check-semconv-version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash

declare -A semconv_map

package_name="go.opentelemetry.io/otel/semconv"
version_regex="v[0-9]\.[0-9]\+\.[0-9]\+"

while IFS=: read -r file_name package_string; do
semconv_map["$file_name"]="${package_string##*/}"
done < <(find . -type f -name "*.go" -exec grep -o -H "$package_name/$version_regex" {} +)

semconv_versions=($(printf "%s\n" "${semconv_map[@]}" | sort -u))

if [ ${#semconv_versions[@]} -gt 1 ]; then
echo "Error: semconv version mismatch detected."
{
for key in "${!semconv_map[@]}"; do
printf "Source File: %-50s | Semconv Version: %s\n" "$key" "${semconv_map[$key]}"
done
} | column -t -s '|'
echo "Run ./scripts/update-semconv-version.sh to update semconv to latest version."
exit 1
fi
26 changes: 26 additions & 0 deletions scripts/update-semconv-version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/bin/bash

package_name="go.opentelemetry.io/otel/semconv"
version_regex="v[0-9]\.[0-9]\+\.[0-9]\+"

latest_semconv_version=$(
curl -s https://pkg.go.dev/$package_name \
| grep -oP 'data-id="v\d+\.\d+\.\d+"' \
| sed -E 's/\"($version_regex)\"/v\1/' \
| sort -Vr \
| head -n 1 \
| awk -F'"' '{print $2}'
)

latest_package_string="$package_name/$latest_semconv_version"

while IFS=: read -r file_name package_string; do
version_number=${package_string##*/}

if [ "$version_number" != "$latest_semconv_version" ]; then
sed -i "s#$package_name/$version_regex#$latest_package_string#g" "$file_name"
{
printf "Source File: %-60s | Previous Semconv Version: %s | Updated Semconv Version: %s\n" "$file_name" "$version_number" "$latest_semconv_version"
} | column -t -s '|'
fi
done < <(find . -type f -name "*.go" -exec grep -o -H "$package_name/$version_regex" {} +)

0 comments on commit d7ebd16

Please sign in to comment.