Merge branch 'master' into abg/doc-no-intro

uber-go · Aug 27, 2024 · 7cef53d · 7cef53d
2 parents 6b2a121 + 27eba7c
commit 7cef53d
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 235 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest"]
-        go: ["1.21.x", "1.22.x"]
+        go: ["1.22.x", "1.23.x"]
 
     steps:
     - name: Checkout code
@@ -52,7 +52,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Test
       run: make cover COVER_MODULES=./docs
@@ -68,7 +68,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
         cache: false  # managed by golangci-lint
 
     - uses: golangci/golangci-lint-action@v6

diff --git a/app_121_test.go b/app_121_test.go
diff --git a/app_122_test.go b/app_122_test.go
diff --git a/app_test.go b/app_test.go
@@ -2397,6 +2397,15 @@ func TestNopLogger(t *testing.T) {
 	app.RequireStart().RequireStop()
 }
 
+func TestNopLoggerOptionString(t *testing.T) {
+	t.Parallel()
+
+	assert.Equal(t,
+		"fx.WithLogger(go.uber.org/fx.init.func1())",
+		NopLogger.String(),
+	)
+}
+
 func TestCustomLoggerWithPrinter(t *testing.T) {
 	t.Parallel()
 

diff --git a/internal/fxreflect/stack_120_test.go b/internal/fxreflect/stack_120_test.go
diff --git a/internal/fxreflect/stack_121_test.go b/internal/fxreflect/stack_121_test.go
diff --git a/internal/fxreflect/stack_122_test.go b/internal/fxreflect/stack_122_test.go
diff --git a/internal/fxreflect/stack_test.go b/internal/fxreflect/stack_test.go
@@ -65,6 +65,25 @@ func TestStack(t *testing.T) {
 	})
 }
 
+func TestDeepStack(t *testing.T) {
+	t.Run("nest", func(t *testing.T) {
+		// Introduce a few frames.
+		frames := func() []Frame {
+			return func() []Frame {
+				return CallerStack(0, 0)
+			}()
+		}()
+
+		require.True(t, len(frames) > 3, "expected at least three frames")
+		for i, name := range []string{"func1.TestDeepStack.func1.1.2", "func1.1", "func1"} {
+			f := frames[i]
+			assert.Equal(t, "go.uber.org/fx/internal/fxreflect.TestDeepStack."+name, f.Function)
+			assert.Contains(t, f.File, "internal/fxreflect/stack_test.go")
+			assert.NotZero(t, f.Line)
+		}
+	})
+}
+
 func TestStackCallerName(t *testing.T) {
 	t.Parallel()