Merge branch 'main' into igorpeshansky-windows-logger-timestamps

.chloggen/codeboten_mdatagen-expose-scope-name.yaml

@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: mdatagen
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: export ScopeName in internal/metadata package
+
+# One or more tracking issues or pull requests related to the change
+issues: [10845]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: This can be used by components that need to set their scope name manually. Will save component owners from having to store a variable, which may diverge from the scope name used by the component for emitting its own telemetry.
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: []

.chloggen/semconv-v1.27.0.yaml

@@ -0,0 +1,4 @@
+change_type: enhancement
+component: semconv
+note: Add semantic conventions version v1.27.0
+issues: [10837]

.github/workflows/build-and-test-windows.yaml

@@ -33,6 +33,9 @@ jobs:
             ~\go\pkg\mod
             ~\AppData\Local\go-build
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+      - name: Ensure required ports in the dynamic range are available
+        run: |
+          & ${{ github.workspace }}\.github\workflows\scripts\win-required-ports.ps1
       - name: Run Unit Tests
         run: make gotest
 
@@ -55,6 +58,9 @@ jobs:
             ~\go\pkg\mod
             ~\AppData\Local\go-build
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+      - name: Ensure required ports in the dynamic range are available
+        run: |
+          & ${{ github.workspace }}\.github\workflows\scripts\win-required-ports.ps1
 
       - name: Make otelcorecol
         run: make otelcorecol

.github/workflows/generate-semantic-conventions-pr.yaml

@@ -85,7 +85,7 @@ jobs:
           GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
         run: |
           message="Add semantic conventions version $VERSION"
-          body="Add semantic conventions version \`$VERSION\`."
+          body="Add semantic conventions version \`$VERSION\`. Related to #10842"
           branch="opentelemetrybot/add-semantic-conventions-${VERSION}"
 
           git checkout -b $branch
@@ -96,7 +96,7 @@ jobs:
           change_type: enhancement
           component: semconv
           note: Add semantic conventions version $VERSION
-          issues: [ $pull_request_number ]
+          issues: [10842]
           EOF
 
           git add .chloggen/semconv-$VERSION.yaml

.github/workflows/scripts/win-required-ports.ps1

@@ -0,0 +1,20 @@
+<#
+.SYNOPSIS
+    This script ensures that the ports required by the default configuration of the collector are available.
+.DESCRIPTION
+    Certain runs on GitHub Actions sometimes have ports required by the default configuration reserved by other
+    applications via the WinNAT service.
+#>
+
+#Requires -RunAsAdministrator
+
+netsh interface ip show excludedportrange protocol=tcp
+
+Stop-Service winnat
+
+# Only port in the dynamic range that is being, from time to time, reserved by other applications.
+netsh interface ip add excludedportrange protocol=tcp startport=55679 numberofports=1
+
+Start-Service winnat
+
+netsh interface ip show excludedportrange protocol=tcp

cmd/builder/internal/builder/main.go

@@ -74,7 +74,7 @@ func Generate(cfg Config) error {
 	}
 	// create a warning message for non-aligned builder and collector base
 	if cfg.Distribution.OtelColVersion != defaultOtelColVersion {
-		cfg.Logger.Info("You're building a distribution with non-aligned version of the builder. Compilation may fail due to API changes. Please upgrade your builder or API", zap.String("builder-version", defaultOtelColVersion))
+		cfg.Logger.Info("You're building a distribution with non-aligned version of the builder. The version mismatch may cause a compilation failure. It's recommended to use the same version.", zap.String("collector-version", cfg.Distribution.OtelColVersion), zap.String("builder-version", defaultOtelColVersion))
 	}
 	// if the file does not exist, try to create it
 	if _, err := os.Stat(cfg.Distribution.OutputPath); os.IsNotExist(err) {

cmd/mdatagen/main_test.go

@@ -546,12 +546,14 @@ import (
 	"go.opentelemetry.io/collector/config/configtelemetry"
 )
 
+const ScopeName = ""
+
 func Meter(settings component.TelemetrySettings) metric.Meter {
-	return settings.MeterProvider.Meter("")
+	return settings.MeterProvider.Meter(ScopeName)
 }
 
 func Tracer(settings component.TelemetrySettings) trace.Tracer {
-	return settings.TracerProvider.Tracer("")
+	return settings.TracerProvider.Tracer(ScopeName)
 }
 `,
 		},
@@ -580,12 +582,14 @@ import (
 	"go.opentelemetry.io/collector/config/configtelemetry"
 )
 
+const ScopeName = ""
+
 func Meter(settings component.TelemetrySettings) metric.Meter {
-	return settings.MeterProvider.Meter("")
+	return settings.MeterProvider.Meter(ScopeName)
 }
 
 func Tracer(settings component.TelemetrySettings) trace.Tracer {
-	return settings.TracerProvider.Tracer("")
+	return settings.TracerProvider.Tracer(ScopeName)
 }
 `,
 		},

cmd/mdatagen/templates/telemetry.go.tmpl

@@ -16,12 +16,14 @@ import (
     "go.opentelemetry.io/collector/config/configtelemetry"
 )
 
+const ScopeName = "{{ .ScopeName }}"
+
 func Meter(settings component.TelemetrySettings) metric.Meter {
-	return settings.MeterProvider.Meter("{{ .ScopeName }}")
+	return settings.MeterProvider.Meter(ScopeName)
 }
 
 func Tracer(settings component.TelemetrySettings) trace.Tracer {
-	return settings.TracerProvider.Tracer("{{ .ScopeName }}")
+	return settings.TracerProvider.Tracer(ScopeName)
 }
 {{- if .Telemetry.Metrics }}
 

semconv/v1.27.0/doc.go

@@ -0,0 +1,9 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+// Package semconv implements OpenTelemetry semantic conventions.
+//
+// OpenTelemetry semantic conventions are agreed standardized naming
+// patterns for OpenTelemetry things. This package represents the v1.27.0
+// version of the OpenTelemetry semantic conventions.
+package semconv // import "go.opentelemetry.io/collector/semconv/v1.27.0"